Merge branch '5.x' into 5.4

# Conflicts:
#	src/templates/store-management/shipping/shippingmethods/_edit.twig
#	src/translations/en/commerce.php

Author: brandonkelly

src/templates/store-management/shipping/shippingmethods/_edit.twig

@@ -87,7 +87,7 @@
         id: 'orderCondition',
         label: 'Match Order'|t('commerce'),
         errors: shippingMethod.getErrors('orderCondition'),
-        instructions: 'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availability early or if there are common conditions to all rules for this method.'|t('commerce'),
+        instructions: 'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.'|t('commerce'),
     }, orderConditionInput) }}
 
     {% set customerConditionInput %}

src/translations/de/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Abgeschlossen',
     'Completing order failed.' => 'Bestellungsabschluss fehlgeschlagen.',
     'Condition' => 'Bedingung',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Die Bedingungen werden hier mit einer Bestellung abgeglichen, bevor die Regeln abgesucht werden. Dies ist nützlich, wenn Sie die Verfügbarkeit einer Methode frühzeitig prüfen möchten oder wenn es gemeinsame Bedingungen für alle Regeln für diese Methode gibt.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Die Bedingungen werden hier mit einer Bestellung abgeglichen, bevor die Regeln abgesucht werden. Dies ist nützlich, wenn Sie die Verfügbarkeit einer Methode frühzeitig prüfen möchten oder wenn es gemeinsame Bedingungen für alle Regeln für diese Methode gibt.',
     'Conditions' => 'Bedingungen',
     'Control Panel Settings' => 'Control Panel Einstellungen',
     'Control panel' => 'Control Panel',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Anzuwendende Strategie beim Berechnen des Mindestbestellungspreises.',
     'Subject' => 'Betreff',
     'Subscribing user' => 'Abonnierter Benutzer',
+    'Subscription Fields' => 'Abonnementfelder',
     'Subscription Plans' => 'Abonnementpläne',
     'Subscription Settings' => 'Abonnementeinstellungen',
     'Subscription cancelled.' => 'Abonnement gekündigt.',

src/translations/en-GB/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Completed',
     'Completing order failed.' => 'Failed to complete order.',
     'Condition' => 'Condition',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availabililty early or if there are common conditions to all rules for this method.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availabililty early or if there are common conditions to all rules for this method.',
     'Conditions' => 'Conditions',
     'Control Panel Settings' => 'Control Panel Settings',
     'Control panel' => 'Control panel',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Strategy to apply when calculating the minimum order price.',
     'Subject' => 'Subject',
     'Subscribing user' => 'Subscribing user',
+    'Subscription Fields' => 'Subscription Fields',
     'Subscription Plans' => 'Subscription Plans',
     'Subscription Settings' => 'Subscription Settings',
     'Subscription cancelled.' => 'Subscription cancelled.',

src/translations/en/commerce.php

@@ -181,7 +181,7 @@
     'Completed' => 'Completed',
     'Completing order failed.' => 'Completing order failed.',
     'Condition' => 'Condition',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availability early or if there are common conditions to all rules for this method.' => 'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availability early or if there are common conditions to all rules for this method.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.',
     'Conditions here are matched against the order’s customer before looking through the rules. This is useful if you want qualify a method’s availability early or if there are common conditions to all rules for this method.' => 'Conditions here are matched against the order’s customer before looking through the rules. This is useful if you want qualify a method’s availability early or if there are common conditions to all rules for this method.',
     'Conditions' => 'Conditions',
     'Control Panel Settings' => 'Control Panel Settings',

src/translations/fr-CA/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Terminé',
     'Completing order failed.' => 'Échec de l\'exécution de la commande.',
     'Condition' => 'Condition',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Les conditions sont comparées à un ordre avant d\'examiner les règles. Cette fonction est utile si vous souhaitez vérifier la disponibilité d\'une méthode à un stade précoce ou s\'il existe des conditions communes à toutes les règles relatives à cette méthode.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Les conditions sont comparées à un ordre avant d\'examiner les règles. Cette fonction est utile si vous souhaitez vérifier la disponibilité d\'une méthode à un stade précoce ou s\'il existe des conditions communes à toutes les règles relatives à cette méthode.',
     'Conditions' => 'Conditions',
     'Control Panel Settings' => 'Réglages du panneau de configuration',
     'Control panel' => 'Panneau de configuration',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Stratégie à employer lors du calcul du prix de la commande minimale.',
     'Subject' => 'Objet',
     'Subscribing user' => 'Utilisateur abonné',
+    'Subscription Fields' => 'Champs d’abonnement',
     'Subscription Plans' => 'Plans d’abonnement',
     'Subscription Settings' => 'Paramètres d\'abonnement',
     'Subscription cancelled.' => 'Abonnement annulé.',

src/translations/fr/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Terminé',
     'Completing order failed.' => 'Échec de l\'exécution de la commande.',
     'Condition' => 'Condition',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Les conditions sont comparées à une commande avant d\'examiner les règles. Cette fonction est utile si vous souhaitez vérifier la disponibilité d\'une méthode à un stade précoce ou s\'il existe des conditions communes à toutes les règles relatives à cette méthode.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Les conditions sont comparées à une commande avant d\'examiner les règles. Cette fonction est utile si vous souhaitez vérifier la disponibilité d\'une méthode à un stade précoce ou s\'il existe des conditions communes à toutes les règles relatives à cette méthode.',
     'Conditions' => 'Conditions',
     'Control Panel Settings' => 'Paramètres du panneau de contrôle',
     'Control panel' => 'Panneau de contrôle',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Stratégie à employer lors du calcul du prix de la commande minimale.',
     'Subject' => 'Objet',
     'Subscribing user' => 'Utilisateur abonné',
