shopware6: locales

diff --git a/SL/DB/Shop.pm b/SL/DB/Shop.pm
index 0018de693cd273df2731589aadd743ad5231befa..750e3a3b70f49b3db91493dc4c6492e4a4dd962d 100644 (file)
--- a/SL/DB/Shop.pm
+++ b/SL/DB/Shop.pm
@@ -30,7 +30,7 @@ sub validate {
     push @errors, $::locale->text('Shipping cost article is not implemented')        if $self->{shipping_costs_parts_id};
     push @errors, $::locale->text('Fetch from last order number is not implemented') if $self->{last_order_number};
   } else {
     push @errors, $::locale->text('Shipping cost article is not implemented')        if $self->{shipping_costs_parts_id};
     push @errors, $::locale->text('Fetch from last order number is not implemented') if $self->{last_order_number};
   } else {

-    push @errors, $::locale->text('Use Long Description from Parts is only for Shopware6  implemented')
+    push @errors, $::locale->text('Use Long Description from Parts is only for Shopware6 implemented')

       if $self->{use_part_longdescription};
   }
   return @errors;
       if $self->{use_part_longdescription};
   }
   return @errors;

diff --git a/locale/de/all b/locale/de/all
index dc4e144dfcb399a18fd2889639e885ec0ae840e0..aec1eb1632b07f263b4bbec768928c3fa1441ec9 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1526,7 +1526,7 @@ $self->{texts} = {
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Fee'                         => 'Gebühr',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Fee'                         => 'Gebühr',

-  'Fetch from last order number not implemented' => 'Das Abholen ab der letzten Auftragsnummer ist nicht implementiert',
+  'Fetch from last order number is not implemented' => 'Das Abholen ab der letzten Auftragsnummer ist nicht implementiert',

   'Fetch order'                 => 'Hole Bestellung',
   'Field'                       => 'Feld',
   'File'                        => 'Datei',
   'Fetch order'                 => 'Hole Bestellung',
   'Field'                       => 'Feld',
   'File'                        => 'Datei',


@@ -3101,6 +3101,7 @@ $self->{texts} = {
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',
   'Shipping address (name)'     => 'Name der Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',
   'Shipping address (name)'     => 'Name der Lieferadresse',

+  'Shipping cost article is not implemented' => 'Versandkosten-Artikel ist nicht implementiert',

   'Shipping cost article not implemented' => 'Lieferkosten-Artikel nicht implementiert',
   'Shipping costs'              => 'Versandkosten',
   'Shipping date'               => 'Lieferdatum',
   'Shipping cost article not implemented' => 'Lieferkosten-Artikel nicht implementiert',
   'Shipping costs'              => 'Versandkosten',
   'Shipping date'               => 'Lieferdatum',


@@ -4083,6 +4084,8 @@ $self->{texts} = {
   'Use File Storage backend'    => 'Verwende Dateisystem-Backend',
   'Use Filemanagement'          => 'Verwende Dateimanagement',
   'Use Income'                  => 'GUV und BWA verwenden',
   'Use File Storage backend'    => 'Verwende Dateisystem-Backend',
   'Use Filemanagement'          => 'Verwende Dateimanagement',
   'Use Income'                  => 'GUV und BWA verwenden',

+  'Use Long Description from Parts for Shop Long Description' => 'Verwende den Artikel Langtext aus den Stammdaten für den Langtext im Shop',
+  'Use Long Description from Parts is only for Shopware6 implemented' => 'Der Langtext aus den Stammdaten kann nur in Shopware6 verwendet werden',

   'Use UStVA'                   => 'UStVA verwenden',
   'Use WebDAV Repository'       => 'Verwende WebDAV',
   'Use WebDAV Storage backend'  => 'Verwende WebDAV-Backend',
   'Use UStVA'                   => 'UStVA verwenden',
   'Use WebDAV Repository'       => 'Verwende WebDAV',
   'Use WebDAV Storage backend'  => 'Verwende WebDAV-Backend',

diff --git a/locale/en/all b/locale/en/all
index c3730b6d35fab913776c3dc92a562a3f8e328a74..79e8f6be7ac8e3e3a9d6b5874e4687dff74d0a5c 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -1526,7 +1526,7 @@ $self->{texts} = {
   'Feb'                         => '',
   'February'                    => '',
   'Fee'                         => '',
   'Feb'                         => '',
   'February'                    => '',
   'Fee'                         => '',

-  'Fetch from last order number not implemented' => '',
+  'Fetch from last order number is not implemented' => '',

   'Fetch order'                 => '',
   'Field'                       => '',
   'File'                        => '',
   'Fetch order'                 => '',
   'Field'                       => '',
   'File'                        => '',


@@ -3101,6 +3101,7 @@ $self->{texts} = {
   'Shipping Address'            => '',
   'Shipping Point'              => '',
   'Shipping address (name)'     => '',
   'Shipping Address'            => '',
   'Shipping Point'              => '',
   'Shipping address (name)'     => '',

+  'Shipping cost article is not implemented' => '',

   'Shipping cost article not implemented' => '',
   'Shipping costs'              => '',
   'Shipping date'               => '',
   'Shipping cost article not implemented' => '',
   'Shipping costs'              => '',
   'Shipping date'               => '',


@@ -4082,6 +4083,8 @@ $self->{texts} = {
   'Use File Storage backend'    => '',
   'Use Filemanagement'          => '',
   'Use Income'                  => 'Use GUV and BWA',
   'Use File Storage backend'    => '',
   'Use Filemanagement'          => '',
   'Use Income'                  => 'Use GUV and BWA',

+  'Use Long Description from Parts for Shop Long Description' => '',
+  'Use Long Description from Parts is only for Shopware6 implemented' => '',

   'Use UStVA'                   => '',
   'Use WebDAV Repository'       => '',
   'Use WebDAV Storage backend'  => '',
   'Use UStVA'                   => '',
   'Use WebDAV Repository'       => '',
   'Use WebDAV Storage backend'  => '',