From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 4 Mar 2010 13:11:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~33^2~4^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/f42b8272a31219ff145eafb007874b520c1fc3eb?ds=inline;hp=-c

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

f42b8272a31219ff145eafb007874b520c1fc3eb
diff --combined locale/de/all
index ea3162dc0,a52b051d5..dcbea1566
--- a/locale/de/all
+++ b/locale/de/all
@@@ -1705,7 -1705,6 +1705,7 @@@ $self->{texts} = 
    'Transaction has been split on both the credit and the debit side' => 'Sowohl auf der Soll- als auch auf der Haben-Seite gesplittete Buchung',
    'Transaction posted!'         => 'Buchung verbucht!',
    'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
 +  'Transdate'                   => 'Belegdatum',
    'Transfer'                    => 'Umlagern',
    'Transfer Quantity'           => 'Umlagermenge',
    'Transfer To Stock'           => 'Lagereingang',
@@@ -1798,7 -1797,7 +1798,7 @@@
    'WHJournal'                   => 'Lagerbuchungen',
    'Warehouse'                   => 'Lager',
    'Warehouse From'              => 'Quelllager',
-   'Warehouse MIgration'         => 'Lagermigration',
+   'Warehouse Migration'         => 'Lagermigration',
    'Warehouse To'                => 'Ziellager',
    'Warehouse content'           => 'Lagerbestand',
    'Warehouse deleted.'          => 'Lager gel&ouml;scht.',