diff --git a/README.md b/README.md
index 2684713a..12acf596 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,9 @@ Read more about the integration configuration on [our Wiki](https://github.com/m
 
 # Release notes
 
+*0.1.16*
+- Verify if the string constants are already defined
+
 *0.1.15*
 - Do not call payments API with order token.
 
diff --git a/lang/dutch/modules/payment/mollie_applepay.php b/lang/dutch/modules/payment/mollie_applepay.php
index 8cb0382f..2581234e 100644
--- a/lang/dutch/modules/payment/mollie_applepay.php
+++ b/lang/dutch/modules/payment/mollie_applepay.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Wil je Apple Pay accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Wil je Apple Pay accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_title">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_bancontact.php b/lang/dutch/modules/payment/mollie_bancontact.php
index 0223b908..e1cda5a4 100644
--- a/lang/dutch/modules/payment/mollie_bancontact.php
+++ b/lang/dutch/modules/payment/mollie_bancontact.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Wil je Bancontact accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Wil je Bancontact accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_title">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_banktransfer.php b/lang/dutch/modules/payment/mollie_banktransfer.php
index 5401c23e..bf945afa 100644
--- a/lang/dutch/modules/payment/mollie_banktransfer.php
+++ b/lang/dutch/modules/payment/mollie_banktransfer.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Wil je Bank transfer accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Wil je Bank transfer accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_belfius.php b/lang/dutch/modules/payment/mollie_belfius.php
index 8f294296..a83de196 100644
--- a/lang/dutch/modules/payment/mollie_belfius.php
+++ b/lang/dutch/modules/payment/mollie_belfius.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Wil je Belfius Pay Button accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Wil je Belfius Pay Button accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_creditcard.php b/lang/dutch/modules/payment/mollie_creditcard.php
index f3efe8ee..c2c34d32 100644
--- a/lang/dutch/modules/payment/mollie_creditcard.php
+++ b/lang/dutch/modules/payment/mollie_creditcard.php
@@ -1,58 +1,58 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Wil je Credit card accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Wil je Credit card accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Gebruik Mollie Components');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Gebruik Mollie Components');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Gebruik betalen met één klik');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'Lees meer over <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">betalen met één klik</a> en hoe het uw conversie verbetert.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Gebruik betalen met één klik');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'Lees meer over <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">betalen met één klik</a> en hoe het uw conversie verbetert.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Toestemmingstekst betalen met één klik');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Bepaal een label voor de toestemming voor betalen met één klik.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Toestemmingstekst betalen met één klik');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Bepaal een label voor de toestemming voor betalen met één klik.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Beschrijving betalen met één klik');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Bepaal de tekst die wordt weergegeven wanneer de klant betalen met één klik selecteert.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Beschrijving betalen met één klik');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Bepaal de tekst die wordt weergegeven wanneer de klant betalen met één klik selecteert.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_eps.php b/lang/dutch/modules/payment/mollie_eps.php
index c6c5c253..bbae7f76 100644
--- a/lang/dutch/modules/payment/mollie_eps.php
+++ b/lang/dutch/modules/payment/mollie_eps.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Wil je eps accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Wil je eps accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties.  <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties.  <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_giftcard.php b/lang/dutch/modules/payment/mollie_giftcard.php
index 00c03f17..4a0d8cd8 100644
--- a/lang/dutch/modules/payment/mollie_giftcard.php
+++ b/lang/dutch/modules/payment/mollie_giftcard.php
@@ -1,49 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Wil je Gift cards accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Wil je Gift cards accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_giropay.php b/lang/dutch/modules/payment/mollie_giropay.php
index 7552a95a..f5ec2a8e 100644
--- a/lang/dutch/modules/payment/mollie_giropay.php
+++ b/lang/dutch/modules/payment/mollie_giropay.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Wil je Giropay accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Wil je Giropay accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_ideal.php b/lang/dutch/modules/payment/mollie_ideal.php
index 73c65d2c..3af71cd3 100644
--- a/lang/dutch/modules/payment/mollie_ideal.php
+++ b/lang/dutch/modules/payment/mollie_ideal.php
@@ -1,49 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Wil je iDEAL accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Wil je iDEAL accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_kbc.php b/lang/dutch/modules/payment/mollie_kbc.php
index 60b90267..a0a5406f 100644
--- a/lang/dutch/modules/payment/mollie_kbc.php
+++ b/lang/dutch/modules/payment/mollie_kbc.php
@@ -1,50 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Wil je KBC/CBC Payment Button accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Wil je KBC/CBC Payment Button accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
-
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_klarnapaylater.php b/lang/dutch/modules/payment/mollie_klarnapaylater.php
index 19db04b6..969c5b32 100644
--- a/lang/dutch/modules/payment/mollie_klarnapaylater.php
+++ b/lang/dutch/modules/payment/mollie_klarnapaylater.php
@@ -1,35 +1,35 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Wil je Pay later accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Wil je Pay later accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)<br><br>Let op: het is niet mogelijk om een ​​vervaldatum meer dan 28 dagen in de toekomst te gebruiken, tenzij een ander maximum is overeengekomen tussen de handelaar en Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span><br><br>Let op: het is niet mogelijk om een ​​vervaldatum meer dan 28 dagen in de toekomst te gebruiken, tenzij een ander maximum is overeengekomen tussen de handelaar en Klarna.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
diff --git a/lang/dutch/modules/payment/mollie_klarnapaynow.php b/lang/dutch/modules/payment/mollie_klarnapaynow.php
index b9b53eb1..e91a1b0c 100644
--- a/lang/dutch/modules/payment/mollie_klarnapaynow.php
+++ b/lang/dutch/modules/payment/mollie_klarnapaynow.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Betaal nu.');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Betaal nu.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Wil je Betaal nu accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Wil je Betaal nu accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', 'Dagen tot verstrijken');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', 'Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)<br><br>Let op: het is niet mogelijk om een ​​vervaldatum meer dan 28 dagen in de toekomst te gebruiken, tenzij een ander maximum is overeengekomen tussen de handelaar en Klarna.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span><br><br>Let op: het is niet mogelijk om een ​​vervaldatum meer dan 28 dagen in de toekomst te gebruiken, tenzij een ander maximum is overeengekomen tussen de handelaar en Klarna.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', 'Transactiebeschrijving');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', 'De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
\ No newline at end of file
diff --git a/lang/dutch/modules/payment/mollie_klarnasliceit.php b/lang/dutch/modules/payment/mollie_klarnasliceit.php
index cf671dae..e20dd7b1 100644
--- a/lang/dutch/modules/payment/mollie_klarnasliceit.php
+++ b/lang/dutch/modules/payment/mollie_klarnasliceit.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Wil je Slice it accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Wil je Slice it accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)<br><br>Let op: het is niet mogelijk om een ​​vervaldatum meer dan 28 dagen in de toekomst te gebruiken, tenzij een ander maximum is overeengekomen tussen de handelaar en Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span><br><br>Let op: het is niet mogelijk om een ​​vervaldatum meer dan 28 dagen in de toekomst te gebruiken, tenzij een ander maximum is overeengekomen tussen de handelaar en Klarna.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
\ No newline at end of file
diff --git a/lang/dutch/modules/payment/mollie_paypal.php b/lang/dutch/modules/payment/mollie_paypal.php
index 11d19290..9fa89fc5 100644
--- a/lang/dutch/modules/payment/mollie_paypal.php
+++ b/lang/dutch/modules/payment/mollie_paypal.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Wil je PayPal accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Wil je PayPal accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_przelewy24.php b/lang/dutch/modules/payment/mollie_przelewy24.php
index f4f91da1..300de4a2 100644
--- a/lang/dutch/modules/payment/mollie_przelewy24.php
+++ b/lang/dutch/modules/payment/mollie_przelewy24.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Wil je Przelewy24 accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Wil je Przelewy24 accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/dutch/modules/payment/mollie_sofort.php b/lang/dutch/modules/payment/mollie_sofort.php
index 7bce8d75..a758755e 100644
--- a/lang/dutch/modules/payment/mollie_sofort.php
+++ b/lang/dutch/modules/payment/mollie_sofort.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', 'Nadat je de bestelling hebt gecontroleerd, word je doorgestuurd naar de website van de betalingsprovider om je aankoop af te ronden.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Betaalmethode inschakelen');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Wil je SOFORT Banking accepteren als betalingen?');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Betaalmethode inschakelen');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Wil je SOFORT Banking accepteren als betalingen?');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Naam checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Naam checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Geef een naam op die wordt gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Omschrijving checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Geef een beschrijving op die zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Sta betalingen naar specifieke landen toe');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', 'Selecteer landen waar de betalingsmethode beschikbaar zal zijn. Als je niets selecteerd, is deze betaling beschikbaar voor alle geactiveerde landen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Toeslag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Toeslag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Voer de extra kosten in voor een betaling in de standaardvaluta. Als het veld leeg is, worden er geen extra betalingskosten aan klanten in rekening gebracht..');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', 'API-methode');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', 'API-methode');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', '<b>Payment API</b><br>Gebruik het Payment API Platform voor de transacties. <a href="https://docs.mollie.com/payments/overview" target="_blank">Lees meer</a>.<br><br><b>Order API</b><br>Gebruik het nieuwe Payment API Platform voor de transacties. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Lees meer</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Dagen tot verstrijken</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transactiebeschrijving</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).');
diff --git a/lang/english/modules/payment/mollie_applepay.php b/lang/english/modules/payment/mollie_applepay.php
index f29d47d0..e0a83c71 100644
--- a/lang/english/modules/payment/mollie_applepay.php
+++ b/lang/english/modules/payment/mollie_applepay.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Do you want to accept Apple Pay as payments?');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Do you want to accept Apple Pay as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction Description</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_title">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
-
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
diff --git a/lang/english/modules/payment/mollie_bancontact.php b/lang/english/modules/payment/mollie_bancontact.php
index 73b2e684..31caad4a 100644
--- a/lang/english/modules/payment/mollie_bancontact.php
+++ b/lang/english/modules/payment/mollie_bancontact.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Do you want to accept Bancontact as payments?');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Do you want to accept Bancontact as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_applepay_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_title">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
-
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
diff --git a/lang/english/modules/payment/mollie_banktransfer.php b/lang/english/modules/payment/mollie_banktransfer.php
index 17f86fd6..094163d7 100644
--- a/lang/english/modules/payment/mollie_banktransfer.php
+++ b/lang/english/modules/payment/mollie_banktransfer.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Do you want to accept Bank transfer as payments?');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Do you want to accept Bank transfer as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
\ No newline at end of file
diff --git a/lang/english/modules/payment/mollie_belfius.php b/lang/english/modules/payment/mollie_belfius.php
index 447a924b..be53b76c 100644
--- a/lang/english/modules/payment/mollie_belfius.php
+++ b/lang/english/modules/payment/mollie_belfius.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Do you want to accept Belfius Pay Button as payments?');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Do you want to accept Belfius Pay Button as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
\ No newline at end of file
diff --git a/lang/english/modules/payment/mollie_creditcard.php b/lang/english/modules/payment/mollie_creditcard.php
index 31fe22df..74f84b5c 100644
--- a/lang/english/modules/payment/mollie_creditcard.php
+++ b/lang/english/modules/payment/mollie_creditcard.php
@@ -1,58 +1,58 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Do you want to accept Creditcard as payments?');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Do you want to accept Creditcard as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Use Mollie Components');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Use Mollie Components');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Use Single Click Payment');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'Read more about <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">Single Click Payments</a> and how it improves your conversion.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Use Single Click Payment');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'Read more about <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">Single Click Payments</a> and how it improves your conversion.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Single Click Payment Approval Text');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Please define a label for the Single Click approval.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Single Click Payment Approval Text');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Please define a label for the Single Click approval.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Single Click Payment Description');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Please define text that will be displayed when the customer selects Single Click payment.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Single Click Payment Description');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Please define text that will be displayed when the customer selects Single Click payment.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
\ No newline at end of file
diff --git a/lang/english/modules/payment/mollie_eps.php b/lang/english/modules/payment/mollie_eps.php
index 6f1111f4..4a4fd931 100644
--- a/lang/english/modules/payment/mollie_eps.php
+++ b/lang/english/modules/payment/mollie_eps.php
@@ -1,47 +1,47 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Do you want to accept eps as payments?');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Do you want to accept eps as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
 
