Corrections messages pour réinitialisation de mot de passe.

diff --git a/RegistrationTool.py b/RegistrationTool.py
index bddd44bf93e6c43e72e124ea7a0c17c992ffa058..e8262f9de617062be5f228d7922e88a931553b2f 100644 (file)
--- a/RegistrationTool.py
+++ b/RegistrationTool.py
@@ -270,7 +270,7 @@ class RegistrationTool(BaseRegistrationTool) :
             if member :
                 member.setSecurityProfile(password=password)
                 del self._passwordResetRequests[uuid]
             if member :
                 member.setSecurityProfile(password=password)
                 del self._passwordResetRequests[uuid]

-                return  userid, _('Password successfully reset.')
+                return  userid, _('Password successfully updated.')

             else :
                 return None, _('"%s" username not found.') % userid
             
             else :
                 return None, _('"%s" username not found.') % userid
             

diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index deb2b3fa97461c36ed8454835033f9abe8a25a23..65d19a21bba39d4732e6b78bf899d563bb503a49 100644 (file)
Binary files a/locales/en/LC_MESSAGES/plinn.mo and b/locales/en/LC_MESSAGES/plinn.mo differ

diff --git a/locales/en/LC_MESSAGES/plinn.po b/locales/en/LC_MESSAGES/plinn.po
index 69cef88c996bbb3c727bd36efbe8f3a20e27ebf1..740eca6121499685d95dbc73c1789d1a82de76b2 100644 (file)
--- a/locales/en/LC_MESSAGES/plinn.po
+++ b/locales/en/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"

-"POT-Creation-Date: Tue Apr  1 16:10:35 2014\n"
+"POT-Creation-Date: Mon May 12 23:42:25 2014\n"

 "PO-Revision-Date: 2013-11-28 13:12+0100\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "PO-Revision-Date: 2013-11-28 13:12+0100\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"


@@ -41,7 +41,7 @@ msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 
 #: n/RegistrationTool.py:273
 msgstr ""
 
 #: n/RegistrationTool.py:273

-msgid "Password successfully reset."
+msgid "Password successfully updated."

 msgstr ""
 
 #: n/RegistrationTool.py:275
 msgstr ""
 
 #: n/RegistrationTool.py:275


@@ -532,7 +532,6 @@ msgstr ""
 
 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
 
 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390

-#: n/skins/generic/password_reset_template.pt:28

 msgid "Password"
 msgstr ""
 
 msgid "Password"
 msgstr ""
 


@@ -600,14 +599,14 @@ msgstr ""
 
 #: n/skins/custom_generic/main_template_standard.pt:111
 #: n/skins/custom_generic/talkback_tree.pt:63
 
 #: n/skins/custom_generic/main_template_standard.pt:111
 #: n/skins/custom_generic/talkback_tree.pt:63

-#: n/skins/generic/main_template_ajax.pt:12
+#: n/skins/generic/main_template_ajax.pt:11

 #: n/skins/photo_theme/main_template_standard.pt:119
 msgid "Information"
 msgstr ""
 
 #: n/skins/custom_generic/main_template_standard.pt:112
 #: n/skins/custom_generic/talkback_tree.pt:64
 #: n/skins/photo_theme/main_template_standard.pt:119
 msgid "Information"
 msgstr ""
 
 #: n/skins/custom_generic/main_template_standard.pt:112
 #: n/skins/custom_generic/talkback_tree.pt:64

-#: n/skins/generic/main_template_ajax.pt:13 n/skins/generic/widgets.pt:17
+#: n/skins/generic/main_template_ajax.pt:12 n/skins/generic/widgets.pt:17

 #: n/skins/photo_theme/main_template_standard.pt:120
 #: n/skins/photo_theme/search_results_macros.pt:38
 msgid "${DYNAMIC_CONTENT}"
 #: n/skins/photo_theme/main_template_standard.pt:120
 #: n/skins/photo_theme/search_results_macros.pt:38
 msgid "${DYNAMIC_CONTENT}"


@@ -672,7 +671,6 @@ msgstr ""
 #: n/skins/custom_generic/talkback_tree.pt:82
 #: n/skins/generic/gruf_macros.pt:77 n/skins/generic/gruf_macros.pt:410
 #: n/skins/generic/header_widgets.pt:32 n/skins/generic/header_widgets.pt:173
 #: n/skins/custom_generic/talkback_tree.pt:82
 #: n/skins/generic/gruf_macros.pt:77 n/skins/generic/gruf_macros.pt:410
 #: n/skins/generic/header_widgets.pt:32 n/skins/generic/header_widgets.pt:173

