From f4c99bcdc9425cde32f0323811cf737e0d567070 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <benoit.pin@gmail.com>
Date: Fri, 5 Sep 2014 00:25:44 +0200
Subject: [PATCH 1/1] localisation++

---
 locales/en/LC_MESSAGES/photoprint.po |  26 +++++++++++--------
 locales/fr/LC_MESSAGES/photoprint.mo | Bin 14196 -> 14228 bytes
 locales/fr/LC_MESSAGES/photoprint.po |  36 ++++++++++++++++-----------
 locales/photoprint.pot               |  30 ++++++++++++----------
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po
index 9dff8f9..ac41bf8 100644
--- a/locales/en/LC_MESSAGES/photoprint.po
+++ b/locales/en/LC_MESSAGES/photoprint.po
@@ -199,7 +199,7 @@ msgid ""
 msgstr ""
 
 #: t/skins/my_orders.py:17 t/skins/order_list.py:14
-#: t/skins/order_view_template.pt:181
+#: t/skins/order_view_template.pt:185
 msgid "Date"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 #: t/skins/order_list_template.pt:37 t/skins/order_list_template.pt:50
 #: t/skins/order_manual_payment_form.pt:19
 #: t/skins/order_notify_done_form.pt:19 t/skins/order_notify_sent_form.pt:19
-#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:191
+#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:195
 msgid "${DYNAMIC_CONTENT}"
 msgstr ""
 
@@ -372,7 +372,7 @@ msgstr ""
 msgid "Billing"
 msgstr ""
 
-#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:133
+#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:137
 msgid "Shipping"
 msgstr ""
 
@@ -402,23 +402,27 @@ msgstr ""
 msgid "image removed"
 msgstr ""
 
-#: t/skins/order_view_template.pt:137
-msgid "VAT"
+#: t/skins/order_view_template.pt:133
+msgid "Discount"
 msgstr ""
 
 #: t/skins/order_view_template.pt:141
+msgid "VAT"
+msgstr ""
+
+#: t/skins/order_view_template.pt:145
 msgid "Total amount to pay"
 msgstr ""
 
-#: t/skins/order_view_template.pt:151
+#: t/skins/order_view_template.pt:155
 msgid "Pay with PayPal:"
 msgstr ""
 
-#: t/skins/order_view_template.pt:152 t/skins/order_view_template.pt:154
+#: t/skins/order_view_template.pt:156 t/skins/order_view_template.pt:158
 msgid "Pay with PayPal"
 msgstr ""
 
-#: t/skins/order_view_template.pt:164
+#: t/skins/order_view_template.pt:168
 msgid ""
 "Please check the preceding table and proceed to payment. By clicking on the "
 "PayPal button, you will temporarily leave the site: you will be redirected "
@@ -430,15 +434,15 @@ msgid ""
 "or by credit card."
 msgstr ""
 
-#: t/skins/order_view_template.pt:176
+#: t/skins/order_view_template.pt:180
 msgid "Order processing history"
 msgstr ""
 
-#: t/skins/order_view_template.pt:182
+#: t/skins/order_view_template.pt:186
 msgid "Actor"
 msgstr ""
 
-#: t/skins/order_view_template.pt:183
+#: t/skins/order_view_template.pt:187
 msgid "Action"
 msgstr ""
 
diff --git a/locales/fr/LC_MESSAGES/photoprint.mo b/locales/fr/LC_MESSAGES/photoprint.mo
index 3bdcd3483c9a5c8b54eca738a6b1cef523f1411c..01d5f9436723bc2c8b07edf997170631729ead78 100644
GIT binary patch
delta 3619
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
Sz+-uZCB@4Nn+p;`!~X-<L`xX}

delta 3588
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

diff --git a/locales/fr/LC_MESSAGES/photoprint.po b/locales/fr/LC_MESSAGES/photoprint.po
index 840f7e4..b442ec6 100644
--- a/locales/fr/LC_MESSAGES/photoprint.po
+++ b/locales/fr/LC_MESSAGES/photoprint.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Wed Sep  3 23:34:02 2014\n"
-"PO-Revision-Date: 2014-09-01 23:39+0200\n"
+"POT-Creation-Date: Fri Sep  5 00:21:28 2014\n"
+"PO-Revision-Date: 2014-09-05 00:22+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
@@ -111,7 +111,8 @@ msgid ""
 "<br /> Those restrictions are only for this login field."
 msgstr ""
 "Votre login doit commencer par une lettre, suivi par des lettres,<br/>\n"
-"des chiffres ou _ (underscore). Pas d'accent, pas de ponctuation, pas de<br/>\n"
+"des chiffres ou _ (underscore). Pas d'accent, pas de ponctuation, pas de<br/"
+">\n"
 "caractères spéciaux. Ces restrictions ne s'appliquent qu'à ce champ."
 
 #: t/skins/customer_join_template.pt:56 t/skins/customer_login_form.pt:45
@@ -128,7 +129,8 @@ msgstr "Accès à des images privées"
 
 #: t/skins/customer_join_template.pt:75
 msgid "Please enter the access code to view / purchase private images."
-msgstr "Veuillez entrer le code d'accès pour voir / acheter des images privées."
+msgstr ""
+"Veuillez entrer le code d'accès pour voir / acheter des images privées."
 
 #: t/skins/customer_join_template.pt:104 t/skins/personalize_form.pt:46
 msgid "Billing informations"
@@ -229,7 +231,7 @@ msgstr ""
 "visite."
 
 #: t/skins/my_orders.py:17 t/skins/order_list.py:14
-#: t/skins/order_view_template.pt:181
+#: t/skins/order_view_template.pt:185
 msgid "Date"
 msgstr "Date"
 
