diff --git a/modules/bankwire/translations/es.php b/modules/bankwire/translations/es.php index 239dfb230..018ec9352 100644 --- a/modules/bankwire/translations/es.php +++ b/modules/bankwire/translations/es.php @@ -38,15 +38,12 @@ $_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccd $_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Otros modos de pago'; $_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Pago por transferencia bancaria'; $_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Pago por transferencia bancaria (el proceso llevará más tiempo)'; -$_MODULE['<{bankwire}prestashop>payment_return_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Su pedido'; -$_MODULE['<{bankwire}prestashop>payment_return_75fbf512d744977d62599cc3f0ae2bb4'] = 'está completo.'; +$_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Su pedido %s está completo.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'por favor, háganos una transferencia por:'; $_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'un importe de'; $_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'al propietario de la cuenta'; $_MODULE['<{bankwire}prestashop>payment_return_de6d813f05e3916a86b89bd8b1a8a489'] = 'con los siguientes datos'; $_MODULE['<{bankwire}prestashop>payment_return_619b26a60df1af3649d2e8920a7949cd'] = 'a este banco'; -$_MODULE['<{bankwire}prestashop>payment_return_dd765b42bd8a2631e8e7b9a9af1c590f'] = 'No se olvide añadir su pedido #'; -$_MODULE['<{bankwire}prestashop>payment_return_4460fcb45ad7a6a61c95293eb611da12'] = 'en el objeto de su transferencia'; $_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Le hemos enviado un email con esta información.'; $_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Su pedido será enviado próximamente, en cuanto recibamos su pago.'; $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Para cualquier duda, por favor contacte con nosotros'; diff --git a/modules/bankwire/translations/fr.php b/modules/bankwire/translations/fr.php index c3705b36b..5f87e532d 100644 --- a/modules/bankwire/translations/fr.php +++ b/modules/bankwire/translations/fr.php @@ -38,16 +38,14 @@ $_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccd $_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Autres moyens de paiement'; $_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire'; $_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)'; -$_MODULE['<{bankwire}prestashop>payment_return_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Votre commande sur'; -$_MODULE['<{bankwire}prestashop>payment_return_75fbf512d744977d62599cc3f0ae2bb4'] = 'a bien été enregistrée.'; +$_MODULE['<{bankwire}prestashop>payment_return_88526efe38fd18179a127024aba8c1d7'] = 'Votre commande sur %s a bien été enregistrée.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'Veuillez nous envoyer un virement bancaire avec :'; $_MODULE['<{bankwire}prestashop>payment_return_a35abd2d31d9e1da82599bc67e166506'] = 'un montant de'; $_MODULE['<{bankwire}prestashop>payment_return_c51326a2ac458845d579a82a92f111f0'] = 'à l\'ordre de'; $_MODULE['<{bankwire}prestashop>payment_return_de6d813f05e3916a86b89bd8b1a8a489'] = 'suivant ces détails'; $_MODULE['<{bankwire}prestashop>payment_return_619b26a60df1af3649d2e8920a7949cd'] = 'à cette banque'; -$_MODULE['<{bankwire}prestashop>payment_return_dd765b42bd8a2631e8e7b9a9af1c590f'] = 'N\'oubliez pas d\'indiquer votre numéro de commande'; -$_MODULE['<{bankwire}prestashop>payment_return_4460fcb45ad7a6a61c95293eb611da12'] = 'dans le sujet de votre virement'; -$_MODULE['<{bankwire}prestashop>payment_return_08b63acd68117efc30b7072cbeedfb81'] = 'N\'oubliez pas d\'indiquer votre référence de commande'; +$_MODULE['<{bankwire}prestashop>payment_return_63fb3f7c94ee5d8027bf599885de279d'] = 'N\'oubliez pas d\'indiquer votre numéro de commande n°%d dans le sujet de votre virement.'; +$_MODULE['<{bankwire}prestashop>payment_return_1faa25b80a8d31e5ef25a78d3336606d'] = 'N\'oubliez pas d\'indiquer votre référence de commande %s dans le sujet de votre virement.'; $_MODULE['<{bankwire}prestashop>payment_return_13f4ac6dc75b5829499cb9cf8b733071'] = 'Un e-mail contenant ces informations vous a été envoyé.'; $_MODULE['<{bankwire}prestashop>payment_return_c4457a9f2f20e39386008bbb2cd3a78f'] = 'Votre commande sera expédiée dès réception de votre virement.'; $_MODULE['<{bankwire}prestashop>payment_return_0db71da7150c27142eef9d22b843b4a9'] = 'Pour toute question ou information complémentaire, veuillez contacter notre'; diff --git a/modules/bankwire/views/templates/hook/payment_return.tpl b/modules/bankwire/views/templates/hook/payment_return.tpl index 1a1ad1731..4695d29b8 100644 --- a/modules/bankwire/views/templates/hook/payment_return.tpl +++ b/modules/bankwire/views/templates/hook/payment_return.tpl @@ -25,7 +25,7 @@ *} {if $status == 'ok'} -

{l s='Your order on' mod='bankwire'} {$shop_name} {l s='is complete.' mod='bankwire'} +

{l s='Your order on %s is complete.' sprintf=$shop_name mod='bankwire'}

{l s='Please send us a bank wire with:' mod='bankwire'}

- {l s='an amount of' mod='bankwire'} {$total_to_pay} @@ -33,9 +33,9 @@

- {l s='with these details' mod='bankwire'} {if $bankwireDetails}{$bankwireDetails}{else}___________{/if}

- {l s='to this bank' mod='bankwire'} {if $bankwireAddress}{$bankwireAddress}{else}___________{/if} {if !isset($reference)} -

- {l s='Do not forget to insert your order number #' mod='bankwire'} {$id_order} {l s='in the subject of your bank wire' mod='bankwire'} +

- {l s='Do not forget to insert your order number #%d in the subject of your bank wire' sprintf=$id_order mod='bankwire'} {else} -

- {l s='Do not forget to insert your order reference' mod='bankwire'} {$reference} {l s='in the subject of your bank wire' mod='bankwire'} +

- {l s='Do not forget to insert your order reference %s in the subject of your bank wire.' sprintf=$reference mod='bankwire'} {/if}

{l s='An e-mail has been sent to you with this information.' mod='bankwire'}

{l s='Your order will be sent as soon as we receive your settlement.' mod='bankwire'}

