Derniers ajustements sur la réinitialisation de mot de passe.

diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index 785873f..e0ffadd 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 9713ba3..19fefa6 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: Fri Aug  2 10:08:44 2013\n"
+"POT-Creation-Date: Fri Aug  2 10:33:47 2013\n"

 "PO-Revision-Date: 2007-10-17 14:43+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "PO-Revision-Date: 2007-10-17 14:43+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"


@@ -851,7 +851,6 @@ msgid "Add new member"
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:250 n/skins/generic/gruf_macros.pt:365
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:250 n/skins/generic/gruf_macros.pt:365

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

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 


@@ -1047,6 +1046,10 @@ msgstr ""
 msgid "Exit boxes editing"
 msgstr ""
 
 msgid "Exit boxes editing"
 msgstr ""
 

+#: n/skins/generic/password_reset_form.py:26
+msgid " Login "
+msgstr ""
+

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

diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index 2d05a96..3c299ba 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 979c5de..34e3a8d 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: Fri Aug  2 10:08:44 2013\n"
-"PO-Revision-Date: 2013-08-02 10:10+0200\n"
+"POT-Creation-Date: Fri Aug  2 10:33:47 2013\n"
+"PO-Revision-Date: 2013-08-02 10:29+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"


@@ -474,7 +474,9 @@ msgstr ""
 #: n/skins/custom_generic/logged_in_template.pt:17
 msgid ""
 "If you have forgotten your password, you can reset it by going to this page:"
 #: n/skins/custom_generic/logged_in_template.pt:17
 msgid ""
 "If you have forgotten your password, you can reset it by going to this page:"

-msgstr "Si vous avez oublié votre mot de passe, vous pouvez le réinitialiser en allant sur cette page :"
+msgstr ""
+"Si vous avez oublié votre mot de passe, vous pouvez le réinitialiser en "
+"allant sur cette page :"

 
 #: n/skins/custom_generic/logged_in_template.pt:21
 msgid "password resetting"
 
 #: n/skins/custom_generic/logged_in_template.pt:21
 msgid "password resetting"


@@ -894,7 +896,6 @@ msgid "Add new member"
 msgstr "Nouveau membre"
 
 #: n/skins/generic/gruf_macros.pt:250 n/skins/generic/gruf_macros.pt:365
 msgstr "Nouveau membre"
 
 #: n/skins/generic/gruf_macros.pt:250 n/skins/generic/gruf_macros.pt:365

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

 msgid "Login"
 msgstr "Login"
 
 msgid "Login"
 msgstr "Login"
 


@@ -1090,6 +1091,10 @@ 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:26
+msgid " Login "
+msgstr "Connexion"
+

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

diff --git a/locales/plinn.pot b/locales/plinn.pot
index 9dbc6f1..1b1d014 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: Fri Aug  2 10:09:29 2013\n"
+"POT-Creation-Date: Fri Aug  2 10:33:47 2013\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"


@@ -858,7 +858,6 @@ msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:250
 #: n/skins/generic/gruf_macros.pt:365
 
 #: n/skins/generic/gruf_macros.pt:250
 #: n/skins/generic/gruf_macros.pt:365

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

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 


@@ -1063,6 +1062,10 @@ msgstr ""
 msgid "Exit boxes editing"
 msgstr ""
 
 msgid "Exit boxes editing"
 msgstr ""
 

+#: n/skins/generic/password_reset_form.py:26
+msgid " Login "
+msgstr ""
+

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

diff --git a/skins/generic/password_reset_form.py b/skins/generic/password_reset_form.py
index 6dfb557..dce99eb 100644 (file)
--- a/skins/generic/password_reset_form.py
+++ b/skins/generic/password_reset_form.py
@@ -23,7 +23,7 @@ if passwordChanged :
                    {'name' : '__ac_password',   'value' : form['password']},
                    {'name' : 'noAjax',          'value' : '1'})
     target = utool()
                    {'name' : '__ac_password',   'value' : form['password']},
                    {'name' : 'noAjax',          'value' : '1'})
     target = utool()

-    buttons = ({'name': 'login', 'value': _('Login')},)
+    buttons = ({'name': 'login', 'value': _(' Login ')},)

 else :
     hidden_vars = []
     target = '%s/password_reset_form/%s' % (utool(), uuid)
 else :
     hidden_vars = []
     target = '%s/password_reset_form/%s' % (utool(), uuid)