-#: n/skins/generic/password_reset_form.py:30

 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr ""
 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr ""


@@ -921,7 +919,6 @@ msgid "Given Name"
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396

-#: n/skins/generic/password_reset_template.pt:34

 msgid "Confirm"
 msgstr ""
 
 msgid "Confirm"
 msgstr ""
 


@@ -1097,12 +1094,16 @@ msgstr ""
 msgid "Exit boxes editing"
 msgstr ""
 
 msgid "Exit boxes editing"
 msgstr ""
 

+#: n/skins/generic/password_reset_form.py:30
+msgid "Update Password"
+msgstr ""
+

 #: n/skins/generic/password_reset_mail.py:4
 msgid "Hi %(fullName)s,"
 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:6
 #: n/skins/generic/password_reset_mail.py:4
 msgid "Hi %(fullName)s,"
 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:6

-msgid "You have asked to change your password."
+msgid "You recently asked to reset your password."

 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:8
 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:8


@@ -1128,7 +1129,15 @@ msgid "Password resetting"
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:21
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:21

-msgid "Please enter a new password and clic on \"Validate\" button."
+msgid "Please choose a new password."
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:28
+msgid "New Password"
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:34
+msgid "Confirm New Password"

 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:49
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:49


@@ -1216,18 +1225,19 @@ msgstr ""
 
 #: n/skins/generic/request_password_reset_template.pt:12
 msgid ""
 
 #: n/skins/generic/request_password_reset_template.pt:12
 msgid ""

-"Enter your email or your username below and click on the \"Send\" button. "
-"You will receive an email with a link to reset your password."
+"Enter your email or your login below and click on the \"Send\" button. For "
+"security reasons, we store your password encrypted, and cannot mail it to "
+"you. You will receive an email with a link to reset your password."

 msgstr ""
 
 msgstr ""
 

-#: n/skins/generic/request_password_reset_template.pt:19
+#: n/skins/generic/request_password_reset_template.pt:21

 msgid ""
 msgid ""

-"If this will not work for you (for example, if you forget your username or "
-"didn't enter your email address) send email to ${admin_email}."
+"If this will not work for you (for example, if you forgot your login or your "
+"email address has changed), contact us at ${admin_email}."

 msgstr ""
 
 #. Default: "Send"
 msgstr ""
 
 #. Default: "Send"

-#: n/skins/generic/request_password_reset_template.pt:26
+#: n/skins/generic/request_password_reset_template.pt:27

 msgid " Send "
 msgstr ""
 
 msgid " Send "
 msgstr ""
 

diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index c7f4f909f8840da70f580fe7d51e786204697a76..a837fd74fa1c892f9d0a2cfb2f1ec86a6516bfd7 100644 (file)
Binary files a/locales/fr/LC_MESSAGES/plinn.mo and b/locales/fr/LC_MESSAGES/plinn.mo differ

diff --git a/locales/fr/LC_MESSAGES/plinn.po b/locales/fr/LC_MESSAGES/plinn.po
index 6e878497c6feae82feba22644730bd75ef13325b..b1c28475159a946ff2a6caa7fcb3e5d8e9a17591 100755 (executable)
--- a/locales/fr/LC_MESSAGES/plinn.po
+++ b/locales/fr/LC_MESSAGES/plinn.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"

-"POT-Creation-Date: Tue Apr  1 16:10:35 2014\n"
-"PO-Revision-Date: 2014-01-19 10:51+0100\n"
+"POT-Creation-Date: Mon May 12 23:42:25 2014\n"
+"PO-Revision-Date: 2014-05-12 23:42+0200\n"

 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"


@@ -43,8 +43,8 @@ msgstr ""
 "demander une nouvelle."
 
 #: n/RegistrationTool.py:273
 "demander une nouvelle."
 
 #: n/RegistrationTool.py:273

-msgid "Password successfully reset."
-msgstr "Mot de passe correctement réinitialisé."
+msgid "Password successfully updated."
+msgstr "Mot de passe correctement mis à jour."

 
 #: n/RegistrationTool.py:275
 msgid "\"%s\" username not found."
 
 #: n/RegistrationTool.py:275
 msgid "\"%s\" username not found."