@@ -259,7 +261,7 @@ msgstr "Mes commandes"
 #: t/skins/order_list_template.pt:37 t/skins/order_list_template.pt:50
 #: t/skins/order_manual_payment_form.pt:19
 #: t/skins/order_notify_done_form.pt:19 t/skins/order_notify_sent_form.pt:19
-#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:191
+#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:195
 msgid "${DYNAMIC_CONTENT}"
 msgstr ""
 
@@ -411,7 +413,7 @@ msgstr "Commande N° ${order_number}"
 msgid "Billing"
 msgstr "Facturation"
 
-#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:133
+#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:137
 msgid "Shipping"
 msgstr "Livraison"
 
@@ -441,23 +443,27 @@ msgstr "Montant (TTC)"
 msgid "image removed"
 msgstr "image supprimée"
 
-#: t/skins/order_view_template.pt:137
+#: t/skins/order_view_template.pt:133
+msgid "Discount"
+msgstr "Remise"
+
+#: t/skins/order_view_template.pt:141
 msgid "VAT"
 msgstr "TVA"
 
-#: t/skins/order_view_template.pt:141
+#: t/skins/order_view_template.pt:145
 msgid "Total amount to pay"
 msgstr "Montant total à payer"
 
-#: t/skins/order_view_template.pt:151
+#: t/skins/order_view_template.pt:155
 msgid "Pay with PayPal:"
 msgstr "Payer avec PayPal :"
 
-#: t/skins/order_view_template.pt:152 t/skins/order_view_template.pt:154
+#: t/skins/order_view_template.pt:156 t/skins/order_view_template.pt:158
 msgid "Pay with PayPal"
 msgstr "Payer avec PayPal"
 
-#: t/skins/order_view_template.pt:164
+#: t/skins/order_view_template.pt:168
 msgid ""
 "Please check the preceding table and proceed to payment. By clicking on the "
 "PayPal button, you will temporarily leave the site: you will be redirected "
@@ -478,15 +484,15 @@ msgstr ""
 "vous pourrez, à votre convenance, payer par virement PayPal ou par carte "
 "bancaire."
 
-#: t/skins/order_view_template.pt:176
+#: t/skins/order_view_template.pt:180
 msgid "Order processing history"
 msgstr "Historique du traitement de la commande"
 
-#: t/skins/order_view_template.pt:182
+#: t/skins/order_view_template.pt:186
 msgid "Actor"
 msgstr "Acteur"
 
-#: t/skins/order_view_template.pt:183
+#: t/skins/order_view_template.pt:187
 msgid "Action"
 msgstr "Action"
 
diff --git a/locales/photoprint.pot b/locales/photoprint.pot
index fef7ace..2e7478b 100644
--- a/locales/photoprint.pot
+++ b/locales/photoprint.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Wed Sep  3 23:34:02 2014\n"
+"POT-Creation-Date: Fri Sep  5 00:21:28 2014\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -227,7 +227,7 @@ msgstr ""
 
 #: t/skins/my_orders.py:17
 #: t/skins/order_list.py:14
-#: t/skins/order_view_template.pt:181
+#: t/skins/order_view_template.pt:185
 msgid "Date"
 msgstr ""
 
@@ -266,7 +266,7 @@ msgstr ""
 #: t/skins/order_notify_done_form.pt:19
 #: t/skins/order_notify_sent_form.pt:19
 #: t/skins/order_view_template.pt:86
-#: t/skins/order_view_template.pt:191
+#: t/skins/order_view_template.pt:195
 msgid "${DYNAMIC_CONTENT}"
 msgstr ""
 
@@ -413,7 +413,7 @@ msgid "Billing"
 msgstr ""
 
 #: t/skins/order_view_template.pt:53
-#: t/skins/order_view_template.pt:133
+#: t/skins/order_view_template.pt:137
 msgid "Shipping"
 msgstr ""
 
@@ -443,36 +443,40 @@ msgstr ""
 msgid "image removed"
 msgstr ""
 
-#: t/skins/order_view_template.pt:137
-msgid "VAT"
+#: t/skins/order_view_template.pt:133
+msgid "Discount"
 msgstr ""
 
 #: t/skins/order_view_template.pt:141
+msgid "VAT"
+msgstr ""
+
+#: t/skins/order_view_template.pt:145
 msgid "Total amount to pay"
 msgstr ""
 
-#: t/skins/order_view_template.pt:151
+#: t/skins/order_view_template.pt:155
 msgid "Pay with PayPal:"
 msgstr ""
 
-#: t/skins/order_view_template.pt:152
-#: t/skins/order_view_template.pt:154
+#: t/skins/order_view_template.pt:156
+#: t/skins/order_view_template.pt:158
 msgid "Pay with PayPal"
 msgstr ""
 
-#: t/skins/order_view_template.pt:164
+#: t/skins/order_view_template.pt:168
 msgid "Please check the preceding table and proceed to payment. By clicking on the PayPal button, you will temporarily leave the site: you will be redirected to the payment provider PayPal. Please follow given instructions. The transaction will be final as soon as you are back on the ${site_name} site. For your information, there is no need to create a PayPal account, even if you will be prompted: you can simply use your credit card. If you already have a PayPal account, you can, at your convenience, pay by PayPal transfer or by credit card."
 msgstr ""
 
-#: t/skins/order_view_template.pt:176
+#: t/skins/order_view_template.pt:180
 msgid "Order processing history"
 msgstr ""
 
-#: t/skins/order_view_template.pt:182
+#: t/skins/order_view_template.pt:186
 msgid "Actor"
 msgstr ""
 
-#: t/skins/order_view_template.pt:183
+#: t/skins/order_view_template.pt:187
 msgid "Action"
 msgstr ""
 
-- 
2.20.1