X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=locale%2Fen%2Fall;h=b63a581efc6f74a8eb25bb9451db1539d2d89892;hb=9dc9d7a849e2adb59da3f66efbdd9b4c1a8cefa2;hp=b94f20dafaaba70361d097d466715cb74d0f2512;hpb=be8c4415c90cb11cbf45132b63482f420b41070b;p=kivitendo-erp.git

diff --git a/locale/en/all b/locale/en/all
index b94f20daf..b63a581ef 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -14,7 +14,6 @@ $self->{texts} = {
   ' bytes, max='                => '',
   ' missing!'                   => '',
   '#1 (custom variable)'        => '',
-  '#1 CB transactions and #1 OB transactions generated.' => '',
   '#1 MD'                       => '',
   '#1 additional part(s)'       => '',
   '#1 bank transaction bookings undone.' => '',
@@ -307,12 +306,14 @@ $self->{texts} = {
   'Apply to transfers without bin' => '',
   'Apply to transfers without comment' => '',
   'Apply to transfers without warehouse' => '',
+  'Apply year-end bookings'     => '',
   'Applying #1:'                => '',
   'Approximately #1 prices will be updated.' => '',
   'Apr'                         => '',
   'April'                       => '',
   'Ar aging on %s'              => '',
-  'Are you sure to generate cb/ob transactions?' => '',
+  'Are you sure to update all positions from master data?' => '',
+  'Are you sure to update this position from master data?' => '',
   'Are you sure you want to delete Invoice Number' => '',
   'Are you sure you want to delete this letter?' => '',
   'Are you sure you want to remove the marked entries from the queue?' => '',
@@ -356,7 +357,6 @@ $self->{texts} = {
   'Attachment name'             => '',
   'Attachments'                 => '',
   'Attempt to call an undefined sub named \'%s\'' => '',
-  'Attention: Here will be generated a lot of CB/OB transactions.' => '',
   'Audit Control'               => '',
   'Aug'                         => '',
   'August'                      => '',
@@ -389,8 +389,10 @@ $self->{texts} = {
   'Background jobs and task server' => '',
   'Balance'                     => '',
   'Balance Sheet'               => '',
+  'Balance accounts'            => '',
   'Balance sheet date'          => '',
   'Balance startdate method'    => '',
+  'Balance with CB'             => '',
   'Balances'                    => '',
   'Balancing'                   => '',
   'Bank'                        => '',
@@ -474,6 +476,7 @@ $self->{texts} = {
   'Booking group (database ID)' => '',
   'Booking group (name)'        => '',
   'Booking groups'              => '',
+  'Booking needs at least one debit and one credit booking!' => '',
   'Bookinggroup/Tax'            => '',
   'Books are open'              => '',
   'Books closed up to'          => '',
@@ -495,8 +498,6 @@ $self->{texts} = {
   'CANCELED'                    => '',
   'CB Transaction'              => '',
   'CB Transactions'             => '',
-  'CB date #1 is higher than OB date #2. Please select again.' => '',
-  'CB/OB Transactions'          => '',
   'CN'                          => '',
   'CR'                          => '',
   'CSS style for pictures'      => '',
@@ -525,6 +526,7 @@ $self->{texts} = {
   'Cancel Accounts Payables Transaction' => '',
   'Cancel Accounts Receivables Transaction' => '',
   'Cancelling is disallowed. Either undo or balance the current payments until the open amount matches the invoice amount' => '',
+  'Cannot change transaction in a closed period!' => '',
   'Cannot check correct WebDAV folder' => '',
   'Cannot delete account!'      => '',
   'Cannot delete customer!'     => '',
@@ -569,6 +571,7 @@ $self->{texts} = {
   'Cannot transfer negative quantities.' => '',
   'Cannot transfer. <br> Reason:<br>#1' => '',
   'Cannot unlink payment for a closed period!' => '',
+  'Carry over account for year-end closing' => '',
   'Carry over shipping address' => '',
   'Cash'                        => '',
   'Cash accounting'             => '',
@@ -639,6 +642,7 @@ $self->{texts} = {
   'Close Window'                => '',
   'Close window'                => '',
   'Closed'                      => '',
+  'Closing Balance'             => '',
   'Collective Orders only work for orders from one customer!' => '',
   'Column name'                 => '',
   'Comma'                       => '',
@@ -1263,6 +1267,7 @@ $self->{texts} = {
   'Error message from the database: #1' => '',
   'Error message from the webshop api:' => '',
   'Error when saving: #1'       => '',
+  'Error while applying year-end bookings!' => '',
   'Error with default taxzone'  => '',
   'Error!'                      => '',
   'Error: #1'                   => '',
@@ -1335,6 +1340,7 @@ $self->{texts} = {
   'Error: unknown local bank account id' => '',
   'Errors during conversion:'   => '',
   'Errors during printing:'     => '',
+  'Errors in GL transaction:'   => '',
   'Ertrag'                      => '',
   'Ertrag prozentual'           => '',
   'Escape character'            => '',
@@ -1846,6 +1852,8 @@ $self->{texts} = {
   'Long Description (quotations & orders)' => '',
   'Long Description for invoices' => '',
   'Long Description for quotations & orders' => '',
+  'Loss'                        => '',
+  'Loss carried forward account' => '',
   'Luxembourg'                  => '',
   'MAILED'                      => '',
   'MD'                          => '',
@@ -1907,6 +1915,7 @@ $self->{texts} = {
   'Missing Method!'             => '',
   'Missing Tax Authoritys Preferences' => '',
   'Missing amount'              => '',
+  'Missing configuration section "authentication/#1" in "config/kivitendo.conf".' => '',
   'Missing parameter #1 in call to sub #2.' => '',
   'Missing parameter (at least one of #1) in call to sub #2.' => '',
   'Missing parameter for WebDAV file copy' => '',
@@ -1990,6 +1999,7 @@ $self->{texts} = {
   'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' => '',
   'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' => '',
   'No bins have been added to this warehouse yet.' => '',
+  'No carry-over chart configured!' => '',
   'No changes since previous version.' => '',
   'No clients have been created yet.' => '',
   'No contact selected to delete' => '',
@@ -2018,7 +2028,6 @@ $self->{texts} = {
   'No groups have been created yet.' => '',
   'No internal phone extensions have been configured yet.' => '',
   'No invoices have been selected.' => '',
-  'No or an unknown authenticantion module specified in "config/kivitendo.conf".' => '',
   'No part was selected.'       => '',
   'No payment term has been created yet.' => '',
   'No picture has been uploaded' => '',
@@ -2027,11 +2036,12 @@ $self->{texts} = {
   'No print templates have been created for this client yet. Please do so in the client configuration.' => '',
   'No printers have been created yet.' => '',
   'No problems were recognized.' => '',
+  'No profit and loss carried forward chart configured!' => '',
+  'No profit carried forward chart configured!' => '',
   'No quotations or orders have been created yet.' => '',
   'No report with id #1'        => '',
   'No requirement spec templates have been created yet.' => '',
   'No results.'                 => '',
-  'No revert available.'        => '',
   'No search results found!'    => '',
   'No sections created yet'     => '',
   'No sections have been created so far.' => '',
@@ -2107,7 +2117,6 @@ $self->{texts} = {
   'Number pages'                => '',
   'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => '',
   'OB Transaction'              => '',
-  'OB Transactions'             => '',
   'Objects have been imported.' => '',
   'Obsolete'                    => '',
   'Oct'                         => '',
@@ -2120,8 +2129,6 @@ $self->{texts} = {
   'On Hand'                     => '',
   'On Order'                    => '',
   'On the next page the type of all variables can be set.' => '',
-  'One OB-transaction'          => '',
-  'One SB-transaction'          => '',
   'One of the columns "qty" or "target_qty" must be given. If "target_qty" is given, the quantity to transfer for each transfer will be calculate, so that the quantity for this part, warehouse and bin will result in the given "target_qty" after each transfer.' => '',
   'One or more Perl modules missing' => '',
   'Onhand only sets the quantity in master data, not in inventory. This is only a legacy info field and will be overwritten as soon as a inventory transfer happens.' => '',
@@ -2298,6 +2305,7 @@ $self->{texts} = {
   '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 configure the carry over and profit and loss accounts for year-end closing in the client configuration!' => '',
   'Please contact your administrator or a service provider.' => '',
   'Please contact your administrator.' => '',
   'Please correct the settings and try again or deactivate that client.' => '',
@@ -2387,6 +2395,7 @@ $self->{texts} = {
   'Price #1'                    => '',
   'Price Factor'                => '',
   'Price Factors'               => '',
+  'Price List'                  => '',
   'Price Rule'                  => '',
   'Price Rules'                 => '',
   'Price Source'                => '',
@@ -2442,6 +2451,9 @@ $self->{texts} = {
   'Production'                  => 'Production',
   'Production (typeabbreviation)' => 'W',
   'Productivity'                => '',
+  'Profit'                      => '',
+  'Profit and loss accounts'    => '',
+  'Profit carried forward account' => '',
   'Profit determination'        => '',
   'Proforma Invoice'            => '',
   'Program'                     => '',
@@ -2686,7 +2698,6 @@ $self->{texts} = {
   'SEPA strings'                => '',
   'SQL query'                   => '',
   'SWIFT MT940 format'          => '',
-  'Saldo'                       => '',
   'Saldo Credit'                => '',
   'Saldo Debit'                 => '',
   'Saldo neu'                   => '',
@@ -2789,7 +2800,6 @@ $self->{texts} = {
   'Select Mulit-Item Options'   => '',
   'Select a Customer'           => '',
   'Select a period'             => '',
-  'Select charts for which the CB/OB transactions want to be posted.' => '',
   'Select federal state...'     => '',
   'Select file to upload'       => '',
   'Select from one of the items below' => '',
@@ -2952,6 +2962,7 @@ $self->{texts} = {
   'Show the picture in the part form' => '',
   'Show the pictures in the result for search parts' => '',
   'Show the weights of articles and the total weight in orders, invoices and delivery notes?' => '',
+  'Show update button for positions in order forms' => '',
   'Show weights'                => '',
   'Show your TODO list after logging in' => '',
   'Show »not delivered qty/value« column in sales and purchase orders' => '',
@@ -2995,6 +3006,7 @@ $self->{texts} = {
   'Start of year'               => '',
   'Start process'               => '',
   'Start the correction assistant' => '',
+  'Startdate method'            => '',
   'Startdate_coa'               => '',
   'Starting Balance'            => '',
   'Starting balance'            => '',
@@ -3017,6 +3029,7 @@ $self->{texts} = {
   'Stock Local/Shop'            => '',
   'Stock Qty for Date'          => '',
   'Stock for part #1'           => '',
+  'Stock levels'                => '',
   'Stock value'                 => '',
   'Stocked Qty'                 => '',
   'Stocktaking'                 => '',
@@ -3048,10 +3061,8 @@ $self->{texts} = {
   'Subtotals per quarter'       => '',
   'Such entries cannot be exported into the DATEV format and have to be fixed as well.' => '',
   'Suggested invoice'           => '',
-  'Sum CB Transactions'         => '',
   'Sum Credit'                  => '',
   'Sum Debit'                   => '',
-  'Sum OB Transactions'         => '',
   'Sum for'                     => '',
   'Sum for #1'                  => '',
   'Sum for section'             => '',
@@ -3509,7 +3520,6 @@ $self->{texts} = {
   'There was an error saving the draft' => '',
   'There was an error saving the letter' => '',
   'There was an error saving the letter draft' => '',
-  'There will be two transactions done:' => '',
   'There you can let kivitendo create the basic tables for you, even in an already existing database.' => '',
   'Therefore several settings that had to be made for each user in the past have been consolidated into the client configuration.' => '',
   'Therefore the definition of "kg" with the base unit "g" and a factor of 1000 is valid while defining "g" with a base unit of "kg" and a factor of "0.001" is not.' => '',
@@ -3595,7 +3605,6 @@ $self->{texts} = {
   'Time estimate'               => '',
   'Time period for the analysis:' => '',
   'Time/cost estimate actions'  => '',
-  'Timerange'                   => '',
   'Timestamp'                   => '',
   'Tired of copying always nice phrases for this message? Click here to use the new preset message option!' => '',
   'Title'                       => '',
@@ -3709,6 +3718,7 @@ $self->{texts} = {
   'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' => '',
   'Unknown Category'            => '',
   'Unknown Link'                => '',
+  'Unknown authenticantion module #1 specified in "config/kivitendo.conf".' => '',
   'Unknown control fields: #1'  => '',
   'Unknown dependency \'%s\'.'  => '',
   'Unknown module: #1'          => '',
@@ -3725,6 +3735,7 @@ $self->{texts} = {
   'Update Prices'               => '',
   'Update SKR04: new tax account 3804 (19%)' => '',
   'Update customer using billing address' => '',
+  'Update from master data'     => '',
   'Update prices'               => '',
   'Update prices of existing entries' => '',
   'Update prices of existing entries / skip non-existent' => '',
@@ -3836,6 +3847,7 @@ $self->{texts} = {
   'View background job execution result' => '',
   'View sent email'             => '',
   'View warehouse content'      => '',
+  'View/edit all employees purchase documents' => '',
   'View/edit all employees sales documents' => '',
   'Von Konto: '                 => '',
   'WHJournal'                   => 'Warehouse journal',
@@ -3900,6 +3912,10 @@ $self->{texts} = {
   'X'                           => '',
   'YYYY'                        => '',
   'Year'                        => '',
+  'Year-end bookings were successfully completed!' => '',
+  'Year-end closing'            => '',
+  'Year-end date'               => '',
+  'Year-end date missing'       => '',
   'Yearly'                      => '',
   'Yearly taxreport not yet implemented' => '',
   'Yes'                         => '',
@@ -3922,6 +3938,7 @@ $self->{texts} = {
   'You cannot create an invoice for delivery orders from different vendors.' => '',
   'You cannot modify individual assigments from additional articles to line items.' => '',
   'You cannot paste function blocks or sub function blocks if there is no section.' => '',
+  'You cannot use a negative amount with debit/credit!' => '',
   'You do not have access to any custom data export.' => '',
   'You do not have permission to access this entry.' => '',
   'You do not have the permissions to access this function.' => '',
@@ -4001,7 +4018,6 @@ $self->{texts} = {
   'cleared'                     => '',
   'click here to edit cvars'    => '',
   'close'                       => '',
-  'close chart'                 => '',
   'closed'                      => '',
   'companylogo_subtitle'        => '',
   'config/kivitendo.conf: Key "DB_config" is missing.' => '',
@@ -4061,7 +4077,6 @@ $self->{texts} = {
   'from \'#1\' imported Files'  => '',
   'from (time)'                 => '',
   'general_ledger_list'         => '',
-  'generate cb/ob transactions for selected charts' => '',
   'generated Files'             => '',
   'gobd-#1-#2.zip'              => '',
   'h'                           => '',