@@ -551,7 +551,6 @@ msgstr "Login"
 
 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
 
 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390

-#: n/skins/generic/password_reset_template.pt:28

 msgid "Password"
 msgstr "Mot de passe"
 
 msgid "Password"
 msgstr "Mot de passe"
 


@@ -631,14 +630,14 @@ msgstr "Requête faîte par l'IP ${ip} à ${time}"
 
 #: n/skins/custom_generic/main_template_standard.pt:111
 #: n/skins/custom_generic/talkback_tree.pt:63
 
 #: n/skins/custom_generic/main_template_standard.pt:111
 #: n/skins/custom_generic/talkback_tree.pt:63

-#: n/skins/generic/main_template_ajax.pt:12
+#: n/skins/generic/main_template_ajax.pt:11

 #: n/skins/photo_theme/main_template_standard.pt:119
 msgid "Information"
 msgstr "Information"
 
 #: n/skins/custom_generic/main_template_standard.pt:112
 #: n/skins/custom_generic/talkback_tree.pt:64
 #: n/skins/photo_theme/main_template_standard.pt:119
 msgid "Information"
 msgstr "Information"
 
 #: n/skins/custom_generic/main_template_standard.pt:112
 #: n/skins/custom_generic/talkback_tree.pt:64

-#: n/skins/generic/main_template_ajax.pt:13 n/skins/generic/widgets.pt:17
+#: n/skins/generic/main_template_ajax.pt:12 n/skins/generic/widgets.pt:17

 #: n/skins/photo_theme/main_template_standard.pt:120
 #: n/skins/photo_theme/search_results_macros.pt:38
 msgid "${DYNAMIC_CONTENT}"
 #: n/skins/photo_theme/main_template_standard.pt:120
 #: n/skins/photo_theme/search_results_macros.pt:38
 msgid "${DYNAMIC_CONTENT}"


@@ -706,7 +705,6 @@ msgstr "Corps"
 #: n/skins/custom_generic/talkback_tree.pt:82
 #: n/skins/generic/gruf_macros.pt:77 n/skins/generic/gruf_macros.pt:410
 #: n/skins/generic/header_widgets.pt:32 n/skins/generic/header_widgets.pt:173
 #: n/skins/custom_generic/talkback_tree.pt:82
 #: n/skins/generic/gruf_macros.pt:77 n/skins/generic/gruf_macros.pt:410
 #: n/skins/generic/header_widgets.pt:32 n/skins/generic/header_widgets.pt:173

-#: n/skins/generic/password_reset_form.py:30

 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr "Valider"
 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr "Valider"


@@ -973,7 +971,6 @@ msgid "Given Name"
 msgstr "Prénom"
 
 #: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396
 msgstr "Prénom"
 
 #: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396

-#: n/skins/generic/password_reset_template.pt:34

 msgid "Confirm"
 msgstr "Confirmation"
 
 msgid "Confirm"
 msgstr "Confirmation"
 


@@ -1149,13 +1146,17 @@ msgstr "Coller"
 msgid "Exit boxes editing"
 msgstr "Quitter l'édition des boîtes"
 
 msgid "Exit boxes editing"
 msgstr "Quitter l'édition des boîtes"
 

+#: n/skins/generic/password_reset_form.py:30
+msgid "Update Password"
+msgstr "Mettre à jour le mot de passe"
+

 #: n/skins/generic/password_reset_mail.py:4
 msgid "Hi %(fullName)s,"
 msgstr "Bonjour %(fullName)s,"
 
 #: n/skins/generic/password_reset_mail.py:6
 #: n/skins/generic/password_reset_mail.py:4
 msgid "Hi %(fullName)s,"
 msgstr "Bonjour %(fullName)s,"
 
 #: n/skins/generic/password_reset_mail.py:6

-msgid "You have asked to change your password."
-msgstr "Vous avez demandé de changer de mot de passe."
+msgid "You recently asked to reset your password."
+msgstr "Vous avez récemment demandé de réinitialiser votre mot de passe."

 
 #: n/skins/generic/password_reset_mail.py:8
 msgid ""
 
 #: n/skins/generic/password_reset_mail.py:8
 msgid ""


