Merge branch 'currency'
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 24 May 2013 09:49:46 +0000 (11:49 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 24 May 2013 09:49:46 +0000 (11:49 +0200)
1  2 
SL/AP.pm
SL/AR.pm
SL/CT.pm
SL/DO.pm
SL/Form.pm
SL/IR.pm
SL/IS.pm
SL/User.pm
locale/de/all

diff --cc SL/AP.pm
Simple merge
diff --cc SL/AR.pm
Simple merge
diff --cc SL/CT.pm
Simple merge
diff --cc SL/DO.pm
Simple merge
diff --cc SL/Form.pm
Simple merge
diff --cc SL/IR.pm
Simple merge
diff --cc SL/IS.pm
Simple merge
diff --cc SL/User.pm
Simple merge
diff --cc 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',