From: G. Richardson Date: Wed, 18 May 2016 13:17:35 +0000 (+0200) Subject: Nicht-übersetzte Deutsche Begriffe entfernt und übersetzt X-Git-Tag: release-3.4.1~136 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=88f11e29e4262e1e567f5b48e10bfe51eb5759ea;p=kivitendo-erp.git 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 be989eee1..3a099ba90 100644 --- 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 => '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') }, diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 25ee60262..a116d1263 100644 --- 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.'), }, - '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'), }, diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 6cb9e9cd8..327853915 100644 --- 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'), }, - 'shop' => { 'text' => $locale->text('Shopartikel'), }, + 'shop' => { 'text' => $locale->text('Shop article'), }, 'projectnumber' => { 'text' => $locale->text('Project Number'), }, 'projectdescription' => { 'text' => $locale->text('Project Description'), }, ); diff --git a/locale/de/all b/locale/de/all index 393f44126..74e7c0c2d 100755 --- 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', - 'Abteilung' => 'Abteilung', '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 group' => 'Preisgruppe', '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 c39287841..c917f639d 100644 --- a/templates/webpages/customer_vendor/tabs/billing.html +++ b/templates/webpages/customer_vendor/tabs/billing.html @@ -314,7 +314,7 @@ [% IF ( SELF.is_customer() ) %] - [% 'Preisklasse' | $T8 %] + [% 'Price group' | $T8 %] [% 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 @@ - [% 'Steuersatz' | $T8 %] + [% 'Tax rate' | $T8 %] [% 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 b881fb058..e93531a30 100644 --- a/templates/webpages/customer_vendor/tabs/shipto.html +++ b/templates/webpages/customer_vendor/tabs/shipto.html @@ -31,7 +31,7 @@ - [% 'Abteilung' | $T8 %] + [% 'Department' | $T8 %] [% 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 482edc596..b4f30473b 100644 --- a/templates/webpages/ic/form_header.html +++ b/templates/webpages/ic/form_header.html @@ -267,7 +267,7 @@ [%- END %] - + diff --git a/templates/webpages/ic/price_row.html b/templates/webpages/ic/price_row.html index b89b10252..10f4b5b58 100644 --- a/templates/webpages/ic/price_row.html +++ b/templates/webpages/ic/price_row.html @@ -6,8 +6,8 @@ - - + + [%- FOREACH row = PRICES %] diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html index 12cdcbbfe..fafcacc26 100644 --- a/templates/webpages/ic/search.html +++ b/templates/webpages/ic/search.html @@ -66,7 +66,7 @@ - + @@ -221,7 +221,7 @@ - + diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html index bca42dfdb..a2d9f9027 100644 --- a/templates/webpages/ic/search_update_prices.html +++ b/templates/webpages/ic/search_update_prices.html @@ -63,7 +63,7 @@

[% 'Preisklasse' | $T8 %][% 'Preis' | $T8 %][% 'Price group' | $T8 %][% 'Price' | $T8 %]
[% 'Shopartikel' | $T8 %][% 'Shop article' | $T8 %] [% L.yes_no_tag('shop', shop, default='', with_empty=1, empty_title='---') %]
[%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %] [%- L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %][%- L.checkbox_tag('l_shop', label=LxERP.t8('Shopartikel'), value='Y') %][%- L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %] [%- L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %]
- +
[% 'Preisklasse' | $T8 %][% 'Price group' | $T8 %] [% 'Preis' | $T8 %] [% 'Prozentual/Absolut' | $T8 %]