@@ -1182,10 +1183,16 @@ msgid "Password resetting"
 msgstr "Réinitialisation du mot de passe"
 
 #: n/skins/generic/password_reset_template.pt:21
 msgstr "Réinitialisation du mot de passe"
 
 #: n/skins/generic/password_reset_template.pt:21

-msgid "Please enter a new password and clic on \"Validate\" button."
-msgstr ""
-"Veuillez entrer un nouveau mot de passe puis cliquer sur le bouton "
-"« Valider »."
+msgid "Please choose a new password."
+msgstr "Veuillez choisir un nouveau mot de passe."
+
+#: n/skins/generic/password_reset_template.pt:28
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: n/skins/generic/password_reset_template.pt:34
+msgid "Confirm New Password"
+msgstr "Confirmer le nouveau mot de passe"

 
 #: n/skins/generic/password_reset_template.pt:49
 msgid "Password changed"
 
 #: n/skins/generic/password_reset_template.pt:49
 msgid "Password changed"


@@ -1278,24 +1285,26 @@ msgstr "Réinitialisation de mot de passe"
 
 #: n/skins/generic/request_password_reset_template.pt:12
 msgid ""
 
 #: n/skins/generic/request_password_reset_template.pt:12
 msgid ""

-"Enter your email or your username below and click on the \"Send\" button. "
-"You will receive an email with a link to reset your password."
+"Enter your email or your login below and click on the \"Send\" button. For "
+"security reasons, we store your password encrypted, and cannot mail it to "
+"you. You will receive an email with a link to reset your password."

 msgstr ""
 "Entrez votre email ou votre login ci-dessous et cliquez sur « Envoyer ». "
 msgstr ""
 "Entrez votre email ou votre login ci-dessous et cliquez sur « Envoyer ». "

-"Vous recevrez un email contenant un lien pour réinitialiser votre mot de "
-"passe."
+"Pour des raisons de sécurité, nous conservons votre mot de passe sous forme "
+"cryptée : nous ne pouvons donc pas vous l'envoyer. Vous recevrez un email "
+"contenant un lien pour réinitialiser votre mot de passe.\""

 
 

-#: n/skins/generic/request_password_reset_template.pt:19
+#: n/skins/generic/request_password_reset_template.pt:21

 msgid ""
 msgid ""

-"If this will not work for you (for example, if you forget your username or "
-"didn't enter your email address) send email to ${admin_email}."
+"If this will not work for you (for example, if you forgot your login or your "
+"email address has changed), contact us at ${admin_email}."

 msgstr ""
 msgstr ""

-"Si cela ne marche pas dans votre cas (par exemple si vous avez oublié votre "
-"login ou si vous n'aviez pas entré une adresse email), vous pouvez envoyer "
-"un email à ${admin_email}."
+"Si cela ne marche pas dans votre cas (par exemple, si vous avez oublié votre "
+"login ou si votre adresse mail a changé), contactez-nous à l'adresse "
+"suivante : ${admin_email}"

 
 #. Default: "Send"
 
 #. Default: "Send"

-#: n/skins/generic/request_password_reset_template.pt:26
+#: n/skins/generic/request_password_reset_template.pt:27

 msgid " Send "
 msgstr " Envoyer "
 
 msgid " Send "
 msgstr " Envoyer "
 


@@ -2362,6 +2371,33 @@ msgstr "Ceci est la page d'accueil par défaut."
 msgid "Huge Folder"
 msgstr "Dossier"
 
 msgid "Huge Folder"
 msgstr "Dossier"
 

+#~ msgid "Password successfully reset."
+#~ msgstr "Mot de passe correctement réinitialisé."
+
+#~ msgid "You have asked to change your password."
+#~ msgstr "Vous avez demandé de changer de mot de passe."
+
+#~ msgid "Please enter a new password and clic on \"Validate\" button."
+#~ msgstr ""
+#~ "Veuillez entrer un nouveau mot de passe puis cliquer sur le bouton "
+#~ "« Valider »."
+
+#~ msgid ""
+#~ "Enter your email or your username below and click on the \"Send\" button. "
+#~ "You will receive an email with a link to reset your password."
+#~ msgstr ""
+#~ "Entrez votre email ou votre login ci-dessous et cliquez sur « Envoyer ». "
+#~ "Vous recevrez un email contenant un lien pour réinitialiser votre mot de "
+#~ "passe."
+
+#~ msgid ""
+#~ "If this will not work for you (for example, if you forget your username "
+#~ "or didn't enter your email address) send email to ${admin_email}."
+#~ msgstr ""
+#~ "Si cela ne marche pas dans votre cas (par exemple si vous avez oublié "
+#~ "votre login ou si vous n'aviez pas entré une adresse email), vous pouvez "
+#~ "envoyer un email à ${admin_email}."
+

 #~ msgid ""
 #~ "Enter your username below and click on the \"Send\" button. You will "
 #~ "receive an email with a link to reset your password."
 #~ msgid ""
 #~ "Enter your username below and click on the \"Send\" button. You will "
 #~ "receive an email with a link to reset your password."

