traduction des messages de workflow.

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index c776485..8d5d3d3 100644 (file)
Binary files a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo and b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo differ

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index 999c12a..2748581 100644 (file)
--- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Sat Feb 21 01:11:05 2015\n"
-"PO-Revision-Date: 2015-02-21 00:35+0100\n"
+"POT-Creation-Date: Wed Apr 15 17:13:53 2015\n"
+"PO-Revision-Date: 2015-04-15 17:00+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "Language: \n"
@@ -226,7 +226,7 @@ msgstr " Change and View "
 msgid "Name"
 msgstr "Name"
 
-#: n/skins/content/folder_factories.pt:34
+#: n/skins/content/folder_factories.pt:35
 #: n/skins/content/topic_edit_template.pt:51
 #: n/skins/generic/gruf_macros.pt:288 n/skins/generic/gruf_macros.pt:327
 msgid "Add"
@@ -592,19 +592,30 @@ msgstr "No news is no news."
 msgid "More..."
 msgstr "More..."
 
-#: n/skins/custom_generic/join_template.pt:14
+#: n/skins/custom_generic/join_form.py:60
+#: n/skins/photo_theme/photo_main_macros.pt:28
+msgid "Join"
+msgstr "Join"
+
+#: n/skins/custom_generic/join_template.pt:12
+msgid "Become a member"
+msgstr "Become a member"
+
+#: n/skins/custom_generic/join_template.pt:16
 msgid ""
-"You are already a member. You may use the <a href=\"personalize_form"
-"\">personalization form</a> to change your membership information."
+"You are already authenticated. You may use the ${personalize_form} to change "
+"your personal informations."
 msgstr ""
-"You are already a member. You may use the <a href=\"personalize_form"
-"\">personalization form</a> to change your membership information."
 
-#: n/skins/custom_generic/join_template.pt:20
+#: n/skins/custom_generic/join_template.pt:16
+msgid "personalization form"
+msgstr ""
+
+#: n/skins/custom_generic/join_template.pt:23
 msgid "You have been registered as a member."
 msgstr "You have been registered as a member."
 
-#: n/skins/custom_generic/join_template.pt:22
+#: n/skins/custom_generic/join_template.pt:24
 msgid ""
 "You will receive an email shortly containing your password and instructions "
 "on how to activate your membership."
@@ -612,7 +623,7 @@ msgstr ""
 "You will receive an email shortly containing your password and instructions "
 "on how to activate your membership."
 
-#: n/skins/custom_generic/join_template.pt:27
+#: n/skins/custom_generic/join_template.pt:29
 msgid "Click the button to log in immediately."
 msgstr "Click the button to log in immediately."
 
@@ -620,7 +631,7 @@ msgstr "Click the button to log in immediately."
 msgid "Your registration request has been taken into account."
 msgstr "Your registration request has been taken into account."
 
-#: n/skins/custom_generic/join_template.pt:42
+#: n/skins/custom_generic/join_template.pt:41
 msgid ""
 "Your request will be reviewed soon by a portal administrator. You will "
 "receive an email containing your password and instructions on how to "
@@ -630,7 +641,7 @@ msgstr ""
 "receive an email containing your password and instructions on how to "
 "activate your membership when your registration will be approved."
 
-#: n/skins/custom_generic/join_template.pt:48
+#: n/skins/custom_generic/join_template.pt:47
 msgid ""
 "Your request will be reviewed soon by a portal administrator. You will "
 "receive an email when your registration will be approved."
@@ -642,7 +653,7 @@ msgstr ""
 msgid "Return to homepage"
 msgstr "Return to homepage"
 
-#: n/skins/custom_generic/join_template.pt:57
+#: n/skins/custom_generic/join_template.pt:56
 msgid ""
 "Becoming a member gives you the ability to personalize the site and "
 "participate in the community."
