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

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

diff --git a/locale/en/do b/locale/en/do
index 29fa9fc..dc4cb34 100644 (file)
--- a/locale/en/do
+++ b/locale/en/do
@@ -108,6 +108,7 @@ $self->{texts} = {
   'ELSE'                        => 'ELSE',
   'Edit Purchase Delivery Order' => 'Edit Purchase Delivery Order',
   'Edit Sales Delivery Order'   => 'Edit Sales Delivery Order',
+  'Employee'                    => 'Employee',
   'Enter longdescription'       => 'Enter longdescription',
   'Error in database control file \'%s\': %s' => 'Error in database control file \'%s\': %s',
   'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.' => 'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.',
@@ -228,7 +229,6 @@ $self->{texts} = {
   'Sales Invoice'               => 'Sales Invoice',
   'Sales Order'                 => 'Sales Order',
   'Sales quotation'             => 'Sales quotation',
-  'Salesperson'                 => 'Salesperson',
   'Screen'                      => 'Screen',
   'Select a Customer'           => 'Select a Customer',
   'Select a customer'           => 'Select a customer',
@@ -241,12 +241,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',
@@ -265,6 +262,7 @@ $self->{texts} = {
   'The list has been printed.'  => 'The list has been printed.',
   'The parts for this delivery order have already been transferred in.' => 'The parts for this delivery order have already been transferred in.',
   'The parts for this delivery order have already been transferred out.' => 'The parts for this delivery order have already been transferred out.',
+  '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)',
   'Transaction description'     => 'Transaction description',
@@ -283,6 +281,7 @@ $self->{texts} = {
   'Vendor not on file or locked!' => 'Vendor not on file or locked!',
   'Vendor not on file!'         => 'Vendor not on file!',
   'View warehouse content'      => 'View warehouse content',
+  'View/edit all employees sales documents' => 'View/edit all employees sales documents',
   'Warehouse management'        => 'Warehouse management',
   'Yes'                         => 'Yes',
   'You cannot create an invoice for delivery orders for different customers.' => 'You cannot create an invoice for delivery orders for different customers.',
@@ -292,6 +291,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.',
@@ -302,6 +302,7 @@ $self->{texts} = {
   'emailed to'                  => 'emailed to',
   'invoice'                     => 'invoice',
   'no'                          => 'no',
+  'no bestbefore'               => 'no bestbefore',
   'no chargenumber'             => 'no chargenumber',
   'none (pricegroup)'           => 'none (pricegroup)',
   'packing_list'                => 'packing_list',
@@ -384,6 +385,7 @@ $self->{subs} = {
   'redo_stock_info'             => 'redo_stock_info',
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
+  'remove_emptied_rows'         => 'remove_emptied_rows',
   'report_generator_back'       => 'report_generator_back',
   'report_generator_dispatcher' => 'report_generator_dispatcher',
   'report_generator_do'         => 'report_generator_do',