diff --git a/locales/plinn.pot b/locales/plinn.pot
index 23362478b34c97b4e8e9d0ff698797f188e245ab..1695fb63a47e85e42938b907bd557a34e711990a 100644 (file)
--- a/locales/plinn.pot
+++ b/locales/plinn.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"

-"POT-Creation-Date: Tue Apr  1 16:10:35 2014\n"
+"POT-Creation-Date: Mon May 12 23:42:25 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"
 "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"


@@ -48,7 +48,7 @@ msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 
 #: n/RegistrationTool.py:273
 msgstr ""
 
 #: n/RegistrationTool.py:273

-msgid "Password successfully reset."
+msgid "Password successfully updated."

 msgstr ""
 
 #: n/RegistrationTool.py:275
 msgstr ""
 
 #: n/RegistrationTool.py:275


@@ -115,11 +115,11 @@ msgid "Cancel delete mode"
 msgstr ""
 
 #: n/skins/content/changes_history_template.pt:24
 msgstr ""
 
 #: n/skins/content/changes_history_template.pt:24

-msgid "\302\253 later revisions"
+msgid "« later revisions"

 msgstr ""
 
 #: n/skins/content/changes_history_template.pt:28
 msgstr ""
 
 #: n/skins/content/changes_history_template.pt:28

-msgid "earlier revisions \302\273"
+msgid "earlier revisions »"

 msgstr ""
 
 #: n/skins/content/changes_history_template.pt:37
 msgstr ""
 
 #: n/skins/content/changes_history_template.pt:37


@@ -542,7 +542,6 @@ msgstr ""
 #: n/skins/custom_generic/login_form.pt:28
 #: n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
 #: n/skins/custom_generic/login_form.pt:28
 #: n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390

-#: n/skins/generic/password_reset_template.pt:28

 msgid "Password"
 msgstr ""
 
 msgid "Password"
 msgstr ""
 


@@ -602,14 +601,14 @@ msgstr ""
 
 #: n/skins/custom_generic/main_template_standard.pt:111
 #: n/skins/custom_generic/talkback_tree.pt:63
 
 #: n/skins/custom_generic/main_template_standard.pt:111
 #: n/skins/custom_generic/talkback_tree.pt:63

-#: n/skins/generic/main_template_ajax.pt:12
+#: n/skins/generic/main_template_ajax.pt:11

 #: n/skins/photo_theme/main_template_standard.pt:119
 msgid "Information"
 msgstr ""
 
 #: n/skins/custom_generic/main_template_standard.pt:112
 #: n/skins/custom_generic/talkback_tree.pt:64
 #: n/skins/photo_theme/main_template_standard.pt:119
 msgid "Information"
 msgstr ""
 
 #: n/skins/custom_generic/main_template_standard.pt:112
 #: n/skins/custom_generic/talkback_tree.pt:64

-#: n/skins/generic/main_template_ajax.pt:13
+#: n/skins/generic/main_template_ajax.pt:12

 #: n/skins/generic/widgets.pt:17
 #: n/skins/photo_theme/main_template_standard.pt:120
 #: n/skins/photo_theme/search_results_macros.pt:38
 #: n/skins/generic/widgets.pt:17
 #: n/skins/photo_theme/main_template_standard.pt:120
 #: n/skins/photo_theme/search_results_macros.pt:38


@@ -675,7 +674,6 @@ msgstr ""
 #: n/skins/generic/gruf_macros.pt:410
 #: n/skins/generic/header_widgets.pt:32
 #: n/skins/generic/header_widgets.pt:173
 #: n/skins/generic/gruf_macros.pt:410
 #: n/skins/generic/header_widgets.pt:32
 #: n/skins/generic/header_widgets.pt:173

