Nicht-übersetzte Deutsche Begriffe entfernt und übersetzt

Shopartikel, Steuersatz, Abteilung, Preisgruppe (gab es auch als
Preisklasse).

diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index be989eee1bd3dbf651169c9afb64cb0e623dfdca..3a099ba9076b2cc9b72d42c04aafc882ac69259c 100644 (file)
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -534,7 +534,7 @@ sub setup_displayable_columns {
                                  { name => 'price_factor',       description => $::locale->text('Price factor (name)')                                  },
                                  { name => 'rop',                description => $::locale->text('ROP')                                                  },
                                  { name => 'sellprice',          description => $::locale->text('Sellprice')                                            },
                                  { name => 'price_factor',       description => $::locale->text('Price factor (name)')                                  },
                                  { name => 'rop',                description => $::locale->text('ROP')                                                  },
                                  { name => 'sellprice',          description => $::locale->text('Sellprice')                                            },

-                                 { name => 'shop',               description => $::locale->text('Shopartikel')                                          },
+                                 { name => 'shop',               description => $::locale->text('Shop article')                                         },

                                  { name => 'type',               description => $::locale->text('Article type')  . ' [3]'                             },
                                  { name => 'unit',               description => $::locale->text('Unit (if missing or empty default unit will be used)') },
                                  { name => 've',                 description => $::locale->text('Verrechnungseinheit')                                  },
                                  { name => 'type',               description => $::locale->text('Article type')  . ' [3]'                             },
                                  { name => 'unit',               description => $::locale->text('Unit (if missing or empty default unit will be used)') },
                                  { name => 've',                 description => $::locale->text('Verrechnungseinheit')                                  },

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 25ee60262c0fbb37694458e442e1341226a8b62d..a116d12633fc57c2f9f54e09af4c29f83ec0d59c 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -926,7 +926,7 @@ sub ap_transactions {
     'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
     'country'                 => { 'text' => $locale->text('Country'), },
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
     'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
     'country'                 => { 'text' => $locale->text('Country'), },
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },

-    'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
+    'taxzone'                 => { 'text' => $locale->text('Tax rate'), },

     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
     'direct_debit'            => { 'text' => $locale->text('direct debit'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
     'direct_debit'            => { 'text' => $locale->text('direct debit'), },

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 6cb9e9cd8d0b0108da9d8e701e6e2df2cc4a2967..327853915cc7f6d7d09d37c78a93b9e44caeee43 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1043,7 +1043,7 @@ sub generate_report {
     'transdate'          => { 'text' => $locale->text('Transdate'), },
     'unit'               => { 'text' => $locale->text('Unit'), },
     'weight'             => { 'text' => $locale->text('Weight'), },
     'transdate'          => { 'text' => $locale->text('Transdate'), },
     'unit'               => { 'text' => $locale->text('Unit'), },
     'weight'             => { 'text' => $locale->text('Weight'), },

-    'shop'               => { 'text' => $locale->text('Shopartikel'), },
+    'shop'               => { 'text' => $locale->text('Shop article'), },

     'projectnumber'      => { 'text' => $locale->text('Project Number'), },
     'projectdescription' => { 'text' => $locale->text('Project Description'), },
   );
     'projectnumber'      => { 'text' => $locale->text('Project Number'), },
     'projectdescription' => { 'text' => $locale->text('Project Description'), },
   );

diff --git a/locale/de/all b/locale/de/all
index 393f4412600d43202417b824f67381ee01849ae5..74e7c0c2d647002292298ed3b9a4dfc057d9a438 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -85,7 +85,6 @@ $self->{texts} = {
   'Abrechnungsnummer'           => 'Abrechnungsnummer',
   'Absolute BB Balance'         => 'Gesamtsaldo laut Bankbuchungen',
   'Absolute BT Balance'         => 'Gesamtsaldo laut Kontoauszug',
   'Abrechnungsnummer'           => 'Abrechnungsnummer',
   'Absolute BB Balance'         => 'Gesamtsaldo laut Bankbuchungen',
   'Absolute BT Balance'         => 'Gesamtsaldo laut Kontoauszug',

-  'Abteilung'                   => 'Abteilung',

   'Acc Transaction'             => 'Hauptbuch',
   'Acc transaction'             => 'Hauptbuch Buchung',
   'AccTransaction'              => 'AccTransaction',
   'Acc Transaction'             => 'Hauptbuch',
   'Acc transaction'             => 'Hauptbuch Buchung',
   'AccTransaction'              => 'AccTransaction',


@@ -2094,6 +2093,7 @@ $self->{texts} = {
   'Price factor (name)'         => 'Preisfaktor (Name)',
   'Price factor deleted!'       => 'Preisfaktor gelöscht.',
   'Price factor saved!'         => 'Preisfaktor gespeichert.',
   'Price factor (name)'         => 'Preisfaktor (Name)',
   'Price factor deleted!'       => 'Preisfaktor gelöscht.',
   'Price factor saved!'         => 'Preisfaktor gespeichert.',

+  'Price group'                 => 'Preisgruppe',

   'Price group (database ID)'   => 'Preisgruppe (Datenbank-ID)',
   'Price group (name)'          => 'Preisgruppe (Name) ',
   'Price information'           => 'Preisinformation',
   'Price group (database ID)'   => 'Preisgruppe (Datenbank-ID)',
   'Price group (name)'          => 'Preisgruppe (Name) ',
   'Price information'           => 'Preisinformation',

diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index c39287841376b86eb7248f2ee25f413661760ad0..c917f639dbea7114d7c242a0eed6245b540832b6 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -314,7 +314,7 @@
       </td>
 
       [% IF ( SELF.is_customer() ) %]
       </td>
 
       [% IF ( SELF.is_customer() ) %]

-        <th align="right">[% 'Preisklasse' | $T8 %]</th>
+        <th align="right">[% 'Price group' | $T8 %]</th>

 
         <td>
           [% L.select_tag('cv.klass', SELF.all_pricegroups, default = SELF.cv.klass, value_key = 'id', title_key = 'pricegroup', with_empty = 1) %]
 
         <td>
           [% L.select_tag('cv.klass', SELF.all_pricegroups, default = SELF.cv.klass, value_key = 'id', title_key = 'pricegroup', with_empty = 1) %]


@@ -324,7 +324,7 @@
     </tr>
 
     <tr>
     </tr>
 
     <tr>

-      <th align="right">[% 'Steuersatz' | $T8 %]</th>
+      <th align="right">[% 'Tax rate' | $T8 %]</th>

 
       <td>
         [% L.select_tag('cv.taxzone_id', SELF.all_taxzones, default = SELF.cv.taxzone_id, value_key = 'id', title_key = 'description') %]
 
       <td>
         [% L.select_tag('cv.taxzone_id', SELF.all_taxzones, default = SELF.cv.taxzone_id, value_key = 'id', title_key = 'description') %]

diff --git a/templates/webpages/customer_vendor/tabs/shipto.html b/templates/webpages/customer_vendor/tabs/shipto.html
index b881fb05802a8d44f2d99a217c728636da1059d9..e93531a30b180400941201dc186fcfd7e8cfc851 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/shipto.html
+++ b/templates/webpages/customer_vendor/tabs/shipto.html
@@ -31,7 +31,7 @@
     </tr>
 
     <tr>
     </tr>
 
     <tr>

-      <th align="right" nowrap>[% 'Abteilung' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Department' | $T8 %]</th>

 
       <td>
         [% L.input_tag('shipto.shiptodepartment_1', SELF.shipto.shiptodepartment_1,  size = 16) %]
 
       <td>
         [% L.input_tag('shipto.shiptodepartment_1', SELF.shipto.shiptodepartment_1,  size = 16) %]

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index 482edc5967e1582d82c3f97bc7c541170bde2b22..b4f30473b7cdff536aa4389e153f056ac76ae0e8 100644 (file)
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -267,7 +267,7 @@
           </tr>
         [%- END %]
           <tr>
           </tr>
         [%- END %]
           <tr>

-           <th align="right" nowrap><label for="shop">[% 'Shopartikel' | $T8 %]</label></th>
+           <th align="right" nowrap><label for="shop">[% 'Shop article' | $T8 %]</label></th>

            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
           </tr>
          </table>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
           </tr>
          </table>

diff --git a/templates/webpages/ic/price_row.html b/templates/webpages/ic/price_row.html
index b89b10252f8fbdbc9b14adc9d66f189d053d60fd..10f4b5b58daab8cb85b629e243a6826cc656b1c7 100644 (file)
--- a/templates/webpages/ic/price_row.html
+++ b/templates/webpages/ic/price_row.html
@@ -6,8 +6,8 @@
     <td>
       <table width=100%>
         <tr>
     <td>
       <table width=100%>
         <tr>

-          <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
-          <th class="listheading">[% 'Preis' | $T8 %]</th>
+          <th class="listheading">[% 'Price group' | $T8 %]</th>
+          <th class="listheading">[% 'Price' | $T8 %]</th>

         </tr>
 [%- FOREACH row = PRICES %]
         <tr class="listrow[% loop.count % 2 %]">
         </tr>
 [%- FOREACH row = PRICES %]
         <tr class="listrow[% loop.count % 2 %]">

diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 12cdcbbfe344301e35f9d26565ed51b941266dff..fafcacc26c3ae2ba86daf6af82d86d81fb540a16 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -66,7 +66,7 @@
       </tr>
 
       <tr>
       </tr>
 
       <tr>

-       <th align="right" nowrap>[% 'Shopartikel' | $T8 %]</th>
+       <th align="right" nowrap>[% 'Shop article' | $T8 %]</th>

        <td>[% L.yes_no_tag('shop', shop, default='', with_empty=1, empty_title='---') %]</td>
       </tr>
 
        <td>[% L.yes_no_tag('shop', shop, default='', with_empty=1, empty_title='---') %]</td>
       </tr>
 


@@ -221,7 +221,7 @@
          <tr>
           <td>[%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %]</td>
           <td>[%- L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %]</td>
          <tr>
           <td>[%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %]</td>
           <td>[%- L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %]</td>

-          <td>[%- L.checkbox_tag('l_shop', label=LxERP.t8('Shopartikel'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %]</td>

           <td>[%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %]</td>
          </tr>
 
           <td>[%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %]</td>
          </tr>
 

diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html
index bca42dfdbc0daea478d3626a0d35023eac2033dd..a2d9f9027b30596b4f7e00c285267e75676a74a9 100644 (file)
--- a/templates/webpages/ic/search_update_prices.html
+++ b/templates/webpages/ic/search_update_prices.html
@@ -63,7 +63,7 @@
   <p>
    <table>
     <tr>
   <p>
    <table>
     <tr>

-     <th class="listheading">[% 'Preisklasse' | $T8 %]</th>
+     <th class="listheading">[% 'Price group' | $T8 %]</th>

      <th class="listheading">[% 'Preis' | $T8 %]</th>
      <th class="listheading">[% 'Prozentual/Absolut' | $T8 %]</th>
     </tr>
      <th class="listheading">[% 'Preis' | $T8 %]</th>
      <th class="listheading">[% 'Prozentual/Absolut' | $T8 %]</th>
     </tr>