diff --git a/lang/english/modules/payment/mollie_giftcard.php b/lang/english/modules/payment/mollie_giftcard.php
index 2d535540..a76e8bb5 100644
--- a/lang/english/modules/payment/mollie_giftcard.php
+++ b/lang/english/modules/payment/mollie_giftcard.php
@@ -1,50 +1,50 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Do you want to accept Gift cards as payments?');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Do you want to accept Gift cards as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE','Checkout name');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC','Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE','Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC','Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE' , 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC' , 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE' ) ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE' , 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC' ) ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC' , 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE' , 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC' , 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE' ) ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE' , 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC' ) ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC' , 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE' , 'API method');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC' , '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE' ) ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE' , 'API method');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC' ) ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC' , '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
 
diff --git a/lang/english/modules/payment/mollie_giropay.php b/lang/english/modules/payment/mollie_giropay.php
index 4346870a..de4424c8 100644
--- a/lang/english/modules/payment/mollie_giropay.php
+++ b/lang/english/modules/payment/mollie_giropay.php
@@ -1,47 +1,47 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Do you want to accept Giropay as payments?');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Do you want to accept Giropay as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
 
diff --git a/lang/english/modules/payment/mollie_ideal.php b/lang/english/modules/payment/mollie_ideal.php
index 9b06ef88..5e0a5c98 100644
--- a/lang/english/modules/payment/mollie_ideal.php
+++ b/lang/english/modules/payment/mollie_ideal.php
@@ -1,50 +1,50 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Do you want to accept iDEAL as payments?');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Do you want to accept iDEAL as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
 
