X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/cfc18d35f154b3504fca6e84c98e438b40d109a3..33e90020be0dd5fd780363fe0b8c98cb97f9b79c:/locale/en/all

diff --git a/locale/en/all b/locale/en/all
index ceea86cc3..0c43e983b 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -294,6 +294,7 @@ $self->{texts} = {
   'Already counted'             => '',
   'Already imported entries (duplicates)' => '',
   'Always edit assembly items (user can change/delete items even if assemblies are already produced)' => '',
+  'Always edit assortment items (user can change/delete items even if assortments are already used)' => '',
   'Always save orders with a projectnumber (create new projects)' => '',
   'Amended Advance Turnover Tax Return' => '',
   'Amount'                      => '',
@@ -350,6 +351,7 @@ $self->{texts} = {
   'Assembly (typeabbreviation)' => 'A',
   'Assembly Last Cost'          => '',
   'Assembly Number missing!'    => '',
+  'Assembly creation transfers services' => '',
   'Assembly creation warehouse dependent' => '',
   'Assembly items'              => '',
   'Asset'                       => '',
@@ -1088,6 +1090,7 @@ $self->{texts} = {
   'Do not change the tax rate of taxkey 0.' => '',
   'Do not check for duplicates' => '',
   'Do not create Factur-X/ZUGFeRD invoices' => '',
+  'Do not leave booking form?'  => '',
   'Do not link to a project.'   => '',
   'Do not modify this position' => '',
   'Do not run the task server for this client' => '',
@@ -2068,6 +2071,7 @@ $self->{texts} = {
   'Name does not make sense without any bsooqr options' => '',
   'Name in Selected Records'    => '',
   'Name of the goal/source (if field names remote_name and remote_name_1 exist they will be combined into field "remote_name")' => '',
+  'Need at least one original position for the workflow Order to Delivery Order!' => '',
   'Need charge number!'         => '',
   'Negative reductions are possible to model price increases.' => '',
   'Neither sections nor function blocks have been created yet.' => '',
@@ -2489,6 +2493,8 @@ $self->{texts} = {
   'Positions'                   => '',
   'Post'                        => '',
   'Post Payment'                => '',
+  'Post and new booking'        => '',
+  'Post and upload document'    => '',
   'Post payments'               => '',
   'Post payments for selected invoices' => '',
   'Postal Invoice'              => '',
@@ -2590,6 +2596,8 @@ $self->{texts} = {
   'Problem'                     => '',
   'Produce'                     => '',
   'Produce Assembly'            => '',
+  'Produce Assembly Configuration' => '',
+  'Produce assembly consumes services if assigned as a assembly item' => '',
   'Produce assembly only if all parts are in the same warehouse' => '',
   'Production'                  => 'Production',
   'Production (typeabbreviation)' => 'W',
@@ -2991,6 +2999,7 @@ $self->{texts} = {
   'September'                   => '',
   'Serial No.'                  => '',
   'Serial Number'               => '',
+  'Serial Number missing in Row' => '',
   'Server'                      => '',
   'Server control'              => '',
   'Service'                     => '',
@@ -2999,6 +3008,7 @@ $self->{texts} = {
   'Service Number missing!'     => '',
   'Service, assembly or part'   => '',
   'Services'                    => '',
+  'Services in Delivery Orders' => '',
   'Set (set to)'                => '',
   'Set all source and memo fields' => '',
   'Set count for one or more of the items to select them' => '',
@@ -3869,7 +3879,6 @@ $self->{texts} = {
   'Transfer from warehouse'     => '',
   'Transfer in'                 => '',
   'Transfer in via default'     => '',
-  'Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.' => '',
   'Transfer out'                => '',
   'Transfer out all items of a sales invoice when posting it. Items are transfered out acording to the settings above.' => '',
   'Transfer out on posting sales invoices?' => '',
@@ -3999,7 +4008,6 @@ $self->{texts} = {
   'Use date and duration for time recordings' => '',
   'Use default booking group because setting is \'all\'' => '',
   'Use default booking group because wanted is missing' => '',
-  'Use default warehouse for assembly transfer' => '',
   'Use existing templates'      => '',
   'Use for Factur-X/ZUGFeRD'    => '',
   'Use master default bin for Default Transfer, if no default bin for the part is configured' => '',