@@ -658,7 +669,7 @@ msgstr ""
 "It does not cost any money to become a member and your email and other "
 "personal information will remain private."
 
-#: n/skins/custom_generic/join_template.pt:63
+#: n/skins/custom_generic/join_template.pt:64
 msgid ""
 "You must submit a valid email address. This address will be used to send you "
 "a randomly-generated password. Once you have logged in with this password, "
@@ -668,40 +679,34 @@ msgstr ""
 "a randomly-generated password. Once you have logged in with this password, "
 "you may change it to anything you like."
 
-#: n/skins/custom_generic/join_template.pt:74
-msgid "Member ID"
-msgstr "Member ID"
-
-#: n/skins/custom_generic/join_template.pt:81
+#: n/skins/custom_generic/join_template.pt:76
 msgid "First name"
 msgstr "First name"
 
-#: n/skins/custom_generic/join_template.pt:87
+#: n/skins/custom_generic/join_template.pt:81
 msgid "Last name"
 msgstr "Last name"
 
-#: n/skins/custom_generic/join_template.pt:93
-msgid "Email Address"
-msgstr "Email Address"
+#: n/skins/custom_generic/join_template.pt:88
+#: n/skins/custom_generic/personalize_form.pt:39
+#: n/skins/generic/gruf_macros.pt:280 n/skins/generic/gruf_macros.pt:402
+msgid "Email address"
+msgstr "Email address"
+
+#: n/skins/custom_generic/join_template.pt:94
+msgid "use as login"
+msgstr "use as login"
 
-#: n/skins/custom_generic/join_template.pt:100
+#: n/skins/custom_generic/join_template.pt:101
 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
 msgid "Password"
 msgstr "Password"
 
-#: n/skins/custom_generic/join_template.pt:106
+#: n/skins/custom_generic/join_template.pt:107
 msgid "Password (confirm)"
 msgstr "Password (confirm)"
 
-#: n/skins/custom_generic/join_template.pt:112
-msgid "Mail Password?"
-msgstr "Mail Password?"
-
-#: n/skins/custom_generic/join_template.pt:116
-msgid "Check this box to have the password mailed."
-msgstr "Check this box to have the password mailed."
-
 #: n/skins/custom_generic/logged_in.py:28
 #: n/skins/custom_generic/logged_in_template.pt:9
 msgid "Login failure"
@@ -933,11 +938,6 @@ msgstr "Click here"
 msgid "Given Name"
 msgstr "Given Name"
 
-#: n/skins/custom_generic/personalize_form.pt:39
-#: n/skins/generic/gruf_macros.pt:280 n/skins/generic/gruf_macros.pt:402
-msgid "Email address"
-msgstr "Email address"
-
 #: n/skins/custom_generic/personalize_form.pt:45
 msgid "Preferred languages"
 msgstr "Preferred languages"
@@ -1207,12 +1207,14 @@ msgstr "modified on ${date} at ${time} – creator: ${creator}"
 msgid "Make private: \"${docTitle}\""
 msgstr "Make private: \"${docTitle}\""
 
-#. Default: "share_transition_explanations"
+#. Default: "Once this change made, this content will only be visible by you and the reviewers."
 #: n/skins/generic/content_make_private_form.pt:11
 msgid "make_private_transition_explanations"
 msgstr ""
+"Once this change made, this content will only be visible by you and the "
+"reviewers."
 
-#: n/skins/generic/content_make_private_form.pt:16
+#: n/skins/generic/content_make_private_form.pt:18
 #: n/skins/generic/content_reject_form.pt:25
 msgid "Make private"
 msgstr "Make private"
@@ -1221,16 +1223,19 @@ msgstr "Make private"
 msgid "Publish: \"${docTitle}\""
 msgstr "Publish: \"${docTitle}\""
 
+#. Default: "The publication of this content will make it available to all visitors and prevent its suppression."
 #: n/skins/generic/content_publish_form.pt:10
 msgid "publish_transition_explanations"
 msgstr ""
