From b2738d2fe138c708f1bad016fdb07928efc012a1 Mon Sep 17 00:00:00 2001 From: MaWoScha Date: Fri, 10 Jul 2015 17:06:06 -0400 Subject: [PATCH] Version 0.4.0, added: E-Mail-Templates revised by MaWoScha --- MagentoConnect.html | 1 + .../Config/Form/Fieldset/Instructions.php | 2 +- .../German/LocalePackDe/etc/config.xml | 2 +- .../default/locale/de_DE/translate.csv | 55 ++++++ .../default/blank/locale/de_DE/translate.csv | 1 + .../default/locale/de_DE/translate.csv | 6 + .../default/iphone/locale/de_DE/translate.csv | 0 .../default/modern/locale/de_DE/translate.csv | 1 + .../rwd/default/locale/de_DE/translate.csv | 23 +++ .../de_DE/template/email/account_new.html | 26 +-- .../email/account_new_confirmation.html | 43 ++--- .../template/email/account_new_confirmed.html | 21 ++- .../account_password_reset_confirmation.html | 12 +- .../template/email/admin_password_new.html | 10 +- .../admin_password_reset_confirmation.html | 14 +- ...amazonpayments_asp_notification_error.html | 10 +- .../de_DE/template/email/contact_form.html | 15 +- .../email/currency_update_warning.html | 7 +- .../de_DE/template/email/html/support.html | 20 +- .../template/email/log_clean_warning.html | 9 +- .../email/moneybookers_activateemail.html | 13 +- .../email/newsletter_subscr_confirm.html | 63 +++---- .../email/newsletter_subscr_success.html | 4 +- .../email/newsletter_unsub_success.html | 6 +- .../de_DE/template/email/password_new.html | 7 +- .../de_DE/template/email/payment_failed.html | 25 +-- .../email/product_alert_cron_error.html | 18 +- .../template/email/product_price_alert.html | 2 +- .../de_DE/template/email/product_share.html | 10 +- .../template/email/product_stock_alert.html | 2 +- .../template/email/sales/creditmemo_new.html | 169 +++++++++-------- .../email/sales/creditmemo_new_guest.html | 168 +++++++++-------- .../email/sales/creditmemo_update.html | 85 ++++----- .../email/sales/creditmemo_update_guest.html | 84 ++++----- .../template/email/sales/invoice_new.html | 170 +++++++++-------- .../email/sales/invoice_new_guest.html | 170 +++++++++-------- .../template/email/sales/invoice_update.html | 86 ++++----- .../email/sales/invoice_update_guest.html | 83 ++++----- .../de_DE/template/email/sales/order_new.html | 173 +++++++++--------- .../template/email/sales/order_new_guest.html | 172 +++++++++-------- .../template/email/sales/order_update.html | 85 ++++----- .../email/sales/order_update_guest.html | 83 ++++----- .../template/email/sales/shipment_new.html | 173 +++++++++--------- .../email/sales/shipment_new_guest.html | 172 +++++++++-------- .../template/email/sales/shipment_update.html | 86 ++++----- .../email/sales/shipment_update_guest.html | 83 ++++----- .../email/sitemap_generate_warning.html | 7 +- app/locale/de_DE/template/email/token.html | 6 +- .../de_DE/template/email/wishlist_share.html | 28 ++- var/connect/German_LocalePack_de_DE.xml | 2 +- 50 files changed, 1266 insertions(+), 1247 deletions(-) create mode 100644 app/design/adminhtml/default/default/locale/de_DE/translate.csv create mode 100644 app/design/frontend/default/blank/locale/de_DE/translate.csv create mode 100644 app/design/frontend/default/default/locale/de_DE/translate.csv create mode 100644 app/design/frontend/default/iphone/locale/de_DE/translate.csv create mode 100644 app/design/frontend/default/modern/locale/de_DE/translate.csv create mode 100644 app/design/frontend/rwd/default/locale/de_DE/translate.csv diff --git a/MagentoConnect.html b/MagentoConnect.html index 1dbf0ef..779381f 100644 --- a/MagentoConnect.html +++ b/MagentoConnect.html @@ -37,4 +37,5 @@