-#: n/skins/generic/password_reset_form.py:30

 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr ""
 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr ""


@@ -932,7 +930,6 @@ msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:274
 #: n/skins/generic/gruf_macros.pt:396
 
 #: n/skins/generic/gruf_macros.pt:274
 #: n/skins/generic/gruf_macros.pt:396

-#: n/skins/generic/password_reset_template.pt:34

 msgid "Confirm"
 msgstr ""
 
 msgid "Confirm"
 msgstr ""
 


@@ -1112,12 +1109,16 @@ msgstr ""
 msgid "Exit boxes editing"
 msgstr ""
 
 msgid "Exit boxes editing"
 msgstr ""
 

+#: n/skins/generic/password_reset_form.py:30
+msgid "Update Password"
+msgstr ""
+

 #: n/skins/generic/password_reset_mail.py:4
 msgid "Hi %(fullName)s,"
 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:6
 #: n/skins/generic/password_reset_mail.py:4
 msgid "Hi %(fullName)s,"
 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:6

-msgid "You have asked to change your password."
+msgid "You recently asked to reset your password."

 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:8
 msgstr ""
 
 #: n/skins/generic/password_reset_mail.py:8


@@ -1141,7 +1142,15 @@ msgid "Password resetting"
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:21
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:21

-msgid "Please enter a new password and clic on \"Validate\" button."
+msgid "Please choose a new password."
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:28
+msgid "New Password"
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:34
+msgid "Confirm New Password"

 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:49
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:49


@@ -1225,14 +1234,14 @@ msgid "Password reset"
 msgstr ""
 
 #: n/skins/generic/request_password_reset_template.pt:12
 msgstr ""
 
 #: n/skins/generic/request_password_reset_template.pt:12

-msgid "Enter your email or your username below and click on the \"Send\" button. You will receive an email with a link to reset your password."
+msgid "Enter your email or your login below and click on the \"Send\" button. For security reasons, we store your password encrypted, and cannot mail it to you. You will receive an email with a link to reset your password."

 msgstr ""
 
 msgstr ""
 

-#: n/skins/generic/request_password_reset_template.pt:19
-msgid "If this will not work for you (for example, if you forget your username or didn't enter your email address) send email to ${admin_email}."
+#: n/skins/generic/request_password_reset_template.pt:21
+msgid "If this will not work for you (for example, if you forgot your login or your email address has changed), contact us at ${admin_email}."

 msgstr ""
 
 msgstr ""
 

-#: n/skins/generic/request_password_reset_template.pt:26
+#: n/skins/generic/request_password_reset_template.pt:27

 #. Default: "Send"
 msgid " Send "
 msgstr ""
 #. Default: "Send"
 msgid " Send "
 msgstr ""


@@ -1246,7 +1255,7 @@ msgid "Restore this revision"
 msgstr ""
 
 #: n/skins/generic/revision_context_header.pt:22
 msgstr ""
 
 #: n/skins/generic/revision_context_header.pt:22

-msgid "\342\206\220 previous revision"
+msgid "← previous revision"

 msgstr ""
 
 #: n/skins/generic/revision_context_header.pt:27
 msgstr ""
 
 #: n/skins/generic/revision_context_header.pt:27


@@ -1254,7 +1263,7 @@ msgid "current revision"
 msgstr ""
 
 #: n/skins/generic/revision_context_header.pt:29
 msgstr ""
 
 #: n/skins/generic/revision_context_header.pt:29

-msgid "next revision \342\206\222"
+msgid "next revision →"

 msgstr ""
 
 #: n/skins/generic/search.py:109
 msgstr ""
 
 #: n/skins/generic/search.py:109

diff --git a/skins/generic/password_reset_form.py b/skins/generic/password_reset_form.py
index dce99eb9a2edcb0351cfe79f15dec1bd7732390a..eaa2eb76e10cbc05896a882d3d59ac8fce7edf29 100644 (file)
--- a/skins/generic/password_reset_form.py
+++ b/skins/generic/password_reset_form.py
@@ -27,7 +27,7 @@ if passwordChanged :
 else :
     hidden_vars = []
     target = '%s/password_reset_form/%s' % (utool(), uuid)
 else :
     hidden_vars = []
     target = '%s/password_reset_form/%s' % (utool(), uuid)

