Merge branch 'master' of ssh://lx-office/~/lx-office-erp

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

diff --git a/locale/en/login b/locale/en/login
index 7578046..60b1896 100644 (file)
--- a/locale/en/login
+++ b/locale/en/login
@@ -288,7 +288,6 @@ $self->{texts} = {
   'Sales Orders'                => 'Sales Orders',
   'Sales quotation'             => 'Sales quotation',
   'Salesman'                    => 'Salesman',
-  'Salesperson'                 => 'Salesperson',
   'Screen'                      => 'Screen',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -301,12 +300,9 @@ $self->{texts} = {
   'Sep'                         => 'Sep',
   'September'                   => 'September',
   'Serial No.'                  => 'Serial No.',
-  'Ship'                        => 'Ship',
-  'Ship rcvd'                   => 'Ship rcvd',
   'Ship to'                     => 'Ship to',
   'Ship via'                    => 'Ship via',
   'Shipping Address'            => 'Shipping Address',
-  'Show details'                => 'Show details',
   'Stock'                       => 'Stock',
   'Storno Invoice'              => 'Storno Invoice',
   'Storno Packing List'         => 'Storno Packing List',
@@ -331,6 +327,7 @@ $self->{texts} = {
   'The parts for this delivery order have already been transferred out.' => 'The parts for this delivery order have already been transferred out.',
   'The session is invalid or has expired.' => 'The session is invalid or has expired.',
   'The subject is missing.'     => 'The subject is missing.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.',
   'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.',
   'To (email)'                  => 'To (email)',
   'Total'                       => 'Total',
@@ -341,6 +338,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Unit',
   'Unknown dependency \'%s\'.'  => 'Unknown dependency \'%s\'.',
+  'Valid until'                 => 'Valid until',
   'Value'                       => 'Value',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Vendor',
@@ -353,6 +351,7 @@ $self->{texts} = {
   'Vendor type'                 => 'Vendor type',
   'Version'                     => 'Version',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Workflow purchase_order'     => 'Workflow purchase_order',
   'Workflow request_quotation'  => 'Workflow request_quotation',
@@ -369,6 +368,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.',
   'Zipcode'                     => 'Zipcode',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'bestbefore #1',
   'bin_list'                    => 'bin_list',
   'chargenumber #1'             => 'chargenumber #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Key "DB_config" is missing.',
@@ -380,6 +380,7 @@ $self->{texts} = {
   'follow_up_list'              => 'follow_up_list',
   'invoice'                     => 'invoice',
   'no'                          => 'no',
+  'no bestbefore'               => 'no bestbefore',
   'no chargenumber'             => 'no chargenumber',
   'none (pricegroup)'           => 'none (pricegroup)',
   'oe.pl::search called with unknown type' => 'oe.pl::search called with unknown type',
@@ -489,6 +490,7 @@ $self->{subs} = {
   'redo_stock_info'             => 'redo_stock_info',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report'                      => 'report',
   'report_for_todo_list'        => 'report_for_todo_list',
   'report_generator_back'       => 'report_generator_back',