From 902379ae97bfcb89f20e914b2e75b5b07969a491 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Fri, 4 Oct 2013 21:41:06 +0200 Subject: [PATCH 1/1] =?utf8?q?Mise=20=C3=A0=20jour=20localisation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- locales/en/LC_MESSAGES/photoprint.po | 45 ++++++++++++----------- locales/fr/LC_MESSAGES/photoprint.mo | Bin 11188 -> 11231 bytes locales/fr/LC_MESSAGES/photoprint.po | 47 ++++++++++++------------ locales/photoprint-manual.pot | 4 +++ locales/photoprint.pot | 52 ++++++++++++++------------- skins/order_view_template.pt | 1 - 6 files changed, 81 insertions(+), 68 deletions(-) diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po index acae00d..7f97f28 100644 --- a/locales/en/LC_MESSAGES/photoprint.po +++ b/locales/en/LC_MESSAGES/photoprint.po @@ -61,7 +61,7 @@ msgid "Please accept general conditions of sales." msgstr "" #: t/skins/my_orders.py:17 t/skins/order_list.py:14 -#: t/skins/order_view_template.pt:182 +#: t/skins/order_view_template.pt:181 msgid "Date" msgstr "" @@ -91,7 +91,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:87 t/skins/order_view_template.pt:193 +#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:191 msgid "${DYNAMIC_CONTENT}" msgstr "" @@ -209,7 +209,7 @@ msgid "Tracking url" msgstr "" #: t/skins/order_printing_list_template.pt:22 -#: t/skins/order_view_template.pt:97 +#: t/skins/order_view_template.pt:96 msgid "Image" msgstr "" @@ -222,7 +222,7 @@ msgid "Format / type" msgstr "" #: t/skins/order_printing_list_template.pt:25 -#: t/skins/order_view_template.pt:99 +#: t/skins/order_view_template.pt:98 msgid "Quantity" msgstr "" @@ -254,53 +254,53 @@ msgstr "" msgid "Country" msgstr "" -#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:134 +#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:133 msgid "Shipping" msgstr "" -#: t/skins/order_view_template.pt:84 +#: t/skins/order_view_template.pt:83 msgid "Processing" msgstr "" -#: t/skins/order_view_template.pt:98 +#: t/skins/order_view_template.pt:97 msgid "Printing format and type" msgstr "" -#: t/skins/order_view_template.pt:100 +#: t/skins/order_view_template.pt:99 msgid "Unit price" msgstr "" -#: t/skins/order_view_template.pt:101 +#: t/skins/order_view_template.pt:100 #: t/skins/photoprint_templates_edit_template.pt:45 #: t/skins/photoprint_templates_edit_template.pt:131 msgid "VAT (%)" msgstr "" -#: t/skins/order_view_template.pt:102 +#: t/skins/order_view_template.pt:101 msgid "Amount
(tax incl.)" msgstr "" -#: t/skins/order_view_template.pt:111 +#: t/skins/order_view_template.pt:110 msgid "image removed" msgstr "" -#: t/skins/order_view_template.pt:138 +#: t/skins/order_view_template.pt:137 msgid "VAT" msgstr "" -#: t/skins/order_view_template.pt:142 +#: t/skins/order_view_template.pt:141 msgid "Total amount to pay" msgstr "" -#: t/skins/order_view_template.pt:152 +#: t/skins/order_view_template.pt:151 msgid "Pay with PayPal:" msgstr "" -#: t/skins/order_view_template.pt:153 t/skins/order_view_template.pt:155 +#: t/skins/order_view_template.pt:152 t/skins/order_view_template.pt:154 msgid "Pay with PayPal" msgstr "" -#: t/skins/order_view_template.pt:165 +#: t/skins/order_view_template.pt:164 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 " @@ -312,15 +312,15 @@ msgid "" "or by credit card." msgstr "" -#: t/skins/order_view_template.pt:177 +#: t/skins/order_view_template.pt:176 msgid "Order processing history" msgstr "" -#: t/skins/order_view_template.pt:183 +#: t/skins/order_view_template.pt:182 msgid "Actor" msgstr "" -#: t/skins/order_view_template.pt:184 +#: t/skins/order_view_template.pt:183 msgid "Action" msgstr "" @@ -366,11 +366,11 @@ msgid "" "credit card by cliking on the PayPal button.
" msgstr "" -#: t/skins/photoprint_templates_edit_form.py:56 +#: t/skins/photoprint_templates_edit_form.py:55 msgid "Printing options added." msgstr "" -#: t/skins/photoprint_templates_edit_form.py:60 +#: t/skins/photoprint_templates_edit_form.py:59 msgid "Printing options deleted." msgstr "" @@ -547,3 +547,6 @@ msgstr "" msgid "[%s] order %s sending notification" msgstr "" + +msgid "paypal_pay" +msgstr "" diff --git a/locales/fr/LC_MESSAGES/photoprint.mo b/locales/fr/LC_MESSAGES/photoprint.mo index 17ace82bce71d113b2c0a0b70c1163343e1abb9d..2246a9bffe8d35fed34dfd314503917f013b8bdf 100644 GIT binary patch delta 2296 zcmXZcaZJ=@9LMqJfHSxwNCD#v=$CMSpiD4|5SpUHfpA0W36enbd8$5KitEP-|Kmv-|zQ4-{<>0 zzvr_pzix4VS&((e@VAfu68<}~j7i~Z*(If?I1l6K$32*dNi4>_cn`jh zdhP_?k7Ks|3>H#9m%i_s-zYpp!wlYs!CYgOVhO5)bx2I669f1RR$&(^#{H-P-@!aQ zY}-FVy>|)~z~@+j-y=hrzp%%+#@wZFFAY6h^g)WEAzYqk|N<33!7 zgVrNhOZ^mTpea$I(w3c4IqU#4m6O9waTRRmVMe2g|UZmo@Vd)C509ZN}3sg~b%EAj@n1L(L$U z{3#<2s@{OyGHs|1UO>&P*P1|OY6!KthEW+9Ma}#Ks{a%ctN8}?oO{_8uA@4*Y3qNZ zQspCT4Va4>un3j0Fsj34sP|e>9j?XmK4UhZmay!B^yaKat@+c|tw=wv*-k;bzc<}r z-nPDnn!zzt$79IPjB`-{7qJefa4utnZTuOVeG~H1XCaAZfGVm2DpzlxtU$FJ7r~qbAnYe)(=N}|FCWnm? z()V9ZK`*XC?aHUH9yehPCUI`lpk{g+SK=hDK|kNHKF2m}#OJLZ61$m1Wq2ADP@a=M zunN&_rlE?0HrtEH1~+lkW;=jN-EnNfG3@5xm_}u!qda|13?SRZyo;=c8AHu*64lQ& z)I?@&dnH?+Sj?IV@~@e6(V$Iq6f5yKa%Pwb)Pp~xmSPr_>e6s}bB0kFS&m9^D=OfP z)@M;CVUN9^KtJ^)uE(LUn{N1l2Bq*a>hrjPdeKib+AIrEOH_`TSdR*%5gTw7>RgDS zmLP?#ID^Va9r@QevL1KgFlO?V%(@h6X}DWWCs@lV(uYyh%rBvXcTh7cCXdQQ1?t>r zLj@K^Enxx`_yOw?)Pzo=_R!a;O?cMccdt+g(C|BIfZO&)22uH`7oc7UA^XiNL8ZLi z`W()q9>X9eP|pvdGUwU)2dDr(MSV5n$hZMBK_N)P1uvRC=zojSUhmKBUf&zuwj9@& z^nT(x=xqzE^zHKw1y=apOic!=^8&HRKrFIzJ9syX`wQA$iaMKi#2x2hr=h-i#Uss) eO{rHxx8~<}Mxxz)-MivWXJnu=veWCW-S9sVknPL> delta 2258 zcmXZce@sE$<-U+s9aAzYu%flpP2Sp=&whD&h*He(o{!8F{6cVP$KfjdzD z+l6=H9(Vo-PNsh{b=|j%G^TUn3g+M#mSSdRYJh4aCR>Ca*5OQCiHflkHDNbq<16m` zZq$7Pr~vk35q^YBVc%hk`DVY-$l}D~9CSl7s^7*z6K+9e+Jnld4>i$iI0g4&E*?fz z>J!vB7qAR3Cfy%L1yG7Jncu3^z^B}WK8(?S!+8Yr>0d^b_y(%vk%?3Zv#=No zkgqM}ph`Z5QEWyf(24isR-8J{?0xhV*_lbHHTe-$sxd6UC~0ZpGSr$qg39;_%)?F2 zS200<05#F)s6a0v$=lDUac`r>%OxsRqBKhVRpKNkn9~-Z)^sJRlxt9>Y(o97)m`6& zny3rsVvp+|N4|E7gC-t9lC*D8mAZu*=RZ^hy~)&Hnx5z z)KUFH%h=w9O?Jj(Z zdLa#CDc(R0G;JE?#S&Bn22cTghzj_a>z_ddFpR3i2&#ftk>c2|&U7|LmY)AY8rqHJ zSb-0sp3@doMmtfNzJ>E}5EtQf)MJ?78J>+xoSjI_Hi(qi&Y=SO9eD!nFRa1L81>gC zdzc0r+SZ^pSvxA@?O28V_%tt!bEt|`+?RSkJc(=zdmdQ@>qlich#KcCDv?olKBFl0 zCXAyJsVk!XT8nN@%)sra2oEAb+9}jhjG{_CE}nXRJyb=eph{eV3OMOphaX|51K5rmF^#8W6chBn_lwQu)5ziNu>tE*nV-NIeuc{HA5>|{-4`Owb%Ta$tyvHX8tui#ez diff --git a/locales/fr/LC_MESSAGES/photoprint.po b/locales/fr/LC_MESSAGES/photoprint.po index bd2625b..31b0546 100644 --- a/locales/fr/LC_MESSAGES/photoprint.po +++ b/locales/fr/LC_MESSAGES/photoprint.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plinn 2.0\n" -"POT-Creation-Date: Thu Oct 3 17:53:20 2013\n" +"POT-Creation-Date: Fri Oct 4 21:36:58 2013\n" "PO-Revision-Date: 2013-10-03 17:55+0200\n" "Last-Translator: Benoît PIN\n" "Language-Team: CRI http://cri.ensmp.fr\n" @@ -81,7 +81,7 @@ msgid "Please accept general conditions of sales." msgstr "Veuillez accepter les conditions générales des ventes." #: t/skins/my_orders.py:17 t/skins/order_list.py:14 -#: t/skins/order_view_template.pt:182 +#: t/skins/order_view_template.pt:181 msgid "Date" msgstr "Date" @@ -111,7 +111,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:87 t/skins/order_view_template.pt:193 +#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:191 msgid "${DYNAMIC_CONTENT}" msgstr "" @@ -238,7 +238,7 @@ msgid "Tracking url" msgstr "url de suivi" #: t/skins/order_printing_list_template.pt:22 -#: t/skins/order_view_template.pt:97 +#: t/skins/order_view_template.pt:96 msgid "Image" msgstr "Image" @@ -251,7 +251,7 @@ msgid "Format / type" msgstr "Format / type" #: t/skins/order_printing_list_template.pt:25 -#: t/skins/order_view_template.pt:99 +#: t/skins/order_view_template.pt:98 msgid "Quantity" msgstr "Quantité" @@ -283,53 +283,53 @@ msgstr "Code postal" msgid "Country" msgstr "Pays" -#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:134 +#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:133 msgid "Shipping" msgstr "Livraison" -#: t/skins/order_view_template.pt:84 +#: t/skins/order_view_template.pt:83 msgid "Processing" msgstr "Traitement" -#: t/skins/order_view_template.pt:98 +#: t/skins/order_view_template.pt:97 msgid "Printing format and type" msgstr "Format d'impression et type de support" -#: t/skins/order_view_template.pt:100 +#: t/skins/order_view_template.pt:99 msgid "Unit price" msgstr "Prix unitaire" -#: t/skins/order_view_template.pt:101 +#: t/skins/order_view_template.pt:100 #: t/skins/photoprint_templates_edit_template.pt:45 #: t/skins/photoprint_templates_edit_template.pt:131 msgid "VAT (%)" msgstr "TVA (%)" -#: t/skins/order_view_template.pt:102 +#: t/skins/order_view_template.pt:101 msgid "Amount
(tax incl.)" msgstr "Montant (TTC)" -#: t/skins/order_view_template.pt:111 +#: t/skins/order_view_template.pt:110 msgid "image removed" msgstr "image supprimée" -#: t/skins/order_view_template.pt:138 +#: t/skins/order_view_template.pt:137 msgid "VAT" msgstr "TVA" -#: t/skins/order_view_template.pt:142 +#: t/skins/order_view_template.pt:141 msgid "Total amount to pay" msgstr "Montant total à payer" -#: t/skins/order_view_template.pt:152 +#: t/skins/order_view_template.pt:151 msgid "Pay with PayPal:" msgstr "Payer avec PayPal :" -#: t/skins/order_view_template.pt:153 t/skins/order_view_template.pt:155 +#: t/skins/order_view_template.pt:152 t/skins/order_view_template.pt:154 msgid "Pay with PayPal" msgstr "Payer avec PayPal" -#: t/skins/order_view_template.pt:165 +#: t/skins/order_view_template.pt:164 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 " @@ -350,15 +350,15 @@ msgstr "" "vous pourrez, à votre convenance, payer par virement PayPal ou par carte " "bancaire." -#: t/skins/order_view_template.pt:177 +#: t/skins/order_view_template.pt:176 msgid "Order processing history" msgstr "Historique du traitement de la commande" -#: t/skins/order_view_template.pt:183 +#: t/skins/order_view_template.pt:182 msgid "Actor" msgstr "Acteur" -#: t/skins/order_view_template.pt:184 +#: t/skins/order_view_template.pt:183 msgid "Action" msgstr "Action" @@ -406,11 +406,11 @@ msgstr "" "Votre paiement a été annulé.
\n" "Vous pouvez réessayer avec un autre compte / autre carte bancaire.
" -#: t/skins/photoprint_templates_edit_form.py:56 +#: t/skins/photoprint_templates_edit_form.py:55 msgid "Printing options added." msgstr "Options d'impression ajoutées." -#: t/skins/photoprint_templates_edit_form.py:60 +#: t/skins/photoprint_templates_edit_form.py:59 msgid "Printing options deleted." msgstr "Options d'impression supprimées." @@ -592,6 +592,9 @@ msgstr "[%s] annulation de la commande %s" msgid "[%s] order %s sending notification" msgstr "[%s] expédition de la commande %s" +msgid "paypal_pay" +msgstr "Paiement PayPal" + #~ msgid "Use one of these button to pay:" #~ msgstr "Utilisez un de ces bouton pour payer :" diff --git a/locales/photoprint-manual.pot b/locales/photoprint-manual.pot index 688317d..efd99d8 100644 --- a/locales/photoprint-manual.pot +++ b/locales/photoprint-manual.pot @@ -83,3 +83,7 @@ msgstr "" msgid "[%s] order %s sending notification" msgstr "" + +msgid "paypal_pay" +msgstr "" + diff --git a/locales/photoprint.pot b/locales/photoprint.pot index 3a7b635..2e1b21d 100644 --- a/locales/photoprint.pot +++ b/locales/photoprint.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Meaningless\n" -"POT-Creation-Date: Thu Oct 3 17:53:20 2013\n" +"POT-Creation-Date: Fri Oct 4 21:36:58 2013\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -85,7 +85,7 @@ msgstr "" #: t/skins/my_orders.py:17 #: t/skins/order_list.py:14 -#: t/skins/order_view_template.pt:182 +#: t/skins/order_view_template.pt:181 msgid "Date" msgstr "" @@ -123,8 +123,8 @@ msgstr "" #: 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:87 -#: t/skins/order_view_template.pt:193 +#: t/skins/order_view_template.pt:86 +#: t/skins/order_view_template.pt:191 msgid "${DYNAMIC_CONTENT}" msgstr "" @@ -245,7 +245,7 @@ msgid "Tracking url" msgstr "" #: t/skins/order_printing_list_template.pt:22 -#: t/skins/order_view_template.pt:97 +#: t/skins/order_view_template.pt:96 msgid "Image" msgstr "" @@ -258,7 +258,7 @@ msgid "Format / type" msgstr "" #: t/skins/order_printing_list_template.pt:25 -#: t/skins/order_view_template.pt:99 +#: t/skins/order_view_template.pt:98 msgid "Quantity" msgstr "" @@ -295,66 +295,66 @@ msgid "Country" msgstr "" #: t/skins/order_view_template.pt:53 -#: t/skins/order_view_template.pt:134 +#: t/skins/order_view_template.pt:133 msgid "Shipping" msgstr "" -#: t/skins/order_view_template.pt:84 +#: t/skins/order_view_template.pt:83 msgid "Processing" msgstr "" -#: t/skins/order_view_template.pt:98 +#: t/skins/order_view_template.pt:97 msgid "Printing format and type" msgstr "" -#: t/skins/order_view_template.pt:100 +#: t/skins/order_view_template.pt:99 msgid "Unit price" msgstr "" -#: t/skins/order_view_template.pt:101 +#: t/skins/order_view_template.pt:100 #: t/skins/photoprint_templates_edit_template.pt:45 #: t/skins/photoprint_templates_edit_template.pt:131 msgid "VAT (%)" msgstr "" -#: t/skins/order_view_template.pt:102 +#: t/skins/order_view_template.pt:101 msgid "Amount
(tax incl.)" msgstr "" -#: t/skins/order_view_template.pt:111 +#: t/skins/order_view_template.pt:110 msgid "image removed" msgstr "" -#: t/skins/order_view_template.pt:138 +#: t/skins/order_view_template.pt:137 msgid "VAT" msgstr "" -#: t/skins/order_view_template.pt:142 +#: t/skins/order_view_template.pt:141 msgid "Total amount to pay" msgstr "" -#: t/skins/order_view_template.pt:152 +#: t/skins/order_view_template.pt:151 msgid "Pay with PayPal:" msgstr "" -#: t/skins/order_view_template.pt:153 -#: t/skins/order_view_template.pt:155 +#: t/skins/order_view_template.pt:152 +#: t/skins/order_view_template.pt:154 msgid "Pay with PayPal" msgstr "" -#: t/skins/order_view_template.pt:165 +#: t/skins/order_view_template.pt:164 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:177 +#: t/skins/order_view_template.pt:176 msgid "Order processing history" msgstr "" -#: t/skins/order_view_template.pt:183 +#: t/skins/order_view_template.pt:182 msgid "Actor" msgstr "" -#: t/skins/order_view_template.pt:184 +#: t/skins/order_view_template.pt:183 msgid "Action" msgstr "" @@ -398,11 +398,11 @@ msgstr "" msgid "Your payment has been canceled.
You can retry with an other account / credit card by cliking on the PayPal button.
" msgstr "" -#: t/skins/photoprint_templates_edit_form.py:56 +#: t/skins/photoprint_templates_edit_form.py:55 msgid "Printing options added." msgstr "" -#: t/skins/photoprint_templates_edit_form.py:60 +#: t/skins/photoprint_templates_edit_form.py:59 msgid "Printing options deleted." msgstr "" @@ -580,3 +580,7 @@ msgstr "" msgid "[%s] order %s sending notification" msgstr "" + +msgid "paypal_pay" +msgstr "" + diff --git a/skins/order_view_template.pt b/skins/order_view_template.pt index 0678456..5f748b2 100644 --- a/skins/order_view_template.pt +++ b/skins/order_view_template.pt @@ -186,7 +186,6 @@ time - Cyberplus actor -- 2.20.1