+    'Subscription Fields' => 'Champs d’abonnement',
     'Subscription Plans' => 'Abonnements',
     'Subscription Settings' => 'Paramètres d\'abonnement',
     'Subscription cancelled.' => 'Abonnement annulé.',

src/translations/it/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Completato',
     'Completing order failed.' => 'Completamento dell\'ordine fallito.',
     'Condition' => 'Condizione',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Le condizioni vengono confrontate con un ordine prima di esaminare le regole. Ciò è utile se si desidera qualificare in anticipo la disponibilità di un metodo o se esistono condizioni comuni per tutte le regole per questo metodo.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Le condizioni vengono confrontate con un ordine prima di esaminare le regole. Ciò è utile se si desidera qualificare in anticipo la disponibilità di un metodo o se esistono condizioni comuni per tutte le regole per questo metodo.',
     'Conditions' => 'Condizioni',
     'Control Panel Settings' => 'Impostazioni del pannello di controllo',
     'Control panel' => 'Pannello di controllo',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Strategia da applicare durante il calcolo del prezzo d\'ordine minimo.',
     'Subject' => 'Oggetto',
     'Subscribing user' => 'Utente che effettua la sottoscrizione',
+    'Subscription Fields' => 'Campi della sottoscrizione',
     'Subscription Plans' => 'Piani di sottoscrizione',
     'Subscription Settings' => 'Impostazioni di sottoscrizione',
     'Subscription cancelled.' => 'Sottoscrizione annullata.',

src/translations/ja/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => '完了',
     'Completing order failed.' => '注文の完了に失敗しました。',
     'Condition' => '条件',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'ここでの条件は、ルールを調べる前に注文に対して照合されます。これは、前もってメソッドの可用性を評価する場合、またはこのメソッドに対してすべてのルールに共通の条件がある場合に役立ちます。',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'ここでの条件は、ルールを調べる前に注文に対して照合されます。これは、前もってメソッドの可用性を評価する場合、またはこのメソッドに対してすべてのルールに共通の条件がある場合に役立ちます。',
     'Conditions' => '条件',
     'Control Panel Settings' => 'コントロールパネルの設定',
     'Control panel' => 'コントロールパネル',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => '最低の注文価格を算出する方法',
     'Subject' => '件名',
     'Subscribing user' => '定期支払い中のユーザー',
+    'Subscription Fields' => '定期支払いフィールド',
     'Subscription Plans' => '定期支払いプラン',
     'Subscription Settings' => '定期支払い設定',
     'Subscription cancelled.' => '定期支払いをキャンセルしました。',

src/translations/nb/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Fullført',
     'Completing order failed.' => 'Fullføring av ordre mislyktes.',
     'Condition' => 'Tilstand',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Her matches betingelsene mot en ordre før reglene blir vurdert. Dette er nyttig hvis du ønsker å kvalifisere en metodes tilgjengelighet tidlig, eller hvis det finnes felles betingelser for alle reglene for denne metoden.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Her matches betingelsene mot en ordre før reglene blir vurdert. Dette er nyttig hvis du ønsker å kvalifisere en metodes tilgjengelighet tidlig, eller hvis det finnes felles betingelser for alle reglene for denne metoden.',
     'Conditions' => 'Betingelser',
     'Control Panel Settings' => 'Kontrollpanelinnstillinger',
     'Control panel' => 'Kontrollpanel',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Strategi å bruke når du beregner minimumspris for ordre.',
     'Subject' => 'Emne',
     'Subscribing user' => 'Abonnerende bruker',
+    'Subscription Fields' => 'Abonnementsfelt',
     'Subscription Plans' => 'Abonnementsplaner',
     'Subscription Settings' => 'Abonnementsinnstillinger',
     'Subscription cancelled.' => 'Abonnement kansellert.',

src/translations/nl/commerce.php

@@ -180,7 +180,7 @@
     'Completed' => 'Voltooid',
     'Completing order failed.' => 'Uitvoering bestelling mislukt.',
     'Condition' => 'Conditie',
-    'Conditions here are matched against an order before looking through the rules. This is useful if you want qualify a method’s availabililty early or if there are common conditions to all rules for this method.' => 'Voorwaarden worden hier vergeleken met een bestelling voordat de regels worden bekeken. Dit is handig als u de beschikbaarheid van een methode vroegtijdig wilt kwalificeren of als er gemeenschappelijke voorwaarden zijn voor alle regels voor deze methode.',
+    'Conditions here are matched against an order before looking through the rules. This is useful if you want to qualify a method’s availability early, or if there are common conditions to all rules for this method.' => 'Voorwaarden worden hier vergeleken met een bestelling voordat de regels worden bekeken. Dit is handig als u de beschikbaarheid van een methode vroegtijdig wilt kwalificeren of als er gemeenschappelijke voorwaarden zijn voor alle regels voor deze methode.',
     'Conditions' => 'Voorwaarden',
     'Control Panel Settings' => 'Instellingen configuratiescherm',
     'Control panel' => 'Configuratiescherm',
@@ -1065,6 +1065,7 @@
     'Strategy to apply when calculating the minimum order price.' => 'Toe te passen strategie bij het berekenen van de minimale bestelprijs.',
     'Subject' => 'Onderwerp',
     'Subscribing user' => 'Geabonneerde gebruiker',
+    'Subscription Fields' => 'Abonnementsvelden',
     'Subscription Plans' => 'Abonnementsplannen',
     'Subscription Settings' => 'Abonnementsinstellingen',
     'Subscription cancelled.' => 'Abonnement geannuleerd.',