{l s='For any questions or for further information, please contact our' mod='bankwire'} {l s='customer support' mod='bankwire'}. diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 7990dbaf4..ad5a71a3e 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -92,7 +92,7 @@ var img_dir = '{$img_dir}'; {$customization.quantity}x{if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)} {$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|escape:html:'UTF-8'|replace:"
":" "|truncate:28} {else} - {l s='Customization #' mod='blockcart'}{$id_customization|intval}{l s=':' mod='blockcart'} + {l s='Customization #%d:' sprintf=$id_customization|intval mod='blockcart'} {/if} {/foreach} diff --git a/modules/blockcart/translations/es.php b/modules/blockcart/translations/es.php index ef240548d..0c9f3d2ba 100644 --- a/modules/blockcart/translations/es.php +++ b/modules/blockcart/translations/es.php @@ -20,7 +20,7 @@ $_MODULE['<{blockcart}prestashop>blockcart_86024cad1e83101d97359d7351051156'] = $_MODULE['<{blockcart}prestashop>blockcart_f5bf48aa40cad7891eb709fcf1fde128'] = 'producto'; $_MODULE['<{blockcart}prestashop>blockcart_9e65b51e82f2a9b9f72ebe3e083582bb'] = '(vacío)'; $_MODULE['<{blockcart}prestashop>blockcart_4b7d496eedb665d0b5f589f2f874e7cb'] = 'Detalle del producto'; -$_MODULE['<{blockcart}prestashop>blockcart_853ae90f0351324bd73ea615e6487517'] = ':'; +$_MODULE['<{blockcart}prestashop>blockcart_3d9e3bae9905a12dae384918ed117a26'] = 'Personalización n°%d:'; $_MODULE['<{blockcart}prestashop>blockcart_09dc02ecbb078868a3a86dded030076d'] = 'Sin producto'; $_MODULE['<{blockcart}prestashop>blockcart_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Transporte'; $_MODULE['<{blockcart}prestashop>blockcart_ba794350deb07c0c96fe73bd12239059'] = 'Embalaje'; diff --git a/modules/blockcart/translations/fr.php b/modules/blockcart/translations/fr.php index 37a0e310f..9b4e1ee29 100644 --- a/modules/blockcart/translations/fr.php +++ b/modules/blockcart/translations/fr.php @@ -12,7 +12,7 @@ $_MODULE['<{blockcart}prestashop>blockcart_00d23a76e43b46dae9ec7aa9dcbebb32'] = $_MODULE['<{blockcart}prestashop>blockcart_b9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé'; $_MODULE['<{blockcart}prestashop>blockcart_dba281afb9a38e654ea9dab4cd6cb0ca'] = 'Activer le mode Ajax du panier (compatible avec le thème par défaut)'; $_MODULE['<{blockcart}prestashop>blockcart_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer'; -$_MODULE['<{blockcart}prestashop>blockcart_20351b3328c35ab617549920f5cb4939'] = 'Personnalisation '; +$_MODULE['<{blockcart}prestashop>blockcart_20351b3328c35ab617549920f5cb4939'] = 'Personnalisation n°'; $_MODULE['<{blockcart}prestashop>blockcart_ed6e9a09a111035684bb23682561e12d'] = 'supprimer cet article du panier'; $_MODULE['<{blockcart}prestashop>blockcart_c6995d6cc084c192bc2e742f052a5c74'] = 'Livraison gratuite !'; $_MODULE['<{blockcart}prestashop>blockcart_e7a6ca4e744870d455a57b644f696457'] = 'Gratuit !'; @@ -22,7 +22,7 @@ $_MODULE['<{blockcart}prestashop>blockcart_86024cad1e83101d97359d7351051156'] = $_MODULE['<{blockcart}prestashop>blockcart_f5bf48aa40cad7891eb709fcf1fde128'] = 'article'; $_MODULE['<{blockcart}prestashop>blockcart_9e65b51e82f2a9b9f72ebe3e083582bb'] = '(vide)'; $_MODULE['<{blockcart}prestashop>blockcart_4b7d496eedb665d0b5f589f2f874e7cb'] = 'Détails de l\'article'; -$_MODULE['<{blockcart}prestashop>blockcart_853ae90f0351324bd73ea615e6487517'] = ' :'; +$_MODULE['<{blockcart}prestashop>blockcart_3d9e3bae9905a12dae384918ed117a26'] = 'Personnalisation n°%d :'; $_MODULE['<{blockcart}prestashop>blockcart_09dc02ecbb078868a3a86dded030076d'] = 'Aucun produit'; $_MODULE['<{blockcart}prestashop>blockcart_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Expédition'; $_MODULE['<{blockcart}prestashop>blockcart_ba794350deb07c0c96fe73bd12239059'] = 'Emballage'; diff --git a/modules/blockcontact/blockcontact.tpl b/modules/blockcontact/blockcontact.tpl index 9895a2ae0..fd7e0859b 100644 --- a/modules/blockcontact/blockcontact.tpl +++ b/modules/blockcontact/blockcontact.tpl @@ -27,8 +27,8 @@

{l s='Contact us' mod='blockcontact'}

-

{l s='Our hotline' mod='blockcontact'}
{l s='is available 24/7' mod='blockcontact'}

+

{l s='Our hotline is available 24/7' mod='blockcontact'}

{if $telnumber != ''}

{l s='Phone:' mod='blockcontact'}{$telnumber}

{/if} - {if $email != ''}{l s='Contact' mod='blockcontact'}
{l s='our hotline' mod='blockcontact'}{/if} + {if $email != ''}{l s='Contact our hotline' mod='blockcontact'}{/if}
diff --git a/modules/blockcontact/translations/fr.php b/modules/blockcontact/translations/fr.php index 327093548..d47a36cf8 100644 --- a/modules/blockcontact/translations/fr.php +++ b/modules/blockcontact/translations/fr.php @@ -9,8 +9,6 @@ $_MODULE['<{blockcontact}prestashop>blockcontact_17870f54a180e69e60e84125f805db6 $_MODULE['<{blockcontact}prestashop>blockcontact_6a1e265f92087bb6dd18194833fe946b'] = 'E-mail :'; $_MODULE['<{blockcontact}prestashop>blockcontact_b17f3f4dcf653a5776792498a9b44d6a'] = 'Mettre à jour les réglages'; $_MODULE['<{blockcontact}prestashop>blockcontact_02d4482d332e1aef3437cd61c9bcc624'] = 'Contactez-nous'; -$_MODULE['<{blockcontact}prestashop>blockcontact_6e6a51212bd633f9901a22cea27194d8'] = 'Notre service client'; -$_MODULE['<{blockcontact}prestashop>blockcontact_0410dfe3c18ee59b251102c205ceca34'] = 'est disponible 24h/24, 7j/7'; +$_MODULE['<{blockcontact}prestashop>blockcontact_8b1f7be76996ad6911a17592b9804e1b'] = 'Notre service client est disponible 24h/24, 7j/7'; $_MODULE['<{blockcontact}prestashop>blockcontact_673ae02fffb72f0fe68a66f096a01347'] = 'Tél. :'; -$_MODULE['<{blockcontact}prestashop>blockcontact_bbaff12800505b22a853e8b7f4eb6a22'] = 'Contacter'; -$_MODULE['<{blockcontact}prestashop>blockcontact_e9376117c97ae76d0eefdc3e1f4486e7'] = 'notre service client'; +$_MODULE['<{blockcontact}prestashop>blockcontact_e6d0e56415c30a59658fb34ef5d7be35'] = 'Contacter notre service client'; diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 95c3e6f51..f2a5c9fe1 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -1747,7 +1747,7 @@ class BlockLayered extends Module + onclick="return confirm(\''.addslashes(sprintf($this->l('Delete filter template #%d?'), (int)$filters_template['id_layered_filter'])).'\');"> '; @@ -2099,7 +2099,7 @@ class BlockLayered extends Module

'.$this->l('Step 3/3 - Name your template').'

'.$this->l('Template name:').' ('.$this->l('only as a reminder').')

'.$this->l('No filters selected, the blocklayered will be disable for the categories seleted.').'

@@ -3633,7 +3633,7 @@ class BlockLayered extends Module - '.$this->l('Attribute group:').' '.$attribute_group['name'].' ('.(int)$attribute_group['n'].' '.($attribute_group['n'] > 1 ? $this->l('attributes') : $this->l('attribute')).')'. + '.($attribute_group['n'] > 1 ? sprintf($this->l('Attribute group: %1$s (%2$d attributes)'), $attribute_group['name'], $attribute_group['n']) : sprintf($this->l('Attribute group: %1$s (%2$d attribute)'), $attribute_group['name'], $attribute_group['n'])).')'. ($attribute_group['is_color_group'] ? ' ' : '').' - '.$this->l('Feature:').' '.$feature['name'].' ('.(int)$feature['n'].' '.($feature['n'] > 1 ? $this->l('values') : $this->l('value')).') + '.($feature['n'] > 1 ? sprintf($this->l('Feature: %1$s (%2$d values)'), $feature['name'], $feature['n']) : sprintf($this->l('Feature: %1$s (%2$d value)'), $feature['name'], $feature['n'])).') %
'.$this->l('day(s)').'
-

'.$this->l('Next process will send:').' '.(int)($n1).' '.($n1 > 1 ? $this->l('e-mails') : $this->l('e-mail')).'

+

'.($n1 > 1 ? sprintf($this->l('Next process will send: %d e-mails'), $n1) : sprintf($this->l('Next process will send: %d e-mail'), $n1)).'

2. '.$this->l('Re-order').'

'.$this->l('For each validated order, generate a discount and send it to the customer.').'

@@ -132,7 +132,7 @@ class Followup extends Module
%
'.$this->l('day(s)').'
-

'.$this->l('Next process will send:').' '.(int)($n2).' '.($n2 > 1 ? $this->l('e-mails') : $this->l('e-mail')).'

+

'.($n2 > 1 ? sprintf($this->l('Next process will send: %d e-mails'), $n2) : sprintf($this->l('Next process will send: %d e-mail'), $n2)).'

3. '.$this->l('Best customers').'

'.$this->l('For each customer raising a threshold, generate a discount and send it to the customer.').'

@@ -143,7 +143,7 @@ class Followup extends Module
'.($currency->format == 1 ? ' '.$currency->sign.' ' : '').' '.($currency->format == 2 ? ' '.$currency->sign : '').'
'.$this->l('day(s)').'
-

'.$this->l('Next process will send:').' '.(int)($n3).' '.($n3 > 1 ? $this->l('e-mails') : $this->l('e-mail')).'

+

'.($n3 > 1 ? sprintf($this->l('Next process will send: %d e-mails'), $n3) : sprintf($this->l('Next process will send: %d e-mail'), $n3)).'

4. '.$this->l('Bad customers').'

'.$this->l('For each customer who has already passed at least one order and with no orders since a given duration, generate a discount and send it to the customer.').'

@@ -154,7 +154,7 @@ class Followup extends Module
'.$this->l('day(s)').'
'.$this->l('day(s)').'
-

'.$this->l('Next process will send:').' '.(int)($n4).' '.($n4 > 1 ? $this->l('e-mails') : $this->l('e-mail')).'

+

'.($n4 > 1 ? sprintf($this->l('Next process will send: %d e-mails'), $n4) : sprintf($this->l('Next process will send: %d e-mail'), $n4)).'

'.$this->l('Delete outdated discounts during each launch to clean database.').'
diff --git a/modules/followup/translations/es.php b/modules/followup/translations/es.php index bbbaf5850..6c8850c8c 100644 --- a/modules/followup/translations/es.php +++ b/modules/followup/translations/es.php @@ -14,9 +14,8 @@ $_MODULE['<{followup}prestashop>followup_2faec1f9f8cc7f8f40d521c4dd574f49'] = 'A $_MODULE['<{followup}prestashop>followup_b30690be173bcd4a83df0cd68f89a385'] = 'Importe del descuento'; $_MODULE['<{followup}prestashop>followup_2018945d252b94aeb99b0909f288717c'] = 'Duración de validez'; $_MODULE['<{followup}prestashop>followup_225e75c29d32392d311f5dc94c792384'] = 'día(s)'; -$_MODULE['<{followup}prestashop>followup_79645190f574ce5b72b89f4122107b72'] = 'El próximo envío transmmitirá:'; -$_MODULE['<{followup}prestashop>followup_46e89640babbc6a0e52599a92a6c13b4'] = 'emails'; -$_MODULE['<{followup}prestashop>followup_1ec5f5ec77c51a968271b2ca9862907d'] = 'email'; +$_MODULE['<{followup}prestashop>followup_dcc0220e44b6d9be3d709d5c2cd34917'] = 'El próximo envío transmmitirá: %d emails'; +$_MODULE['<{followup}prestashop>followup_3ae92a92fa710dca82e5b6667da30b7b'] = 'El próximo envío transmmitirá: %d email'; $_MODULE['<{followup}prestashop>followup_a8b8dbd070a92fb8b17baab71d8d633f'] = 'Pedir de nuevo'; $_MODULE['<{followup}prestashop>followup_895858cf10b8a1750a42875cb9c69092'] = 'Para cada pedido validado, genera un vale de compra y lo envía al cliente'; $_MODULE['<{followup}prestashop>followup_8b83489bd116cb60e2f348e9c63cd7f6'] = 'Mejores clientes'; diff --git a/modules/followup/translations/fr.php b/modules/followup/translations/fr.php index 617e9d533..72881f922 100644 --- a/modules/followup/translations/fr.php +++ b/modules/followup/translations/fr.php @@ -14,9 +14,8 @@ $_MODULE['<{followup}prestashop>followup_2faec1f9f8cc7f8f40d521c4dd574f49'] = 'A $_MODULE['<{followup}prestashop>followup_b30690be173bcd4a83df0cd68f89a385'] = 'Montant de la remise'; $_MODULE['<{followup}prestashop>followup_2018945d252b94aeb99b0909f288717c'] = 'Durée de validité'; $_MODULE['<{followup}prestashop>followup_225e75c29d32392d311f5dc94c792384'] = 'jour(s)'; -$_MODULE['<{followup}prestashop>followup_79645190f574ce5b72b89f4122107b72'] = 'Le prochain envoi transmettra :'; -$_MODULE['<{followup}prestashop>followup_46e89640babbc6a0e52599a92a6c13b4'] = 'e-mails'; -$_MODULE['<{followup}prestashop>followup_1ec5f5ec77c51a968271b2ca9862907d'] = 'e-mail'; +$_MODULE['<{followup}prestashop>followup_dcc0220e44b6d9be3d709d5c2cd34917'] = 'Le prochain envoi transmettra : %d e-mails'; +$_MODULE['<{followup}prestashop>followup_3ae92a92fa710dca82e5b6667da30b7b'] = 'Le prochain envoi transmettra : %d e-mail'; $_MODULE['<{followup}prestashop>followup_a8b8dbd070a92fb8b17baab71d8d633f'] = 'Re-commander'; $_MODULE['<{followup}prestashop>followup_895858cf10b8a1750a42875cb9c69092'] = 'Pour chaque commande validée, génère un bon d\'achat et l\'envoie au client'; $_MODULE['<{followup}prestashop>followup_8b83489bd116cb60e2f348e9c63cd7f6'] = 'Meilleurs clients'; diff --git a/modules/gsitemap/gsitemap.php b/modules/gsitemap/gsitemap.php index de817e4d2..ad08f6965 100644 --- a/modules/gsitemap/gsitemap.php +++ b/modules/gsitemap/gsitemap.php @@ -60,7 +60,7 @@ class Gsitemap extends Module { file_put_contents(GSITEMAP_FILE, ''); if (!($fp = fopen(GSITEMAP_FILE, 'w'))) - $this->_postErrors[] = $this->l('Cannot create').' '.realpath(dirname(__FILE__.'/../..')).'/'.$this->l('sitemap.xml file.'); + $this->_postErrors[] = sprintf($this->l('Cannot create %ssitemap.xml file.'), realpath(dirname(__FILE__.'/../..')).'/'); else fclose($fp); } diff --git a/modules/gsitemap/translations/es.php b/modules/gsitemap/translations/es.php index 8660aefd0..afc997266 100644 --- a/modules/gsitemap/translations/es.php +++ b/modules/gsitemap/translations/es.php @@ -4,8 +4,7 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{gsitemap}prestashop>gsitemap_3aaaafde6f9b2701f9e6eb9292e95521'] = 'Google Sitemap'; $_MODULE['<{gsitemap}prestashop>gsitemap_935a6bc13704a117d22333c3155b5dae'] = 'Genere su fichero de Google Sitemap'; -$_MODULE['<{gsitemap}prestashop>gsitemap_5bbdad908e423585a7ecc6b61b66b313'] = 'Creación imposible'; -$_MODULE['<{gsitemap}prestashop>gsitemap_09fa1e865bdcf4d3215d5b0005b93154'] = 'fichero sitemap.xml'; +$_MODULE['<{gsitemap}prestashop>gsitemap_d6f3ee9fea727d5740303a416a450cf1'] = 'Creación imposible del fichero %ssitemap.xml.'; $_MODULE['<{gsitemap}prestashop>gsitemap_5a517cec50ac8e742f6583c6c404c4e9'] = 'El fichero sitemap fue generado correctamente'; $_MODULE['<{gsitemap}prestashop>gsitemap_0a6ee1a4f10278211d74152e633d0ed0'] = 'Error mientras se creaba el fichero sitemap'; $_MODULE['<{gsitemap}prestashop>gsitemap_eb175747116b689caadea1b84202f513'] = 'Su fichero de google sitemap está online en la siguiente dirección:'; diff --git a/modules/gsitemap/translations/fr.php b/modules/gsitemap/translations/fr.php index afce5b97c..4b44fde46 100644 --- a/modules/gsitemap/translations/fr.php +++ b/modules/gsitemap/translations/fr.php @@ -4,8 +4,7 @@ global $_MODULE; $_MODULE = array(); $_MODULE['<{gsitemap}prestashop>gsitemap_3aaaafde6f9b2701f9e6eb9292e95521'] = 'Google sitemap'; $_MODULE['<{gsitemap}prestashop>gsitemap_935a6bc13704a117d22333c3155b5dae'] = 'Génère votre fichier sitemap pour Google'; -$_MODULE['<{gsitemap}prestashop>gsitemap_5bbdad908e423585a7ecc6b61b66b313'] = 'Impossible de créer'; -$_MODULE['<{gsitemap}prestashop>gsitemap_09fa1e865bdcf4d3215d5b0005b93154'] = 'le fichier sitemap.xml.'; +$_MODULE['<{gsitemap}prestashop>gsitemap_d6f3ee9fea727d5740303a416a450cf1'] = 'Impossible de créer le fichier %ssitemap.xml.'; $_MODULE['<{gsitemap}prestashop>gsitemap_5a517cec50ac8e742f6583c6c404c4e9'] = 'Fichier Sitemap généré'; $_MODULE['<{gsitemap}prestashop>gsitemap_0a6ee1a4f10278211d74152e633d0ed0'] = 'Erreur durant la création du fichier sitemap'; $_MODULE['<{gsitemap}prestashop>gsitemap_dbca7bedb74f116f17eea44cddf9761f'] = 'Sitemap principal'; diff --git a/modules/loyalty/loyalty.php b/modules/loyalty/loyalty.php index a7011f0c5..353a6490e 100644 --- a/modules/loyalty/loyalty.php +++ b/modules/loyalty/loyalty.php @@ -596,7 +596,7 @@ class Loyalty extends Module $points = (int)LoyaltyModule::getPointsByCustomer((int)$params['id_customer']); $html = ' -

'.$this->l('Loyalty points').' ('.(int)$points.' '.$this->l('points').')

'; +

'.sprintf($this->l('Loyalty points (%d points)'), $points).'

'; if (!$points) return $html.' '.$this->l('This customer has no points'); @@ -614,7 +614,7 @@ class Loyalty extends Module { $html.= ' - '.((int)$loyalty['id'] > 0 ? ''.$this->l('#').sprintf('%06d', $loyalty['id']).'' : '--').' + '.((int)$loyalty['id'] > 0 ? ''.sprintf($this->l('#%d'), $loyalty['id']).'' : '--').' '.Tools::displayDate($loyalty['date'], (int)($params['cookie']->id_lang)).' '.((int)$loyalty['id'] > 0 ? $loyalty['total_without_shipping'] : '--').' '.(int)$loyalty['points'].' diff --git a/modules/loyalty/translations/es.php b/modules/loyalty/translations/es.php index ddc6ea653..ebf5b0de4 100644 --- a/modules/loyalty/translations/es.php +++ b/modules/loyalty/translations/es.php @@ -35,15 +35,14 @@ $_MODULE['<{loyalty}prestashop>loyalty_38fb7d24e0d60a048f540ecb18e13376'] = 'Gua $_MODULE['<{loyalty}prestashop>loyalty_8b80d4b6307990874b832cc15a92e5a3'] = 'Algunos parámetros han desaparecido.'; $_MODULE['<{loyalty}prestashop>loyalty_a82e0d057f443115e807bd6ca595fc8c'] = 'El objeto pedido es incorrecto'; $_MODULE['<{loyalty}prestashop>loyalty_94c69408d25102ba7ddcf3533b56c407'] = 'el objeto del cliente es incorrecto.'; -$_MODULE['<{loyalty}prestashop>loyalty_f67fb9d4e53cbac558e2735a7503ce92'] = 'Puntos de fidelidad'; -$_MODULE['<{loyalty}prestashop>loyalty_0aab81de5c4c87021772015efc184d67'] = 'Puntos'; +$_MODULE['<{loyalty}prestashop>loyalty_94c2a3734a95577d173f702aa67a4788'] = 'Puntos de fidelidad (%d puntos)'; $_MODULE['<{loyalty}prestashop>loyalty_309cd9f5437d1bb06a7fdab1811afe1a'] = 'Este cliente no tiene puntos'; $_MODULE['<{loyalty}prestashop>loyalty_a240fa27925a635b08dc28c9e4f9216d'] = 'Pedido'; $_MODULE['<{loyalty}prestashop>loyalty_44749712dbec183e983dcd78a7736c41'] = 'Fecha'; $_MODULE['<{loyalty}prestashop>loyalty_aa7f22f84f7be784055a3e7e7d22c519'] = 'Total (sin transporte)'; $_MODULE['<{loyalty}prestashop>loyalty_75dd5f1160a3f02b6fae89c54361a1b3'] = 'Puntos'; $_MODULE['<{loyalty}prestashop>loyalty_1026e44f047fb9da36a62c0a8846baac'] = 'Estado de los puntos'; -$_MODULE['<{loyalty}prestashop>loyalty_01abfc750a0c942167651c40d088531d'] = '#'; +$_MODULE['<{loyalty}prestashop>loyalty_98ab04462a3ea83fe76f4163efe755da'] = '#%s'; $_MODULE['<{loyalty}prestashop>loyalty_66c2c90ea9f6f4a12854195085781d7f'] = 'Total puntos disponibles:'; $_MODULE['<{loyalty}prestashop>loyalty_928666bdf20510dfa5c58393b77f1798'] = 'Valor de bono:'; $_MODULE['<{loyalty}prestashop>loyalty_a9be824aae4f2381a27b7c699b1e041e'] = 'En espera de validación'; @@ -53,6 +52,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_df05c2db84dacb19b599b489bf3963db'] = 'No $_MODULE['<{loyalty}prestashop>loyalty_01371a1d58e9234c0b9dbc08cf54fa8b'] = 'No válidos en descuentos'; $_MODULE['<{loyalty}prestashop>loyalty_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mi cuenta:'; $_MODULE['<{loyalty}prestashop>loyalty_c540093e64d84440025b2d8201f04336'] = 'Mis puntos recompensa'; +$_MODULE['<{loyalty}prestashop>loyalty_01abfc750a0c942167651c40d088531d'] = '#'; $_MODULE['<{loyalty}prestashop>loyalty_5acc2ceeb883ba07cef2d02ea382f242'] = 'Usted no ha solicitado pedidos.'; $_MODULE['<{loyalty}prestashop>loyalty_dd1f775e443ff3b9a89270713580a51b'] = 'Anterior'; $_MODULE['<{loyalty}prestashop>loyalty_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Siguiente'; @@ -75,7 +75,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_cec73b5ce095a59305ad92a0d47495cb'] = 'Par $_MODULE['<{loyalty}prestashop>loyalty_019d1ca7d50cc54b995f60d456435e87'] = 'Usado'; $_MODULE['<{loyalty}prestashop>loyalty_2af3bf4c82c5b33875d532820a959799'] = 'Generado por los siguientes pedidos'; $_MODULE['<{loyalty}prestashop>loyalty_18fb6221fe0d9895c2e9ba08283f00e9'] = 'Pedido n°%d'; -$_MODULE['<{loyalty}prestashop>loyalty_d5797f3bbadc278f756576dafc6ab4b8'] = 'puntos.'; +$_MODULE['<{loyalty}prestashop>loyalty_4c8d2e0395ae7d21e374dcbeb1cbeaaa'] = '%d puntos.'; $_MODULE['<{loyalty}prestashop>loyalty_1f67ea7a0b26e9eacc70523bde28df0c'] = 'más...'; $_MODULE['<{loyalty}prestashop>loyalty_a16cf3ec5200cc519f4fe48e34b1df83'] = 'El importe mínimo requerido para utilizar estos vales es de.'; $_MODULE['<{loyalty}prestashop>loyalty_8e69341aca5dbf9f55c2e75a2ed5df3c'] = 'Sin vales aún'; @@ -94,8 +94,8 @@ $_MODULE['<{loyalty}prestashop>product_78ee54aa8f813885fe2fe20d232518b9'] = 'pun $_MODULE['<{loyalty}prestashop>product_443c3e03e194c2a4cdb107808b051615'] = 'que se puede(n) transformar en un vale de descuento de'; $_MODULE['<{loyalty}prestashop>shopping-cart_ea2c0ea1a08add3a75273e7f32f05f7a'] = 'fidelidad'; $_MODULE['<{loyalty}prestashop>shopping-cart_4cd8259257033282f11cc9bbe648dff7'] = 'Si valida su carrito, puede reunir'; -$_MODULE['<{loyalty}prestashop>shopping-cart_2996152bb442bf98c80c515c6055de5f'] = 'puntos de fidelidad'; -$_MODULE['<{loyalty}prestashop>shopping-cart_b40d5c523ee75453134b1449dd9cd13a'] = 'punto de fidelidad'; +$_MODULE['<{loyalty}prestashop>shopping-cart_1340ddee36660d8e1d5f6918dee0ba4e'] = '%d puntos de fidelidad'; +$_MODULE['<{loyalty}prestashop>shopping-cart_e7e421ccebbe3fafffe0f67dbd595d5b'] = '%d punto de fidelidad'; $_MODULE['<{loyalty}prestashop>shopping-cart_443c3e03e194c2a4cdb107808b051615'] = 'que se puede(n) transformar en un vale de descuento de'; $_MODULE['<{loyalty}prestashop>shopping-cart_2d354f4df80bbebf309f184c3953dc1d'] = 'No está disponible para los pedidos realizados como invitado'; $_MODULE['<{loyalty}prestashop>shopping-cart_8cec799df06a3f5a026b31fcd95e0172'] = 'Añadir más productos al carrito para obtener puntos de fidelidad.'; diff --git a/modules/loyalty/translations/fr.php b/modules/loyalty/translations/fr.php index d451efc5f..1e5e732f5 100644 --- a/modules/loyalty/translations/fr.php +++ b/modules/loyalty/translations/fr.php @@ -43,7 +43,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_44749712dbec183e983dcd78a7736c41'] = 'Dat $_MODULE['<{loyalty}prestashop>loyalty_aa7f22f84f7be784055a3e7e7d22c519'] = 'Total (hors frais de ports)'; $_MODULE['<{loyalty}prestashop>loyalty_75dd5f1160a3f02b6fae89c54361a1b3'] = 'Points'; $_MODULE['<{loyalty}prestashop>loyalty_1026e44f047fb9da36a62c0a8846baac'] = 'État des points'; -$_MODULE['<{loyalty}prestashop>loyalty_01abfc750a0c942167651c40d088531d'] = 'n°'; +$_MODULE['<{loyalty}prestashop>loyalty_98ab04462a3ea83fe76f4163efe755da'] = '#%d'; $_MODULE['<{loyalty}prestashop>loyalty_66c2c90ea9f6f4a12854195085781d7f'] = 'Total de points disponibles :'; $_MODULE['<{loyalty}prestashop>loyalty_928666bdf20510dfa5c58393b77f1798'] = 'Valeur du bon :'; $_MODULE['<{loyalty}prestashop>loyalty_a9be824aae4f2381a27b7c699b1e041e'] = 'En attente de validation'; @@ -53,6 +53,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_df05c2db84dacb19b599b489bf3963db'] = 'Non $_MODULE['<{loyalty}prestashop>loyalty_01371a1d58e9234c0b9dbc08cf54fa8b'] = 'Non valables sur les promotions'; $_MODULE['<{loyalty}prestashop>loyalty_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte'; $_MODULE['<{loyalty}prestashop>loyalty_c540093e64d84440025b2d8201f04336'] = 'Mes points de fidélité'; +$_MODULE['<{loyalty}prestashop>loyalty_01abfc750a0c942167651c40d088531d'] = 'n°'; $_MODULE['<{loyalty}prestashop>loyalty_5acc2ceeb883ba07cef2d02ea382f242'] = 'Vous n\'avez passé aucune commande.'; $_MODULE['<{loyalty}prestashop>loyalty_dd1f775e443ff3b9a89270713580a51b'] = 'Précédent'; $_MODULE['<{loyalty}prestashop>loyalty_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant'; @@ -75,7 +76,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_cec73b5ce095a59305ad92a0d47495cb'] = 'À $_MODULE['<{loyalty}prestashop>loyalty_019d1ca7d50cc54b995f60d456435e87'] = 'Utilisé'; $_MODULE['<{loyalty}prestashop>loyalty_2af3bf4c82c5b33875d532820a959799'] = 'Généré par les commandes suivantes'; $_MODULE['<{loyalty}prestashop>loyalty_18fb6221fe0d9895c2e9ba08283f00e9'] = 'Commande n°%d'; -$_MODULE['<{loyalty}prestashop>loyalty_d5797f3bbadc278f756576dafc6ab4b8'] = 'points.'; +$_MODULE['<{loyalty}prestashop>loyalty_4c8d2e0395ae7d21e374dcbeb1cbeaaa'] = '%d points.'; $_MODULE['<{loyalty}prestashop>loyalty_1f67ea7a0b26e9eacc70523bde28df0c'] = 'plus...'; $_MODULE['<{loyalty}prestashop>loyalty_a16cf3ec5200cc519f4fe48e34b1df83'] = 'Le montant minimum de commande afin d\'utiliser ces bons est : '; $_MODULE['<{loyalty}prestashop>loyalty_8e69341aca5dbf9f55c2e75a2ed5df3c'] = 'Aucun bon de réduction pour le moment.'; @@ -94,8 +95,8 @@ $_MODULE['<{loyalty}prestashop>product_78ee54aa8f813885fe2fe20d232518b9'] = 'poi $_MODULE['<{loyalty}prestashop>product_443c3e03e194c2a4cdb107808b051615'] = 'pouvant être transformé(s) en un bon de réduction de'; $_MODULE['<{loyalty}prestashop>shopping-cart_ea2c0ea1a08add3a75273e7f32f05f7a'] = 'fidélité'; $_MODULE['<{loyalty}prestashop>shopping-cart_4cd8259257033282f11cc9bbe648dff7'] = 'En validant votre panier, vous pouvez collecter'; -$_MODULE['<{loyalty}prestashop>shopping-cart_2996152bb442bf98c80c515c6055de5f'] = 'points de fidélité'; -$_MODULE['<{loyalty}prestashop>shopping-cart_b40d5c523ee75453134b1449dd9cd13a'] = 'point de fidélité'; +$_MODULE['<{loyalty}prestashop>shopping-cart_1340ddee36660d8e1d5f6918dee0ba4e'] = '%d points de fidélité'; +$_MODULE['<{loyalty}prestashop>shopping-cart_e7e421ccebbe3fafffe0f67dbd595d5b'] = '%d point de fidélité'; $_MODULE['<{loyalty}prestashop>shopping-cart_443c3e03e194c2a4cdb107808b051615'] = 'pouvant être transformé(s) en un bon de réduction de'; $_MODULE['<{loyalty}prestashop>shopping-cart_2d354f4df80bbebf309f184c3953dc1d'] = 'Offre non applicable pour les commandes passées en tant qu\'invité'; $_MODULE['<{loyalty}prestashop>shopping-cart_8cec799df06a3f5a026b31fcd95e0172'] = 'Ajoutez des produits à votre panier pour gagner plus de points de fidélité.'; diff --git a/modules/loyalty/views/templates/front/loyalty.tpl b/modules/loyalty/views/templates/front/loyalty.tpl index b30469e00..bd72cc735 100644 --- a/modules/loyalty/views/templates/front/loyalty.tpl +++ b/modules/loyalty/views/templates/front/loyalty.tpl @@ -163,7 +163,13 @@ {dateFormat date=$discount->date_from} {dateFormat date=$discount->date_to} {if $discount->quantity > 0}{l s='To use' mod='loyalty'}{else}{l s='Used' mod='loyalty'}{/if} - {l s='more...' mod='loyalty'} + + {l s='more...' mod='loyalty'} {/foreach} diff --git a/modules/loyalty/views/templates/hook/shopping-cart.tpl b/modules/loyalty/views/templates/hook/shopping-cart.tpl index 17d656dfa..ef6e9f810 100644 --- a/modules/loyalty/views/templates/hook/shopping-cart.tpl +++ b/modules/loyalty/views/templates/hook/shopping-cart.tpl @@ -28,8 +28,8 @@

{l s='loyalty' mod='loyalty'} {if $points > 0} - {l s='By checking out of this shopping cart you can collect up to' mod='loyalty'} {$points} - {if $points > 1}{l s='loyalty points' mod='loyalty'}{else}{l s='loyalty point' mod='loyalty'}{/if} + {l s='By checking out of this shopping cart you can collect up to' mod='loyalty'} + {if $points > 1}{l s='%d loyalty points' sprintf=$points mod='loyalty'}{else}{l s='%d loyalty point' sprintf=$points mod='loyalty'}{/if} {l s='that can be converted into a voucher of' mod='loyalty'} {convertPrice price=$voucher}{if isset($guest_checkout) && $guest_checkout}*{/if}.
{if isset($guest_checkout) && $guest_checkout}* {l s='Not available for Instant checkout order' mod='loyalty'}{/if} {else} diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index 0c0ad2177..036cd8f65 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -246,8 +246,7 @@ class MailAlerts extends Module

- '.$this->l('One e-mail address per line').'
- '.$this->l('e.g.,').' bob@example.com + '.$this->l('One e-mail address per line (e.g. bob@example.com)').'
 
diff --git a/modules/mailalerts/translations/es.php b/modules/mailalerts/translations/es.php index 8cc1f5520..efbcd9e8e 100644 --- a/modules/mailalerts/translations/es.php +++ b/modules/mailalerts/translations/es.php @@ -16,8 +16,7 @@ $_MODULE['<{mailalerts}prestashop>mailalerts_86e8d61297942b00e9937299735df971'] $_MODULE['<{mailalerts}prestashop>mailalerts_38fb7d24e0d60a048f540ecb18e13376'] = 'Guardar'; $_MODULE['<{mailalerts}prestashop>mailalerts_9204d21640382a89a95ec42f44f9051c'] = 'Nuevo pedido:'; $_MODULE['<{mailalerts}prestashop>mailalerts_ebc3ccf8441dba3c1615afa6acb3282a'] = 'Fuera de stock'; -$_MODULE['<{mailalerts}prestashop>mailalerts_8c5b6fe38a32f46c355f025a820c804c'] = 'Una dirección email por línea'; -$_MODULE['<{mailalerts}prestashop>mailalerts_f77ed609e48d550f0166dfbafc102710'] = 'ej:'; +$_MODULE['<{mailalerts}prestashop>mailalerts_4395d1c88a7f0796edc652d2b57bc664'] = 'Una dirección email por línea (ej: bob@example.com)'; $_MODULE['<{mailalerts}prestashop>mailalerts_7cb9a154f101c674c945f88dad5c5e28'] = 'No hay mensaje'; $_MODULE['<{mailalerts}prestashop>mailalerts_1d744a9ad1dac20645cfc4a36b77323b'] = 'imagen(es)'; $_MODULE['<{mailalerts}prestashop>mailalerts_9137796c15dd92e5553c3f29574d0968'] = 'Código del vale:'; diff --git a/modules/mailalerts/translations/fr.php b/modules/mailalerts/translations/fr.php index 904c7d062..c7de08cde 100644 --- a/modules/mailalerts/translations/fr.php +++ b/modules/mailalerts/translations/fr.php @@ -24,8 +24,7 @@ $_MODULE['<{mailalerts}prestashop>mailalerts_929396618e54384e9a22493055028533'] $_MODULE['<{mailalerts}prestashop>mailalerts_cadcfa2749b0cfb51d88837d4a934ad1'] = 'Couverture :'; $_MODULE['<{mailalerts}prestashop>mailalerts_dccbd7d58f294df927f4d0baafb6c375'] = 'Couverture de stock, en jours. Cette valeur est également utilisée pour calculer la couverture actuelle d\'un produit.'; $_MODULE['<{mailalerts}prestashop>mailalerts_7bcb7394f6b2ff226c423fea1a153754'] = 'Adresses e-mail'; -$_MODULE['<{mailalerts}prestashop>mailalerts_8c5b6fe38a32f46c355f025a820c804c'] = 'Une adresse e-mail par ligne'; -$_MODULE['<{mailalerts}prestashop>mailalerts_f77ed609e48d550f0166dfbafc102710'] = 'ex :'; +$_MODULE['<{mailalerts}prestashop>mailalerts_4395d1c88a7f0796edc652d2b57bc664'] = 'Une adresse e-mail par ligne (ex : bob@example.com)'; $_MODULE['<{mailalerts}prestashop>mailalerts_7cb9a154f101c674c945f88dad5c5e28'] = 'Aucun message'; $_MODULE['<{mailalerts}prestashop>mailalerts_1d744a9ad1dac20645cfc4a36b77323b'] = 'image(s)'; $_MODULE['<{mailalerts}prestashop>mailalerts_9137796c15dd92e5553c3f29574d0968'] = 'Code de réduction :'; diff --git a/modules/newsletter/newsletter.php b/modules/newsletter/newsletter.php index 952a03f08..ac98291d7 100644 --- a/modules/newsletter/newsletter.php +++ b/modules/newsletter/newsletter.php @@ -113,8 +113,7 @@ class Newsletter extends Module $this->_my_fputcsv($fd, $tab); fclose($fd); $this->_html .= $this->displayConfirmation( - $this->l('The .CSV file has been successfully exported.'). - ' ('.$nb.' '.$this->l('customers found').')
+ sprintf($this->l('The .CSV file has been successfully exported. (%d customers found)'), $nb).'
'.$this->l('Download the file').' '.$this->_file.'
    diff --git a/modules/newsletter/translations/es.php b/modules/newsletter/translations/es.php index 21930ef04..1f9fc0067 100644 --- a/modules/newsletter/translations/es.php +++ b/modules/newsletter/translations/es.php @@ -15,8 +15,7 @@ $_MODULE['<{newsletter}prestashop>newsletter_011d8c5d94f729f013963d856cd78745'] $_MODULE['<{newsletter}prestashop>newsletter_793ee192a9124cd6f529460eef17d3e5'] = 'Inscritos a publicidades'; $_MODULE['<{newsletter}prestashop>newsletter_7b15c043d66fecc45c8752592aa38e38'] = 'Operar un filtro a los inscritos a publicidades'; $_MODULE['<{newsletter}prestashop>newsletter_82e5e0bc0f9c776c98253d569c111c0f'] = 'Noy hay clientes a los que se aplique este filtro'; -$_MODULE['<{newsletter}prestashop>newsletter_d526d090aa22242fa5f6acfccc6bd007'] = 'El fichero .CSV ha sido exportado correctamente'; -$_MODULE['<{newsletter}prestashop>newsletter_55caa4828d4e935c2ba9f1558f1c4edd'] = 'clientes encontrados'; +$_MODULE['<{newsletter}prestashop>newsletter_04e7c39a16e4d89fe9c3861af82ececa'] = 'El fichero .CSV ha sido exportado correctamente. (%d clientes encontrados)'; $_MODULE['<{newsletter}prestashop>newsletter_48e3d5f66961b621c78f709afcd7d437'] = 'Descargar el fichero'; $_MODULE['<{newsletter}prestashop>newsletter_faa1115fbab933e7178ee43ce1590977'] = 'ATENCION: Si trata de abrir el fichero .CSV con Excel, no olvide seleccionar el UTF-8 para el encodage, si no aparecerán caracteres incorrectos'; $_MODULE['<{newsletter}prestashop>newsletter_81573e0ea79138f02fd2cee94786d7e9'] = 'Error: imposible escribir en'; diff --git a/modules/newsletter/translations/fr.php b/modules/newsletter/translations/fr.php index 77265f856..564fc6a95 100644 --- a/modules/newsletter/translations/fr.php +++ b/modules/newsletter/translations/fr.php @@ -15,8 +15,7 @@ $_MODULE['<{newsletter}prestashop>newsletter_011d8c5d94f729f013963d856cd78745'] $_MODULE['<{newsletter}prestashop>newsletter_793ee192a9124cd6f529460eef17d3e5'] = 'Inscrits pub'; $_MODULE['<{newsletter}prestashop>newsletter_7b15c043d66fecc45c8752592aa38e38'] = 'Mettre un filtre sur les inscrits aux messages publicitaires.'; $_MODULE['<{newsletter}prestashop>newsletter_82e5e0bc0f9c776c98253d569c111c0f'] = 'Aucun client trouvé avec ces paramètres !'; -$_MODULE['<{newsletter}prestashop>newsletter_d526d090aa22242fa5f6acfccc6bd007'] = 'Le fichier .CSV a bien été exporté'; -$_MODULE['<{newsletter}prestashop>newsletter_55caa4828d4e935c2ba9f1558f1c4edd'] = 'clients trouvés'; +$_MODULE['<{newsletter}prestashop>newsletter_04e7c39a16e4d89fe9c3861af82ececa'] = 'Le fichier .CSV a bien été exporté. (%d clients trouvés)'; $_MODULE['<{newsletter}prestashop>newsletter_48e3d5f66961b621c78f709afcd7d437'] = 'Télécharger le fichier'; $_MODULE['<{newsletter}prestashop>newsletter_faa1115fbab933e7178ee43ce1590977'] = 'ATTENTION : si vous tentez d\'ouvrir le fichier .csv avec Excel, n\'oubliez pas de sélectionner l\'encodage UTF-8, sinon vous aurez des caractères incorrects'; $_MODULE['<{newsletter}prestashop>newsletter_81573e0ea79138f02fd2cee94786d7e9'] = 'Erreur : impossible d\'écrire'; diff --git a/modules/productcomments/productcomments-ajax.php b/modules/productcomments/productcomments-ajax.php index 0c8122a5d..db648c310 100644 --- a/modules/productcomments/productcomments-ajax.php +++ b/modules/productcomments/productcomments-ajax.php @@ -130,7 +130,7 @@ else if (Tools::getValue('action') && Tools::getValue('secure_key') == $productC $errors[] = $productCom->l('Comment text is required.'); } else - $errors[] = $productCom->l('You should wait').' '.Configuration::get('PRODUCT_COMMENTS_MINIMAL_TIME').' '.$productCom->l('seconds before posting a new comment'); + $errors[] = sprintf($productCom->l('You should wait %d seconds before posting a new comment.'), Configuration::get('PRODUCT_COMMENTS_MINIMAL_TIME')); } } diff --git a/modules/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl index 8414fecd6..c12738c7d 100644 --- a/modules/productcomments/productcomments.tpl +++ b/modules/productcomments/productcomments.tpl @@ -144,7 +144,7 @@

    {$comment.content|escape:'html':'UTF-8'|nl2br}