+"The publication of this content will make it available to all visitors and "
+"prevent its suppression."
 
-#: n/skins/generic/content_publish_form.pt:17
+#: n/skins/generic/content_publish_form.pt:20
 #: n/skins/generic/content_reject_form.pt:16
 msgid "Notify by e-mail"
 msgstr "Notify by e-mail"
 
-#: n/skins/generic/content_publish_form.pt:26
+#: n/skins/generic/content_publish_form.pt:29
 msgid "Publish"
 msgstr "Publish"
 
@@ -1240,17 +1245,18 @@ msgstr "Make private: \"${objectid}\""
 
 #: n/skins/generic/content_reject_form.pt:9
 msgid "Make this item private to disable public access"
-msgstr ""
+msgstr "Make this item private to disable public access"
 
 #: n/skins/generic/content_retract_form.pt:8
 msgid "Retract: \"${objectid}\""
 msgstr "Retract: \"${objectid}\""
 
+#. Default: "By retracting this content, you will cancel its submit and put it back to private state."
 #: n/skins/generic/content_retract_form.pt:9
 msgid "retract_transition_explanations"
-msgstr ""
+msgstr "By retracting this content, you will cancel its submit and put it back to private state."
 
-#: n/skins/generic/content_retract_form.pt:15
+#: n/skins/generic/content_retract_form.pt:18
 msgid "Retract"
 msgstr "Retract"
 
@@ -2031,10 +2037,6 @@ msgstr "Loading progress..."
 msgid "Skip to content"
 msgstr "Skip to content"
 
-#: n/skins/photo_theme/photo_main_macros.pt:28
-msgid "Join"
-msgstr "Join"
-
 #: n/skins/photo_theme/search_results_macros.pt:12
 msgid "Title"
 msgstr "Title"
@@ -2921,6 +2923,25 @@ msgstr "Directory"
 msgid "Configure portal"
 msgstr "Configure portal"
 
+#~ msgid ""
+#~ "You are already a member. You may use the <a href=\"personalize_form"
+#~ "\">personalization form</a> to change your membership information."
+#~ msgstr ""
+#~ "You are already a member. You may use the <a href=\"personalize_form"
+#~ "\">personalization form</a> to change your membership information."
+
+#~ msgid "Member ID"
+#~ msgstr "Member ID"
+
+#~ msgid "Email Address"
+#~ msgstr "Email Address"
+
+#~ msgid "Mail Password?"
+#~ msgstr "Mail Password?"
+
+#~ msgid "Check this box to have the password mailed."
+#~ msgstr "Check this box to have the password mailed."
+
 #~ msgid "Depublish: \"${docTitle}\""
 #~ msgstr "Depublish: \"${docTitle}\""
 

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index e1f30bc..35702ab 100644 (file)
Binary files a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo and b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo differ

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index 7e46c9a..439e1ac 100644 (file)
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Mon Dec 15 15:35:05 2014\n"
-"PO-Revision-Date: 2014-12-15 15:42+0100\n"
+"POT-Creation-Date: Wed Apr 15 17:13:14 2015\n"
+"PO-Revision-Date: 2015-04-15 15:06+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
@@ -219,7 +219,7 @@ msgstr " Changer et voir "
 msgid "Name"
 msgstr "Nom"
 
-#: n/skins/content/folder_factories.pt:34
+#: n/skins/content/folder_factories.pt:35
 #: n/skins/content/topic_edit_template.pt:51
 #: n/skins/generic/gruf_macros.pt:288 n/skins/generic/gruf_macros.pt:327
 msgid "Add"
@@ -585,20 +585,30 @@ msgstr "Pas de nouvelle bonne nouvelle !"
 msgid "More..."
 msgstr "Plus…"
 
