X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/bb8613c0076aa50c91d771063d21cd797037c3a1..c0309f121cc9204dad42dd2a7abdc7dff43d3b36:/locale/en/all

diff --git a/locale/en/all b/locale/en/all
index 15ff9e101..480d03258 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -29,6 +29,7 @@ $self->{texts} = {
   '%'                           => '',
   '(recommended) Insert the used currencies in the system. You can simply change the name of the currencies by editing the textfields above. Do not use a name of a currency that is already in use.' => '',
   '*/'                          => '',
+  '+'                           => '',
   ', if set'                    => '',
   '---please select---'         => '',
   '. Automatically generated.'  => '',
@@ -349,6 +350,7 @@ $self->{texts} = {
   'Assembly (typeabbreviation)' => 'A',
   'Assembly Last Cost'          => '',
   'Assembly Number missing!'    => '',
+  'Assembly creation warehouse dependent' => '',
   'Assembly items'              => '',
   'Asset'                       => '',
   'Assets'                      => '',
@@ -746,6 +748,7 @@ $self->{texts} = {
   'Create a new client'         => '',
   'Create a new delivery term'  => '',
   'Create a new group'          => '',
+  'Create a new part'           => '',
   'Create a new payment term'   => '',
   'Create a new price rule'     => '',
   'Create a new printer'        => '',
@@ -983,6 +986,7 @@ $self->{texts} = {
   'Default currency missing!'   => '',
   'Default hourly rate for new customers' => '',
   'Default output medium'       => '',
+  'Default part for shipping costs' => '',
   'Default printer'             => '',
   'Default taxzone'             => '',
   'Default template format'     => '',
@@ -1417,6 +1421,7 @@ $self->{texts} = {
   'Errors during conversion:'   => '',
   'Errors during printing:'     => '',
   'Errors in GL transaction:'   => '',
+  'Errors: #1'                  => '',
   'Ertrag'                      => '',
   'Ertrag prozentual'           => '',
   'Escape character'            => '',
@@ -1700,6 +1705,8 @@ $self->{texts} = {
   'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' => '',
   'If your old bins match exactly Bins in the Warehouse CLICK on <b>AUTOMATICALLY MATCH BINS</b>.' => '',
   'Ignore faulty positions'     => '',
+  'Ignore services for the purchase orders state of delivery' => '',
+  'Ignore services for the sales orders state of delivery' => '',
   'Illegal characters have been removed from the following fields: #1' => '',
   'Illegal date'                => '',
   'Image'                       => '',
@@ -2340,6 +2347,7 @@ $self->{texts} = {
   'Parsing the XMP metadata failed.' => '',
   'Part'                        => '',
   'Part "#1" has chargenumber or best before date set. So it cannot be transfered automatically.' => '',
+  'Part #1 exists in warehouse #2, but not in warehouse #3 ' => '',
   'Part (database ID)'          => '',
   'Part (typeabbreviation)'     => 'P',
   'Part Classification'         => '',
@@ -2385,6 +2393,7 @@ $self->{texts} = {
   'Payment Terms missing in row ' => '',
   'Payment bookings disallowed. After the booking this record may be suggested with the amount of \'#1\' or otherwise has to be choosen manually. No automatic payment booking will be done to chart \'#2\'.' => '',
   'Payment date missing!'       => '',
+  'Payment description'         => '',
   'Payment list'                => '',
   'Payment posted!'             => '',
   'Payment terms'               => '',
@@ -2572,6 +2581,7 @@ $self->{texts} = {
   'Problem'                     => '',
   'Produce'                     => '',
   'Produce Assembly'            => '',
+  'Produce assembly only if all parts are in the same warehouse' => '',
   'Production'                  => 'Production',
   'Production (typeabbreviation)' => 'W',
   'Productivity'                => '',
@@ -2617,6 +2627,7 @@ $self->{texts} = {
   'Purchase Invoices'           => '',
   'Purchase Order'              => '',
   'Purchase Orders'             => '',
+  'Purchase Orders Services are deliverable' => '',
   'Purchase Orders deleteable'  => '',
   'Purchase Price Rules'        => '',
   'Purchase Price Rules '       => '',
@@ -2843,6 +2854,7 @@ $self->{texts} = {
   'Sales Order delivery date interval' => '',
   'Sales Orders'                => '',
   'Sales Orders Advance'        => '',
+  'Sales Orders Services are deliverable' => '',
   'Sales Orders deleteable'     => '',
   'Sales Price Rules'           => '',
   'Sales Price Rules '          => '',
@@ -2907,6 +2919,7 @@ $self->{texts} = {
   'Save proposals'              => '',
   'Save settings as'            => '',
   'Saving failed. Error message from the database: #1' => '',
+  'Saving failed. Error message from the server: #1' => '',
   'Saving the file \'%s\' failed. OS error message: %s' => '',
   'Saving the record template \'#1\' failed.' => '',
   'Saving the time recording entry failed: #1' => '',
@@ -3987,6 +4000,7 @@ $self->{texts} = {
   'Useable for…'                => '',
   'Used for Purchase'           => '',
   'Used for Sale'               => '',
+  'Used for assembly #1 #2'     => '',
   'User'                        => '',
   'User Preferences'            => '',
   'User access'                 => '',
@@ -4119,6 +4133,7 @@ $self->{texts} = {
   'Yes'                         => '',
   'Yes, included by default'    => '',
   'Yes/No (Checkbox)'           => '',
+  'You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.' => '',
   'You are logged out!'         => '',
   'You can also delete this transaction and re-enter it manually.' => '',
   'You can choose account categories for taxes. Depending on these categories taxes will be displayed for transfers in the general ledger or not.' => '',