X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=locale%2Fen%2Fall;h=a8df39e1f8b40f94e68187783a115b7623d1ca74;hb=7a3c31d44c832fbd4f7af132308b9a51bb1395d4;hp=a373362f0402bf02847ebe79540eae0b328f0fb5;hpb=a19d5fb7fc372f5931d704c427ee14e1c1c1ddae;p=kivitendo-erp.git

diff --git a/locale/en/all b/locale/en/all
index a373362f0..a8df39e1f 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -249,6 +249,7 @@ $self->{texts} = {
   'Administration'              => '',
   'Administration area'         => '',
   'Advance turnover tax return' => '',
+  'Advance turnover tax return only valid for SKR03 or SKR04' => '',
   'After closed period'         => '',
   'Aktion'                      => '',
   'All'                         => '',
@@ -300,7 +301,6 @@ $self->{texts} = {
   'Annotations'                 => '',
   'Any stock contents containing a best before date will be impossible to stock out otherwise.' => '',
   'Ap aging on %s'              => '',
-  'Application Error. No Format given' => '',
   'Application Error. Wrong Format' => '',
   'Apply'                       => '',
   'Apply customer'              => '',
@@ -514,6 +514,7 @@ $self->{texts} = {
   'CSV import: bank transactions' => '',
   'CSV import: contacts'        => '',
   'CSV import: customers and vendors' => '',
+  'CSV import: delivery orders' => '',
   'CSV import: inventories'     => '',
   'CSV import: orders'          => '',
   'CSV import: parts and services' => '',
@@ -572,6 +573,7 @@ $self->{texts} = {
   'Cannot stock without amount' => '',
   'Cannot storno invoice for a closed period!' => '',
   'Cannot storno storno invoice!' => '',
+  'Cannot transfer #1 qty with #2 serial number(s)' => '',
   'Cannot transfer negative entries.' => '',
   'Cannot transfer negative quantities.' => '',
   'Cannot transfer. <br> Reason:<br>#1' => '',
@@ -697,6 +699,7 @@ $self->{texts} = {
   'Correct taxkey'              => '',
   'Cost Center'                 => '',
   'Costs'                       => '',
+  'Could not create new project #1' => '',
   'Could not extract ZUGFeRD data, data and error message:' => '',
   'Could not find an entry for this part in the pricegroup.' => '',
   'Could not load class #1 (#2): "#3"' => '',
@@ -956,6 +959,7 @@ $self->{texts} = {
   'Default template format'     => '',
   'Default transfer delivery order' => '',
   'Default transfer invoice'    => '',
+  'Default transfer invoice with charge number' => '',
   'Default transport article number' => '',
   'Default unit'                => '',
   'Default value'               => '',
@@ -1001,6 +1005,7 @@ $self->{texts} = {
   'Delivery terms'              => '',
   'Delivery terms (database ID)' => '',
   'Delivery terms (name)'       => '',
+  'DeliveryOrder'               => '',
   'Denmark'                     => '',
   'Department'                  => '',
   'Department (database ID)'    => '',
@@ -1050,12 +1055,12 @@ $self->{texts} = {
   'Do not set this bin'         => '',
   'Do not set this comment'     => '',
   'Do not set this warehouse'   => '',
-  'Do you really want do continue?' => '',
   'Do you really want to cancel this general ledger transaction?' => '',
   'Do you really want to cancel this invoice?' => '',
   'Do you really want to cancel?' => '',
   'Do you really want to close the selected SEPA exports? No payment will be recorded for bank collections that haven\'t been marked as executed yet.' => '',
   'Do you really want to close the selected SEPA exports? No payment will be recorded for bank transfers that haven\'t been marked as executed yet.' => '',
+  'Do you really want to continue?' => '',
   'Do you really want to delete AP transaction #1?' => '',
   'Do you really want to delete AR transaction #1?' => '',
   'Do you really want to delete GL transaction #1?' => '',
@@ -1067,8 +1072,6 @@ $self->{texts} = {
   'Do you really want to delete this record template?' => '',
   'Do you really want to print?' => '',
   'Do you really want to revert to this version?' => '',
-  'Do you really want to save?' => '',
-  'Do you really want to send by mail?' => '',
   'Do you really want to undo the selected SEPA exports? You have to reassign the export again.' => '',
   'Do you really want to unimport the selected documents?' => '',
   'Do you want to <b>limit</b> your search?' => '',
@@ -1275,6 +1278,7 @@ $self->{texts} = {
   'Equity'                      => '',
   'Erfolgsrechnung'             => '',
   'Error'                       => '',
+  'Error handling'              => '',
   '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 transfer at all or the full quantity of #2 #3.' => '',
@@ -1296,6 +1300,7 @@ $self->{texts} = {
   'Error: Customer/vendor is ambiguous' => '',
   'Error: Customer/vendor missing' => '',
   'Error: Customer/vendor not found' => '',
+  'Error: Faulty position in this delivery order' => '',
   'Error: Found local bank account number but local bank code doesn\'t match' => '',
   'Error: Gender (cp_gender) missing or invalid' => '',
   'Error: Invalid bin'          => '',
@@ -1322,11 +1327,17 @@ $self->{texts} = {
   'Error: Invalid warehouse'    => '',
   'Error: Invalid warehouse id' => '',
   'Error: Invalid warehouse name #1' => '',
+  'Error: More than one source order found' => '',
   'Error: Name missing'         => '',
+  'Error: Not enough parts in stock' => '',
   'Error: Part is ambiguous'    => '',
   'Error: Part is obsolete'     => '',
   'Error: Part not found'       => '',
   'Error: Quantity to transfer is zero.' => '',
+  'Error: Source order not found' => '',
+  'Error: Stock problem'        => '',
+  'Error: Stocking out would result in stock underrun' => '',
+  'Error: Stocking out would result in stock underrun: #1' => '',
   'Error: Transfer would result in a negative target quantity.' => '',
   'Error: Unit missing or invalid' => '',
   'Error: Warehouse not found'  => '',
@@ -1476,6 +1487,8 @@ $self->{texts} = {
   'For part "#1" there are missing #2 #3 in the default warehouse/bin "#4/#5".' => '',
   'For part "#1" there is no default warehouse and bin defined.' => '',
   'For part "#1" there is no default warehouse and bin for ignoring onhand defined.' => '',
+  'For purchase delivery orders, warn on workflow to invoice if not stocked in' => '',
+  'For sales delivery orders, warn on workflow to invoice if not stocked out' => '',
   'For type "customer" the perl module JSON is required. Please check this on system level: $ ./scripts/installation_check.pl' => '',
   'Foreign Exchange Gain'       => '',
   'Foreign Exchange Loss'       => '',
@@ -1524,7 +1537,6 @@ $self->{texts} = {
   'General ledger transactions can only be changed on the day they are posted.' => '',
   'General settings'            => '',
   'Generate and print sales delivery orders' => '',
-  'Generic Tax Report'          => '',
   'Germany'                     => '',
   'Get shoporders'              => 'Get and process orders from a web shop',
   'Git revision: #1, #2 #3'     => '',
@@ -1603,13 +1615,16 @@ $self->{texts} = {
   'If disabled sales quotations cannot be converted into sales invoices directly.' => '',
   'If enabled ZUGFeRD-conformant sales invoice PDFs will be created.' => '',
   'If enabled a column will be shown in sales and purchase orders that lists both the amount and the value not shipped yet for each item.' => '',
+  'If enabled a warning will be shown in purchase delivery orders on workflow to invoices if positions are not stocked in.' => '',
   'If enabled a warning will be shown in sales and purchase orders if there are two or more positions of the same part (new controller only).' => '',
   'If enabled a warning will be shown in sales and purchase orders if there the delivery date is empty.' => '',
+  'If enabled a warning will be shown in sales delivery orders on workflow to invoices if positions are not stocked out.' => '',
   'If enabled only those projects that are assigned to the currently selected customer are offered for selection in sales records.' => '',
   'If enabled purchase and sales records cannot be saved if no transaction description has been entered.' => '',
   'If item not found, allow creation of new item' => '',
   'If left empty the default sender from the kivitendo configuration will be used (key \'email_from\' in section \'periodic_invoices\'; current value: #1).' => '',
   'If missing then the start date will be used.' => '',
+  'If one or more space separated serial numbers are assigned in a sales invoice, match the charge number of the inventory item. Assumes that Serial Number and Charge Number have 1:1 relation. Otherwise throw a error message for the default sales invoice transfer.' => '',
   'If searching a part from a document and no part is found then offer to create a new part.' => '',
   'If the article type is set to \'mixed\' then a column called \'part_type\' or called \'pclass\' must be present.' => '',
   'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => '',
@@ -1627,6 +1642,7 @@ $self->{texts} = {
   'If you want to delete such a dataset you have to edit the client(s) that are using the dataset in question and have them use another dataset.' => '',
   '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'     => '',
   'Illegal characters have been removed from the following fields: #1' => '',
   'Illegal date'                => '',
   'Image'                       => '',
@@ -1696,6 +1712,7 @@ $self->{texts} = {
   'Introduction of clients'     => '',
   'Inv. Duedate'                => '',
   'Invalid'                     => '',
+  'Invalid charge number: #1'   => '',
   'Invalid combination of ledger account number length. Mismatch length of #1 with length of #2. Please check your account settings. ' => '',
   'Invalid duration format'     => '',
   'Invalid follow-up ID.'       => '',
@@ -1740,6 +1757,7 @@ $self->{texts} = {
   'Invoices with payments cannot be canceled.' => '',
   'Invoices, Credit Notes & AR Transactions' => '',
   'Is Searchable'               => '',
+  'Is sales'                    => '',
   'Is this a summary account to record' => '',
   'It can be changed later but must be unique within the installation.' => '',
   'It is not allowed that a summary account occurs in a drop-down menu!' => '',
@@ -1837,6 +1855,7 @@ $self->{texts} = {
   'List Printers'               => '',
   'List Transactions'           => '',
   'List Users, Clients and User Groups' => '',
+  'List all rows'               => '',
   'List current background jobs' => '',
   'List export'                 => '',
   'List of bank collections'    => '',
@@ -1912,6 +1931,7 @@ $self->{texts} = {
   'Mass Create Print Sales Invoice from Delivery Order' => '',
   'Master Data'                 => '',
   'Master Data Bin Text Deleted' => '',
+  'Match Sales Invoice Serial numbers with inventory charge numbers?' => '',
   'Matching Price Rules can apply in one of three types:' => '',
   'Max. Dunning Level'          => '',
   'Maximal amount difference'   => '',
@@ -1970,6 +1990,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 charge number!'         => '',
   'Negative reductions are possible to model price increases.' => '',
   'Neither sections nor function blocks have been created yet.' => '',
   'Net Income Statement'        => '',
@@ -2104,6 +2125,7 @@ $self->{texts} = {
   'Not Discountable'            => '',
   'Not delivered'               => '',
   'Not done yet'                => '',
+  'Not enough in stock for the serial number #1' => '',
   'Not obsolete'                => '',
   'Note'                        => '',
   'Note that parameter names must not be quoted.' => '',
@@ -2199,6 +2221,7 @@ $self->{texts} = {
   'Order probability & expected billing date' => '',
   'Order value periodicity'     => '',
   'Order/Item row name'         => '',
+  'Order/Item/Stock row name'   => '',
   'Order/RFQ Number'            => '',
   'OrderItem'                   => '',
   'Ordered'                     => '',
@@ -2287,6 +2310,7 @@ $self->{texts} = {
   'Payables'                    => '',
   'Payment'                     => '',
   'Payment / Delivery Options'  => '',
+  'Payment Date'                => '',
   'Payment Reminder'            => '',
   'Payment Terms'               => '',
   'Payment Terms missing in row ' => '',
@@ -2414,6 +2438,7 @@ $self->{texts} = {
   'Preset email text for requests (rfq)' => '',
   'Preset email text for sales delivery orders' => '',
   'Preset email text for sales invoices' => '',
+  'Preset email text for sales invoices with direct debit' => '',
   'Preset email text for sales orders' => '',
   'Preset email text for sales quotations' => '',
   'Preview'                     => '',
@@ -3061,6 +3086,7 @@ $self->{texts} = {
   'Stock for part #1'           => '',
   'Stock levels'                => '',
   'Stock value'                 => '',
+  'StockInfo'                   => '',
   'Stocked Qty'                 => '',
   'Stocktaking'                 => '',
   'Stocktaking History'         => '',
@@ -3133,7 +3159,6 @@ $self->{texts} = {
   'Tax Office Preferences'      => '',
   'Tax Percent is a number between 0 and 100' => '',
   'Tax Period'                  => '',
-  'Tax Position'                => '',
   'Tax collected'               => '',
   'Tax deleted!'                => '',
   'Tax number'                  => '',
@@ -3158,7 +3183,6 @@ $self->{texts} = {
   'Taxkey_coa'                  => '',
   'Taxkeys and Taxreport Preferences' => '',
   'Taxlink_coa'                 => '',
-  'Taxnumber'                   => '',
   'Taxrate missing!'            => '',
   'Taxzones'                    => '',
   'Tel'                         => '',
@@ -3623,6 +3647,8 @@ $self->{texts} = {
   'This record has already been closed.' => '',
   'This record has already been delivered.' => '',
   'This record has not been saved yet.' => '',
+  'This record has not been stocked in. Proceed?' => '',
+  'This record has not been stocked out. Proceed?' => '',
   'This requirement spec is currently linked to the following project:' => '',
   'This requirement spec is currently not linked to a project.' => '',
   'This requires you to manually correct entries for which an automatic conversion failed and to check those for which it succeeded.' => '',
@@ -3923,6 +3949,7 @@ $self->{texts} = {
   'Warn before saving orders without a delivery date' => '',
   'Warning'                     => '',
   'Warning! Loading a draft will discard unsaved data!' => '',
+  'Warning: Faulty position ignored' => '',
   'Warning: One or more field value are not in valid DATEV format at:' => '',
   'Warnings and errors'         => '',
   'Watch status'                => '',
@@ -3999,6 +4026,7 @@ $self->{texts} = {
   'You do not have permission to access this entry.' => '',
   'You do not have the permissions to access this function.' => '',
   'You don\'t have the rights to edit this customer.' => '',
+  'You have changed the currency or exchange rate. Please check prices.' => '',
   'You have entered or selected the following shipping address for this customer:' => '',
   'You have never worked with currencies.' => '',
   'You have not added bank accounts yet.' => '',
@@ -4022,6 +4050,7 @@ $self->{texts} = {
   'You should create a backup of the database before proceeding because the backup might not be reversible.' => '',
   'You\'re not editing a file.' => '',
   'You\'ve already chosen the following limitations:' => '',
+  'Your Order'                  => '',
   'Your PostgreSQL installationen does not use Unicode as its encoding. This is not supported anymore.' => '',
   'Your Reference'              => '',
   'Your TODO list'              => '',
@@ -4116,6 +4145,8 @@ $self->{texts} = {
   'error while unlinking payment #1 : ' => '',
   'every third month'           => '',
   'every time'                  => '',
+  'exchange rate already exists, no update allowed' => '',
+  'exchange rate has to be positive' => '',
   'executed'                    => '',
   'execution as user \'#1\''    => '',
   'failed'                      => '',