X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=locale%2Fen%2Fall;h=091e70d44a3d7b738d8e5b89018dd7de3c2e157c;hb=c1c277273614033442c21c85cbad0ec37112f018;hp=2ca236828f76587afeb4ce5a06a178dc10714892;hpb=fca6a1fe95b6995c063c6f1ff23a436684a0e644;p=kivitendo-erp.git

diff --git a/locale/en/all b/locale/en/all
index 2ca236828..091e70d44 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -349,6 +349,7 @@ $self->{texts} = {
   'Assembly (typeabbreviation)' => 'A',
   'Assembly Last Cost'          => '',
   'Assembly Number missing!'    => '',
+  'Assembly creation warehouse dependent' => '',
   'Assembly items'              => '',
   'Asset'                       => '',
   'Assets'                      => '',
@@ -540,7 +541,6 @@ $self->{texts} = {
   'Calculate'                   => '',
   'Calculate due date automatically' => '',
   'Calling #1 now'              => '',
-  'Can not create that quantity with current stock' => '',
   'Can only delete the "Storno zu" part of the cancellation pair.' => '',
   'Can only save template if amounts,i.e. 1 for debit and credit are set.' => '',
   'Can\'t connect to shop. #1'  => '',
@@ -1700,6 +1700,8 @@ $self->{texts} = {
   'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' => '',
   'If your old bins match exactly Bins in the Warehouse CLICK on <b>AUTOMATICALLY MATCH BINS</b>.' => '',
   'Ignore faulty positions'     => '',
+  'Ignore services for the purchase orders state of delivery' => '',
+  'Ignore services for the sales orders state of delivery' => '',
   'Illegal characters have been removed from the following fields: #1' => '',
   'Illegal date'                => '',
   'Image'                       => '',
@@ -1772,6 +1774,8 @@ $self->{texts} = {
   'Introduction of clients'     => '',
   'Inv. Duedate'                => '',
   'Invalid'                     => '',
+  'Invalid assembly'            => '',
+  'Invalid bin'                 => '',
   'Invalid charge number: #1'   => '',
   'Invalid combination of ledger account number length. Mismatch length of #1 with length of #2. Please check your account settings. ' => '',
   'Invalid duration format'     => '',
@@ -2340,6 +2344,7 @@ $self->{texts} = {
   'Parsing the XMP metadata failed.' => '',
   'Part'                        => '',
   'Part "#1" has chargenumber or best before date set. So it cannot be transfered automatically.' => '',
+  'Part #1 exists in warehouse #2, but not in warehouse #3 ' => '',
   'Part (database ID)'          => '',
   'Part (typeabbreviation)'     => 'P',
   'Part Classification'         => '',
@@ -2572,6 +2577,7 @@ $self->{texts} = {
   'Problem'                     => '',
   'Produce'                     => '',
   'Produce Assembly'            => '',
+  'Produce assembly only if all parts are in the same warehouse' => '',
   'Production'                  => 'Production',
   'Production (typeabbreviation)' => 'W',
   'Productivity'                => '',
@@ -2617,6 +2623,7 @@ $self->{texts} = {
   'Purchase Invoices'           => '',
   'Purchase Order'              => '',
   'Purchase Orders'             => '',
+  'Purchase Orders Services are deliverable' => '',
   'Purchase Orders deleteable'  => '',
   'Purchase Price Rules'        => '',
   'Purchase Price Rules '       => '',
@@ -2843,6 +2850,7 @@ $self->{texts} = {
   'Sales Order delivery date interval' => '',
   'Sales Orders'                => '',
   'Sales Orders Advance'        => '',
+  'Sales Orders Services are deliverable' => '',
   'Sales Orders deleteable'     => '',
   'Sales Price Rules'           => '',
   'Sales Price Rules '          => '',
@@ -3683,7 +3691,7 @@ $self->{texts} = {
   'There is one or more sections for which no part has been assigned yet; therefore creating the new record is not possible yet.' => '',
   'There was an error deleting the draft' => '',
   'There was an error executing the background job.' => '',
-  'There was an error parsing the csv file: #1 in line #2: #3' => '',
+  'There was an error parsing the csv file: #1 in line #2.' => '',
   'There was an error saving the draft' => '',
   'There was an error saving the letter' => '',
   'There was an error saving the letter draft' => '',
@@ -3987,6 +3995,7 @@ $self->{texts} = {
   'Useable for…'                => '',
   'Used for Purchase'           => '',
   'Used for Sale'               => '',
+  'Used for assembly #1 #2'     => '',
   'User'                        => '',
   'User Preferences'            => '',
   'User access'                 => '',