From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Fri, 24 May 2013 09:49:46 +0000 (+0200)
Subject: Merge branch 'currency'
X-Git-Tag: release-3.1.0beta1~401^2~21
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=61cdba5d566357f3beabe0e7f3f0cb2d7bdccd73;p=kivitendo-erp.git

Merge branch 'currency'
---

61cdba5d566357f3beabe0e7f3f0cb2d7bdccd73
diff --cc locale/de/all
index dbfe63586,2e840320d..e681137bc
--- a/locale/de/all
+++ b/locale/de/all
@@@ -606,10 -607,10 +608,12 @@@ $self->{texts} = 
    'Decrease'                    => 'Verringern',
    'Default (no language selected)' => 'Standard (keine Sprache ausgewählt)',
    'Default Accounts'            => 'Standardkonten',
 +  'Default Bin'                 => '',
    'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
 +  'Default Warehouse'           => '',
    'Default buchungsgruppe'      => 'Standardbuchungsgruppe',
+   'Default currency'            => 'Standardwährung',
+   'Default currency missing!'   => 'Standardwährung fehlt!',
    'Default output medium'       => 'Standardausgabekanal',
    'Default printer'             => 'Standarddrucker',
    'Default template format'     => 'Standardvorlagenformat',