-#: n/skins/custom_generic/join_template.pt:14
+#: n/skins/custom_generic/join_form.py:60
+#: n/skins/photo_theme/photo_main_macros.pt:28
+msgid "Join"
+msgstr "S'inscrire"
+
+#: n/skins/custom_generic/join_template.pt:12
+msgid "Become a member"
+msgstr "Devenir membre"
+
+#: n/skins/custom_generic/join_template.pt:16
 msgid ""
-"You are already a member. You may use the <a href=\"personalize_form"
-"\">personalization form</a> to change your membership information."
+"You are already authenticated. You may use the ${personalize_form} to change "
+"your personal informations."
 msgstr ""
-"Vous êtes déjà connecté en tant que membre. Vous pouvez utiliser le <a href="
-"\"personalize_form\">formulaire des préférences</a> pour changer vos "
-"informations."
 
-#: n/skins/custom_generic/join_template.pt:20
+#: n/skins/custom_generic/join_template.pt:16
+msgid "personalization form"
+msgstr ""
+
+#: n/skins/custom_generic/join_template.pt:23
 msgid "You have been registered as a member."
 msgstr "Vous avez été enregistré en tant que membre."
 
-#: n/skins/custom_generic/join_template.pt:22
+#: n/skins/custom_generic/join_template.pt:24
 msgid ""
 "You will receive an email shortly containing your password and instructions "
 "on how to activate your membership."
@@ -606,7 +616,7 @@ msgstr ""
 "Vous allez recevoir sous peu un e-mail qui contiendra votre mot de passe "
 "ainsi que les instructions pour activer votre inscription."
 
-#: n/skins/custom_generic/join_template.pt:27
+#: n/skins/custom_generic/join_template.pt:29
 msgid "Click the button to log in immediately."
 msgstr "Cliquez sur le bouton pour vous connecter immédiatement."
 
@@ -614,7 +624,7 @@ msgstr "Cliquez sur le bouton pour vous connecter immédiatement."
 msgid "Your registration request has been taken into account."
 msgstr "Votre demande d'inscription a été prise en compte."
 
-#: n/skins/custom_generic/join_template.pt:42
+#: n/skins/custom_generic/join_template.pt:41
 msgid ""
 "Your request will be reviewed soon by a portal administrator. You will "
 "receive an email containing your password and instructions on how to "
@@ -624,7 +634,7 @@ msgstr ""
 "Vous recevrez un e-mail contenant votre mot de passe et des instructions "
 "pour vous connectez dès que votre inscription aura été approuvée."
 
-#: n/skins/custom_generic/join_template.pt:48
+#: n/skins/custom_generic/join_template.pt:47
 msgid ""
 "Your request will be reviewed soon by a portal administrator. You will "
 "receive an email when your registration will be approved."
@@ -636,7 +646,7 @@ msgstr ""
 msgid "Return to homepage"
 msgstr "Retour à la page d'accueil"
 
-#: n/skins/custom_generic/join_template.pt:57
+#: n/skins/custom_generic/join_template.pt:56
 msgid ""
 "Becoming a member gives you the ability to personalize the site and "
 "participate in the community."
@@ -652,7 +662,7 @@ msgstr ""
 "Devenir membre est complètement gratuit. Votre e-mail ainsi que toutes vos "
 "données personnelles resteront privées."
 
-#: n/skins/custom_generic/join_template.pt:63
+#: n/skins/custom_generic/join_template.pt:64
 msgid ""
 "You must submit a valid email address. This address will be used to send you "
 "a randomly-generated password. Once you have logged in with this password, "
@@ -662,41 +672,34 @@ msgstr ""
 "envoyer votre mot de passe généré automatiquement. Vous pourrez le changer "
 "dès votre première connexion."
 
-#: n/skins/custom_generic/join_template.pt:74
-msgid "Member ID"
-msgstr "Login"
-
-#: n/skins/custom_generic/join_template.pt:81
+#: n/skins/custom_generic/join_template.pt:76
 msgid "First name"
 msgstr "Prénom"
 