-    buttons = ({'name': 'validate', 'value': _('Validate')},)
+    buttons = ({'name': 'validate', 'value': _('Update Password')},)

 
 options['form'] = { 'action': target,
                     'listButtonInfos': tuple(buttons),
 
 options['form'] = { 'action': target,
                     'listButtonInfos': tuple(buttons),

diff --git a/skins/generic/password_reset_mail.py b/skins/generic/password_reset_mail.py
index 442a1f6a6f11913f27fd6a4c5a25cd4e56ceac3e..7a9ab12d46280cc18620a09ad0f0b1fba962b47f 100644 (file)
--- a/skins/generic/password_reset_mail.py
+++ b/skins/generic/password_reset_mail.py
@@ -3,7 +3,7 @@ from Products.Plinn.utils import translate as _
 
 print _('Hi %(fullName)s,')
 print
 
 print _('Hi %(fullName)s,')
 print

-print _('You have asked to change your password.')
+print _('You recently asked to reset your password.')

 
 print _("To get back into your account on the %(siteName)s website, you'll need to create a new password.")
 print _("It's easy:")
 
 print _("To get back into your account on the %(siteName)s website, you'll need to create a new password.")
 print _("It's easy:")

diff --git a/skins/generic/password_reset_template.pt b/skins/generic/password_reset_template.pt
index 0440dd792eca5b2049f35795ea0be69bac0a1185..d0db692924aa30c0a17f32c22ac8477c922676c5 100644 (file)
--- a/skins/generic/password_reset_template.pt
+++ b/skins/generic/password_reset_template.pt
@@ -19,19 +19,19 @@
               <td colspan="2">
                 <dl class="FieldHelp">
                   <dd i18n:translate="">
               <td colspan="2">
                 <dl class="FieldHelp">
                   <dd i18n:translate="">

-                    Please enter a new password and clic on "Validate" button.
+                    Please choose a new password.

                   </dd>
                 </dl>
               </td>
             </tr>
             <tr>
                   </dd>
                 </dl>
               </td>
             </tr>
             <tr>

-              <th i18n:translate="">Password</th>
+              <th i18n:translate="">New Password</th>

               <td>
                 <input type="password" name="password"/>
               </td>
             </tr>
             <tr>
               <td>
                 <input type="password" name="password"/>
               </td>
             </tr>
             <tr>

-              <th i18n:translate="">Confirm</th>
+              <th i18n:translate="">Confirm New Password</th>

               <td>
                 <input type="password" name="confirm"/>
               </td>
               <td>
                 <input type="password" name="confirm"/>
               </td>

diff --git a/skins/generic/request_password_reset_template.pt b/skins/generic/request_password_reset_template.pt
index 3604a2ba596968d2b561c36faca4bfeec665e3fc..69b13d590c31baf03bc8eef47089b1f5f9e79074 100644 (file)
--- a/skins/generic/request_password_reset_template.pt
+++ b/skins/generic/request_password_reset_template.pt
@@ -10,14 +10,15 @@
       <div id="Desktop" tal:define="ptool here/portal_properties">
         <h1 i18n:translate="">Password reset</h1>
         <p i18n:translate="">
       <div id="Desktop" tal:define="ptool here/portal_properties">
         <h1 i18n:translate="">Password reset</h1>
         <p i18n:translate="">

-          Enter your email or your username below and click on the "Send"
-          button. You will receive an email with a link to reset your
+          Enter your email or your login below and click on the "Send" button.
+          For security reasons, we store your password encrypted, and cannot
+          mail it to you. You will receive an email with a link to reset your

           password.
         </p>
         <p i18n:translate="">
           password.
         </p>
         <p i18n:translate="">

-          If this will not work for you (for example, if you forget your
-          username or didn't enter your email address) send email to <a
-          tal:attributes="href string:mailto:${ptool/email_from_address}"
+          If this will not work for you (for example, if you forgot your login
+          or your email address has changed), contact us at
+          <a tal:attributes="href string:mailto:${ptool/email_from_address}"

           tal:content="ptool/email_from_address" href="mailto:me@here.com"
           i18n:name="admin_email">me@here.com</a>.
         </p>
           tal:content="ptool/email_from_address" href="mailto:me@here.com"
           i18n:name="admin_email">me@here.com</a>.
         </p>