diff --git a/lang/english/modules/payment/mollie_kbc.php b/lang/english/modules/payment/mollie_kbc.php
index 1e90b5e0..e6e68e83 100644
--- a/lang/english/modules/payment/mollie_kbc.php
+++ b/lang/english/modules/payment/mollie_kbc.php
@@ -1,49 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Do you want to accept KBC/CBC Payment Button as payments?');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Do you want to accept KBC/CBC Payment Button as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
diff --git a/lang/english/modules/payment/mollie_klarnapaylater.php b/lang/english/modules/payment/mollie_klarnapaylater.php
index 48336e49..ea5f2163 100644
--- a/lang/english/modules/payment/mollie_klarnapaylater.php
+++ b/lang/english/modules/payment/mollie_klarnapaylater.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Do you want to accept Pay later as payments?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Do you want to accept Pay later as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)<br><br>Please note: It is not possible to use an expiry date more than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span><br><br>Please note: It is not possible to use an expiry date more than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
diff --git a/lang/english/modules/payment/mollie_klarnapaynow.php b/lang/english/modules/payment/mollie_klarnapaynow.php
index 9e2a703e..85a144d6 100644
--- a/lang/english/modules/payment/mollie_klarnapaynow.php
+++ b/lang/english/modules/payment/mollie_klarnapaynow.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Pay now.');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Pay now.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Do you want to accept Pay now as payments?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Do you want to accept Pay now as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)<br><br>Please note: It is not possible to use an expiry date more than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span><br><br>Please note: It is not possible to use an expiry date more than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
diff --git a/lang/english/modules/payment/mollie_klarnasliceit.php b/lang/english/modules/payment/mollie_klarnasliceit.php
index 6b8e2b19..06ee675e 100644
--- a/lang/english/modules/payment/mollie_klarnasliceit.php
+++ b/lang/english/modules/payment/mollie_klarnasliceit.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Do you want to accept Slice it as payments?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Do you want to accept Slice it as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE','Checkout name');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC','Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE','Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC','Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE' , 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC' , 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE' ) ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE' , 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC' ) ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC' , 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE' , 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC' , 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE' ) ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE' , 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC' ) ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC' , 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE' , 'API method');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC' , '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE' ) ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE' , 'API method');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC' ) ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC' , '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)<br><br>Please note: It is not possible to use an expiry date more than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span><br><br>Please note: It is not possible to use an expiry date more than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
diff --git a/lang/english/modules/payment/mollie_paypal.php b/lang/english/modules/payment/mollie_paypal.php
index 9e707d2a..47e01078 100644
--- a/lang/english/modules/payment/mollie_paypal.php
+++ b/lang/english/modules/payment/mollie_paypal.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Do you want to accept PayPal as payments?');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Do you want to accept PayPal as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
\ No newline at end of file
diff --git a/lang/english/modules/payment/mollie_przelewy24.php b/lang/english/modules/payment/mollie_przelewy24.php
index 934a3b36..95f6f12b 100644
--- a/lang/english/modules/payment/mollie_przelewy24.php
+++ b/lang/english/modules/payment/mollie_przelewy24.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Do you want to accept Przelewy24 as payments?');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Do you want to accept Przelewy24 as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
\ No newline at end of file
diff --git a/lang/english/modules/payment/mollie_sofort.php b/lang/english/modules/payment/mollie_sofort.php
index 098194f2..969e11c9 100644
--- a/lang/english/modules/payment/mollie_sofort.php
+++ b/lang/english/modules/payment/mollie_sofort.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', 'You will be redirected to payment gateway website to complete your purchase after the order review step.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Enable payment method');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Do you want to accept SOFORT Banking as payments?');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Enable payment method');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Do you want to accept SOFORT Banking as payments?');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Checkout name');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Checkout name');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Please define name that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout description');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Please define description text that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Allow payment to specific countries');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', 'Please select countries where payment method will be available. If none is selected, payment will be available for all activated countries.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Surcharge');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Surcharge');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Please enter the extra costs for a payment in default currency. If field is empty, no additional payment costs will be charged to customers.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', 'API method');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', 'API method');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', '<b>Payment API</b><br>Use the Payment API Platform for the transactions. <a href="https://docs.mollie.com/payments/overview" target="_blank">Read more</a>.<br><br><b>Order API</b><br>Use the new Order API Platform and get additional insights in the orders. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Read more</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Please upload logo that will be used in checkout.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Please upload logo that will be used in checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', 'Sort order of display in checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', 'Sort order of display in checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Days To Expire</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaction description</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Payment surcharge');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
-
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.');
 
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).');
diff --git a/lang/french/modules/payment/mollie_applepay.php b/lang/french/modules/payment/mollie_applepay.php
index b063ca3e..604a3295 100644
--- a/lang/french/modules/payment/mollie_applepay.php
+++ b/lang/french/modules/payment/mollie_applepay.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Voulez-vous accepter Apple Pay comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Voulez-vous accepter Apple Pay comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_bancontact.php b/lang/french/modules/payment/mollie_bancontact.php
index 96b80add..a454f35c 100644
--- a/lang/french/modules/payment/mollie_bancontact.php
+++ b/lang/french/modules/payment/mollie_bancontact.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Voulez-vous accepter Bancontact comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Voulez-vous accepter Bancontact comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes.  <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes.  <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_banktransfer.php b/lang/french/modules/payment/mollie_banktransfer.php
index e54aa31f..18e5898a 100644
--- a/lang/french/modules/payment/mollie_banktransfer.php
+++ b/lang/french/modules/payment/mollie_banktransfer.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Voulez-vous accepter Bank transfer comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Voulez-vous accepter Bank transfer comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_belfius.php b/lang/french/modules/payment/mollie_belfius.php
index 7af6894d..d7ca0bff 100644
--- a/lang/french/modules/payment/mollie_belfius.php
+++ b/lang/french/modules/payment/mollie_belfius.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Voulez-vous accepter Belfius Pay Button comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Voulez-vous accepter Belfius Pay Button comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_creditcard.php b/lang/french/modules/payment/mollie_creditcard.php
index 73b4798f..2fff3425 100644
--- a/lang/french/modules/payment/mollie_creditcard.php
+++ b/lang/french/modules/payment/mollie_creditcard.php
@@ -1,59 +1,58 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Voulez-vous accepter Credit card comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Voulez-vous accepter Credit card comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Utiliser les composants Mollie');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Utiliser les composants Mollie');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Utiliser des paiements Single Click');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'En savoir plus sur <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">les paiements Single Click</a> et la manière dont il améliore votre conversion.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Utiliser des paiements Single Click');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'En savoir plus sur <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">les paiements Single Click</a> et la manière dont il améliore votre conversion.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Texte d’approbation des paiements Single Click');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Veuillez définir une étiquette pour l’approbation Single Click.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Texte d’approbation des paiements Single Click');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Veuillez définir une étiquette pour l’approbation Single Click.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Description paiements Single Click');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Veuillez définir le texte qui sera affiché lorsque le client sélectionne le paiement Single Click.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Description paiements Single Click');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Veuillez définir le texte qui sera affiché lorsque le client sélectionne le paiement Single Click.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_eps.php b/lang/french/modules/payment/mollie_eps.php
index 2e3d0fdd..e07d1cc6 100644
--- a/lang/french/modules/payment/mollie_eps.php
+++ b/lang/french/modules/payment/mollie_eps.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Voulez-vous accepter eps comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Voulez-vous accepter eps comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_giftcard.php b/lang/french/modules/payment/mollie_giftcard.php
index f79c993f..bb19ea27 100644
--- a/lang/french/modules/payment/mollie_giftcard.php
+++ b/lang/french/modules/payment/mollie_giftcard.php
@@ -1,49 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Voulez-vous accepter Gift cards comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Voulez-vous accepter Gift cards comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs");
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs");
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_giropay.php b/lang/french/modules/payment/mollie_giropay.php
index a6f33548..e66d2553 100644
--- a/lang/french/modules/payment/mollie_giropay.php
+++ b/lang/french/modules/payment/mollie_giropay.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Voulez-vous accepter Giropay comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Voulez-vous accepter Giropay comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_ideal.php b/lang/french/modules/payment/mollie_ideal.php
index 25006c23..9b3eebe4 100644
--- a/lang/french/modules/payment/mollie_ideal.php
+++ b/lang/french/modules/payment/mollie_ideal.php
@@ -1,50 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Voulez-vous accepter iDEAL comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Voulez-vous accepter iDEAL comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs");
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs");
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_kbc.php b/lang/french/modules/payment/mollie_kbc.php
index 6675a816..5acf6b1a 100644
--- a/lang/french/modules/payment/mollie_kbc.php
+++ b/lang/french/modules/payment/mollie_kbc.php
@@ -1,49 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Voulez-vous accepter KBC/CBC Payment Button comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Voulez-vous accepter KBC/CBC Payment Button comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs");
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs");
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_klarnapaylater.php b/lang/french/modules/payment/mollie_klarnapaylater.php
index a8bb765b..a2c0b8ed 100644
--- a/lang/french/modules/payment/mollie_klarnapaylater.php
+++ b/lang/french/modules/payment/mollie_klarnapaylater.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Voulez-vous accepter Pay later comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Voulez-vous accepter Pay later comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours). <br><br>Remarque: il n\'est pas possible d\'utiliser une date d\'expiration de plus de 28 jours dans le futur, à moins qu\'un autre maximum ne soit convenu entre le commerçant et Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours). <br><br>Remarque: il n\'est pas possible d\'utiliser une date d\'expiration de plus de 28 jours dans le futur, à moins qu\'un autre maximum ne soit convenu entre le commerçant et Klarna.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
diff --git a/lang/french/modules/payment/mollie_klarnapaynow.php b/lang/french/modules/payment/mollie_klarnapaynow.php
index 749eb31c..53546092 100644
--- a/lang/french/modules/payment/mollie_klarnapaynow.php
+++ b/lang/french/modules/payment/mollie_klarnapaynow.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Pay now.');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Pay now.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Voulez-vous accepter Pay now comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Voulez-vous accepter Pay now comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours). <br><br>Remarque: il n\'est pas possible d\'utiliser une date d\'expiration de plus de 28 jours dans le futur, à moins qu\'un autre maximum ne soit convenu entre le commerçant et Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours). <br><br>Remarque: il n\'est pas possible d\'utiliser une date d\'expiration de plus de 28 jours dans le futur, à moins qu\'un autre maximum ne soit convenu entre le commerçant et Klarna.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
diff --git a/lang/french/modules/payment/mollie_klarnasliceit.php b/lang/french/modules/payment/mollie_klarnasliceit.php
index 34393dc0..4d3d4dfb 100644
--- a/lang/french/modules/payment/mollie_klarnasliceit.php
+++ b/lang/french/modules/payment/mollie_klarnasliceit.php
@@ -1,35 +1,35 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Voulez-vous accepter Slice it comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Voulez-vous accepter Slice it comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours). <br><br>Remarque: il n\'est pas possible d\'utiliser une date d\'expiration de plus de 28 jours dans le futur, à moins qu\'un autre maximum ne soit convenu entre le commerçant et Klarna.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours). <br><br>Remarque: il n\'est pas possible d\'utiliser une date d\'expiration de plus de 28 jours dans le futur, à moins qu\'un autre maximum ne soit convenu entre le commerçant et Klarna.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
diff --git a/lang/french/modules/payment/mollie_paypal.php b/lang/french/modules/payment/mollie_paypal.php
index 0cf78421..a8fd37c3 100644
--- a/lang/french/modules/payment/mollie_paypal.php
+++ b/lang/french/modules/payment/mollie_paypal.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Voulez-vous accepter PayPal comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Voulez-vous accepter PayPal comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes.  <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes.  <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_przelewy24.php b/lang/french/modules/payment/mollie_przelewy24.php
index 3771c18e..7842af3d 100644
--- a/lang/french/modules/payment/mollie_przelewy24.php
+++ b/lang/french/modules/payment/mollie_przelewy24.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Voulez-vous accepter Przelewy24 comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Voulez-vous accepter Przelewy24 comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/french/modules/payment/mollie_sofort.php b/lang/french/modules/payment/mollie_sofort.php
index 405f780e..cf291ce2 100644
--- a/lang/french/modules/payment/mollie_sofort.php
+++ b/lang/french/modules/payment/mollie_sofort.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', "Vous allez être redirigé vers le site web de la passerelle de paiement pour effectuer votre achat après l'étape de révision de la commande.");
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Activé le moyen de paiement');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Voulez-vous accepter SOFORT Banking comme paiement ?');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Activé le moyen de paiement');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Voulez-vous accepter SOFORT Banking comme paiement ?');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Nom du checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Nom du checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Veuillez définir le nom à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Description du checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Veuillez définir un texte descriptif à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Autoriser les paiements vers certains pays');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', "Veuillez sélectionner les pays où le moyen de paiement sera disponible. Si aucun n'est sélectionné, le paiement sera disponible pour tous les pays activés.");
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Supplément');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Supplément');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Veuillez entrer le coût additionnel pour un paiement dans la devise par défaut. Si le champ est vide, auncun coût additionnel de paiement ne sera facturé au client.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', "Méthode d'API");
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', "Méthode d'API");
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', "<b>Payment API</b><br>Utilisez la plateforme Payment API pour les transactions. <a href='https://docs.mollie.com/payments/overview' target='_blank'>Reaad more</a>..<br><br><b>Order API</b><br>Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. <a href='https://docs.mollie.com/orders/why-use-orders' target='_blank'>Read more</a>.");
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout");
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout.");
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Jours d\'expiration</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Combien de jours avant l\'expiration des commandes pour cette méthode? Laissez vide pour utiliser l\'expiration par défaut (28 jours)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Description de la transaction</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
-
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.');
 
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).');
diff --git a/lang/german/modules/payment/mollie_applepay.php b/lang/german/modules/payment/mollie_applepay.php
index 8c3bbd0d..85513a2f 100644
--- a/lang/german/modules/payment/mollie_applepay.php
+++ b/lang/german/modules/payment/mollie_applepay.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_TITLE', 'Apple Pay');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Möchten Sie Zahlungen via ApplePay akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_STATUS_DESC', 'Möchten Sie Zahlungen via ApplePay akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
-
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_APPLEPAY_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_bancontact.php b/lang/german/modules/payment/mollie_bancontact.php
index 7106499e..82319a6c 100644
--- a/lang/german/modules/payment/mollie_bancontact.php
+++ b/lang/german/modules/payment/mollie_bancontact.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_TITLE', 'Bancontact');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Möchten Sie Zahlungen via Banccontact akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_STATUS_DESC', 'Möchten Sie Zahlungen via Banccontact akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANCONTACT_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_banktransfer.php b/lang/german/modules/payment/mollie_banktransfer.php
index 21d1fc6e..e1a55a6a 100644
--- a/lang/german/modules/payment/mollie_banktransfer.php
+++ b/lang/german/modules/payment/mollie_banktransfer.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_TITLE', 'Bank transfer');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Möchten Sie Zahlungen via Bank transfer akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_STATUS_DESC', 'Möchten Sie Zahlungen via Bank transfer akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
-
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BANKTRANSFER_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_belfius.php b/lang/german/modules/payment/mollie_belfius.php
index f719817b..f847e81a 100644
--- a/lang/german/modules/payment/mollie_belfius.php
+++ b/lang/german/modules/payment/mollie_belfius.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_TITLE', 'Belfius Pay Button');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Möchten Sie Zahlungen via Belfius akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_STATUS_DESC', 'Möchten Sie Zahlungen via Belfius akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_BELFIUS_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_creditcard.php b/lang/german/modules/payment/mollie_creditcard.php
index a83fe877..8e844037 100644
--- a/lang/german/modules/payment/mollie_creditcard.php
+++ b/lang/german/modules/payment/mollie_creditcard.php
@@ -1,58 +1,59 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_TITLE', 'Credit card');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Möchten Sie Zahlungen via Credit card akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_STATUS_DESC', 'Möchten Sie Zahlungen via Credit card akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Mollie Components verwenden');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_TITLE', 'Mollie Components verwenden');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_COMPONENTS_STATUS_DESC', 'Read more about <a href="https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components" target="_blank">Mollie Components</a> and how it improves your conversion');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Ein-Klick-Zahlungen verwenden');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'Erfahren Sie mehr über <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">Ein-Klick-Zahlungen</a> und wie sie Ihre Umsatzquote steigern.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_TITLE', 'Ein-Klick-Zahlungen verwenden');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_STATUS_DESC', 'Erfahren Sie mehr über <a href="https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work" target="_blank">Ein-Klick-Zahlungen</a> und wie sie Ihre Umsatzquote steigern.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Bestätigungstext für Ein-Klick-Zahlungen');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Legen Sie ein Label für die Bestätigung für Ein-Klick-Zahlungen fest.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_TITLE', 'Bestätigungstext für Ein-Klick-Zahlungen');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_APPROVAL_TEXT_DESC', 'Legen Sie ein Label für die Bestätigung für Ein-Klick-Zahlungen fest.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Beschreibung für Ein-Klick-Zahlungen');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Legen Sie einen Text fest der angezeigt wird wenn Kunden die Ein-Klick-Zahlung wählen.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_TITLE', 'Beschreibung für Ein-Klick-Zahlungen');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SINGLE_CLICK_DESCRIPTION_DESC', 'Legen Sie einen Text fest der angezeigt wird wenn Kunden die Ein-Klick-Zahlung wählen.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
 
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_CREDITCARD_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_eps.php b/lang/german/modules/payment/mollie_eps.php
index 85e305b6..de85af06 100644
--- a/lang/german/modules/payment/mollie_eps.php
+++ b/lang/german/modules/payment/mollie_eps.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
-define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_TITLE', 'eps');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Möchten Sie Zahlungen via eps akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_STATUS_DESC', 'Möchten Sie Zahlungen via eps akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_EPS_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_giftcard.php b/lang/german/modules/payment/mollie_giftcard.php
index 481d4cd3..86f18c3d 100644
--- a/lang/german/modules/payment/mollie_giftcard.php
+++ b/lang/german/modules/payment/mollie_giftcard.php
@@ -1,50 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_TITLE', 'Gift cards');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Möchten Sie Zahlungen via Gift cards akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_STATUS_DESC', 'Möchten Sie Zahlungen via Gift cards akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
-
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIFTCARD_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_giropay.php b/lang/german/modules/payment/mollie_giropay.php
index 22bfb3be..03195bdf 100644
--- a/lang/german/modules/payment/mollie_giropay.php
+++ b/lang/german/modules/payment/mollie_giropay.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_TITLE', 'Giropay');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Möchten Sie Zahlungen via Giropay akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_STATUS_DESC', 'Möchten Sie Zahlungen via Giropay akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_GIROPAY_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_ideal.php b/lang/german/modules/payment/mollie_ideal.php
index 65ac4fea..62d20895 100644
--- a/lang/german/modules/payment/mollie_ideal.php
+++ b/lang/german/modules/payment/mollie_ideal.php
@@ -1,50 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_TITLE', 'iDEAL');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Möchten Sie Zahlungen via iDEAL akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_STATUS_DESC', 'Möchten Sie Zahlungen via iDEAL akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
-
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_IDEAL_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_kbc.php b/lang/german/modules/payment/mollie_kbc.php
index ebd08241..66404e65 100644
--- a/lang/german/modules/payment/mollie_kbc.php
+++ b/lang/german/modules/payment/mollie_kbc.php
@@ -1,49 +1,49 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
-define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_TITLE', 'KBC/CBC Payment Button');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Möchten Sie Zahlungen via KBC/CBC Payment Button akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_STATUS_DESC', 'Möchten Sie Zahlungen via KBC/CBC Payment Button akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', 'Issuer list style');
-define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_TITLE', 'Issuer list style');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KBC_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_klarnapaylater.php b/lang/german/modules/payment/mollie_klarnapaylater.php
index 1978ed35..3612f747 100644
--- a/lang/german/modules/payment/mollie_klarnapaylater.php
+++ b/lang/german/modules/payment/mollie_klarnapaylater.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_TITLE', 'Pay later');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Möchten Sie Zahlungen via Pay later akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_STATUS_DESC', 'Möchten Sie Zahlungen via Pay later akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage). <br><br>Bitte beachten Sie: Es ist nicht möglich, ein Ablaufdatum von mehr als 28 Tagen in der Zukunft zu verwenden, es sei denn, zwischen dem Händler und Klarna wurde ein anderes Maximum vereinbart.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage). <br><br>Bitte beachten Sie: Es ist nicht möglich, ein Ablaufdatum von mehr als 28 Tagen in der Zukunft zu verwenden, es sei denn, zwischen dem Händler und Klarna wurde ein anderes Maximum vereinbart.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYLATER_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
diff --git a/lang/german/modules/payment/mollie_klarnapaynow.php b/lang/german/modules/payment/mollie_klarnapaynow.php
index fc0134ff..30eb5f74 100644
--- a/lang/german/modules/payment/mollie_klarnapaynow.php
+++ b/lang/german/modules/payment/mollie_klarnapaynow.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Pay now.');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_TITLE', 'Pay now.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Möchten Sie Zahlungen via Pay now akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_STATUS_DESC', 'Möchten Sie Zahlungen via Pay now akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage). <br><br>Bitte beachten Sie: Es ist nicht möglich, ein Ablaufdatum von mehr als 28 Tagen in der Zukunft zu verwenden, es sei denn, zwischen dem Händler und Klarna wurde ein anderes Maximum vereinbart.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage). <br><br>Bitte beachten Sie: Es ist nicht möglich, ein Ablaufdatum von mehr als 28 Tagen in der Zukunft zu verwenden, es sei denn, zwischen dem Händler und Klarna wurde ein anderes Maximum vereinbart.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNAPAYNOW_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
diff --git a/lang/german/modules/payment/mollie_klarnasliceit.php b/lang/german/modules/payment/mollie_klarnasliceit.php
index a82043e1..6a28f82f 100644
--- a/lang/german/modules/payment/mollie_klarnasliceit.php
+++ b/lang/german/modules/payment/mollie_klarnasliceit.php
@@ -1,34 +1,34 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_TITLE', 'Slice it');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Möchten Sie Zahlungen via Slice it akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_STATUS_DESC', 'Möchten Sie Zahlungen via Slice it akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage). <br><br>Bitte beachten Sie: Es ist nicht möglich, ein Ablaufdatum von mehr als 28 Tagen in der Zukunft zu verwenden, es sei denn, zwischen dem Händler und Klarna wurde ein anderes Maximum vereinbart.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage). <br><br>Bitte beachten Sie: Es ist nicht möglich, ein Ablaufdatum von mehr als 28 Tagen in der Zukunft zu verwenden, es sei denn, zwischen dem Händler und Klarna wurde ein anderes Maximum vereinbart.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_KLARNASLICEIT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
diff --git a/lang/german/modules/payment/mollie_paypal.php b/lang/german/modules/payment/mollie_paypal.php
index ebdefabb..8254b082 100644
--- a/lang/german/modules/payment/mollie_paypal.php
+++ b/lang/german/modules/payment/mollie_paypal.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_TITLE', 'PayPal');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Möchten Sie Zahlungen via PayPal akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_STATUS_DESC', 'Möchten Sie Zahlungen via PayPal akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PAYPAL_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_przelewy24.php b/lang/german/modules/payment/mollie_przelewy24.php
index 568f357f..e7753bc8 100644
--- a/lang/german/modules/payment/mollie_przelewy24.php
+++ b/lang/german/modules/payment/mollie_przelewy24.php
@@ -1,46 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_TITLE', 'Przelewy24');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Möchten Sie Zahlungen via Przelewy24 akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_STATUS_DESC', 'Möchten Sie Zahlungen via Przelewy24 akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_PRZELEWY24_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/lang/german/modules/payment/mollie_sofort.php b/lang/german/modules/payment/mollie_sofort.php
index a5c51162..6dab7702 100644
--- a/lang/german/modules/payment/mollie_sofort.php
+++ b/lang/german/modules/payment/mollie_sofort.php
@@ -1,47 +1,46 @@
 <?php
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_TITLE', 'SOFORT Banking');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TEXT_DESCRIPTION', 'Nach dem Kontrollieren Ihrer Bestellung werden Sie zur Website des Zahlungsanbieters weitergeleitet, um den Einkauf abzuschließen.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Zahlungsmethode aktivieren');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Möchten Sie Zahlungen via SOFORT Banking akzeptieren?');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_TITLE', 'Zahlungsmethode aktivieren');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_STATUS_DESC', 'Möchten Sie Zahlungen via SOFORT Banking akzeptieren?');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Checkout-Name');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_TITLE', 'Checkout-Name');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_NAME_DESC', 'Bitte geben Sie den Namen an, der im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_TITLE', 'Checkout-Beschreibung');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_CHECKOUT_DESCRIPTION_DESC', 'Bitte geben Sie eine Beschreibung an, die im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_TITLE', 'Zahlungen in ausgewählte Länder erlauben');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ALLOWED_ZONES_DESC', 'Wählen Sie die Länder aus, in denen die Zahlungsmethode verfügbar sein wird. Wir keine ausgewählt, so ist die Zahlung für alle aktivierten Länder verfügbar.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Aufschlag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TITLE', 'Aufschlag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_DESC', 'Geben Sie die zusätzlichen Kosten für eine Zahlung in der Standardwährung ein. Bleibt dieses Feld leer, werden den Kunden keine zusätzlichen Kosten berechnet.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', 'API-Methode');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_TITLE', 'API-Methode');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_API_METHOD_DESC', '<b>Payment API</b><br>Verwenden Sie für Transaktionen die Payment API Plattform. <a href="https://docs.mollie.com/payments/overview" target="_blank">Mehr</a>.<br><br><b>Order API</b><br>Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. <a href="https://docs.mollie.com/orders/why-use-orders" target="_blank">Mehr</a>.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_TITLE', 'Logo');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_TITLE', '<span class="mollie_order_expires_title">Tage bis zum Ablauf</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_ORDER_EXPIRES_DESC', '<span class="mollie_order_expires_desc">Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_TITLE', '<span class="mollie_transaction_description_title">Transaktion Beschreibung</span>');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_TRANSACTION_DESCRIPTION_DESC', '<span class="mollie_transaction_description_desc">Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.</span>');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.');
 
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
-
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
-define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.');
 
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag');
+defined('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_SOFORT_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).');
diff --git a/system/classes/external/mollie/composer.json b/system/classes/external/mollie/composer.json
index d9f383b1..3f431b86 100644
--- a/system/classes/external/mollie/composer.json
+++ b/system/classes/external/mollie/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mollie/gambio",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "require": {
     "php": ">=5.4",
     "mollie/integration-core": "1.3.7"