-#: n/skins/custom_generic/join_template.pt:87
+#: n/skins/custom_generic/join_template.pt:81
 msgid "Last name"
 msgstr "Nom"
 
-#: n/skins/custom_generic/join_template.pt:93
-msgid "Email Address"
-msgstr "Email"
+#: n/skins/custom_generic/join_template.pt:88
+#: n/skins/custom_generic/personalize_form.pt:39
+#: n/skins/generic/gruf_macros.pt:280 n/skins/generic/gruf_macros.pt:402
+msgid "Email address"
+msgstr "Adresse e-mail"
+
+#: n/skins/custom_generic/join_template.pt:94
+msgid "use as login"
+msgstr "utiliser comme identifiant"
 
-#: n/skins/custom_generic/join_template.pt:100
+#: n/skins/custom_generic/join_template.pt:101
 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
 msgid "Password"
 msgstr "Mot de passe"
 
-#: n/skins/custom_generic/join_template.pt:106
+#: n/skins/custom_generic/join_template.pt:107
 msgid "Password (confirm)"
 msgstr "Confirmation"
 
-#: n/skins/custom_generic/join_template.pt:112
-msgid "Mail Password?"
-msgstr "Envoyer le mot de passe ?"
-
-#: n/skins/custom_generic/join_template.pt:116
-msgid "Check this box to have the password mailed."
-msgstr ""
-"Cochez cette case afin que votre mot de passe vous soit envoyé par mail."
-
 #: n/skins/custom_generic/logged_in.py:28
 #: n/skins/custom_generic/logged_in_template.pt:9
 msgid "Login failure"
@@ -935,11 +938,6 @@ msgstr "Cliquez ici"
 msgid "Given Name"
 msgstr "Prénom"
 
-#: n/skins/custom_generic/personalize_form.pt:39
-#: n/skins/generic/gruf_macros.pt:280 n/skins/generic/gruf_macros.pt:402
-msgid "Email address"
-msgstr "Adresse e-mail"
-
 #: n/skins/custom_generic/personalize_form.pt:45
 msgid "Preferred languages"
 msgstr "Préférences linguistiques"
@@ -1210,14 +1208,14 @@ msgstr "modifié le ${date} à ${time} – créateur : ${creator}"
 msgid "Make private: \"${docTitle}\""
 msgstr "Rendre privé : «&nbsp;${docTitle}&nbsp;»"
 
-#. Default: "share_transition_explanations"
+#. Default: "Once this change made, this content will only be visible by you and the reviewers."
 #: n/skins/generic/content_make_private_form.pt:11
 msgid "make_private_transition_explanations"
 msgstr ""
 "Une fois ce changement effectué, ce document ne sera visible que par vous "
 "même ainsi que les coordonnateurs."
 
-#: n/skins/generic/content_make_private_form.pt:16
+#: n/skins/generic/content_make_private_form.pt:18
 #: n/skins/generic/content_reject_form.pt:25
 msgid "Make private"
 msgstr "Rendre privé"
@@ -1226,18 +1224,19 @@ msgstr "Rendre privé"
 msgid "Publish: \"${docTitle}\""
 msgstr "Publier : «&nbsp;${docTitle}&nbsp;»"
 
+#. Default: "The publication of this content will make it available to all visitors and prevent its suppression."
 #: n/skins/generic/content_publish_form.pt:10
 msgid "publish_transition_explanations"
 msgstr ""
 "La publication de ce document aura pour effet de le rendre disponible à "
 "l'ensemble des membres du site ainsi que d'empêcher sa supression."
 
-#: n/skins/generic/content_publish_form.pt:17
+#: n/skins/generic/content_publish_form.pt:20
 #: n/skins/generic/content_reject_form.pt:16
 msgid "Notify by e-mail"
 msgstr "Notifier par mail"
 
