From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 10 Jan 2012 10:13:49 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~73^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/fca2825c79e6740fd511a2f86df9cb1ff898bfdf?ds=sidebyside;hp=-c

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

fca2825c79e6740fd511a2f86df9cb1ff898bfdf
diff --combined locale/de/all
index 555be1e07,e8b538bfd..c4ec6b015
--- a/locale/de/all
+++ b/locale/de/all
@@@ -574,6 -574,7 +574,7 @@@ $self->{texts} = 
    'Delivered'                   => 'Geliefert',
    'Delivery Date'               => 'Lieferdatum',
    'Delivery Order'              => 'Lieferschein',
+   'Delivery Order created'      => 'Lieferschein erstellt',
    'Delivery Order Date'         => 'Lieferscheindatum',
    'Delivery Order Date missing!' => 'Lieferscheindatum fehlt!',
    'Delivery Order Number'       => 'Lieferscheinnummer',
@@@ -1428,7 -1429,6 +1429,7 @@@
    'Purpose'                     => 'Verwendungszweck',
    'Qty'                         => 'Menge',
    'Qty according to delivery order' => 'Menge laut Lieferschein',
 +  'Qty in Selected Records'     => 'Menge in gewählten Belegen',
    'Qty in stock'                => 'Lagerbestand',
    'Quantity'                    => 'Menge',
    'Quantity missing.'           => 'Die Mengenangabe fehlt.',
@@@ -1653,7 -1653,6 +1654,7 @@@
    'Steuersatz'                  => 'Steuersatz',
    'Stock'                       => 'Einlagern',
    'Stock value'                 => 'Bestandswert',
 +  'Stocked Qty'                 => 'Lagermenge',
    'Storno'                      => 'Storno',
    'Storno (one letter abbreviation)' => 'S',
    'Storno Invoice'              => 'Stornorechnung',