Merge branch 'von-opendynamic'

[kivitendo-erp.git] / locale / en / all

diff --git a/locale/en/all b/locale/en/all
index 72b49b8..6f86703 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -221,6 +221,7 @@ $self->{texts} = {
   'Are you sure you want to delete Transaction' => '',
   'Are you sure you want to delete this background job?' => '',
   'Are you sure you want to delete this business?' => '',
+  'Are you sure you want to delete this delivery term?' => '',
   'Are you sure you want to delete this department?' => '',
   'Are you sure you want to delete this payment term?' => '',
   'Are you sure you want to remove the marked entries from the queue?' => '',
@@ -502,6 +503,7 @@ $self->{texts} = {
   'Create a new background job' => '',
   'Create a new business'       => '',
   'Create a new client'         => '',
+  'Create a new delivery term'  => '',
   'Create a new department'     => '',
   'Create a new group'          => '',
   'Create a new payment term'   => '',
@@ -683,6 +685,10 @@ $self->{texts} = {
   'Delivery Orders'             => '',
   'Delivery Plan'               => '',
   'Delivery Plan for currently outstanding sales orders' => '',
+  'Delivery Terms'              => '',
+  'Delivery terms'              => '',
+  'Delivery terms (database ID)' => '',
+  'Delivery terms (name)'       => '',
   'Department'                  => '',
   'Department (database ID)'    => '',
   'Department (description)'    => '',
@@ -827,6 +833,7 @@ $self->{texts} = {
   'Edit bank account'           => '',
   'Edit business'               => '',
   'Edit custom variable'        => '',
+  'Edit delivery term'          => '',
   'Edit department'             => '',
   'Edit file'                   => '',
   'Edit greetings'              => '',
@@ -877,6 +884,7 @@ $self->{texts} = {
   'Error: Invalid business'     => '',
   'Error: Invalid contact'      => '',
   'Error: Invalid currency'     => '',
+  'Error: Invalid delivery terms' => '',
   'Error: Invalid department'   => '',
   'Error: Invalid language'     => '',
   'Error: Invalid order for this order item' => '',
@@ -1055,7 +1063,7 @@ $self->{texts} = {
   'II'                          => '',
   'III'                         => '',
   'IV'                          => '',
-  'If amounts differ more than "Maximal amount difference" (settings), this item is marked as invalid.' => '',
+  '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 the article type is set to \'mixed\' then a column called \'type\' must be present.' => '',
@@ -1358,6 +1366,7 @@ $self->{texts} = {
   'No customer has been selected yet.' => '',
   'No data was found.'          => '',
   'No default currency'         => '',
+  'No delivery term has been created yet.' => '',
   'No department has been created yet.' => '',
   'No dunnings have been selected for printing.' => '',
   'No file has been uploaded yet.' => '',
@@ -1444,7 +1453,7 @@ $self->{texts} = {
   'Order Number'                => '',
   'Order Number missing!'       => '',
   'Order deleted!'              => '',
-  'Order/Item columns'          => '',
+  'Order/Item row name'         => '',
   'OrderItem'                   => '',
   'Ordered'                     => '',
   'Orders'                      => '',
@@ -1498,7 +1507,7 @@ $self->{texts} = {
   'Password'                    => '',
   'Payables'                    => '',
   'Payment'                     => '',
-  'Payment Options'             => '',
+  'Payment / Delivery Options'  => '',
   'Payment Reminder'            => '',
   'Payment Terms'               => '',
   'Payment Terms missing in row ' => '',
@@ -2070,6 +2079,7 @@ $self->{texts} = {
   'The client has been created.' => '',
   'The client has been deleted.' => '',
   'The client has been saved.'  => '',
+  'The column "datatype" must be present and must be at the same position / column in each data set. The values must be the row names (see settings) for order and item data respectively.' => '',
   'The column "make_X" can contain either a vendor\'s database ID, a vendor number or a vendor\'s name.' => '',
   'The column triplets can occur multiple times with different numbers "X" each time (e.g. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).' => '',
   'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => '',
@@ -2098,6 +2108,10 @@ $self->{texts} = {
   'The deductible amount'       => '',
   'The default value depends on the variable type:' => '',
   'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => '',
+  'The delivery term has been created.' => '',
+  'The delivery term has been deleted.' => '',
+  'The delivery term has been saved.' => '',
+  'The delivery term is in use and cannot be deleted.' => '',
   'The department has been created.' => '',
   'The department has been deleted.' => '',
   'The department has been saved.' => '',