-#: n/skins/generic/content_publish_form.pt:26
+#: n/skins/generic/content_publish_form.pt:29
 msgid "Publish"
 msgstr "Publier"
 
@@ -1253,13 +1252,14 @@ msgstr "Rendre cet élément privé pour désactiver l'accès public."
 msgid "Retract: \"${objectid}\""
 msgstr "Retirer : «&nbsp;${objectid}&nbsp;»"
 
+#. Default: "By retracting this content, you will cancel its submit and put it back to private state."
 #: n/skins/generic/content_retract_form.pt:9
 msgid "retract_transition_explanations"
 msgstr ""
 "Le retrait d'un document a pour effet d'annuler sa soumission pour le "
 "remettre à l'état privé."
 
-#: n/skins/generic/content_retract_form.pt:15
+#: n/skins/generic/content_retract_form.pt:18
 msgid "Retract"
 msgstr "Retirer"
 
@@ -2055,10 +2055,6 @@ msgstr "Chargement en cours..."
 msgid "Skip to content"
 msgstr "Sauter au contenu"
 
-#: n/skins/photo_theme/photo_main_macros.pt:28
-msgid "Join"
-msgstr "S'inscrire"
-
 #: n/skins/photo_theme/search_results_macros.pt:12
 msgid "Title"
 msgstr "Titre"
@@ -2950,6 +2946,27 @@ msgstr "Annuaire"
 msgid "Configure portal"
 msgstr "Configurer portail"
 
+#~ msgid ""
+#~ "You are already a member. You may use the <a href=\"personalize_form"
+#~ "\">personalization form</a> to change your membership information."
+#~ msgstr ""
+#~ "Vous êtes déjà connecté en tant que membre. Vous pouvez utiliser le <a "
+#~ "href=\"personalize_form\">formulaire des préférences</a> pour changer vos "
+#~ "informations."
+
+#~ msgid "Member ID"
+#~ msgstr "Login"
+
+#~ msgid "Email Address"
+#~ msgstr "Email"
+
+#~ msgid "Mail Password?"
+#~ msgstr "Envoyer le mot de passe ?"
+
+#~ msgid "Check this box to have the password mailed."
+#~ msgstr ""
+#~ "Cochez cette case afin que votre mot de passe vous soit envoyé par mail."
+
 #~ msgid "Depublish: \"${docTitle}\""
 #~ msgstr "Dépublier : «&nbsp;${docTitle}&nbsp;»"
 

diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index 7b88fdc..028521b 100644 (file)
--- a/Products/Plinn/locales/plinn.pot
+++ b/Products/Plinn/locales/plinn.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Sat Feb 21 01:11:05 2015\n"
+"POT-Creation-Date: Wed Apr 15 17:13:53 2015\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"
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: n/skins/content/folder_factories.pt:34
+#: n/skins/content/folder_factories.pt:35
 #: n/skins/content/topic_edit_template.pt:51
 #: n/skins/generic/gruf_macros.pt:288
 #: n/skins/generic/gruf_macros.pt:327
@@ -592,19 +592,32 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:14
-msgid "You are already a member. You may use the <a href=\"personalize_form\">personalization form</a> to change your membership information."
+#: n/skins/custom_generic/join_form.py:60
+#: n/skins/photo_theme/photo_main_macros.pt:28
+msgid "Join"
+msgstr ""
+
+#: n/skins/custom_generic/join_template.pt:12
+msgid "Become a member"
+msgstr ""
+
+#: n/skins/custom_generic/join_template.pt:16
+msgid "You are already authenticated. You may use the ${personalize_form} to change your personal informations."
+msgstr ""
+
+#: n/skins/custom_generic/join_template.pt:16
+msgid "personalization form"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:20
+#: n/skins/custom_generic/join_template.pt:23
 msgid "You have been registered as a member."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:22
