From: Sven Donath <lxo@dexo.de>
Date: Thu, 30 Sep 2010 14:10:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~110^2~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/0486bc1287667701efa97a45448cf93db7da7932?hp=-c

Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp
---

0486bc1287667701efa97a45448cf93db7da7932
diff --combined locale/de/all
index 532d3d426,2e4ad9b28..9d78ab9a6
--- a/locale/de/all
+++ b/locale/de/all
@@@ -1,5 -1,5 +1,5 @@@
  #!/usr/bin/perl
- # -*- coding: ISO-8859-15; -*-
+ # -*- coding: iso-8859-15; -*-
  # vim: fenc=ISO-8859-15
  
  # These are all the texts to build the translations files.
@@@ -942,6 -942,7 +942,6 @@@ $self->{texts} = 
    'List Price'                  => 'Listenpreis',
    'List Price Factors'          => 'Preisfaktoren anzeigen',
    'List Pricegroups'            => 'Preisgruppen anzeigen',
 -  'List Printer'                => 'Drucker anzeigen',
    'List Tax'                    => 'Bearbeiten',
    'List Transactions'           => 'Buchungsliste',
    'List Warehouses'             => 'Lager anzeigen',