Merge branch 'master' of ssh://lx-office/~/lx-office-erp

[kivitendo-erp.git] / locale / en / all

diff --git a/locale/en/all b/locale/en/all
index 4e8ae75..cb322ee 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# -*- coding: ISO-8859-15; -*-
+# -*- coding: iso-8859-15; -*-
 # vim: fenc=ISO-8859-15
 
 # These are all the texts to build the translations files.
@@ -177,6 +177,7 @@ $self->{texts} = {
   'Amended Advance Turnover Tax Return (Nr. 10)' => '',
   'Amount'                      => '',
   'Amount Due'                  => '',
+  'Amount has to be greater then zero! Wrong row number: ' => '',
   'Annotations'                 => '',
   'Another user with the login #1 does already exist.' => '',
   'Ap aging on %s'              => '',
@@ -526,6 +527,7 @@ $self->{texts} = {
   'Delivery Order deleted!'     => '',
   'Delivery Orders'             => '',
   'Department'                  => '',
+  'Department Id'               => '',
   'Department deleted!'         => '',
   'Department saved!'           => '',
   'Departments'                 => '',
@@ -552,7 +554,7 @@ $self->{texts} = {
   '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?' => '',
-  'Do you really want to delete this group:' => '',
+  'Do you really want to delete this group?' => '',
   'Do you really want to delete this warehouse?' => '',
   'Do you want Lx-Office to create a group for access to all functions?' => '',
   'Do you want to <b>limit</b> your search?' => '',
@@ -942,7 +944,6 @@ $self->{texts} = {
   'List Price'                  => '',
   'List Price Factors'          => '',
   'List Pricegroups'            => '',
-  'List Printer'                => '',
   'List Tax'                    => '',
   'List Transactions'           => '',
   'List Warehouses'             => '',
@@ -970,7 +971,7 @@ $self->{texts} = {
   'Lx-Office can fix these problems automatically.' => '',
   'Lx-Office has been switched to group-based access restrictions.' => '',
   'Lx-Office has found one or more problems in the general ledger.' => '',
-  'Lx-Office is about to update the database <b>#1</b>.' => '',
+  'Lx-Office is about to update the database [ #1 ].' => '',
   'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' => '',
   'MAILED'                      => '',
   'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => '',
@@ -994,6 +995,8 @@ $self->{texts} = {
   'May '                        => '',
   'May set the BCC field when sending emails' => '',
   'Medium Number'               => '',
+  'Members not of'              => 'Not members of',
+  'Members of'                  => 'Members of',
   'Memo'                        => '',
   'Menu'                        => '',
   'Message'                     => '',
@@ -1068,6 +1071,7 @@ $self->{texts} = {
   'No part was found matching the search parameters.' => '',
   'No prices will be updated because no prices have been entered.' => '',
   'No problems were recognized.' => '',
+  'No transaction selected!'    => '',
   'No transfers were executed in this export.' => '',
   'No unknown units where found.' => '',
   'No user has been selected.'  => '',
@@ -1206,6 +1210,7 @@ $self->{texts} = {
   'Please read the file'        => '',
   'Please select a customer from the list below.' => '',
   'Please select a part from the list below.' => '',
+  'Please select a user'        => '',
   'Please select a vendor from the list below.' => '',
   'Please select the chart of accounts this installation is using from the list below.' => '',
   'Please select the database you want to backup' => '',
@@ -1249,9 +1254,8 @@ $self->{texts} = {
   'Printer'                     => '',
   'Printer Command'             => '',
   'Printer Command missing!'    => '',
-  'Printer Description'         => '',
-  'Printer deleted!'            => '',
-  'Printer saved!'              => '',
+  'Printer Management'          => '',
+  'Printers are created for a user database. Please select a user. The associated database will be edited.' => '',
   'Printing ... '               => '',
   'Prior to Lx-Office v2.4.0 the user could enter arbitrary strings as units for parts, services and in invoices, sales quotations etc.' => '',
   'Prior to Lx-Office v2.4.0 the user had to chose the accounts for each part and service.' => '',
@@ -1798,8 +1802,6 @@ $self->{texts} = {
   'User name'                   => '',
   'User saved!'                 => '',
   'Username'                    => '',
-  'Users in<br>this group'      => '',
-  'Users not in this group'     => '',
   'Ust-IDNr'                    => '',
   'Valid from'                  => '',
   'Valid until'                 => '',