+#: n/skins/custom_generic/join_template.pt:24
 msgid "You will receive an email shortly containing your password and instructions on how to activate your membership."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:27
+#: n/skins/custom_generic/join_template.pt:29
 msgid "Click the button to log in immediately."
 msgstr ""
 
@@ -612,11 +625,11 @@ msgstr ""
 msgid "Your registration request has been taken into account."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:42
+#: n/skins/custom_generic/join_template.pt:41
 msgid "Your request will be reviewed soon by a portal administrator. You will receive an email containing your password and instructions on how to activate your membership when your registration will be approved."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:48
+#: n/skins/custom_generic/join_template.pt:47
 msgid "Your request will be reviewed soon by a portal administrator. You will receive an email when your registration will be approved."
 msgstr ""
 
@@ -624,7 +637,7 @@ msgstr ""
 msgid "Return to homepage"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:57
+#: n/skins/custom_generic/join_template.pt:56
 msgid "Becoming a member gives you the ability to personalize the site and participate in the community."
 msgstr ""
 
@@ -632,45 +645,40 @@ msgstr ""
 msgid "It does not cost any money to become a member and your email and other personal information will remain private."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:63
+#: n/skins/custom_generic/join_template.pt:64
 msgid "You must submit a valid email address. This address will be used to send you a randomly-generated password. Once you have logged in with this password, you may change it to anything you like."
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:74
-msgid "Member ID"
+#: n/skins/custom_generic/join_template.pt:76
+msgid "First name"
 msgstr ""
 
 #: n/skins/custom_generic/join_template.pt:81
-msgid "First name"
+msgid "Last name"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:87
-msgid "Last name"
+#: n/skins/custom_generic/join_template.pt:88
+#: n/skins/custom_generic/personalize_form.pt:39
+#: n/skins/generic/gruf_macros.pt:280
+#: n/skins/generic/gruf_macros.pt:402
+msgid "Email address"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:93
-msgid "Email Address"
+#: n/skins/custom_generic/join_template.pt:94
+msgid "use as login"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:100
+#: n/skins/custom_generic/join_template.pt:101
 #: n/skins/custom_generic/login_form.pt:28
 #: n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
 msgid "Password"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:106
+#: n/skins/custom_generic/join_template.pt:107
 msgid "Password (confirm)"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:112
-msgid "Mail Password?"
-msgstr ""
-
-#: n/skins/custom_generic/join_template.pt:116
-msgid "Check this box to have the password mailed."
-msgstr ""
-
 #: n/skins/custom_generic/logged_in.py:28
 #: n/skins/custom_generic/logged_in_template.pt:9
 msgid "Login failure"
@@ -859,12 +867,6 @@ msgstr ""
 msgid "Given Name"
 msgstr ""
 
-#: n/skins/custom_generic/personalize_form.pt:39
-#: n/skins/generic/gruf_macros.pt:280
-#: n/skins/generic/gruf_macros.pt:402
-msgid "Email address"
-msgstr ""
-
 #: n/skins/custom_generic/personalize_form.pt:45
 msgid "Preferred languages"
 msgstr ""
@@ -1106,11 +1108,11 @@ msgid "Make private: \"${docTitle}\""
 msgstr ""
 
 #: n/skins/generic/content_make_private_form.pt:11
-#. Default: "share_transition_explanations"
+#. Default: "Once this change made, this content will only be visible by you and the reviewers."
 msgid "make_private_transition_explanations"
 msgstr ""
 
-#: n/skins/generic/content_make_private_form.pt:16
+#: n/skins/generic/content_make_private_form.pt:18
 #: n/skins/generic/content_reject_form.pt:25
 msgid "Make private"
 msgstr ""
@@ -1120,15 +1122,16 @@ msgid "Publish: \"${docTitle}\""
 msgstr ""
 
 #: n/skins/generic/content_publish_form.pt:10
