diff --git a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
index 5a87aa7..4989655 100644
--- a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
+++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
@@ -257,7 +257,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
      */
     public function renderTemplateFromAdmin()
     {
-        return true;
+        return false;
     }
 
     public function output(Html2Pdf $oPdf, $sFilename, $target, $html)
diff --git a/Application/translations/de/pdfdocuments_lang.php b/Application/translations/de/pdfdocuments_lang.php
new file mode 100644
index 0000000..ff99efe
--- /dev/null
+++ b/Application/translations/de/pdfdocuments_lang.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ * http://www.shopmodule.com
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author        D3 Data Development <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
+ */
+$sLangName = "Deutsch";
+$aLang     = array(
+    'charset'                                            => 'utf-8',
+
+    'D3_PDFDOCUMENTS_THANKYOU_1'                         => 'Vielen Dank für Ihren Einkauf!',
+    'D3_PDFDOCUMENTS_THANKYOU_2'                         => 'Ihr Team von %1$s',
+
+    'D3_PDFDOCUMENTS_GET_IN_CONTACT'                     => 'So erreichen Sie uns:',
+    'D3_PDFDOCUMENTS_TELEFON'                            => 'Telefon: ',
+    'D3_PDFDOCUMENTS_FAX'                                => 'Fax: ',
+    'D3_PDFDOCUMENTS_EMAIL'                              => 'e-Mail: ',
+
+    'D3_PDFDOCUMENTS_BANK_ACCOUNT'                       => 'Bankverbindung:',
+    'D3_PDFDOCUMENTS_BANK_ACCOUNTNR'                     => 'IBAN: ',
+    'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER'               => 'BIC: ',
+
+    'D3_PDFDOCUMENTS_ORDERBILLNR'                        => 'Rechnungs-Nr.: ',
+    'D3_PDFDOCUMENTS_CUSTOMERNR'                         => 'Kundennummer: ',
+    'D3_PDFDOCUMENTS_DATE'                               => 'Datum: ',
+    'D3_PDFDOCUMENTS_DATE_FORMAT'                        => '%d.%m.%Y',
+    'D3_PDFDOCUMENTS_USTIDNR'                            => 'Ust.-ID-Nr: ',
+
+    'D3_PDFDOCUMENTS_INVOICE'                            => 'Rechnung',
+    'D3_PDFDOCUMENTS_DELIVERYNOTE'                       => 'Lieferschein',
+    'D3_PDFDOCUMENTS_ORDERNR'                            => 'Bestellnr.: ',
+    'D3_PDFDOCUMENTS_ORDER_FROM_AT'                      => 'Ihre Bestellung vom %1$s bei "%2$s"',
+
+    'D3_PDFDOCUMENTS_AMOUNT'                             => 'Menge',
+    'D3_PDFDOCUMENTS_DESCRIPTION'                        => 'Beschreibung',
+    'D3_PDFDOCUMENTS_USTPERCENTAGE'                      => 'Ust. %: ',
+    'D3_PDFDOCUMENTS_UNITPRICE'                          => 'Einzelpreis',
+    'D3_PDFDOCUMENTS_TOTALPRICE'                         => 'Gesamtpreis',
+
+    'D3_PDFDOCUMENTS_ARTNR'                              => 'Art.-Nr.',
+
+    'D3_PDFDOCUMENTS_SUMBRUTTO'                          => 'Summe Artikel (brutto)',
+    'D3_PDFDOCUMENTS_DISCOUNT'                           => 'Rabatt',
+    'D3_PDFDOCUMENTS_SUMNETTO'                           => 'Summe Artikel (netto)',
+    'D3_PDFDOCUMENTS_TAX'                                => 'zzgl. MwSt. %1$s %% Betrag',
+    'D3_PDFDOCUMENTS_DELIVERY'                           => 'Versandkosten (netto)',
+    'D3_PDFDOCUMENTS_TOTALSUMBRUT'                       => 'Gesamtsumme (brutto)',
+
+    'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD'                 => 'Ihre gewählte Zahlungsweise: ',
+    'D3_PDFDOCUMENTS_RECEIVED_PAYMENT'                   => 'Den Rechnungsbetrag haben wir dankend erhalten.',
+
+    'D3_PDFDOCUMENTS_MANAGINGDIRECTOR'                   => 'Geschäftsführer:',
+    'D3_PDFDOCUMENTS_COURT'                              => 'Amtsgericht ',
+    'D3_PDFDOCUMENTS_HRBNR'                              => 'HRB ',
+    'D3_PDFDOCUMENTS_USTID'                              => 'Ust.-ID: ',
+
+    'D3_PDFDOCUMENTS_BANK_BANKCODE'                      => 'BIC-/SWIFT-Code: ',
+);
diff --git a/Application/translations/en/pdfdocuments_lang.php b/Application/translations/en/pdfdocuments_lang.php
new file mode 100644
index 0000000..29a6886
--- /dev/null
+++ b/Application/translations/en/pdfdocuments_lang.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ * http://www.shopmodule.com
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author        D3 Data Development <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
+ */
+$sLangName = "English";
+$aLang     = array(
+    'charset'                                            => 'utf-8',
+
+    'D3_PDFDOCUMENTS_THANKYOU_1'                         => 'Many thanks for your purchase!',
+    'D3_PDFDOCUMENTS_THANKYOU_2'                         => 'Your team from %1$s',
+
+    'D3_PDFDOCUMENTS_GET_IN_CONTACT'                     => 'You can contact us as follows:',
+    'D3_PDFDOCUMENTS_TELEFON'                            => 'Telephone: ',
+    'D3_PDFDOCUMENTS_FAX'                                => 'Fax: ',
+    'D3_PDFDOCUMENTS_EMAIL'                              => 'e-Mail: ',
+
+    'D3_PDFDOCUMENTS_BANK_ACCOUNT'                       => 'Bank account:',
+    'D3_PDFDOCUMENTS_BANK_ACCOUNTNR'                     => 'IBAN: ',
+    'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER'               => 'BIC: ',
+
+    'D3_PDFDOCUMENTS_ORDERBILLNR'                        => 'Invoice no.: ',
+    'D3_PDFDOCUMENTS_CUSTOMERNR'                         => 'Customer no.: ',
+    'D3_PDFDOCUMENTS_DATE'                               => 'Date: ',
+    'D3_PDFDOCUMENTS_DATE_FORMAT'                        => '%Y-%m-%d',
+    'D3_PDFDOCUMENTS_USTIDNR'                            => 'VAT ID no.: ',
+
+    'D3_PDFDOCUMENTS_INVOICE'                            => 'Invoice',
+    'D3_PDFDOCUMENTS_DELIVERYNOTE'                       => 'Deliverynote',
+    'D3_PDFDOCUMENTS_ORDERNR'                            => 'Order no.: ',
+    'D3_PDFDOCUMENTS_ORDER_FROM_AT'                      => 'Your order from %1$s at "%2$s"',
+
+    'D3_PDFDOCUMENTS_AMOUNT'                             => 'Amount',
+    'D3_PDFDOCUMENTS_DESCRIPTION'                        => 'Description',
+    'D3_PDFDOCUMENTS_USTPERCENTAGE'                      => 'VAT %: ',
+    'D3_PDFDOCUMENTS_UNITPRICE'                          => 'Unit Price',
+    'D3_PDFDOCUMENTS_TOTALPRICE'                         => 'Total',
+
+    'D3_PDFDOCUMENTS_ARTNR'                              => 'Item no.',
+
+    'D3_PDFDOCUMENTS_SUMBRUTTO'                          => 'Total products (incl. tax)',
+    'D3_PDFDOCUMENTS_DISCOUNT'                           => 'Discount',
+    'D3_PDFDOCUMENTS_SUMNETTO'                           => 'Total products (excl. tax)',
+    'D3_PDFDOCUMENTS_TAX'                                => 'plus VAT %1$s %% amount',
+    'D3_PDFDOCUMENTS_DELIVERY'                           => 'Shipping costs (net)',
+    'D3_PDFDOCUMENTS_TOTALSUMBRUT'                       => 'Total sum (gross)',
+
+    'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD'                 => 'Your chosen payment method: ',
+    'D3_PDFDOCUMENTS_RECEIVED_PAYMENT'                   => 'We have received the invoice amount with thanks.',
+
+    'D3_PDFDOCUMENTS_MANAGINGDIRECTOR'                   => 'managing director:',
+    'D3_PDFDOCUMENTS_COURT'                              => 'local court ',
+    'D3_PDFDOCUMENTS_HRBNR'                              => 'HRB ',
+    'D3_PDFDOCUMENTS_USTID'                              => 'VAT ID: ',
+
+    'D3_PDFDOCUMENTS_BANK_BANKCODE'                      => 'BIC-/SWIFT-Code: ',
+);
diff --git a/Application/views/admin/de/pdfdocuments_lang.php b/Application/views/admin/de/pdfdocuments_lang.php
index ee794c4..2109978 100644
--- a/Application/views/admin/de/pdfdocuments_lang.php
+++ b/Application/views/admin/de/pdfdocuments_lang.php
@@ -18,57 +18,4 @@ $aLang     = array(
 
     'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Grundeinstellungen',
     'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Entwicklermodus',
-
-    'ORDER_OVERVIEW_PDF_auftragsbestaetigung'            => 'Auftragsbestätigung',
-    'ORDER_OVERVIEW_PDF_auftragsbestaetigung_TEXTAREA'   => 'Text für Auftragsbestätigung',
-    'ORDER_OVERVIEW_PDF_AUFTRAGSNUMMER'                  => 'Auftragsbestätigung:',
-    'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1'             => 'Vielen Dank für Ihren Einkauf!',
-    'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2'             => 'Ihr Team von ',
-    'ORDER_OVERVIEW_PDF_auftragsbestaetigung_Alternativtext' => 'Alle Artikel sind ab Lager lieferbar und gehen schnellstmöglich in den Versand.',
-    'ORDER_OVERVIEW_PDF_bestellbestaetitung_TEXTAREA'    => 'Individueller Zahlungstext',
-    'PAYMENT_MAIN_D3SHORTDESCPDF'                        => 'Rechnungstext',
-    'D3_OFFERPDF_FINAL_1'                                => 'Die hier angegebene Materialzusammenstellung dient lediglich der Unterstützung Ihrer Planung. Sie wurde nach bestem Wissen erstellt, erhebt jedoch keinen Anspruch auf Richtigkeit und Vollständigkeit und ersetzt auch nicht Ihre individuelle Planung. Eine Haftung unsererseits für Richtigkeit und Vollständigkeit wird nicht übernommen.',
-    'D3_OFFERPDF_FINAL_2'                                => 'Alle Preisangaben sind inkl. Kupfer- und Metallzuschlägen.',
-    'D3_OFFERPDF_FINAL_3'                                => 'Dieses Angebot ist 14 Tage gültig.',
-    'D3_OFFERPDF_FINAL_4'                                => 'Wir hoffen, dass Ihnen unser Angebot zusagt und würden uns über Ihren Auftrag freuen.',
-
-    'ORDER_OVERVIEW_PDF_d3pdftextkostenstelle_kunden'         => 'kundenspezifischer Kostenstellen',
-    'ORDER_OVERVIEW_PDF_d3pdftextkostenstelle_kunden_PDF'         => 'Rechnungsvermerk:',
-    'D3_ORDERCONFIRMATION_ACTION_ORDERGENERATEPDFORDERCONFIRMATION'  => 'Auftragsbestätigung',
-    //pdf
-    'ORDER_OVERVIEW_PDF_ORDERSAT'              => ' beim Elektroversand Schmidt',
-    'ORDER_OVERVIEW_PDF_ORDERSINCERELY'        => 'Ihre Bestellung vom ',
-    'D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG'     => 'Bankverbindung:',
-    'ORDER_OVERVIEW_PDF_ACCOUNTNR'             => 'IBAN: ',
-    'ORDER_OVERVIEW_PDF_BANKCODE'              => 'BIC-/SWIFT-Code: ',
-    'ORDER_OVERVIEW_PDF_BANKCODE_HEADER'       => 'BIC: ',
-    'D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT'     => 'So erreichen Sie uns:',
-    'D3_ORDER_OVERVIEW_PDF_GESCHAEFTSFUEHRER'  => 'Geschäftsführer: Denis Schmidt',
-    'D3_ORDER_OVERVIEW_PDF_COURT'              => 'Amtsgericht ',
-    'D3_ORDER_OVERVIEW_PDF_HRBNR'              => 'HRB ',
-    'D3_AUFTRAGSBESTAETIGUNG_PDF_PRETEXT'      => 'Auf Grundlage unserer allgemeinen Liefer- und Geschäftsbedingungen bestätigen wir Ihnen folgenden Auftrag:',
-    'D3_ORDER_OVERVIEW_PDF_USTID'              => 'Ust.-ID: ',
-    'D3_ORDER_OVERVIEW_PDF_USTIDNR'            => 'Ust.-ID-Nr: ',
-    'D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE'      => 'Ust. %: ',
-    'D3_ORDER_OVERVIEW_PDF_TELEFON'            => 'Telefon: ',
-    'D3_ORDER_OVERVIEW_PDF_FAX'                => 'Fax: ',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILLNR'        => 'Rechnungs-Nr.: ',
-    'D3_ORDER_OVERVIEW_PDF_ORDERNR'            => 'Bestellnr.: ',
-    'D3_ORDER_OVERVIEW_PDF_DATE'               => 'Datum: ',
-    'D3_ORDER_OVERVIEW_PDF_AMOUNT'             => 'Menge',
-    'D3_ORDER_OVERVIEW_PDF_ARTNR'              => 'Art.-Nr.',
-    'D3_ORDER_OVERVIEW_PDF_DESCRIPTION'        => 'Beschreibung',
-    'D3_ORDER_OVERVIEW_PDF_UNITPRICE'          => 'Einzelpreise',
-    'D3_ORDER_OVERVIEW_PDF_TOTALPRICE'         => 'Gesamtpreis',
-    'D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD' => 'Ihre gewählte Zahlungsweise: ',
-    'D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER'=> 'Den Rechnungsbetrag haben wir dankend erhalten.',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO'=> 'Summe Artikel (brutto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT' => 'Rabatt',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO' => 'Summe Artikel (netto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX'      => 'zzgl. MwSt. ',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE' => '%',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE' => ' Betrag',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY' => 'Versandkosten (netto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT' => 'Gesamtsumme (brutto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR' => 'Kundennummer: ',
 );
diff --git a/Application/views/admin/en/pdfdocuments_lang.php b/Application/views/admin/en/pdfdocuments_lang.php
new file mode 100644
index 0000000..98d7682
--- /dev/null
+++ b/Application/views/admin/en/pdfdocuments_lang.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ * http://www.shopmodule.com
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author        D3 Data Development <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
+ */
+$sLangName = "English";
+$aLang     = array(
+    'charset'                                            => 'utf-8',
+
+    'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Basic settings',
+    'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Developer mode',
+);
diff --git a/Application/views/tpl/documents/deliverynote/inc/informations.tpl b/Application/views/tpl/documents/deliverynote/inc/informations.tpl
index f2429dd..b27d738 100644
--- a/Application/views/tpl/documents/deliverynote/inc/informations.tpl
+++ b/Application/views/tpl/documents/deliverynote/inc/informations.tpl
@@ -2,7 +2,8 @@
     <div class="documentinformations">
         [{block name="pdfDocumentInformations"}]
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$smarty.now|date_format:"%d.%m.%Y"}]
+                [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DATE"}] [{$smarty.now|date_format:$dateFormat}]
             </div>
         [{/block}]
     </div>
diff --git a/Application/views/tpl/documents/deliverynote/inc/salutation.tpl b/Application/views/tpl/documents/deliverynote/inc/salutation.tpl
index 32e8c5a..e9692d9 100644
--- a/Application/views/tpl/documents/deliverynote/inc/salutation.tpl
+++ b/Application/views/tpl/documents/deliverynote/inc/salutation.tpl
@@ -1,7 +1,12 @@
 [{block name="salutation"}]
     <div class="salutation">
-        <div class="documenttype">noch übersetzen: Lieferschein</div>
-        <div class="documentnumber">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</div>
-        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]</div>
+        <div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]</div>
+        <div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR"}] [{$order->getFieldData('oxordernr')}]</div>
+
+        [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+        [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]
+        [{assign var="aArgs" value="//"|explode:$sArgs}]
+
+        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_ORDER_FROM_AT" args=$aArgs}]</div>
     </div>
 [{/block}]
\ No newline at end of file
diff --git a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
index 68c1aab..74c1b65 100644
--- a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
+++ b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
@@ -1,28 +1,28 @@
 <td class="description">
     <div class="sumbrutto">
-        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
+        [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO"}]
     </div>
     [{if $order->getFormattedDiscount() != 0}]
         <div class="discount">
-            [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
+            [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT"}]
         </div>
     [{/if}]
     <div class="sumnetto">
-        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
+        [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO"}]
     </div>
     [{foreach from=$productVats key=VatKey item=oVat}]
         <div class="producttax">
-            [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]
+            [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey}]
         </div>
     [{/foreach}]
     <div class="delivery">
-        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
+        [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY"}]
     </div>
     <div class="deliverytax">
-        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]
+        [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey}]
     </div>
     <div class="totalsum">
-        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
+        [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT"}]
     </div>
 </td>
 <td class="values">
diff --git a/Application/views/tpl/documents/inc/elements/articlelist.tpl b/Application/views/tpl/documents/inc/elements/articlelist.tpl
index 52c6519..21a8592 100644
--- a/Application/views/tpl/documents/inc/elements/articlelist.tpl
+++ b/Application/views/tpl/documents/inc/elements/articlelist.tpl
@@ -4,20 +4,20 @@
     <table class="article_table[{if $showPrices}]_prices[{/if}]">
         <tr>
             <th class="amount">
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_AMOUNT"}]
             </th>
             <th class="description">
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DESCRIPTION"}]
             </th>
             [{if $showPrices}]
                 <th class="tax">
-                    [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_USTPERCENTAGE"}]
                 </th>
                 <th class="unitPrice">
-                    [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_UNITPRICE"}]
                 </th>
                 <th class="totalPrice">
-                    [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALPRICE"}]
                 </th>
             [{/if}]
         </tr>
@@ -30,7 +30,7 @@
                     [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
                     <br>
                     <span class="artnr">
-                        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
+                        [{oxmultilang ident="D3_PDFDOCUMENTS_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
                     </span>
                 </td>
                 [{if $showPrices}]
@@ -55,7 +55,7 @@
                     [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
                     <br>
                     <span class="artnr">
-                        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
+                        [{oxmultilang ident="D3_PDFDOCUMENTS_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
                     </span>
                 </td>
                 [{if $showPrices}]
@@ -80,7 +80,7 @@
                     [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
                     <br>
                     <span class="artnr">
-                        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
+                        [{oxmultilang ident="D3_PDFDOCUMENTS_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
                     </span>
                 </td>
                 [{if $showPrices}]
@@ -105,7 +105,7 @@
                     [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
                     <br>
                     <span class="artnr">
-                        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
+                        [{oxmultilang ident="D3_PDFDOCUMENTS_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
                     </span>
                 </td>
                 [{if $showPrices}]
diff --git a/Application/views/tpl/documents/inc/elements/informations.tpl b/Application/views/tpl/documents/inc/elements/informations.tpl
index c18a3b5..c873a9d 100644
--- a/Application/views/tpl/documents/inc/elements/informations.tpl
+++ b/Application/views/tpl/documents/inc/elements/informations.tpl
@@ -2,16 +2,16 @@
     <div class="contactinformations">
         [{block name="pdfContactInformations"}]
             <div class="headline">
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_GET_IN_CONTACT"}]
             </div>
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->getFieldData('oxtelefon')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_TELEFON"}] [{$shop->getFieldData('oxtelefon')}]
             </div>
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->getFieldData('oxtelefax')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_FAX"}] [{$shop->getFieldData('oxtelefax')}]
             </div>
             <div>
-                [{$shop->getFieldData('oxinfoemail')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_EMAIL"}] [{$shop->getFieldData('oxinfoemail')}]
             </div>
         [{/block}]
     </div>
@@ -19,16 +19,16 @@
     <div class="bankaccountinformations">
         [{block name="pdfBankaccountInformations"}]
             <div class="headline">
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]
             </div>
             <div>
                 [{$shop->getFieldData('oxbankname')}]
             </div>
             <div>
-                [{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->getFieldData('oxibannumber')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR"}] [{$shop->getFieldData('oxibannumber')}]
             </div>
             <div>
-                [{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER"}] [{$shop->getFieldData('oxbiccode')}]
             </div>
         [{/block}]
     </div>
diff --git a/Application/views/tpl/documents/inc/page/footer.tpl b/Application/views/tpl/documents/inc/page/footer.tpl
index 3b1ac42..8c4b88f 100644
--- a/Application/views/tpl/documents/inc/page/footer.tpl
+++ b/Application/views/tpl/documents/inc/page/footer.tpl
@@ -17,18 +17,18 @@
                 [{/block}]
                 [{block name="pdfFooterCenter"}]
                     <td class="footerCenter">
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]</div>
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]</div>
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]</div>
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_MANAGINGDIRECTOR"}] [{$shop->getFieldData('oxfname')}] [{$shop->getFieldData('oxlname')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_COURT"}] [{$shop->getFieldData('oxcourt')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_HRBNR"}] [{$shop->getFieldData('oxhrbnr')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_USTID"}] [{$shop->getFieldData('oxvatnumber')}]</div>
                     </td>
                 [{/block}]
                 [{block name="pdfFooterRight"}]
                     <td class="footerRight">
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</div>
-                        <div>[{$shop->oxshops__oxbankname->value}]</div>
-                        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div>
-                        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]</div>
+                        <div>[{$shop->getFieldData('oxbankname')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR"}] [{$shop->getFieldData('oxibannumber')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE"}] [{$shop->getFieldData('oxbiccode')}]</div>
                     </td>
                 [{/block}]
             </tr>
diff --git a/Application/views/tpl/documents/invoice/inc/conclusion.tpl b/Application/views/tpl/documents/invoice/inc/conclusion.tpl
index 84680eb..e950980 100644
--- a/Application/views/tpl/documents/invoice/inc/conclusion.tpl
+++ b/Application/views/tpl/documents/invoice/inc/conclusion.tpl
@@ -3,19 +3,19 @@
         [{block name="conclusion_paymethod"}]
             <tr>
                 <td>
-                    [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD"}]
                     [{$payment->getFieldData('oxdesc')}]
                 </td>
             </tr>
         [{/block}]
         <tr>
             <td>
-                [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_THANKYOU_1"}]
             </td>
         </tr>
         <tr>
             <td>
-                [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}] [{$shop->oxshops__oxname->value}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_THANKYOU_2" args=$shop->getFieldData('oxname')}]
             </td>
         </tr>
     </table>
diff --git a/Application/views/tpl/documents/invoice/inc/informations.tpl b/Application/views/tpl/documents/invoice/inc/informations.tpl
index 8bf7a10..fcd9f43 100644
--- a/Application/views/tpl/documents/invoice/inc/informations.tpl
+++ b/Application/views/tpl/documents/invoice/inc/informations.tpl
@@ -2,16 +2,17 @@
     <div class="documentinformations">
         [{block name="pdfDocumentInformations"}]
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_ORDERBILLNR"}] [{$order->getFieldData('oxbillnr')}]
             </div>
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]
             </div>
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->getFieldData('oxbilldate')|date_format:"%d.%m.%Y"}]
+                [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DATE"}] [{$order->getFieldData('oxbilldate')|date_format:$dateFormat}]
             </div>
             <div>
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_USTIDNR"}] [{$shop->getFieldData('oxvatnumber')}]
             </div>
         [{/block}]
     </div>
diff --git a/Application/views/tpl/documents/invoice/inc/salutation.tpl b/Application/views/tpl/documents/invoice/inc/salutation.tpl
index 674eda9..58e53e8 100644
--- a/Application/views/tpl/documents/invoice/inc/salutation.tpl
+++ b/Application/views/tpl/documents/invoice/inc/salutation.tpl
@@ -1,7 +1,12 @@
 [{block name="salutation"}]
     <div class="salutation">
-        <div class="documenttype">zu übersetzen: Rechnung</div>
-        <div class="documentnumber">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</div>
-        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]</div>
+        <div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_INVOICE"}]</div>
+        <div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR"}] [{$order->getFieldData('oxordernr')}]</div>
+
+        [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+        [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]
+        [{assign var="aArgs" value="//"|explode:$sArgs}]
+
+        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_ORDER_FROM_AT" args=$aArgs}]</div>
     </div>
 [{/block}]
\ No newline at end of file
diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css
index c019ec4..e86320f 100644
--- a/out/src/css/pdfStyling.css
+++ b/out/src/css/pdfStyling.css
@@ -77,7 +77,7 @@ table{
 .salutation {
   margin-top: 5mm;
 }
-.salutation .documentnumber {
+.salutation .documenttype {
   font-weight: bold;
 }