improve french translation

tracim/tracim/config/app_cfg.py

 # plug(base_config, 'resetpassword', None, mail_subject=reset_password_email_subject)
 plug(base_config, 'resetpassword', 'reset_password')
 
-def fake_unicode(some_string_or_bytes):
-    return some_string_or_bytes
-    if isinstance(some_string_or_bytes, str):
-        print("IS STRING")
-        return some_string_or_bytes
-
-    print("IS ", some_string_or_bytes.__class__.__name__)
-    return str(some_string_or_bytes, 'utf-8')
-#     if isinstance(some_string_or_bytes, bytes):
-#         return some_string_or_bytes.encode('utf-8')
-#     return some_string_or_bytes
-#
-import resetpassword.lib as rplib
-# rplib.unicode = fake_unicode
-
 replace_template(base_config, 'resetpassword.templates.index', 'tracim.templates.reset_password_index')
 replace_template(base_config, 'resetpassword.templates.change_password', 'mako:tracim.templates.reset_password_change_password')
 
 %(password_reset_link)s
 
 If you no longer wish to make the above change, or if you did not initiate this request, please disregard and/or delete this e-mail.
+''')
+
+
+l_('New password')
+l_('Confirm new password')
+l_('Save new password')
+l_('Email address')
+l_('Send Request')
+
+
+l_('Password reset request sent')
+l_('Invalid password reset request')
+l_('Password reset request timed out')
+l_('Invalid password reset request')
+l_('Password changed successfully')
+
+l_('''
+We've received a request to reset the password for this account.
+Please click this link to reset your password:
+
+%(password_reset_link)s
+
+If you no longer wish to make the above change, or if you did not initiate this request, please disregard and/or delete this e-mail.
 ''')

tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po

 msgstr ""
 "Project-Id-Version: pod 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-24 13:36+0200\n"
-"PO-Revision-Date: 2014-10-24 13:36+0100\n"
+"POT-Creation-Date: 2014-10-30 17:34+0100\n"
+"PO-Revision-Date: 2014-10-30 17:37+0100\n"
 "Last-Translator: Damien Accorsi <damien.accorsi@free.fr>\n"
 "Language-Team: fr_FR <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: tracim/config/app_cfg.py:123
+#: tracim/config/app_cfg.py:124
 msgid "Password reset request"
 msgstr "Réinitialisation du mot de passe"
 
-#: tracim/config/app_cfg.py:124
+#: tracim/config/app_cfg.py:125
+#: tracim/config/app_cfg.py:148
 #, python-format
 msgid ""
 "\n"
 "\n"
 "Si vous ne souhaitez plus procéder à ce changement, ou si vous n'êtes pas à l'originie de cette requête, merci d'ignorer et/ou supprimer cet e-mail.\n"
 
+#: tracim/config/app_cfg.py:135
+#: tracim/templates/user_workspace_forms.mak:251
+#: tracim/templates/user_workspace_forms.mak:252
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: tracim/config/app_cfg.py:136
+msgid "Confirm new password"
+msgstr "Confirmer le nouveau mot de passe"
+
+#: tracim/config/app_cfg.py:137
+msgid "Save new password"
+msgstr "Enregistrer le nouveau mot de passe"
+
+#: tracim/config/app_cfg.py:138
+#: tracim/templates/user_get_all.mak:34
+msgid "Email address"
+msgstr "Adresse email"
+
+#: tracim/config/app_cfg.py:139
+msgid "Send Request"
+msgstr "Valider"
+
+#: tracim/config/app_cfg.py:142
+msgid "Password reset request sent"
+msgstr "Requête de réinitialisation du mot de passe envoyée"
+
+#: tracim/config/app_cfg.py:143
+#: tracim/config/app_cfg.py:145
+msgid "Invalid password reset request"
+msgstr "Requête de réinitialisation du mot de passe invalide"
+
+#: tracim/config/app_cfg.py:144
+msgid "Password reset request timed out"
+msgstr "Echec de la requête de réinitialisation du mot de passe"
+
+#: tracim/config/app_cfg.py:146
+msgid "Password changed successfully"
+msgstr "Mot de passe changé"
+
 #: tracim/controllers/__init__.py:139
-#: tracim/templates/master_authenticated.mak:87
+#: tracim/templates/master_authenticated.mak:88
 #: tracim/templates/master_no_toolbar_no_login.mak:112
 #: tracim/templates/user_get_one.mak:39
 #: tracim/templates/user_profile.mak:39
 msgid "You are not authorized to access this resource"
 msgstr "Vous n'êtes pas autorisé à accéder à cette ressource"
 
-#: tracim/model/auth.py:85
+#: tracim/model/auth.py:86
 msgid "Nobody"
 msgstr "Personne"
 
-#: tracim/model/auth.py:86
-#: tracim/templates/master_authenticated.mak:86
+#: tracim/model/auth.py:87
+#: tracim/templates/master_authenticated.mak:87
 #: tracim/templates/master_no_toolbar_no_login.mak:111
 #: tracim/templates/user_get_all.mak:13
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: tracim/model/auth.py:87
+#: tracim/model/auth.py:88
 msgid "Global managers"
 msgstr "Managers globaux"
 
-#: tracim/model/auth.py:88
+#: tracim/model/auth.py:89
 msgid "Administrators"
 msgstr "Administrateurs"
 
 msgstr "Créer un compte"
 
 #: tracim/templates/dashboard.mak:5
-#: tracim/templates/master_authenticated.mak:79
+#: tracim/templates/master_authenticated.mak:80
 #: tracim/templates/master_no_toolbar_no_login.mak:105
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
 #: tracim/templates/index.mak:25
 #: tracim/templates/index.mak:46
-#: tracim/templates/master_authenticated.mak:138
+#: tracim/templates/master_authenticated.mak:139
 msgid "Login"
 msgstr "Login"
 
 msgid "Move folder"
 msgstr "Déplacer le dossier"
 
-#: tracim/templates/master_anonymous.mak:67
-#: tracim/templates/master_authenticated.mak:48
-msgid "Create your own email-ready collaborative workspace on trac.im"
-msgstr "Créez votre propre espace de travail collaboratif compatible avec l'email sur trac.im"
+#: tracim/templates/master_anonymous.mak:68
+#: tracim/templates/master_authenticated.mak:49
+msgid "Create your own collaborative workspace on trac.im"
+msgstr "Créez votre propre espace de travail collaboratif sur trac.im"
 
-#: tracim/templates/master_authenticated.mak:80
+#: tracim/templates/master_authenticated.mak:81
 #: tracim/templates/master_no_toolbar_no_login.mak:106
 #: tracim/templates/workspace_get_all.mak:64
 msgid "Workspace"
 msgstr "Espace de travail"
 
-#: tracim/templates/master_authenticated.mak:84
+#: tracim/templates/master_authenticated.mak:85
 #: tracim/templates/master_no_toolbar_no_login.mak:109
 msgid "Admin"
 msgstr "Admin"
 
-#: tracim/templates/master_authenticated.mak:128
+#: tracim/templates/master_authenticated.mak:129
 #: tracim/templates/master_no_toolbar_no_login.mak:144
 msgid "My account"
 msgstr "Mon compte"
 
-#: tracim/templates/master_authenticated.mak:133
+#: tracim/templates/master_authenticated.mak:134
 #: tracim/templates/master_no_toolbar_no_login.mak:149
 msgid "Logout"
 msgstr "Fermer la session"
 
 #: tracim/templates/reset_password_change_password.mak:21
 #: tracim/templates/reset_password_index.mak:21
-#, fuzzy
 msgid "go back to home page"
 msgstr "Retourner à la page d'accueil"
 
 msgid "Email"
 msgstr "Email"
 
-#: tracim/templates/user_get_all.mak:34
-msgid "Email address"
-msgstr "Adresse email"
-
 #: tracim/templates/user_get_all.mak:37
 msgid "Password"
 msgstr "Mot de passe"
 msgstr "Mes espaces de travail"
 
 #: tracim/templates/user_get_me.mak:42
-#| msgid "This user is not member of any workspace."
 msgid "You are not member of any workspace."
 msgstr "Vous n'êtes membre d'aucun espace de travail"
 
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: tracim/templates/user_workspace_forms.mak:251
-#: tracim/templates/user_workspace_forms.mak:252
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
 #: tracim/templates/user_workspace_forms.mak:255
 #: tracim/templates/user_workspace_forms.mak:256
 msgid "Retype password"
 #~ msgid "The item is a normal document, like a howto or a text document."
 #~ msgstr "L'élément est un document normal, comme un howto ou un document texte"
 
-#~ msgid ""
-#~ "The item will be automatically computed"
-#~ " as \"in progress\" or \"done\" "
-#~ "according to its children status."
-#~ msgstr ""
-#~ "L'élément sera automatiquement mis en "
-#~ "\"En cours\" ou \"Fait\" suivant le "
-#~ "statut de ses enfants."
-
 #~ msgid "No action done on the item."
 #~ msgstr "Aucun changement sur l'élément"
 
 #~ msgid "The work associated with the item is finished."
 #~ msgstr "L'action associée à l'élément n'est pas terminée."
 
-#~ msgid ""
-#~ "Close the item if you want not "
-#~ "to see it anymore. The data won't"
-#~ " be deleted"
-#~ msgstr ""
-#~ "Fermez l'élément si vous ne voulez "
-#~ "plus le voir. Les données ne "
-#~ "seront pas supprimées"
-
 #~ msgid "This status tells that the item has been deleted."
 #~ msgstr "Ce status indique que l'élément a été supprimé."