+#. Default: "The publication of this content will make it available to all visitors and prevent its suppression."
 msgid "publish_transition_explanations"
 msgstr ""
 
-#: n/skins/generic/content_publish_form.pt:17
+#: n/skins/generic/content_publish_form.pt:20
 #: n/skins/generic/content_reject_form.pt:16
 msgid "Notify by e-mail"
 msgstr ""
 
-#: n/skins/generic/content_publish_form.pt:26
+#: n/skins/generic/content_publish_form.pt:29
 msgid "Publish"
 msgstr ""
 
@@ -1145,10 +1148,11 @@ msgid "Retract: \"${objectid}\""
 msgstr ""
 
 #: n/skins/generic/content_retract_form.pt:9
+#. Default: "By retracting this content, you will cancel its submit and put it back to private state."
 msgid "retract_transition_explanations"
 msgstr ""
 
-#: n/skins/generic/content_retract_form.pt:15
+#: n/skins/generic/content_retract_form.pt:18
 msgid "Retract"
 msgstr ""
 
@@ -1881,10 +1885,6 @@ msgstr ""
 msgid "Skip to content"
 msgstr ""
 
-#: n/skins/photo_theme/photo_main_macros.pt:28
-msgid "Join"
-msgstr ""
-
 #: n/skins/photo_theme/search_results_macros.pt:12
 msgid "Title"
 msgstr ""

diff --git a/Products/Plinn/skins/generic/content_make_private_form.pt b/Products/Plinn/skins/generic/content_make_private_form.pt
index eae254d..467e95e 100644 (file)
--- a/Products/Plinn/skins/generic/content_make_private_form.pt
+++ b/Products/Plinn/skins/generic/content_make_private_form.pt
@@ -8,7 +8,9 @@
   <body i18n:domain="plinn">
                <div metal:fill-slot="main">
                <h2 i18n:translate="">Make private: "<span i18n:name="docTitle" tal:replace="here/title_or_id">document title</span>"</h2>
-               <div i18n:translate="make_private_transition_explanations">share_transition_explanations</div>
+               <div i18n:translate="make_private_transition_explanations">
+        Once this change made, this content will only be visible by you and the reviewers.
+      </div>
          </div>
        <form action=".">
                        <div metal:fill-slot="form">

diff --git a/Products/Plinn/skins/generic/content_publish_form.pt b/Products/Plinn/skins/generic/content_publish_form.pt
index 46bc8ea..aff6dd7 100644 (file)
--- a/Products/Plinn/skins/generic/content_publish_form.pt
+++ b/Products/Plinn/skins/generic/content_publish_form.pt
@@ -7,7 +7,10 @@
 
 <h2 i18n:translate="">Publish: "<span tal:replace="here/title_or_id"
                                     i18n:name="docTitle">Item</span>"</h2>
-       <div i18n:translate="publish_transition_explanations">publish_transition_explanations</div>
+       <div i18n:translate="publish_transition_explanations">
+    The publication of this content will make it available to all visitors and
+    prevent its suppression.
+  </div>
 </div>
 
 <form action="dummy">

diff --git a/Products/Plinn/skins/generic/content_retract_form.pt b/Products/Plinn/skins/generic/content_retract_form.pt
index 073584c..069fc6f 100644 (file)
--- a/Products/Plinn/skins/generic/content_retract_form.pt
+++ b/Products/Plinn/skins/generic/content_retract_form.pt
@@ -6,7 +6,10 @@
 <div metal:fill-slot="main" i18n:domain="plinn">
 
 <h2 i18n:translate="">Retract: "<span tal:replace="here/title_or_id" i18n:name="objectid">Item</span>"</h2>
-       <div i18n:translate="retract_transition_explanations">retract_transition_explanations</div>
+       <div i18n:translate="retract_transition_explanations">
+    By retracting this content, you will cancel its submit and put it back to
+    private state.
+  </div>
 </div>
 
 <form action="dummy">