Csv-Import-Hintergrund-Job: Als Ergebnis einen Text zurückgeben, nicht das Job-Objekt.

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

diff --git a/locale/en/all b/locale/en/all
index ede0e2f..8f3c769 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -915,6 +915,7 @@ $self->{texts} = {
   'Error: Invalid price factor' => '',
   'Error: Invalid price group'  => '',
   'Error: Invalid project'      => '',
+  'Error: Invalid salesman'     => '',
   'Error: Invalid shipto'       => '',
   'Error: Invalid tax zone'     => '',
   'Error: Invalid vendor in column make_#1' => '',
@@ -1113,6 +1114,8 @@ $self->{texts} = {
   'Import CSV'                  => '',
   'Import Status'               => '',
   'Import file'                 => '',
+  'Import finished with errors.' => '',
+  'Import finished without errors.' => '',
   'Import not started yet, please wait...' => '',
   'Import preview'              => '',
   'Import profiles'             => '',
@@ -2134,6 +2137,7 @@ $self->{texts} = {
   'The custom variable has been deleted.' => '',
   'The custom variable has been saved.' => '',
   'The custom variable is in use and cannot be deleted.' => '',
+  'The customer name is missing.' => '',
   'The database for user management and authentication does not exist. You can create let kivitendo create it with the following parameters:' => '',
   'The database host is missing.' => '',
   'The database name is missing.' => '',
@@ -2213,6 +2217,10 @@ $self->{texts} = {
   'The payment term is in use and cannot be deleted.' => '',
   'The payments have been posted.' => '',
   'The preferred one is to install packages provided by your operating system distribution (e.g. Debian or RPM packages).' => '',
+  'The price rule for this discount does not exist anymore' => '',
+  'The price rule for this price does not exist anymore' => '',
+  'The price rule is not a rule for discounts' => '',
+  'The price rule is not a rule for prices' => '',
   'The printer could not be deleted.' => '',
   'The printer has been created.' => '',
   'The printer has been deleted.' => '',
@@ -2266,6 +2274,7 @@ $self->{texts} = {
   'The user has been deleted.'  => '',
   'The user has been saved.'    => '',
   'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' => '',
+  'The vendor name is missing.' => '',
   'The warehouse could not be deleted because it has already been used.' => '',
   'The warehouse does not contain any bins.' => '',
   'The warehouse or the bin is missing.' => '',
@@ -2298,7 +2307,7 @@ $self->{texts} = {
   'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => '',
   'There is not enough left of \'#1\' in bin \'#2\' for the removal of #3.' => '',
   'There was an error executing the background job.' => '',
-  'There was an error parsing the csv file: #1 in line #2.' => '',
+  'There was an error parsing the csv file: #1 in line #2: #3' => '',
   'There you can let kivitendo create the basic tables for you, even in an already existing database.' => '',
   'Therefore several settings that had to be made for each user in the past have been consolidated into the client configuration.' => '',
   'Therefore the definition of "kg" with the base unit "g" and a factor of 1000 is valid while defining "g" with a base unit of "kg" and a factor of "0.001" is not.' => '',
@@ -2622,6 +2631,8 @@ $self->{texts} = {
   'delete'                      => '',
   'delivered'                   => '',
   'deliverydate'                => '',
+  'difference as skonto'        => '',
+  'difference_as_skonto'        => 'remainder as skonto',
   'direct debit'                => '',
   'disposed'                    => '',
   'do not include'              => '',
@@ -2780,6 +2791,10 @@ $self->{texts} = {
   'vendor_list'                 => '',
   'warehouse_journal_list'      => '',
   'warehouse_report_list'       => '',
+  'with skonto acc. to pt'      => '',
+  'with_skonto_pt'              => 'with skonto payment terms',
+  'without skonto'              => '',
+  'without_skonto'              => 'without skonto',
   'wrongformat'                 => '',
   'yearly'                      => '',
   'yes'                         => '',