ChangeLog

  • 0.3.3: Added: E-Mail-Templates (taken from Magento v1.9.0.x).
  • 0.3.6: Update: E-Mail-Templates (upgraded to Magento v1.9.1.x, Rico Neitzel)
  • 0.3.9: Added: Three static blocks to the E-Mail-Templates
    • +
  • 0.4.0: Update: E-Mail-Templates (formatting and translation revised by MaWoScha)
    • diff --git a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php index 1f0edff..c0093d5 100644 --- a/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php +++ b/app/code/community/German/LocalePackDe/Block/System/Config/Form/Fieldset/Instructions.php @@ -4,7 +4,7 @@ * @package German_LocalePack * @authors MaWoScha * @developer MaWoScha - * @version 0.2.0 + * @version 0.1.0 * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class German_LocalePackDe_Block_System_Config_Form_Fieldset_Instructions diff --git a/app/code/community/German/LocalePackDe/etc/config.xml b/app/code/community/German/LocalePackDe/etc/config.xml index 8dffe6e..34b0062 100644 --- a/app/code/community/German/LocalePackDe/etc/config.xml +++ b/app/code/community/German/LocalePackDe/etc/config.xml @@ -11,7 +11,7 @@ - 0.3.9 + 0.4.0 de_DE German (Germany) Language Pack https://github.com/riconeitzel/German_LocalePack_de_DE diff --git a/app/design/adminhtml/default/default/locale/de_DE/translate.csv b/app/design/adminhtml/default/default/locale/de_DE/translate.csv new file mode 100644 index 0000000..5d84462 --- /dev/null +++ b/app/design/adminhtml/default/default/locale/de_DE/translate.csv @@ -0,0 +1,55 @@ +"Are You Sure?","Sind Sie sicher?" +"Store","Laden" +"Shipping Address","Lieferanschrift" +"Dashboard","Übersicht" +"Dashboard Control","Übersicht" +"=========","== Mage-Connect.csv =======" +"1.5.0.0 & later","1.5.0.0 und neuer" +"Action","Aktion" +"Add Author","Autor hinzufügen" +"Add Contents Path","Inhaltspfad hinzufügen" +"Add PHP Extension dependency","PHP-Erweiterung-Abhängigkeit hinzufügen" +"Add Package dependency","Paket-Abhängigkeit hinzufügen" +"Add files","Dateien hinzufügen" +"Authors","Verantwortliche Autoren" +"Channel","Kanal" +"Contents","Inhalte" +"Create Extension Package","Erweiterungs-Paket erstellen" +"Dependencies","Abhängigkeiten" +"Edit Extension","Erweiterung bearbeiten" +"Extension","Erweiterung" +"Extensions","Erweiterungen" +"Failed to create the package.","Paket konnte nicht erstellt werden." +"Failed to load the package data.","Paketdaten konnten nicht geladen werden." +"Failed to save the package.","Paket konnte nicht gespeichert werden." +"Files","Dateien" +"Folder","Verzeichnis/Pfad" +"Ignore","Ignorieren" +"Include","Einschließen" +"License","Lizenz" +"License URI","Lizenz URL" +"Load Local Package","Lokales Paket laden" +"Load local Package","Lokales Paket laden" +"Max","Max" +"Maximum","Maximum" +"Min","Min" +"Minimum","Minimum" +"New Extension","Neue Erweiterung" +"PHP Version","PHP-Version" +"Package File Name","Paket Dateiname" +"Package Info","Paket Info" +"Packages","Pakete" +"Path","Pfad" +"Pre-1.5.0.0","älter als 1.5.0.0" +"Release Info","Informationen zur Veröffentlichung" +"Remove","Entfernen" +"Save As...","Speichern unter ..." +"Save Data and Create Package","Daten speichern und Paket erstellen" +"Save package with custom package file name","Paket speichern mit individueller Bezeichnung der Paketdatei" +"Summary","Kurzbeschreibung" +"Supported releases","Unterstützte Versionen" +"Target","Ziel" +"The package %s data has been loaded.","Die Daten des Pakets %s wurden geladen." +"The package data has been saved.","Die Paketdaten wurden gespeichert." +"There was a problem saving package data","Beim Speichern der Paketdaten ist ein Fehler aufgetreten." +"Type","Art" diff --git a/app/design/frontend/default/blank/locale/de_DE/translate.csv b/app/design/frontend/default/blank/locale/de_DE/translate.csv new file mode 100644 index 0000000..77a0e2b --- /dev/null +++ b/app/design/frontend/default/blank/locale/de_DE/translate.csv @@ -0,0 +1 @@ +"Keep your eyes open for our special Back to School items and save A LOT!","Achten Sie auf unsere speziellen Zurück in die Schule Artikel und SPAREN Sie!" diff --git a/app/design/frontend/default/default/locale/de_DE/translate.csv b/app/design/frontend/default/default/locale/de_DE/translate.csv new file mode 100644 index 0000000..b4ac357 --- /dev/null +++ b/app/design/frontend/default/default/locale/de_DE/translate.csv @@ -0,0 +1,6 @@ +"Keep your eyes open for our special Back to School items and save A LOT!","Sparen Sie jetzt bei unseren Schulanfangsrabatten!" +"Dear %s","Sehr geehrte(r) %s" +"Log In","Anmelden" +"My Account","Mein Konto" +"Thank You,","Danke," +"Thank you very much!","Vielen Dank!" diff --git a/app/design/frontend/default/iphone/locale/de_DE/translate.csv b/app/design/frontend/default/iphone/locale/de_DE/translate.csv new file mode 100644 index 0000000..e69de29 diff --git a/app/design/frontend/default/modern/locale/de_DE/translate.csv b/app/design/frontend/default/modern/locale/de_DE/translate.csv new file mode 100644 index 0000000..77a0e2b --- /dev/null +++ b/app/design/frontend/default/modern/locale/de_DE/translate.csv @@ -0,0 +1 @@ +"Keep your eyes open for our special Back to School items and save A LOT!","Achten Sie auf unsere speziellen Zurück in die Schule Artikel und SPAREN Sie!" diff --git a/app/design/frontend/rwd/default/locale/de_DE/translate.csv b/app/design/frontend/rwd/default/locale/de_DE/translate.csv new file mode 100644 index 0000000..e85f2c4 --- /dev/null +++ b/app/design/frontend/rwd/default/locale/de_DE/translate.csv @@ -0,0 +1,23 @@ +"###","- - - - - - - - - - - - - - - - - - - - -" +"###","Custom phrases that exist only in this theme." +"###","- - - - - - - - - - - - - - - - - - - - -" +"###","Page Module" +"Results per page","Treffer per Seite" +"%s-%s of %s","%s-%s von %s" +"###","Catalog Module" +"Filter","Filter" +"View Details","Beschreibung anzeigen" +"Share on Facebook","Auf Facebook teilen" +"Share on Twitter","Auf Twitter teilen" +"###","Checkout Module" +"Are you sure you want to leave this page? You will need to go through the checkout steps again.","Sind Sie sicher, dass Sie diese Seite verlassen wollen? Sie müssen durch alle Bestellschritte nochmals gehen." +"Zip/Postal Code","PLZ" +"Discount Codes?","Rabatt-Kode?" +"###","Customer Module" +"Registration is free and easy!","Registrieren ist kostenlos und einfach!" +"Faster checkout","Schneller bezahlen" +"Save multiple shipping addresses","Mehrere Lieferadressen speichern" +"View and track orders and more","Ansicht, Sendungsverfolgung und mehr" +"###","Shipment Module" +"Item in your order","Artikel Ihrer Bestellung" +"Items in your order","Artikel Ihrer Bestellung" diff --git a/app/locale/de_DE/template/email/account_new.html b/app/locale/de_DE/template/email/account_new.html index c4d71f8..60a2c53 100644 --- a/app/locale/de_DE/template/email/account_new.html +++ b/app/locale/de_DE/template/email/account_new.html @@ -2,10 +2,9 @@ + + + @@ -17,9 +17,9 @@
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$user.name}},

    -

    Ihr neues Passwort lautet: {{htmlescape var=$password}}

    -

    Sie können Ihr Passwort jederzeit ändern, indem Sie sich in Ihrem Benutzerkonto anmelden.

    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$user.name}}

    +

    Ihr neues Passwort lautet: {{htmlescape var=$user.password}}

    +

    Sie können das Passwort jederzeit ändern, indem Sie sich in Ihrem Konto anmelden.
    diff --git a/app/locale/de_DE/template/email/admin_password_reset_confirmation.html b/app/locale/de_DE/template/email/admin_password_reset_confirmation.html index 2bc8de4..517c4d3 100644 --- a/app/locale/de_DE/template/email/admin_password_reset_confirmation.html +++ b/app/locale/de_DE/template/email/admin_password_reset_confirmation.html @@ -17,19 +17,19 @@
    -

    Hallo {{htmlescape var=$user.name}},

    -

    Sie können Ihr Passwort jederzeit ändern, indem Sie sich im AdminPanel anmelden.

    -

    Das Shopsystem hat eine Anfrage erhalten, dass Ihr Administrator-Passwort zurückgesetzt werden soll.

    -

    Falls Sie Ihr Passwort ändern möchten, klicken Sie bitte auf den folgenden Link:

    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$user.name}}

    +

    Wir haben vor kurzem eine Bitte erhalten, dass Ihr Adminpasswort zurückgesetzt werden soll.

    +

    Sie können das Passwort jederzeit ändern, wenn Sie sich in Ihrem Konto anmelden.

    +

    Wenn Sie diese Änderung angefordert haben, klicken Sie bitte auf den folgenden Link, um Ihr Kennwort neu einzustellen:

    - Reset Password + Passwort zurücksetzen
    -

    Falls der Link nicht funktioniert, kopieren Sie bitte den Link und fügen Sie Ihn direkt in die Adresszeile Ihres Browsers ein.

    -

    Falls Sie Ihr Passwort nicht zurücksetzen möchten, ignorieren Sie bitte diese Nachricht. Ihr Passwort wird dann nicht zurückgesetzt. Sollten Sie diese Anfrage häufiger unaufgefordert erhalten, ändern Sie bitte sicherheitshalber die URL Ihres AdminPanel.

    +

    Falls der Link nicht funktioniert, kopieren Sie bitte den Link und fügen Sie ihn direkt in die Adresszeile Ihres Browsers ein.

    +

    Falls Sie Ihr Passwort nicht zurücksetzen möchten, ignorieren Sie bitte diese Nachricht. Ihr Passwort wird dann unverändert bleiben. Bei Fragen wenden Sie sich bitte direkt an uns! Sollten Sie diese Anfrage häufiger unaufgefordert erhalten, ändern Sie bitte sicherheitshalber die URL Ihres AdminPanel.
    diff --git a/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html b/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html index 9b19ada..3e8da6d 100644 --- a/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html +++ b/app/locale/de_DE/template/email/amazonpayments_asp_notification_error.html @@ -1,12 +1,18 @@ - + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} +
    __('Amazon Simple Pay notification message')__
    __('Request')__:
    {{var request}}
    __('Error')__:
    {{var error}}
    -
    \ No newline at end of file + + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/contact_form.html b/app/locale/de_DE/template/email/contact_form.html index f45a075..671b8d0 100644 --- a/app/locale/de_DE/template/email/contact_form.html +++ b/app/locale/de_DE/template/email/contact_form.html @@ -1,12 +1,15 @@ - + -Name: {{var data.name}} -E-Mail: {{var data.email}} -Telefon: {{var data.telephone}} - -Kommentar: {{var data.comment}} \ No newline at end of file +{{template config_path="design/email/header"}} +

    +Name: {{var data.name}}
    +E-Mail-Adresse: {{var data.email}}
    +Telefon: {{var data.telephone}}

    +Bemerkungen: {{var data.comment}} +

    +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/currency_update_warning.html b/app/locale/de_DE/template/email/currency_update_warning.html index 8ae8a07..610d05b 100644 --- a/app/locale/de_DE/template/email/currency_update_warning.html +++ b/app/locale/de_DE/template/email/currency_update_warning.html @@ -2,6 +2,9 @@ +{{template config_path="design/email/header"}} -Warnungen beim Aktualisieren der Währungskurse: -{{var warnings}} \ No newline at end of file +Hinweise zur Aktualisierung von Währungskursen:
    +{{var warnings}} + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/html/support.html b/app/locale/de_DE/template/email/html/support.html index 161cea7..8b76d1f 100644 --- a/app/locale/de_DE/template/email/html/support.html +++ b/app/locale/de_DE/template/email/html/support.html @@ -1,6 +1,14 @@ - -

    - Falls Sie Fragen oder Anregungen haben, kontaktieren Sie uns bitte wahlweise per E-Mail - {{var store_email}} - {{depend store_phone}} oder auch per Telefon unter der Rufnummer {{var store_phone}}{{/depend}}. -

    \ No newline at end of file + +

    Haben Sie Fragen zu Ihren Bestellungen?

    +

    + {{depend store_phone}} + Rufen Sie uns an: + {{var store_phone}}
    + {{/depend}} + {{depend store_hours}} + {{var store_hours}}
    + {{/depend}} + {{depend store_email}} + Benachrichtigen Sie uns per eMail: {{var store_email}} + {{/depend}} +

    diff --git a/app/locale/de_DE/template/email/log_clean_warning.html b/app/locale/de_DE/template/email/log_clean_warning.html index fddd47a..3a6b1cb 100644 --- a/app/locale/de_DE/template/email/log_clean_warning.html +++ b/app/locale/de_DE/template/email/log_clean_warning.html @@ -1,7 +1,10 @@ - + -Warnungen bei der Bereinigung des Logs: +{{template config_path="design/email/header"}} -{{var warnings}} \ No newline at end of file +Warnmeldungen bei der Bereinigung des Logs:

    +{{var warnings}} + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/moneybookers_activateemail.html b/app/locale/de_DE/template/email/moneybookers_activateemail.html index 9729938..8627ba9 100644 --- a/app/locale/de_DE/template/email/moneybookers_activateemail.html +++ b/app/locale/de_DE/template/email/moneybookers_activateemail.html @@ -1,6 +1,9 @@ -{{var store.getFrontendName()}}
    -Moneybookers E-Mail-Adresse: {{var email_addr}}
    -Moneybookers Kundennummer: {{var customer_id}}
    -URL: {{var url}}
    -Sprache: {{var language}}
    \ No newline at end of file +{{template config_path="design/email/header"}} +

    +Moneybookers E-Mail-Adresse: {{var email_addr}}
    +Moneybookers Kunden-Nr.: {{var customer_id}}
    +URL: {{var url}}
    +Sprache: {{var language}} +

    +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/newsletter_subscr_confirm.html b/app/locale/de_DE/template/email/newsletter_subscr_confirm.html index 984a155..8daa966 100644 --- a/app/locale/de_DE/template/email/newsletter_subscr_confirm.html +++ b/app/locale/de_DE/template/email/newsletter_subscr_confirm.html @@ -1,31 +1,32 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    -

    Vielen Dank für Ihre Newsletter-Anmeldung.

    -

    Bitte klicken Sie auf den unterstehenden Link, um Ihre Anmeldung zu bestätigen:

    - - - - -
    - Newsletter-Anmeldung bestätigen -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    Vielen Dank, dass Sie unseren Newsletter abonniert haben.

    +

    Damit Ihnen der Newsletter zugestellt wird, müssen Sie Ihr Abonnement erst noch bestätigen. Klicken Sie dazu auf den folgenden Link:

    + + + + +
    + Newsletter-Abonnement bestätigen +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/newsletter_subscr_success.html b/app/locale/de_DE/template/email/newsletter_subscr_success.html index 0cacc9b..a4c341b 100644 --- a/app/locale/de_DE/template/email/newsletter_subscr_success.html +++ b/app/locale/de_DE/template/email/newsletter_subscr_success.html @@ -1,4 +1,4 @@ - + {{template config_path="design/email/header"}} {{inlinecss file="email-inline.css"}} @@ -6,7 +6,7 @@
    -

    Wir haben Sie erfolgreich für unseren Newsletter angemeldet.

    +

    Newsletter-Abonnement erfolgreich.
    diff --git a/app/locale/de_DE/template/email/newsletter_unsub_success.html b/app/locale/de_DE/template/email/newsletter_unsub_success.html index b0df396..a5758bc 100644 --- a/app/locale/de_DE/template/email/newsletter_unsub_success.html +++ b/app/locale/de_DE/template/email/newsletter_unsub_success.html @@ -1,4 +1,4 @@ - + {{template config_path="design/email/header"}} {{inlinecss file="email-inline.css"}} @@ -6,9 +6,9 @@
    -

    Wir haben Sie erfolgreich von unserem Newsletter abgemeldet.

    +

    Newsletter-Abbestellung erfolgreich.
    -{{template config_path="design/email/footer"}} \ No newline at end of file +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/password_new.html b/app/locale/de_DE/template/email/password_new.html index e92db9f..f6cf18d 100644 --- a/app/locale/de_DE/template/email/password_new.html +++ b/app/locale/de_DE/template/email/password_new.html @@ -3,10 +3,11 @@ {"store url=\"\"":"Store Url", "var logo_url":"Email Logo Image Url", "var logo_alt":"Email Logo Image Alt", -"store url=\"customer/account/\"":"Customer Account Url", "htmlescape var=$customer.name":"Customer Name", -"htmlescape var=$customer.password":"Customer New Password"} +"htmlescape var=$customer.password":"Customer New Password", +"store url=\"customer/account/\"":"Customer Account Url"} @--> + @@ -16,7 +17,7 @@ diff --git a/app/locale/de_DE/template/email/payment_failed.html b/app/locale/de_DE/template/email/payment_failed.html index 2866798..063951e 100644 --- a/app/locale/de_DE/template/email/payment_failed.html +++ b/app/locale/de_DE/template/email/payment_failed.html @@ -1,4 +1,4 @@ - + - +{{template config_path="design/email/header"}}
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}},

    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}}

    Ihr neues Passwort lautet: {{htmlescape var=$customer.password}}

    Sie können Ihr Passwort jederzeit ändern. Melden Sie sich dazu in Ihrem Benutzerkonto an.
    - + @@ -27,11 +27,11 @@ {{var reason}}

    - Bezahlvorgang
    + Kassentyp
    {{var checkoutType}}

    - Kunde
    + Kunde:
    {{var customer}} <{{var customerEmail}}>

    @@ -39,30 +39,31 @@ {{var items}}

    - Gesamtsumme
    + Gesamtsumme:
    {{var total}}

    - Rechnungsadresse
    + Rechnungsadresse:
    {{var billingAddress.format('html')}}

    - Versandadresse
    + Versandadresse:
    {{var shippingAddress.format('html')}}

    - Versandart
    + Versandart:
    {{var shippingMethod}}

    - Zahlungsart
    + Zahlungsart:
    {{var paymentMethod}}

    - Datum & Zeit
    + Datum & Zeit:
    {{var dateAndTime}}

    -
    Zahlung fehlgeschlagen.Zahlung ist fehlgeschlagen.
    \ No newline at end of file + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/product_alert_cron_error.html b/app/locale/de_DE/template/email/product_alert_cron_error.html index 87ab980..62c0484 100644 --- a/app/locale/de_DE/template/email/product_alert_cron_error.html +++ b/app/locale/de_DE/template/email/product_alert_cron_error.html @@ -1,7 +1,11 @@ - - -Cron-Fehler und -Warnungen bei Produkt-Benachrichtigung: - -{{var warnings}} + + +{{template config_path="design/email/header"}} + +Produkt meldet Cron-Warnmeldungen:

    + +{{var warnings}} + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/product_price_alert.html b/app/locale/de_DE/template/email/product_price_alert.html index 86651b4..e8b4f2e 100644 --- a/app/locale/de_DE/template/email/product_price_alert.html +++ b/app/locale/de_DE/template/email/product_price_alert.html @@ -1,4 +1,4 @@ - + + + - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -{{template config_path="design/email/support"}} -
    -
    -

    Ihre Rechnungskorrektur Nr. {{var creditmemo.increment_id}}

    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -
    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.billing_address.format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.shipping_address.format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihre Rechnungskorrektur Nr. {{var creditmemo.increment_id}}

    +

    Bestellung Nr. {{var order.increment_id}}

    +
    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html b/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html index 723d5d7..ed56c00 100644 --- a/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html +++ b/app/locale/de_DE/template/email/sales/creditmemo_new_guest.html @@ -1,86 +1,82 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -{{template config_path="design/email/support"}} -
    -
    -

    Ihre Rechnungskorrektur Nr. {{var creditmemo.increment_id}}

    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -
    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} - {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.billing_address.format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.shipping_address.format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihre Rechnungskorrektur Nr. {{var creditmemo.increment_id}}

    +

    Bestellung Nr. {{var order.increment_id}}

    +
    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/creditmemo_update.html b/app/locale/de_DE/template/email/sales/creditmemo_update.html index 3c2d5dc..c6a5cfb 100644 --- a/app/locale/de_DE/template/email/sales/creditmemo_update.html +++ b/app/locale/de_DE/template/email/sales/creditmemo_update.html @@ -1,45 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    Sie können den Status Ihrer Bestellung jederzeit in Ihrem Benutzerkonto einsehen.

    -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} +

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html b/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html index 92d51c4..5766b5e 100644 --- a/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html +++ b/app/locale/de_DE/template/email/sales/creditmemo_update_guest.html @@ -1,44 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$billing.getName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/invoice_new.html b/app/locale/de_DE/template/email/sales/invoice_new.html index ae625a4..b3dd09a 100644 --- a/app/locale/de_DE/template/email/sales/invoice_new.html +++ b/app/locale/de_DE/template/email/sales/invoice_new.html @@ -1,88 +1,82 @@ - - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -{{template config_path="design/email/support"}} -
    -
    -

    Ihre Rechnung Nr. {{var invoice.increment_id}}

    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -
    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.billing_address.format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.shipping_address.format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihre Rechnung Nr. {{var invoice.increment_id}}

    +

    Bestellung Nr. {{var order.increment_id}}

    +
    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/invoice_new_guest.html b/app/locale/de_DE/template/email/sales/invoice_new_guest.html index 01f3ec4..b9b4f1d 100644 --- a/app/locale/de_DE/template/email/sales/invoice_new_guest.html +++ b/app/locale/de_DE/template/email/sales/invoice_new_guest.html @@ -1,88 +1,82 @@ - - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -{{template config_path="design/email/support"}} -
    -
    -

    Ihre Rechnung Nr. {{var invoice.increment_id}}

    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -
    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} - {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.billing_address.format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.shipping_address.format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihre Rechnung Nr. {{var invoice.increment_id}}

    +

    Bestellung Nr. {{var order.increment_id}}

    +
    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/invoice_update.html b/app/locale/de_DE/template/email/sales/invoice_update.html index c7035d5..328998d 100644 --- a/app/locale/de_DE/template/email/sales/invoice_update.html +++ b/app/locale/de_DE/template/email/sales/invoice_update.html @@ -1,46 +1,40 @@ - - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    Sie können den Status Ihrer Bestellung jederzeit in Ihrem Benutzerkonto einsehen.

    -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} +

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/invoice_update_guest.html b/app/locale/de_DE/template/email/sales/invoice_update_guest.html index 57b6fc5..62c3305 100644 --- a/app/locale/de_DE/template/email/sales/invoice_update_guest.html +++ b/app/locale/de_DE/template/email/sales/invoice_update_guest.html @@ -1,43 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/order_new.html b/app/locale/de_DE/template/email/sales/order_new.html index 451752e..96ad25b 100644 --- a/app/locale/de_DE/template/email/sales/order_new.html +++ b/app/locale/de_DE/template/email/sales/order_new.html @@ -1,91 +1,82 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -

    vom {{var order.getCreatedAtFormated('long')}}

    -
    - {{if order.getEmailCustomerNote()}} - - - - -
    {{var order.getEmailCustomerNote()}}
    - {{/if}} - {{layout handle="sales_email_order_items" order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.getBillingAddress().format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.getShippingAddress().format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihre Bestellung Nr. {{var order.increment_id}}

    +

    Aufgegeben am {{var order.getCreatedAtFormated('long')}}

    +
    + {{if order.getEmailCustomerNote()}} + + + + +
    {{var order.getEmailCustomerNote()}}
    + {{/if}} + {{layout handle="sales_email_order_items" order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/order_new_guest.html b/app/locale/de_DE/template/email/sales/order_new_guest.html index a4ef076..caa0012 100644 --- a/app/locale/de_DE/template/email/sales/order_new_guest.html +++ b/app/locale/de_DE/template/email/sales/order_new_guest.html @@ -1,90 +1,82 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -

    vom {{var order.getCreatedAtFormated('long')}}

    -
    - {{if order.getEmailCustomerNote()}} - - - - -
    {{var order.getEmailCustomerNote()}}
    - {{/if}} - {{layout handle="sales_email_order_items" order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.getBillingAddress().format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.getShippingAddress().format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihre Bestellung Nr. {{var order.increment_id}}

    +

    Aufgegeben am {{var order.getCreatedAtFormated('long')}}

    +
    + {{if order.getEmailCustomerNote()}} + + + + +
    {{var order.getEmailCustomerNote()}}
    + {{/if}} + {{layout handle="sales_email_order_items" order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/order_update.html b/app/locale/de_DE/template/email/sales/order_update.html index 0d0f966..39707b1 100644 --- a/app/locale/de_DE/template/email/sales/order_update.html +++ b/app/locale/de_DE/template/email/sales/order_update.html @@ -1,45 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    Sie können den Status Ihrer Bestellung jederzeit in Ihrem Benutzerkonto einsehen.

    -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} +

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/order_update_guest.html b/app/locale/de_DE/template/email/sales/order_update_guest.html index d9f1057..76c5906 100644 --- a/app/locale/de_DE/template/email/sales/order_update_guest.html +++ b/app/locale/de_DE/template/email/sales/order_update_guest.html @@ -1,43 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/shipment_new.html b/app/locale/de_DE/template/email/sales/shipment_new.html index 4c86128..084188e 100644 --- a/app/locale/de_DE/template/email/sales/shipment_new.html +++ b/app/locale/de_DE/template/email/sales/shipment_new.html @@ -1,89 +1,84 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -{{template config_path="design/email/support"}} -
    -
    -

    Ihr Versand Nr. {{var shipment.increment_id}}

    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -
    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.billing_address.format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.shipping_address.format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlungsart:
    - {{var payment_html}} -
    - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihr Versand Nr. {{var shipment.increment_id}}

    +

    Bestellung Nr. {{var order.increment_id}}

    +
    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    + {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/shipment_new_guest.html b/app/locale/de_DE/template/email/sales/shipment_new_guest.html index f72cc24..3655dce 100644 --- a/app/locale/de_DE/template/email/sales/shipment_new_guest.html +++ b/app/locale/de_DE/template/email/sales/shipment_new_guest.html @@ -1,88 +1,84 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - - - - - - -
    - - - - - -
    -{{template config_path="design/email/support"}} -
    -
    -

    Ihr Versand Nr. {{var shipment.increment_id}}

    -

    Ihre Bestellung Nr. {{var order.increment_id}}

    -
    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} - {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} - - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - - {{depend order.getIsNotVirtual()}} - - {{/depend}} - - -
    -
    Rechnungsadresse:
    -

    {{var order.billing_address.format('html')}}

    -     		-
    Lieferadresse:
    -

    {{var order.shipping_address.format('html')}}

    -
    -
    Versandart:
    -

    {{var order.shipping_description}}

    -     		-
    Zahlunsgart:
    - {{var payment_html}} -
    - {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + + + + + + + + +
    +{{template config_path="design/email/support"}} +
    +

    Ihr Versand Nr. {{var shipment.increment_id}}

    +

    Bestellung Nr. {{var order.increment_id}}

    +
    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + + + + {{depend order.getIsNotVirtual()}} + + {{/depend}} + +
    +
    Rechnung an:
    +

    {{var order.getBillingAddress().format('html')}}

    +     		+
    Lieferung an:
    +

    {{var order.getShippingAddress().format('html')}}

    +
    +
    Zahlungsart:
    + {{var payment_html}} +     		+
    Versandart:
    +

    {{var order.getShippingDescription()}}

    +
    + {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}} +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/shipment_update.html b/app/locale/de_DE/template/email/sales/shipment_update.html index 9810cc7..7dfa0d3 100644 --- a/app/locale/de_DE/template/email/sales/shipment_update.html +++ b/app/locale/de_DE/template/email/sales/shipment_update.html @@ -1,46 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    Sie können den aktuellen Status Ihrer Bestellung jederzeit in Ihrem Benutzerkonto einsehen.

    -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} +

    Sie können den Status Ihrer Bestellung überprüfen, indem Sie sich bei Ihrem Konto anmelden.

    +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sales/shipment_update_guest.html b/app/locale/de_DE/template/email/sales/shipment_update_guest.html index ee69457..c7ab0c3 100644 --- a/app/locale/de_DE/template/email/sales/shipment_update_guest.html +++ b/app/locale/de_DE/template/email/sales/shipment_update_guest.html @@ -1,43 +1,40 @@ - - - - -{{template config_path="design/email/header"}} -{{inlinecss file="email-inline.css"}} - - - - - -
    - - - - -
    -

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}},

    -

    Ihre Bestellung Nr. #{{var order.increment_id}} hat den Status {{var order.getStatusLabel()}}.

    - {{if comment}} - - - - -
    {{var comment}}
    - {{/if}} -

    - {{block type="cms/block" block_id="email_template_contact"}} -

    -
    -
    - -{{template config_path="design/email/footer"}} + + + + + +{{template config_path="design/email/header"}} +{{inlinecss file="email-inline.css"}} + + + + + +
    +

    {{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$order.getCustomerName()}}

    +

    Ihre Bestellung Nr. {{var order.increment_id}} wurde aktualisiert auf: {{var order.getStatusLabel()}}

    + {{if comment}} + + + + +
    {{var comment}}
    + {{/if}} + +

    + {{block type="cms/block" block_id="email_template_contact"}} +

    +
    + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/sitemap_generate_warning.html b/app/locale/de_DE/template/email/sitemap_generate_warning.html index 3eafaed..2d9f0c4 100644 --- a/app/locale/de_DE/template/email/sitemap_generate_warning.html +++ b/app/locale/de_DE/template/email/sitemap_generate_warning.html @@ -2,6 +2,9 @@ +{{template config_path="design/email/header"}} -Warnungen bei der Sitemap-Erstellung: -{{var warnings}} \ No newline at end of file +Warnungen bei der Sitemap-Erstellung:
    +{{var warnings}} + +{{template config_path="design/email/footer"}} diff --git a/app/locale/de_DE/template/email/token.html b/app/locale/de_DE/template/email/token.html index edf2661..c56163a 100644 --- a/app/locale/de_DE/template/email/token.html +++ b/app/locale/de_DE/template/email/token.html @@ -1,4 +1,4 @@ - + + + @@ -14,24 +16,18 @@ -
    - +
    +

    Hallo, schaut euch doch einmal meinen Wunschzettel vom Online-Shop {{var store.getFrontendName()}} an.

    + - +
    -

    Hallo,
    hier gibt es meinen Wunschzettel von {{var store.getFrontendName()}}.

    - - - - -
    {{var message}}
    - {{var items}} - {{depend salable}} -

    Alle Artikel in den Warenkorb legen | - {{/depend}} - Alle Artikel ansehen

    -     		{{var message}}
    + {{var items}} + {{depend salable}} +

    Alle Artikel in den Warenkorb legen! | + {{/depend}} + Alle Artikel anzeigen!
    diff --git a/var/connect/German_LocalePack_de_DE.xml b/var/connect/German_LocalePack_de_DE.xml index b8df1c7..335bc4b 100644 --- a/var/connect/German_LocalePack_de_DE.xml +++ b/var/connect/German_LocalePack_de_DE.xml @@ -13,7 +13,7 @@ German language pack for Magento Commerce Paquete de idioma alemán para Magento Commerce OSL http://opensource.org/licenses/osl-3.0.php - 0.3.9 + 0.4.0 stable Compatible with Magento (1.6.2) 1.7.0.x-1.9.2.x