X-Git-Url: https://svn.cri.ensmp.fr/git/photoprint.git/blobdiff_plain/077104edcbc86919b1ba1bf6318e88201614faa4..f4c99bcdc9425cde32f0323811cf737e0d567070:/locales/en/LC_MESSAGES/photoprint.po?ds=inline

diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po
index ddc0a0d..ac41bf8 100644
--- a/locales/en/LC_MESSAGES/photoprint.po
+++ b/locales/en/LC_MESSAGES/photoprint.po
@@ -20,44 +20,44 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: t/skins/customer_add_control.py:19
+#: t/skins/customer_add_control.py:21
 msgid "Please enter a given name."
 msgstr ""
 
-#: t/skins/customer_add_control.py:20
+#: t/skins/customer_add_control.py:22
 msgid "Please enter a name."
 msgstr ""
 
-#: t/skins/customer_add_control.py:21
+#: t/skins/customer_add_control.py:23
 msgid "Please enter an email."
 msgstr ""
 
-#: t/skins/customer_add_control.py:22
+#: t/skins/customer_add_control.py:24
 msgid "Please enter a member id."
 msgstr ""
 
-#: t/skins/customer_add_control.py:23
+#: t/skins/customer_add_control.py:25
 msgid "Please enter a billing address."
 msgstr ""
 
-#: t/skins/customer_add_control.py:24
+#: t/skins/customer_add_control.py:26
 msgid "Please enter a city."
 msgstr ""
 
-#: t/skins/customer_add_control.py:25
+#: t/skins/customer_add_control.py:27
 msgid "Please enter zip code."
 msgstr ""
 
-#: t/skins/customer_add_control.py:26
+#: t/skins/customer_add_control.py:28
 msgid "Please enter a country."
 msgstr ""
 
-#: t/skins/customer_add_control.py:27
+#: t/skins/customer_add_control.py:29
 msgid "Please enter a phone."
 msgstr ""
 
-#: t/skins/customer_add_control.py:28
-msgid "Please accept general conditions of sales."
+#: t/skins/customer_add_control.py:56
+msgid "Wrong private collection credentials."
 msgstr ""
 
 #: t/skins/customer_join_template.pt:11
@@ -84,59 +84,62 @@ msgstr ""
 msgid "Member ID"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:48 t/skins/customer_login_form.pt:45
+#: t/skins/customer_join_template.pt:45
+msgid ""
+"Your login must starts with a letter, followed only by <br /> letters, "
+"numbers or _ (underscore).<br /> No accent, nopunctuation or special chars."
+"<br /> Those restrictions are only for this login field."
+msgstr ""
+
+#: t/skins/customer_join_template.pt:56 t/skins/customer_login_form.pt:45
 msgid "Password"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:54
+#: t/skins/customer_join_template.pt:62
 msgid "Password (confirm)"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:60
-msgid "Mail Password?"
+#: t/skins/customer_join_template.pt:73
+msgid "Access to private Images"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:64
-msgid "Check this box to have the password mailed."
+#: t/skins/customer_join_template.pt:75
+msgid "Please enter the access code to view / purchase private images."
 msgstr ""
 
-#: t/skins/customer_join_template.pt:102 t/skins/personalize_form.pt:46
+#: t/skins/customer_join_template.pt:104 t/skins/personalize_form.pt:46
 msgid "Billing informations"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:106 t/skins/order_view_template.pt:35
+#: t/skins/customer_join_template.pt:108 t/skins/order_view_template.pt:35
 #: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
 msgid "Address"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:113 t/skins/order_view_template.pt:39
+#: t/skins/customer_join_template.pt:115 t/skins/order_view_template.pt:39
 #: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
 msgid "City"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:119 t/skins/order_view_template.pt:43
+#: t/skins/customer_join_template.pt:121 t/skins/order_view_template.pt:43
 #: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
 msgid "Zip code"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:125 t/skins/order_view_template.pt:47
+#: t/skins/customer_join_template.pt:127 t/skins/order_view_template.pt:47
 #: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
 msgid "Country"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:135 t/skins/personalize_form.pt:79
+#: t/skins/customer_join_template.pt:137 t/skins/personalize_form.pt:79
 msgid "Phone"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:144
-msgid "I accept general conditions of sales"
-msgstr ""
-
-#: t/skins/customer_join_template.pt:152
+#: t/skins/customer_join_template.pt:147
 msgid "Register"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:153
+#: t/skins/customer_join_template.pt:148
 #: t/skins/photoprint_templates_edit_template.pt:142
 msgid "Cancel"
 msgstr ""
@@ -196,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 ""
 
@@ -226,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 ""
 
@@ -369,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 ""
 
@@ -399,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 "
@@ -427,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 ""
 
@@ -463,6 +470,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: t/skins/photoprint_order_cancel.py:5
+msgid "Your payment has been canceled. You can retry later."
+msgstr ""
+
 #: t/skins/photoprint_order_confirm.py:7
 msgid "Your payment has been accepted by PayPal."
 msgstr ""
@@ -566,6 +577,18 @@ msgstr ""
 msgid "You must enter a numeric value for the VAT rate."
 msgstr ""
 
+#: t/utils.py:53
+msgid "Wrong private collection identifier."
+msgstr ""
+
+#: t/utils.py:56
+msgid "Collection's password does not match confirmation."
+msgstr ""
+
+#: t/utils.py:60
+msgid "Wrong collection's password."
+msgstr ""
+
 # from photoprint-manual.pot
 msgid "Your payment is complete."
 msgstr ""