diff --git a/classes/AdminTab.php b/classes/AdminTab.php index f3a3a9bc0..82d5bba52 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -1915,7 +1915,7 @@ abstract class AdminTabCore echo (isset($field['desc']) ? '

'.$field['desc'].'

' : ''); // Is this field invisible in current shop context ? - echo ($isInvisible) ? '

'.$this->l('You can\'t change the value of this configuration field in this shop context').'

' : ''; + echo ($isInvisible) ? '

'.$this->l('You cannot change the value of this configuration field in this shop context').'

' : ''; echo ''; } diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php index 4a512992c..220043cbd 100644 --- a/classes/LocalizationPack.php +++ b/classes/LocalizationPack.php @@ -183,7 +183,7 @@ class LocalizationPackCore if (!$trg->save()) { - $this->_errors[] = Tools::displayError('This tax rule can\'t be saved.'); + $this->_errors[] = Tools::displayError('This tax rule cannot be saved.'); return false; } diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index bc90ad2aa..e94ef9696 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -498,7 +498,7 @@ abstract class PaymentModuleCore extends Module } else { - $error = Tools::displayError('Cart can\'t be loaded or an order has already been placed using this cart'); + $error = Tools::displayError('Cart cannot be loaded or an order has already been placed using this cart'); Logger::addLog($error, 4, '0000001', 'Cart', intval($cart->id)); die($error); } diff --git a/modules/carriercompare/carriercompare.php b/modules/carriercompare/carriercompare.php index 71cdb18e5..ab69cb0b0 100755 --- a/modules/carriercompare/carriercompare.php +++ b/modules/carriercompare/carriercompare.php @@ -206,7 +206,7 @@ class CarrierCompare extends Module $this->context->cookie->postcode = $zipcode; $this->context->cart->id_carrier = $id_carrier; if (!$this->context->cart->update()) - return array($this->l('Can\'t update the cart')); + return array($this->l('Cannot update the cart')); return array(); } diff --git a/themes/default/lang/de.php b/themes/default/lang/de.php index 7321e8dd2..ca4456b81 100644 --- a/themes/default/lang/de.php +++ b/themes/default/lang/de.php @@ -353,7 +353,7 @@ $_LANG['order-detail_cb5e100e5a9a3e7f6d1fd97512215282'] = 'Fehler'; $_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Nachricht hinzufügen:'; $_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'Wenn Sie uns eine Nachricht zu Ihrer Bestellung hinterlassen möchten, tragen Sie sie bitte hier ein.'; $_LANG['order-detail_94966d90747b97d1f0f206c98a8b1ac3'] = 'Absenden'; -$_LANG['order-detail_a9979df9e349275e2d86f7af03e24d14'] = 'Sie können keine Waren-Rücksendung auf einem Gastkonto vornehmen.'; +$_LANG['order-detail_590c804f5318db099cc7369a0a4b3823'] = 'Sie können keine Waren-Rücksendung auf einem Gastkonto vornehmen.'; $_LANG['order-follow_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mein Konto'; $_LANG['order-follow_bfc23574a242be4531bcb29877ac1d8a'] = 'Produkt-Rücksendung'; $_LANG['order-follow_2e99578f8bd14385bc5bcc2608e7b938'] = 'Sie haben nicht genügend Produkte, um mit dieser Menge eine neue Rücksendung anzulegen!'; diff --git a/themes/default/lang/en.php b/themes/default/lang/en.php index caceb73ac..39be70b06 100644 --- a/themes/default/lang/en.php +++ b/themes/default/lang/en.php @@ -353,7 +353,7 @@ $_LANG['order-detail_cb5e100e5a9a3e7f6d1fd97512215282'] = 'error'; $_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Add a message:'; $_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'If you would like to add a comment about your order, please write it below.'; $_LANG['order-detail_94966d90747b97d1f0f206c98a8b1ac3'] = 'Send'; -$_LANG['order-detail_a9979df9e349275e2d86f7af03e24d14'] = 'You cannot make a merchandise return with a guest account'; +$_LANG['order-detail_590c804f5318db099cc7369a0a4b3823'] = 'You cannot make a merchandise return with a guest account'; $_LANG['order-follow_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account'; $_LANG['order-follow_bfc23574a242be4531bcb29877ac1d8a'] = 'Return Merchandise Authorization (RMA)'; $_LANG['order-follow_2e99578f8bd14385bc5bcc2608e7b938'] = 'You do not have enough products to request another merchandise return.'; diff --git a/themes/default/lang/es.php b/themes/default/lang/es.php index 9272c51ae..6d6504ee6 100644 --- a/themes/default/lang/es.php +++ b/themes/default/lang/es.php @@ -353,7 +353,7 @@ $_LANG['order-detail_cb5e100e5a9a3e7f6d1fd97512215282'] = 'error'; $_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Añadir un mensaje:'; $_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'Si desea dejarnos un comentario acerca de su pedido, por favor escríbalo a continuación.'; $_LANG['order-detail_94966d90747b97d1f0f206c98a8b1ac3'] = 'Enviar'; -$_LANG['order-detail_a9979df9e349275e2d86f7af03e24d14'] = 'No es posible hacer una devolución de mercancía con una cuenta invitado'; +$_LANG['order-detail_590c804f5318db099cc7369a0a4b3823'] = 'No es posible hacer una devolución de mercancía con una cuenta invitado'; $_LANG['order-follow_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mi cuenta'; $_LANG['order-follow_bfc23574a242be4531bcb29877ac1d8a'] = 'Devolución de productos'; $_LANG['order-follow_2e99578f8bd14385bc5bcc2608e7b938'] = 'No tiene suficientes productos para solicitar otra devolución de mercancías.'; diff --git a/themes/default/lang/fr.php b/themes/default/lang/fr.php index 09faf21da..0eab0ada4 100644 --- a/themes/default/lang/fr.php +++ b/themes/default/lang/fr.php @@ -403,7 +403,7 @@ $_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Ajouter un message :' $_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'Si vous voulez nous laisser un message à propos de votre commande, merci de l\'écrire ici.'; $_LANG['order-detail_7bc873cba11f035df692c3549366c722'] = '- Choisissez -'; $_LANG['order-detail_94966d90747b97d1f0f206c98a8b1ac3'] = 'Envoyer'; -$_LANG['order-detail_a9979df9e349275e2d86f7af03e24d14'] = 'Vous ne pouvez pas faire de retour de marchandise avec un compte invité'; +$_LANG['order-detail_590c804f5318db099cc7369a0a4b3823'] = 'Vous ne pouvez pas faire de retour de marchandise avec un compte invité'; $_LANG['order-follow_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte'; $_LANG['order-follow_bfc23574a242be4531bcb29877ac1d8a'] = 'Retour produits'; $_LANG['order-follow_2e99578f8bd14385bc5bcc2608e7b938'] = 'Vous n\'avez pas assez de produits pour générer un autre retour avec cette quantité !'; diff --git a/themes/default/lang/it.php b/themes/default/lang/it.php index dcd2a462a..6c1d74a80 100755 --- a/themes/default/lang/it.php +++ b/themes/default/lang/it.php @@ -353,7 +353,7 @@ $_LANG['order-detail_cb5e100e5a9a3e7f6d1fd97512215282'] = 'errore'; $_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Aggiungi un messaggio:'; $_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'Se vuoi aggiungere un commento riguardo al tuo ordine, scrivilo qui sotto.'; $_LANG['order-detail_94966d90747b97d1f0f206c98a8b1ac3'] = 'Invia'; -$_LANG['order-detail_a9979df9e349275e2d86f7af03e24d14'] = 'Non è possibile effettuare una restituzione di merce con un account ospite'; +$_LANG['order-detail_590c804f5318db099cc7369a0a4b3823'] = 'Non è possibile effettuare una restituzione di merce con un account ospite'; $_LANG['order-follow_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Il mio account'; $_LANG['order-follow_bfc23574a242be4531bcb29877ac1d8a'] = 'Autorizzazione resi merci'; $_LANG['order-follow_2e99578f8bd14385bc5bcc2608e7b938'] = 'Non hai prodotti sufficienti per chiedere un\'altra restituzione della merce.'; diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl index 94b3bd011..577bb8097 100644 --- a/themes/default/order-detail.tpl +++ b/themes/default/order-detail.tpl @@ -430,5 +430,5 @@

{else} -

 {l s='You can\'t make a merchandise return with a guest account'}

+

 {l s='You cannott make a merchandise return with a guest account'}

{/if} \ No newline at end of file diff --git a/translations/de/errors.php b/translations/de/errors.php index 3d213ca9c..bb133e7e1 100644 --- a/translations/de/errors.php +++ b/translations/de/errors.php @@ -148,7 +148,7 @@ $_ERRORS['beab08f29e61dd1802f7fcd23b41931d'] = 'Kann nicht aktualisiert werden I $_ERRORS['115baa3a6f65bb35be1ee1dde195a51c'] = 'Kann die zugeordneten Länder nicht aktualisieren'; $_ERRORS['14b8bac6e5716ca19c21b71ba132a2cc'] = 'Kann das Bild nicht schreiben '; $_ERRORS['188661dbe5cab3735c98dab758fa288e'] = 'Kann mit no-picture-Bild nicht in schreiben'; -$_ERRORS['a0db299e2909bf7fc86ed75bf66f9079'] = 'Kann nicht geladen werden, oder eine Bestellung ist bereits mit diesem Warenkorb aufgenommen worden'; +$_ERRORS['PaymentModule43423b4056880b08f2c9aa50d8670531'] = 'Kann nicht geladen werden, oder eine Bestellung ist bereits mit diesem Warenkorb aufgenommen worden'; $_ERRORS['3862efce9647cdbdb704436703a7863a'] = 'Diese Kategorie kann nicht hierher verschoben werden'; $_ERRORS['07769d17f9ccd3b90a8d5cb54a5c5609'] = 'Kategorie existiert nicht'; $_ERRORS['1976d7f704de389d9fe064e08ea35b2d'] = 'Spalte'; @@ -441,7 +441,7 @@ $_ERRORS['edd62dfcf50e7a6dea932ca1eca167b2'] = 'Diese Eigenschaft wird nicht in $_ERRORS['28c993bca90a1f5a4510d3a21ca2b705'] = 'Dieser Staat wird genutzt'; $_ERRORS['1b7e32fd6ed56569d8557947ccf095a6'] = 'Dieser Staat befindet sich nicht in diesem Land'; $_ERRORS['5af5f631f774a71445e3028253874394'] = 'Dieses Geschäft ist nicht Ihre neue Bestellung angenommen.'; -$_ERRORS['e944542bcbbbd7851918e6e7e81b4d8a'] = 'Diese Steuerregel kann nicht gespeichert werden.'; +$_ERRORS['LocalizationPack36f9983aadfde9d77db0d357abe6e85e'] = 'Diese Steuerregel kann nicht gespeichert werden.'; $_ERRORS['7df7cede74e46f3db6b15097bc0def56'] = 'Dieser Gutschein kann nur folgender Devise verwendet werden:'; $_ERRORS['f31c6bd22c7b96ca912b03f72ba9da24'] = 'dieser Ermäßigungsgutschein wurde bereits verwendet oder ist deaktiviert'; $_ERRORS['be0caf91a9818eb72c4b365ac169fba8'] = 'Dieser Ermäßigungsgutschein ist abgelaufen (Nutzungslimit erreicht)'; diff --git a/translations/en/errors.php b/translations/en/errors.php index e20338185..72d98ab29 100644 --- a/translations/en/errors.php +++ b/translations/en/errors.php @@ -148,7 +148,7 @@ $_ERRORS['beab08f29e61dd1802f7fcd23b41931d'] = 'Cannot update information'; $_ERRORS['115baa3a6f65bb35be1ee1dde195a51c'] = 'Cannot update the associated country: '; $_ERRORS['14b8bac6e5716ca19c21b71ba132a2cc'] = 'Cannot write'; $_ERRORS['188661dbe5cab3735c98dab758fa288e'] = 'Cannot write \"No picture\" image to'; -$_ERRORS['a0db299e2909bf7fc86ed75bf66f9079'] = 'Cart cannot be loaded or an order has already been placed using this cart. Try to log-out or delete your web browser cookies.'; +$_ERRORS['PaymentModule43423b4056880b08f2c9aa50d8670531'] = 'Cart cannot be loaded or an order has already been placed using this cart. Try to log-out or delete your web browser cookies.'; $_ERRORS['3862efce9647cdbdb704436703a7863a'] = 'Category cannot be moved here'; $_ERRORS['07769d17f9ccd3b90a8d5cb54a5c5609'] = 'Category does not exist'; $_ERRORS['1976d7f704de389d9fe064e08ea35b2d'] = 'Column'; @@ -441,7 +441,7 @@ $_ERRORS['edd62dfcf50e7a6dea932ca1eca167b2'] = 'This property does not exist in $_ERRORS['28c993bca90a1f5a4510d3a21ca2b705'] = 'This state is currently in use'; $_ERRORS['1b7e32fd6ed56569d8557947ccf095a6'] = 'This state is not in this country.'; $_ERRORS['5af5f631f774a71445e3028253874394'] = 'This store has not accepted your new order.'; -$_ERRORS['e944542bcbbbd7851918e6e7e81b4d8a'] = 'This tax rule cannot be saved.'; +$_ERRORS['LocalizationPack36f9983aadfde9d77db0d357abe6e85e'] = 'This tax rule cannot be saved.'; $_ERRORS['7df7cede74e46f3db6b15097bc0def56'] = 'This voucher can only be used in the following currency:'; $_ERRORS['f31c6bd22c7b96ca912b03f72ba9da24'] = 'This voucher has already been used or is disabled.'; $_ERRORS['be0caf91a9818eb72c4b365ac169fba8'] = 'This voucher has expired (usage limit reached).'; diff --git a/translations/es/errors.php b/translations/es/errors.php index 9f1456716..4759a2067 100644 --- a/translations/es/errors.php +++ b/translations/es/errors.php @@ -148,7 +148,7 @@ $_ERRORS['beab08f29e61dd1802f7fcd23b41931d'] = 'Imposible actualizar la informac $_ERRORS['115baa3a6f65bb35be1ee1dde195a51c'] = 'Imposible actualizar las asociaciones de países'; $_ERRORS['14b8bac6e5716ca19c21b71ba132a2cc'] = 'No se puede escribir la imagen'; $_ERRORS['188661dbe5cab3735c98dab758fa288e'] = 'Imposible generar la imagen \"no hay imagen\" en'; -$_ERRORS['a0db299e2909bf7fc86ed75bf66f9079'] = 'El carrito no puede cargarse o ya hay un pedido en el mismo'; +$_ERRORS['PaymentModule43423b4056880b08f2c9aa50d8670531'] = 'El carrito no puede cargarse o ya hay un pedido en el mismo'; $_ERRORS['3862efce9647cdbdb704436703a7863a'] = 'Imposible mover la categoría aquí'; $_ERRORS['07769d17f9ccd3b90a8d5cb54a5c5609'] = 'La categoría no existe'; $_ERRORS['1976d7f704de389d9fe064e08ea35b2d'] = 'Columna'; @@ -441,7 +441,7 @@ $_ERRORS['edd62dfcf50e7a6dea932ca1eca167b2'] = 'Esta propiedad no existe en la c $_ERRORS['28c993bca90a1f5a4510d3a21ca2b705'] = 'Este estado está actualmente en uso'; $_ERRORS['1b7e32fd6ed56569d8557947ccf095a6'] = 'Este estado no se encuentra en este país'; $_ERRORS['5af5f631f774a71445e3028253874394'] = 'Esta tienda no ha aceptado su nuevo pedido'; -$_ERRORS['e944542bcbbbd7851918e6e7e81b4d8a'] = 'Esta regla fiscal no se puede guardar.'; +$_ERRORS['LocalizationPack36f9983aadfde9d77db0d357abe6e85e'] = 'Esta regla fiscal no se puede guardar.'; $_ERRORS['7df7cede74e46f3db6b15097bc0def56'] = 'este vale de descuento sólo puede utilizarse en esta divisa:'; $_ERRORS['f31c6bd22c7b96ca912b03f72ba9da24'] = 'este vale de descuento ya fue utilizado o está desactivado'; $_ERRORS['be0caf91a9818eb72c4b365ac169fba8'] = 'este vale de descuento ha caducado (fecha de utilización sobrepasada)'; diff --git a/translations/fr/errors.php b/translations/fr/errors.php index 1f38b0133..4ac037b74 100644 --- a/translations/fr/errors.php +++ b/translations/fr/errors.php @@ -93,7 +93,7 @@ $_ERRORS['e970d66f1c952edf7a4e5dfcf3e18958'] = 'Une erreur est survenue lors de $_ERRORS['28c39342f22a394f233ec0cba0ecfa02'] = 'Une erreur est survenue pendant la récupération d\'un état'; $_ERRORS['37c73343e4118943bc088bb4ad94a56c'] = 'Propriété de taxe invalide.'; $_ERRORS['42a8c33bd3e937c419378c5a965e65ac'] = 'Une erreur est survenue lors de l\'import d\'une taxe'; -$_ERRORS['e944542bcbbbd7851918e6e7e81b4d8a'] = 'Cette règle ne peut être sauvegardée.'; +$_ERRORS['LocalizationPack36f9983aadfde9d77db0d357abe6e85e'] = 'Cette règle ne peut être sauvegardée.'; $_ERRORS['a258f8e051c4e2508a6cc3ecd39d2807'] = 'Impossible d\'analyser les monnaies du flux XML.'; $_ERRORS['19f29a24f0ccb9b96b37182473b27d63'] = 'Propriété de devise invalide'; $_ERRORS['bdc3ce1a2e9e6d8ab5bd0dd31c1a03fe'] = 'Une erreur est survenue lors de l\'import d\'une devise'; @@ -136,7 +136,7 @@ $_ERRORS['b9c1228a8e8c3412befae5d854508114'] = 'Une commande a déjà été pass $_ERRORS['d704b4ce33aa79cae671701d42136c15'] = 'Attention : La clé de sécurité est vide, vérifiez votre compte de paiement avant validation'; $_ERRORS['1d744a9ad1dac20645cfc4a36b77323b'] = 'image(s)'; $_ERRORS['b08d3867be98e6fff3233cd40ab8134a'] = 'La création de la commande a échoué'; -$_ERRORS['a0db299e2909bf7fc86ed75bf66f9079'] = 'Le panier ne peut pas être chargé ou une commande a déjà été placé en utilisant ce panier'; +$_ERRORS['PaymentModule43423b4056880b08f2c9aa50d8670531'] = 'Le panier ne peut pas être chargé ou une commande a déjà été placé en utilisant ce panier'; $_ERRORS['f996dce5bdfb1b1094e41cf996c5fdae'] = 'merci de spécifier l\'URL du module'; $_ERRORS['a478ec266116342449ae1705c79d5cc2'] = 'type d\'archive inconnu'; $_ERRORS['f9c7939a8397ee022fefee2bdb3407af'] = 'URL invalide'; diff --git a/translations/it/errors.php b/translations/it/errors.php index 563a0923e..285a81c9a 100644 --- a/translations/it/errors.php +++ b/translations/it/errors.php @@ -148,7 +148,7 @@ $_ERRORS['beab08f29e61dd1802f7fcd23b41931d'] = 'Non è possibile aggiornare le i $_ERRORS['115baa3a6f65bb35be1ee1dde195a51c'] = 'Impossibile aggiornare le nazioni associate.'; $_ERRORS['14b8bac6e5716ca19c21b71ba132a2cc'] = 'Impossibile scrivere l\'immagine'; $_ERRORS['188661dbe5cab3735c98dab758fa288e'] = 'Impossibile generare l\'immagine \"nessuna immagine\" in'; -$_ERRORS['a0db299e2909bf7fc86ed75bf66f9079'] = 'Il carrello non può essere caricato o un ordine è già stato eseguito usando questo carrello'; +$_ERRORS['PaymentModule43423b4056880b08f2c9aa50d8670531'] = 'Il carrello non può essere caricato o un ordine è già stato eseguito usando questo carrello'; $_ERRORS['3862efce9647cdbdb704436703a7863a'] = 'Questa categoria non può essere spostata qui'; $_ERRORS['07769d17f9ccd3b90a8d5cb54a5c5609'] = 'Categoria non esiste'; $_ERRORS['1976d7f704de389d9fe064e08ea35b2d'] = 'Colonna'; @@ -441,7 +441,7 @@ $_ERRORS['edd62dfcf50e7a6dea932ca1eca167b2'] = 'Questa proprietà non esiste nel $_ERRORS['28c993bca90a1f5a4510d3a21ca2b705'] = 'Questo stato è utilizzato'; $_ERRORS['1b7e32fd6ed56569d8557947ccf095a6'] = 'Questa stato non è in questa nazione'; $_ERRORS['5af5f631f774a71445e3028253874394'] = 'Questo negozio non ha accettato il nuovo ordine.'; -$_ERRORS['e944542bcbbbd7851918e6e7e81b4d8a'] = 'Questa regola fiscale non può essere salvata.'; +$_ERRORS['LocalizationPack36f9983aadfde9d77db0d357abe6e85e'] = 'Questa regola fiscale non può essere salvata.'; $_ERRORS['7df7cede74e46f3db6b15097bc0def56'] = 'questo buono può essere utilizzato solo in questa valuta:'; $_ERRORS['f31c6bd22c7b96ca912b03f72ba9da24'] = 'questo buono sconto è già stato utilizzato o è disattivato'; $_ERRORS['be0caf91a9818eb72c4b365ac169fba8'] = 'questo buono sconto è scaduto (limite d\'uso raggiunto)';