diff --git a/system/classes/external/mollie/composer.lock b/system/classes/external/mollie/composer.lock
index b4c51666..fa8f7b58 100644
--- a/system/classes/external/mollie/composer.lock
+++ b/system/classes/external/mollie/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cf20fe4f9bf7aeb6f827a2bc94545b34",
+    "content-hash": "40909d06a659b52e95cb7fb0a6115656",
     "packages": [
         {
             "name": "mollie/integration-core",
@@ -58,5 +58,5 @@
         "php": ">=5.4"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/system/classes/external/mollie/vendor/composer/ClassLoader.php b/system/classes/external/mollie/vendor/composer/ClassLoader.php
index 6d0c3f2d..afef3fa2 100644
--- a/system/classes/external/mollie/vendor/composer/ClassLoader.php
+++ b/system/classes/external/mollie/vendor/composer/ClassLoader.php
@@ -42,30 +42,75 @@
  */
 class ClassLoader
 {
+    /** @var ?string */
     private $vendorDir;
 
     // PSR-4
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var string[]
+     * @psalm-var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var bool[]
+     * @psalm-var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var ?string */
     private $apcuPrefix;
 
+    /**
+     * @var self[]
+     */
     private static $registeredLoaders = array();
 
+    /**
+     * @param ?string $vendorDir
+     */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
     }
 
+    /**
+     * @return string[]
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -75,28 +120,47 @@ public function getPrefixes()
         return array();
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -111,9 +175,11 @@ public function addClassMap(array $classMap)
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
@@ -156,11 +222,13 @@ public function add($prefix, $paths, $prepend = false)
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
@@ -204,8 +272,10 @@ public function addPsr4($prefix, $paths, $prepend = false)
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -220,10 +290,12 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -243,6 +315,8 @@ public function setPsr4($prefix, $paths)
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -265,6 +339,8 @@ public function getUseIncludePath()
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -285,6 +361,8 @@ public function isClassMapAuthoritative()
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -305,6 +383,8 @@ public function getApcuPrefix()
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
@@ -324,6 +404,8 @@ public function register($prepend = false)
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
@@ -403,6 +485,11 @@ public static function getRegisteredLoaders()
         return self::$registeredLoaders;
     }
 
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -474,6 +561,10 @@ private function findFileWithExtension($class, $ext)
  * Scope isolated include.
  *
  * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
  */
 function includeFile($file)
 {
diff --git a/system/classes/external/mollie/vendor/composer/InstalledVersions.php b/system/classes/external/mollie/vendor/composer/InstalledVersions.php
index b3a4e161..d50e0c9f 100644
--- a/system/classes/external/mollie/vendor/composer/InstalledVersions.php
+++ b/system/classes/external/mollie/vendor/composer/InstalledVersions.php
@@ -20,12 +20,25 @@
  *
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
- * To require it's presence, you can require `composer-runtime-api ^2.0`
+ * To require its presence, you can require `composer-runtime-api ^2.0`
  */
 class InstalledVersions
 {
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     */
     private static $installed;
+
+    /**
+     * @var bool|null
+     */
     private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     */
     private static $installedByVendor = array();
 
     /**
@@ -228,7 +241,7 @@ public static function getInstallPath($packageName)
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}
+     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
      */
     public static function getRootPackage()
     {
@@ -242,7 +255,7 @@ public static function getRootPackage()
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}
+     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
      */
     public static function getRawData()
     {
@@ -265,7 +278,7 @@ public static function getRawData()
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     public static function getAllRawData()
     {
@@ -288,7 +301,7 @@ public static function getAllRawData()
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data
+     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
      */
     public static function reload($data)
     {
@@ -298,7 +311,7 @@ public static function reload($data)
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
+     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
     private static function getInstalled()
     {
diff --git a/system/classes/external/mollie/vendor/composer/installed.php b/system/classes/external/mollie/vendor/composer/installed.php
index 4eeaff50..92339a1f 100644
--- a/system/classes/external/mollie/vendor/composer/installed.php
+++ b/system/classes/external/mollie/vendor/composer/installed.php
@@ -1,7 +1,7 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '0.1.15',
-        'version' => '0.1.15.0',
+        'pretty_version' => '0.1.16',
+        'version' => '0.1.16.0',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'mollie/gambio' => array(
-            'pretty_version' => '0.1.15',
-            'version' => '0.1.15.0',
+            'pretty_version' => '0.1.16',
+            'version' => '0.1.16.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),