Merge branch 'f-cvar-htmlfield'

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

diff --git a/locale/en/all b/locale/en/all
index 615173f..59c78fd 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -538,6 +538,7 @@ $self->{texts} = {
   'CSV Export successful!'      => '',
   'CSV export'                  => '',
   'CSV export -- options'       => '',
+  'CSV import: additional billing addresses' => '',
   'CSV import: ar transactions' => '',
   'CSV import: bank transactions' => '',
   'CSV import: contacts'        => '',
@@ -821,6 +822,7 @@ $self->{texts} = {
   'Created for'                 => '',
   'Created on'                  => '',
   'Creating Documents'          => '',
+  'Creating Factur-X/ZUGFeRD invoices is not enabled for this customer.' => '',
   'Creating invoices'           => '',
   'Creating the PDF failed:'    => '',
   'Creation Date'               => '',
@@ -995,6 +997,7 @@ $self->{texts} = {
   'Default Transfer with services' => '',
   'Default Warehouse'           => '',
   'Default Warehouse with ignoring onhand' => '',
+  'Default address flag'        => '',
   'Default article for converting into quotations and orders' => '',
   'Default booking group'       => '',
   'Default client'              => '',
@@ -1499,6 +1502,7 @@ $self->{texts} = {
   'Extended status'             => '',
   'Extension Of Time'           => '',
   'Factor'                      => '',
+  'Factur-X/ZUGFeRD'            => '',
   'Factur-X/ZUGFeRD import'     => '',
   'Factur-X/ZUGFeRD invoice'    => '',
   'Factur-X/ZUGFeRD notes for each invoice' => '',
@@ -1641,6 +1645,7 @@ $self->{texts} = {
   'Groups valid for this client' => '',
   'HTML'                        => '',
   'HTML Templates'              => '',
+  'HTML field'                  => '',
   'Handling of WebDAV'          => '',
   'Hardcopy'                    => '',
   'Has item type'               => '',
@@ -1931,6 +1936,7 @@ $self->{texts} = {
   'Lastcost'                    => '',
   'Lastcost (with X being a number)' => '',
   'Lastname'                    => '',
+  'Leading and trailing whitespaces have been removed.' => '',
   'Left'                        => '',
   'Letter'                      => '',
   'Letter Draft'                => '',
@@ -3362,10 +3368,10 @@ $self->{texts} = {
   'Text blocks back'            => '',
   'Text blocks front'           => '',
   'Text field'                  => '',
-  'Text field variables: \'WIDTH=w HEIGHT=h\' sets the width and height of the text field. They default to 30 and 5 respectively.' => '',
+  'Text field and HTML field variables: \'WIDTH=w HEIGHT=h\' sets the width and height of the field in pixels. They default to 225 and 90 respectively.' => '',
   'Text in CSV File'            => '',
   'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' => '',
-  'Text, text field and number variables: The default value will be used as-is.' => '',
+  'Text, text field, HTML field and number variables: The default value will be used as-is.' => '',
   'Texts for invoices'          => '',
   'Texts for quotations & orders' => '',
   'That export does not exist.' => '',