X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=locale%2Fen%2Fall;h=48370745c06288f727805456843e941383d1bcd3;hb=eed856940a560915032452c19d98b88b1337f8bc;hp=02fed2c441c3eddc4a6e63378c3abe35afc80524;hpb=422f2f17365ea7879c14b902c5db1e4cd7023e48;p=kivitendo-erp.git

diff --git a/locale/en/all b/locale/en/all
index 02fed2c44..48370745c 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -306,6 +306,7 @@ $self->{texts} = {
   'Bestandskonto'               => '',
   'Bilanz'                      => '',
   'Billing Address'             => '',
+  'Billing/shipping address (GLN)' => '',
   'Billing/shipping address (city)' => '',
   'Billing/shipping address (country)' => '',
   'Billing/shipping address (street)' => '',
@@ -743,6 +744,7 @@ $self->{texts} = {
   'Do you really want to delete the selected links?' => '',
   'Do you really want to delete this object?' => '',
   'Do you really want to delete this warehouse?' => '',
+  'Do you really want to save?' => '',
   'Do you want to <b>limit</b> your search?' => '',
   'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => '',
   'Do you want to set the account number "#1" to "#2" and the name "#3" to "#4"?' => '',
@@ -1035,6 +1037,7 @@ $self->{texts} = {
   'Fwd'                         => 'Forward',
   'GL Transaction'              => '',
   'GL transactions changeable'  => '',
+  'GLN'                         => '',
   'Gegenkonto'                  => '',
   'Gender'                      => '',
   'General Ledger'              => '',
@@ -1094,7 +1097,7 @@ $self->{texts} = {
   'IV'                          => '',
   'If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.' => '',
   'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' => '',
-  'If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.' => '',
+  'If enabled a warning will be shown in sales and purchase orders if there are two or more positions of the same part (new controller only).' => 'Falls eingeschaltet, wird eine Warnung angezeigt, wenn der Auftrag mehrere gleiche Artikel enthält (nur neuer Controller).',  '',
   'If the article type is set to \'mixed\' then a column called \'type\' must be present.' => '',
   'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => '',
   'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => '',
@@ -1624,6 +1627,7 @@ $self->{texts} = {
   'Posting Configuration'       => '',
   'Postscript'                  => '',
   'Posustva_coa'                => '',
+  'Precision'                   => '',
   'Preferences'                 => '',
   'Preferences saved!'          => '',
   'Prefix for the new bins\' names' => '',
@@ -1709,6 +1713,7 @@ $self->{texts} = {
   'Quartal'                     => '',
   'Quarter'                     => '',
   'Quarterly'                   => '',
+  'Query Type'                  => '',
   'Queue'                       => '',
   'Quotation'                   => '',
   'Quotation Date'              => '',
@@ -2292,6 +2297,7 @@ $self->{texts} = {
   'There are Bins defined in your master data.' => '',
   'There are bookings to the account 3803 after 01.01.2007. If you didn\'t change this account manually to 19% the bookings are probably incorrect.' => '',
   'There are double partnumbers in your database.' => '',
+  'There are duplicate parts at positions' => '',
   'There are entries in tax where taxkey is NULL.' => '',
   'There are invalid taxnumbers in use.' => '',
   'There are invalid transactions in your database.' => '',
@@ -2444,6 +2450,7 @@ $self->{texts} = {
   'Use As New'                  => '',
   'Use WebDAV Repository'       => '',
   'Use existing templates'      => '',
+  'Use linked items'            => '',
   'Use master default bin for Default Transfer, if no default bin for the part is configured' => '',
   'User'                        => '',
   'User Config'                 => '',
@@ -2507,6 +2514,7 @@ $self->{texts} = {
   'Warehouse management'        => '',
   'Warehouse saved.'            => '',
   'Warehouses'                  => '',
+  'Warn before saving orders with duplicate parts (new controller only)' => '',
   'Warning'                     => '',
   'WebDAV'                      => '',
   'WebDAV link'                 => '',