From e5946136712545e75a24abe90c462ee7d6c01bc8 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Thu, 7 Jun 2012 08:13:51 +0000
Subject: [PATCH] // Fixed translation

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15896 b9a71923-0436-4b27-9f14-aed3839534dd
---
 themes/default/lang/fr.php      | 13 +------------
 themes/default/order-detail.tpl |  6 +++---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/themes/default/lang/fr.php b/themes/default/lang/fr.php
index ced8dec8e..997536499 100644
--- a/themes/default/lang/fr.php
+++ b/themes/default/lang/fr.php
@@ -274,19 +274,13 @@ $_LANG['new-products_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits';
 $_LANG['new-products_d58424783355b6da2dedc302f2bf4065'] = 'Pas de nouveau produit';
 $_LANG['order-address-multishipping-products_03ab340b3f99e03cff9e84314ead38c0'] = 'Qté';
 $_LANG['order-address-multishipping-products_0c458988127eb2150776881e2ef3f0c4'] = 'Adresse de livraison';
-$_LANG['order-address-multishipping-products_1021f02536dc46ab3b07c269949e4de7'] = 'Texte #%s : ';
 $_LANG['order-address-multishipping-products_12d3c7a4296542c62474856ec452c045'] = 'Réf.';
-$_LANG['order-address-multishipping-products_1d9baf077ee87921f57a8fe42d510b65'] = 'Retirer';
 $_LANG['order-address-multishipping-products_713abca3b7abddc0445099b23c0a3697'] = 'Livrer à plusieurs adresses';
-$_LANG['order-address-multishipping-products_853ae90f0351324bd73ea615e6487517'] = ' : ';
 $_LANG['order-address-multishipping-products_89379e8168d3baf9be5963422ac20caa'] = 'Les quantités de certains produits ont été changées, veuillez les vérifier.';
 $_LANG['order-address-multishipping-products_a4d3b161ce1309df1c4e25df28694b7b'] = 'Valider';
 $_LANG['order-address-multishipping-products_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
 $_LANG['order-address-multishipping-products_b669d5bfee7c83844d00c007ef74cd2a'] = 'Choisissez une adresse de livraison :';
-$_LANG['order-address-multishipping-products_c8cd21bd2e33378f10611bc4498cf96f'] = 'Supprimer cette personnalisation';
 $_LANG['order-address-multishipping-products_deb10517653c255364175796ace3553f'] = 'Produit';
-$_LANG['order-address-multishipping-products_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
-$_LANG['order-address-multishipping-products_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
 $_LANG['order-address-multishipping_06933067aafd48425d67bcb01bba5cb6'] = 'Mise à jour';
 $_LANG['order-address-multishipping_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
 $_LANG['order-address-multishipping_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses';
@@ -304,7 +298,6 @@ $_LANG['order-address-product-line_1d9baf077ee87921f57a8fe42d510b65'] = 'Retirer
 $_LANG['order-address-product-line_713abca3b7abddc0445099b23c0a3697'] = 'Livrer à plusieurs adresses';
 $_LANG['order-address-product-line_e716b72edf18038c04664e9b21569177'] = 'Vous devez choisir une quantité minimale de %d pour ce produit';
 $_LANG['order-address-product-line_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
-$_LANG['order-address-product-line_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
 $_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour';
 $_LANG['order-address_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
 $_LANG['order-address_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses';
@@ -365,13 +358,11 @@ $_LANG['order-detail_1f87346a16cf80c372065de3c54c86d9'] = 'TTC';
 $_LANG['order-detail_25e93b63e91b5555bd458c89b1916678'] = 'Générer un retour';
 $_LANG['order-detail_2633d6725607d13e80f5e30514b91fbe'] = 'Total des bons de réduction :';
 $_LANG['order-detail_332c80b1838dc515f5031e09da3b7f3f'] = 'Re-commander';
-$_LANG['order-detail_336d5ebc5436534e61d16e63ddfca327'] = '-';
 $_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Ajouter un message :';
 $_LANG['order-detail_3956298bcfc047e15b0e0d218492ce09'] = 'Retour de marchandise';
 $_LANG['order-detail_3a5199ec2407f4b2f90496072ea8f006'] = 'Total produits HT :';
 $_LANG['order-detail_41de6d6cfb8953c021bbe4ba0701c8a1'] = 'Messages';
 $_LANG['order-detail_44749712dbec183e983dcd78a7736c41'] = 'Date';
-$_LANG['order-detail_466eadd40b3c10580e3ab4e8061161ce'] = 'Facture';
 $_LANG['order-detail_4c2a8fe7eaf24721cc7a9f0175115bd4'] = 'Message';
 $_LANG['order-detail_5068c162a60b5859f973f701333f45c5'] = 'Numéro de suivi';
 $_LANG['order-detail_552a0d8c17d95d5dbdc0c28217024f5a'] = 'Prix du transport';
@@ -384,8 +375,8 @@ $_LANG['order-detail_66c4c5112f455a19afde47829df363fa'] = 'Total :';
 $_LANG['order-detail_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité';
 $_LANG['order-detail_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Prix unitaire';
 $_LANG['order-detail_755bb0834a77079fd1330b555b69e6bf'] = 'Vous avez accepté de recevoir votre commande dans un emballage recyclé.';
+$_LANG['order-detail_780c462e85ba4399a5d42e88f69a15ca'] = 'Facturation';
 $_LANG['order-detail_7bc873cba11f035df692c3549366c722'] = '- Choisissez -';
-$_LANG['order-detail_853ae90f0351324bd73ea615e6487517'] = ' :';
 $_LANG['order-detail_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
 $_LANG['order-detail_8efd9e9597e94fe3397c831f2ed1b7bd'] = 'Vous avez demandé un papier cadeau pour cette commande.';
 $_LANG['order-detail_914419aa32f04011357d3b604a86d7eb'] = 'Transporteur';
@@ -703,7 +694,6 @@ $_LANG['shopping-cart_1ad9dce3d19b51de499eeaa71418435b'] = 'Total HT :';
 $_LANG['shopping-cart_1d4c9008fd49770971ffc2e8f32df870'] = 'Total frais de port TTC :';
 $_LANG['shopping-cart_1d9baf077ee87921f57a8fe42d510b65'] = 'Enlever';
 $_LANG['shopping-cart_2633d6725607d13e80f5e30514b91fbe'] = 'Total bons de réduction :';
-$_LANG['shopping-cart_28e014bf2ccc53bc1a8042ca57ca6645'] = 'Total bons de réduction TTC :';
 $_LANG['shopping-cart_29cfbfc41066134782f966beefd63a4e'] = 'Total produits TTC :';
 $_LANG['shopping-cart_2fb3b950fd7711136f7f251ae5fbdbdc'] = 'Texte n°';
 $_LANG['shopping-cart_300225ee958b6350abc51805dab83c24'] = 'Continuer mes achats';
@@ -720,7 +710,6 @@ $_LANG['shopping-cart_66c4c5112f455a19afde47829df363fa'] = 'Total :';
 $_LANG['shopping-cart_66f51e43606e2baebb8e9c3bfe965da4'] = 'Transport:';
 $_LANG['shopping-cart_691b338fa68b3c177c6ebbc745624c6a'] = 'Total frais de port :';
 $_LANG['shopping-cart_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Prix unitaire';
-$_LANG['shopping-cart_6f758a9cd90f467e432a019b87fee031'] = 'Total emballage cadeau HT :';
 $_LANG['shopping-cart_6faae4c39a8a0fc5020af4137f641c8e'] = 'Envoyer les produits disponibles en premier.';
 $_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ' :';
 $_LANG['shopping-cart_86024cad1e83101d97359d7351051156'] = 'produits';
diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl
index cb1192a6d..c2f5206f1 100644
--- a/themes/default/order-detail.tpl
+++ b/themes/default/order-detail.tpl
@@ -88,7 +88,7 @@
 <div class="adresses_bloc clearfix">
 <br />
 <ul class="address item {if $order->isVirtual()}full_width{/if}">
-	<li class="address_title">{l s='Invoice'}</li>
+	<li class="address_title">{l s='Billing'}</li>
 	{foreach from=$inv_adr_fields name=inv_loop item=field_item}
 		{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
 		{elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</li>
@@ -227,7 +227,7 @@
 								<ul class="typedText">{counter start=0 print=false}
 									{foreach from=$datas item='data'}
 										{assign var='customizationFieldName' value="Text #"|cat:$data.id_customization_field}
-										<li>{$data.name|default:$customizationFieldName}{l s=':'} {$data.value}</li>
+										<li>{$data.name|default:$customizationFieldName} : {$data.value}</li>
 									{/foreach}
 								</ul>
 								{/if}
@@ -295,7 +295,7 @@
 				<td>{l s='Voucher:'} {$discount.name|escape:'htmlall':'UTF-8'}</td>
 				<td><span class="order_qte_span editable">1</span></td>
 				<td>&nbsp;</td>
-				<td>{if $discount.value != 0.00}{l s='-'}{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</td>
+				<td>{if $discount.value != 0.00}-{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</td>
 				{if $return_allowed}
 				<td>&nbsp;</td>
 				{/if}