X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1b46f3217d53fcd31eb37f7b3a3dd793666a06e6..47da14db:/locale/en/all

diff --git a/locale/en/all b/locale/en/all
index 1eed48d5c..0865ca922 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -600,6 +600,7 @@ $self->{texts} = {
   'Check on purchase invoice'   => '',
   'Check on sales invoice'      => '',
   'Checks'                      => '',
+  'Choose "continue" if you want to use this value. Choose "cancel" otherwise.' => '',
   'Choose Customer'             => '',
   'Choose Outputformat'         => '',
   'Choose Vendor'               => '',
@@ -1009,6 +1010,7 @@ $self->{texts} = {
   'Display'                     => '',
   'Display file'                => '',
   'Display options'             => '',
+  'Displayable Name Preferences' => '',
   'Do not change the tax rate of taxkey 0.' => '',
   'Do not check for duplicates' => '',
   'Do not link to a project.'   => '',
@@ -1106,6 +1108,7 @@ $self->{texts} = {
   'E-Mail-Journal'              => '',
   'E-mail'                      => '',
   'E-mail address missing!'     => '',
+  'E.g. "<%customernumber%> <%name%>"' => '',
   'EAN'                         => '',
   'EAN-Code'                    => '',
   'EB-Wert'                     => '',
@@ -1566,6 +1569,7 @@ $self->{texts} = {
   '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.' => '',
+  'If the counted quantity differs more than this threshold from the quantity in the database, a warning will be shown. Set to 0 to switch of this feature.' => '',
   'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => '',
   'If the default transfer out always succeed use this bin for negative stock quantity.' => '',
   'If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.' => '',
@@ -2119,6 +2123,7 @@ $self->{texts} = {
   'Open this Website'           => '',
   'OpenDocument/OASIS'          => '',
   'Openings'                    => '',
+  'Option'                      => '',
   'Optional comment'            => '',
   'Options'                     => '',
   'Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ' => '',
@@ -2262,6 +2267,7 @@ $self->{texts} = {
   'Please Check the bank information for each vendor:' => '',
   'Please ask your administrator to create warehouses and bins.' => '',
   'Please change the partnumber of the following parts and run the update again:' => '',
+  'Please choose a part.'       => '',
   'Please choose for which categories the taxes should be displayed (otherwise remove the ticks):' => '',
   'Please choose the action to be processed for your target quantity:' => '',
   'Please contact your administrator or a service provider.' => '',
@@ -3210,6 +3216,7 @@ $self->{texts} = {
   'The discount must be less than 100%.' => '',
   'The discount must not be negative.' => '',
   'The discounted amount will be shown in documents.' => '',
+  'The display of (mainly) picker results can be configured. To insert the value of one option use <%Name%>.' => '',
   'The document has been changed by another user. No mail was sent. Please reopen it in another window and copy the changes to the new window' => '',
   'The document has been changed by another user. Please reopen it in another window and copy the changes to the new window' => '',
   'The documents have been sent to the printer \'#1\'.' => '',
@@ -3364,6 +3371,7 @@ $self->{texts} = {
   'The subject is missing.'     => '',
   'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' => '',
   'The tabulator character'     => '',
+  'The target quantity of #1 differs more than the threshold quantity of #2.' => '',
   'The task server does not appear to be running.' => '',
   'The task server is already running.' => '',
   'The task server is not running at the moment but needed for this module' => '',
@@ -3498,6 +3506,7 @@ $self->{texts} = {
   'This module can help you identify and correct such entries by analyzing the general ledger and presenting you likely solutions but also allowing you to fix problems yourself.' => '',
   'This object has already been used.' => '',
   'This object has not been saved yet.' => '',
+  'This object is used in price rules.' => '',
   'This option controls the inventory system.' => '',
   'This option controls the method used for determining the startdate for the balance report.' => '',
   'This option controls the method used for profit determination.' => '',
@@ -3530,6 +3539,7 @@ $self->{texts} = {
   'This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?' => '',
   'This will set an exact price.' => '',
   'Three Options:'              => '',
+  'Threshold for warning on quantity difference' => '',
   'Time'                        => '',
   'Time Format'                 => '',
   'Time and price estimate'     => '',