refactor forgot pw function to use django methods / add password change page in profile / i18n update
Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/bg/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/locale/bg/LC_MESSAGES/django.po Mon Mar 22 12:50:42 2010 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 16:15+0100\n"
+"POT-Creation-Date: 2010-03-22 12:39+0100\n"
"PO-Revision-Date: 2010-03-10 20:58+0100\n"
"Last-Translator: bistra <bistra.raykova@free.fr>\n"
"Language-Team: Français <kde-i18n-doc@kde.org>\n"
@@ -377,8 +377,7 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_data.html:58
-#: templates/site/settings_design.html:29
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:47
#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
@@ -431,6 +430,7 @@
#: templates/site/dashboard.html:76
#, python-format
+#, fuzzy
msgid "user %(user)s awaits approval"
msgstr "Потребителят е в очакване на одобрение"
@@ -658,12 +658,16 @@
"към дискусийте в който сте участвали"
#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/login_form.html:21
-msgid "Forgot password?"
+#: templates/site/forgot_pw.html:27
+msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:24
-msgid "Remind my password"
+#: templates/site/forgot_pw.html:35
+msgid "This link is invalid."
+msgstr ""
+
+#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+msgid "Forgot password?"
msgstr ""
#: templates/site/help.html:16
@@ -944,11 +948,22 @@
msgstr "Дезактивирай"
#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Вашият профил (%(username)s)"
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/profile.html:17 templates/site/profile_pw.html:17
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr "Профил"
+
+#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+msgid "Password"
+msgstr ""
+
+#: templates/site/profile.html:33 templates/site/profile_pw.html:33
+#: templates/site/text_create_content.html:45
#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
#: templates/site/text_settings.html:23 templates/site/text_share.html:153
#: templates/site/user_activate.html:27 templates/site/user_list.html:210
@@ -966,25 +981,21 @@
msgid "Reset your password"
msgstr ""
-#: templates/site/settings.html:5 templates/site/settings_data.html:5
-#: templates/site/settings_design.html:5 templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Настройки"
-#: templates/site/settings.html:21 templates/site/settings_data.html:21
-#: templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
msgid "General"
msgstr "Основен"
-#: templates/site/settings.html:23 templates/site/settings_data.html:23
-#: templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
msgstr "Външен вид"
-#: templates/site/settings.html:38 templates/site/settings_data.html:69
-#: templates/site/settings_design.html:40
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
msgid ""
"Are you sure you want to change the role model? All roles (except managers) "
"will be resetted!"
@@ -992,19 +1003,7 @@
"Сигурни ли сти, че искате да промените моделът на ролите? Всички роли (освен "
"на мениджърите) ще бъдат реинициализирани! "
-#: templates/site/settings_data.html:25
-msgid "Data"
-msgstr ""
-
-#: templates/site/settings_data.html:36
-msgid "Export data"
-msgstr ""
-
-#: templates/site/settings_data.html:45
-msgid "Import data"
-msgstr ""
-
-#: templates/site/settings_data.html:60 templates/site/settings_design.html:31
+#: templates/site/settings_design.html:31
msgid "Delete logo"
msgstr "Изтрийте логото"
@@ -1445,10 +1444,6 @@
msgid "About"
msgstr "Относно"
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr "Профил"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Излез"
@@ -1661,7 +1656,7 @@
msgid "Private notifications feed reseted."
msgstr "Частното захранване на уведомяването е реинициализирано."
-#: views/site.py:82 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:545
msgid "You're logged in!"
msgstr "Вие сте включени!"
@@ -1749,26 +1744,14 @@
"кода на работното място, уверете се, че познавате рисковете преди да "
"добавите нещо тук,"
-#: views/site.py:252
-msgid "Username or email"
-msgstr ""
-
-#: views/site.py:279
-msgid "How to reset your password"
-msgstr ""
-
-#: views/site.py:281
+#: views/site.py:253
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:283
-msgid "No user found."
-msgstr ""
-
-#: views/site.py:299
-msgid "Your password has been changed."
+#: views/site.py:257 views/user.py:428
+msgid "Password changed"
msgstr ""
#: views/texts.py:163
@@ -1825,6 +1808,7 @@
#: views/texts.py:849 views/user.py:79 views/user.py:99
#, python-format
+#, fuzzy
msgid "%(count)i user(s) role modified"
msgstr "роля(и) на потребителя са изменени"
@@ -1834,6 +1818,7 @@
#: views/user.py:61
#, python-format
+#, fuzzy
msgid "%(count)i User's access suspended"
msgstr "достъп на потребителя дезактивиран(и)"
@@ -1936,49 +1921,49 @@
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Нова покана е изпратена на потребителя %(prof)s."
-#: views/user.py:407
+#: views/user.py:410
msgid "Profile updated"
msgstr "Профилът е актуализиран"
-#: views/user.py:437
+#: views/user.py:456
msgid "Anonymous user role modified."
msgstr "Ролята на анонимния потребител е променена."
-#: views/user.py:459
+#: views/user.py:478
msgid "User modified"
msgstr "Променен потребител"
-#: views/user.py:474
+#: views/user.py:493
msgid "Subject"
msgstr "Тема"
-#: views/user.py:475
+#: views/user.py:494
msgid "Subject of the email"
msgstr "Тема на имейлa"
-#: views/user.py:478
+#: views/user.py:497
msgid "Body"
msgstr "Основна част"
-#: views/user.py:479
+#: views/user.py:498
msgid "Body of the email"
msgstr "Основна част на майла"
-#: views/user.py:499
+#: views/user.py:518
msgid "Email sent."
msgstr "Имейлът е изпратен"
-#: views/user.py:520
+#: views/user.py:539
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Този акаунт е дезактивиран. Моля контактирайте администратор на работното "
"място."
-#: views/user.py:551
+#: views/user.py:570
msgid "You've been logged out."
msgstr "Вие сте офлайн"
-#: views/user.py:567
+#: views/user.py:586
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -1987,13 +1972,17 @@
"изпратено на вашия имейл, след като вашия акаунт е активиран от "
"администратор на работното място"
-#: views/user.py:570
+#: views/user.py:589
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Регистрацията завърши успешно, едно потвърдително съобщение е изпратено на "
"вашия имейл"
+#, fuzzy
+#~ msgid "Your password has been reset."
+#~ msgstr "Достъпът на потребителя %(prof)s е отказан."
+
#~ msgid "%(workspace_name)s's workspace"
#~ msgstr "Работно място: %(workspace_name)"
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po Mon Mar 22 12:50:42 2010 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 16:16+0100\n"
+"POT-Creation-Date: 2010-03-22 12:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -372,8 +372,7 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_data.html:58
-#: templates/site/settings_design.html:29
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:47
#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
@@ -644,12 +643,16 @@
msgstr ""
#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/login_form.html:21
-msgid "Forgot password?"
+#: templates/site/forgot_pw.html:27
+msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:24
-msgid "Remind my password"
+#: templates/site/forgot_pw.html:35
+msgid "This link is invalid."
+msgstr ""
+
+#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+msgid "Forgot password?"
msgstr ""
#: templates/site/help.html:16
@@ -920,11 +923,22 @@
msgstr ""
#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
#, python-format
msgid "Your profile (%(username)s)"
msgstr ""
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/profile.html:17 templates/site/profile_pw.html:17
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr ""
+
+#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+msgid "Password"
+msgstr ""
+
+#: templates/site/profile.html:33 templates/site/profile_pw.html:33
+#: templates/site/text_create_content.html:45
#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
#: templates/site/text_settings.html:23 templates/site/text_share.html:153
#: templates/site/user_activate.html:27 templates/site/user_list.html:210
@@ -942,43 +956,27 @@
msgid "Reset your password"
msgstr ""
-#: templates/site/settings.html:5 templates/site/settings_data.html:5
-#: templates/site/settings_design.html:5 templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr ""
-#: templates/site/settings.html:21 templates/site/settings_data.html:21
-#: templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
msgid "General"
msgstr ""
-#: templates/site/settings.html:23 templates/site/settings_data.html:23
-#: templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
msgstr ""
-#: templates/site/settings.html:38 templates/site/settings_data.html:69
-#: templates/site/settings_design.html:40
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
msgid ""
"Are you sure you want to change the role model? All roles (except managers) "
"will be resetted!"
msgstr ""
-#: templates/site/settings_data.html:25
-msgid "Data"
-msgstr ""
-
-#: templates/site/settings_data.html:36
-msgid "Export data"
-msgstr ""
-
-#: templates/site/settings_data.html:45
-msgid "Import data"
-msgstr ""
-
-#: templates/site/settings_data.html:60 templates/site/settings_design.html:31
+#: templates/site/settings_design.html:31
msgid "Delete logo"
msgstr ""
@@ -1400,10 +1398,6 @@
msgid "About"
msgstr ""
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr ""
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr ""
@@ -1606,7 +1600,7 @@
msgid "Private notifications feed reseted."
msgstr ""
-#: views/site.py:82 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:545
msgid "You're logged in!"
msgstr ""
@@ -1687,26 +1681,14 @@
"make sure you know what you're doing before adding something here."
msgstr ""
-#: views/site.py:252
-msgid "Username or email"
-msgstr ""
-
-#: views/site.py:279
-msgid "How to reset your password"
-msgstr ""
-
-#: views/site.py:281
+#: views/site.py:253
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:283
-msgid "No user found."
-msgstr ""
-
-#: views/site.py:299
-msgid "Your password has been changed."
+#: views/site.py:257 views/user.py:428
+msgid "Password changed"
msgstr ""
#: views/texts.py:163
@@ -1869,53 +1851,53 @@
msgid "A new invitation has been sent to user %(prof)s."
msgstr ""
-#: views/user.py:407
+#: views/user.py:410
msgid "Profile updated"
msgstr ""
-#: views/user.py:437
+#: views/user.py:456
msgid "Anonymous user role modified."
msgstr ""
-#: views/user.py:459
-msgid "User modified"
-msgstr ""
-
-#: views/user.py:474
-msgid "Subject"
-msgstr ""
-
-#: views/user.py:475
-msgid "Subject of the email"
-msgstr ""
-
#: views/user.py:478
+msgid "User modified"
+msgstr ""
+
+#: views/user.py:493
+msgid "Subject"
+msgstr ""
+
+#: views/user.py:494
+msgid "Subject of the email"
+msgstr ""
+
+#: views/user.py:497
msgid "Body"
msgstr ""
-#: views/user.py:479
+#: views/user.py:498
msgid "Body of the email"
msgstr ""
-#: views/user.py:499
+#: views/user.py:518
msgid "Email sent."
msgstr ""
-#: views/user.py:520
+#: views/user.py:539
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
-#: views/user.py:551
+#: views/user.py:570
msgid "You've been logged out."
msgstr ""
-#: views/user.py:567
+#: views/user.py:586
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
msgstr ""
-#: views/user.py:570
+#: views/user.py:589
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po Mon Mar 22 12:50:42 2010 +0100
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 16:15+0100\n"
+"POT-Creation-Date: 2010-03-22 12:40+0100\n"
"PO-Revision-Date: 2010-02-24 01:37+0900\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -369,8 +369,7 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_data.html:58
-#: templates/site/settings_design.html:29
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:47
#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
@@ -654,12 +653,16 @@
"los que ha participado"
#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/login_form.html:21
-msgid "Forgot password?"
+#: templates/site/forgot_pw.html:27
+msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:24
-msgid "Remind my password"
+#: templates/site/forgot_pw.html:35
+msgid "This link is invalid."
+msgstr ""
+
+#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+msgid "Forgot password?"
msgstr ""
#: templates/site/help.html:16
@@ -941,11 +944,22 @@
msgstr "Desactivar"
#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Su perfil (%(username)s)"
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/profile.html:17 templates/site/profile_pw.html:17
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr "Perfil"
+
+#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+msgid "Password"
+msgstr ""
+
+#: templates/site/profile.html:33 templates/site/profile_pw.html:33
+#: templates/site/text_create_content.html:45
#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
#: templates/site/text_settings.html:23 templates/site/text_share.html:153
#: templates/site/user_activate.html:27 templates/site/user_list.html:210
@@ -963,26 +977,22 @@
msgid "Reset your password"
msgstr ""
-#: templates/site/settings.html:5 templates/site/settings_data.html:5
-#: templates/site/settings_design.html:5 templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Ajustes"
-#: templates/site/settings.html:21 templates/site/settings_data.html:21
-#: templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
#, fuzzy
msgid "General"
msgstr "Genérico"
-#: templates/site/settings.html:23 templates/site/settings_data.html:23
-#: templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
msgstr ""
-#: templates/site/settings.html:38 templates/site/settings_data.html:69
-#: templates/site/settings_design.html:40
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
msgid ""
"Are you sure you want to change the role model? All roles (except managers) "
"will be resetted!"
@@ -990,19 +1000,7 @@
"¿Está seguro/a de querer cambiar el modelo de perfiles? ¡Todos los roles "
"(excepto los administradores) se reiniciarán!"
-#: templates/site/settings_data.html:25
-msgid "Data"
-msgstr ""
-
-#: templates/site/settings_data.html:36
-msgid "Export data"
-msgstr ""
-
-#: templates/site/settings_data.html:45
-msgid "Import data"
-msgstr ""
-
-#: templates/site/settings_data.html:60 templates/site/settings_design.html:31
+#: templates/site/settings_design.html:31
#, fuzzy
msgid "Delete logo"
msgstr "Borrar"
@@ -1463,10 +1461,6 @@
msgid "About"
msgstr "Acerca de"
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr "Perfil"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Desconectarse"
@@ -1679,7 +1673,7 @@
msgid "Private notifications feed reseted."
msgstr "Respuesta de avisos privados reiniciada"
-#: views/site.py:82 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:545
msgid "You're logged in!"
msgstr "¡Se ha conectado!"
@@ -1768,27 +1762,15 @@
"make sure you know what you're doing before adding something here."
msgstr ""
-#: views/site.py:252
-msgid "Username or email"
-msgstr ""
-
-#: views/site.py:279
-msgid "How to reset your password"
-msgstr ""
-
-#: views/site.py:281
+#: views/site.py:253
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:283
-msgid "No user found."
-msgstr ""
-
-#: views/site.py:299
+#: views/site.py:257 views/user.py:428
#, fuzzy
-msgid "Your password has been changed."
+msgid "Password changed"
msgstr "Su texto \"%(title)s\" se ha creado"
#: views/texts.py:163
@@ -1958,49 +1940,49 @@
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Se ha enviado una nueva invitación al usuario %(prof)s."
-#: views/user.py:407
+#: views/user.py:410
msgid "Profile updated"
msgstr "Perfil actualizado"
-#: views/user.py:437
+#: views/user.py:456
msgid "Anonymous user role modified."
msgstr "Perfil de usuario anónimo modificado"
-#: views/user.py:459
+#: views/user.py:478
msgid "User modified"
msgstr "Usuario modificado"
-#: views/user.py:474
+#: views/user.py:493
msgid "Subject"
msgstr "Asunto"
-#: views/user.py:475
+#: views/user.py:494
msgid "Subject of the email"
msgstr "Asunto del correo electrónico"
-#: views/user.py:478
+#: views/user.py:497
msgid "Body"
msgstr "Cuerpo"
-#: views/user.py:479
+#: views/user.py:498
msgid "Body of the email"
msgstr "Cuerpo del mensaje"
-#: views/user.py:499
+#: views/user.py:518
msgid "Email sent."
msgstr "Correo electrónico enviado"
-#: views/user.py:520
+#: views/user.py:539
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Esta cuenta está suspendida. Contacte con el administrador del espacio de "
"trabajo"
-#: views/user.py:551
+#: views/user.py:570
msgid "You've been logged out."
msgstr "Se ha desconectado."
-#: views/user.py:567
+#: views/user.py:586
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2008,13 +1990,17 @@
"Se ha registrado. Recibirá una confirmación por correo electrónico una vez "
"que el moderador apruebe su inscripción."
-#: views/user.py:570
+#: views/user.py:589
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Se ha registrado. Por favor, compruebe que ha recibido el mensaje de "
"confirmación en su correo electrónico."
+#, fuzzy
+#~ msgid "Your password has been reset."
+#~ msgstr "Su texto \"%(title)s\" se ha creado"
+
#~ msgid "How do you want to print?"
#~ msgstr "¿Cómo desea realizar la impresión?"
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po Mon Mar 22 12:50:42 2010 +0100
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 16:16+0100\n"
-"PO-Revision-Date: 2010-03-19 16:19+0100\n"
+"POT-Creation-Date: 2010-03-22 12:41+0100\n"
+"PO-Revision-Date: 2010-03-22 12:39+0100\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: <en@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,8 +18,11 @@
"X-Generator: KBabel 1.11.4\n"
#: client.py:25
-msgid "A selection is required. Select in the text the part your comment applies to."
-msgstr "Une portée est obligatoire. Sélectionner dans le texte la partie sur laquelle porte votre commentaire."
+msgid ""
+"A selection is required. Select in the text the part your comment applies to."
+msgstr ""
+"Une portée est obligatoire. Sélectionner dans le texte la partie sur "
+"laquelle porte votre commentaire."
#: client.py:134
msgid "name is required"
@@ -45,8 +48,7 @@
msgid "comment removed"
msgstr "commentaire supprimé"
-#: client.py:209
-#: client.py:274
+#: client.py:209 client.py:274
msgid "comment saved"
msgstr "commentaire sauvé"
@@ -58,11 +60,8 @@
msgid "Tags input must be no longer than 250 characters."
msgstr "La longueur des tags est limitée à 250 caractères."
-#: models.py:178
-#: templates/site/text_history.html:79
-#: views/create.py:30
-#: views/create.py:45
-#: views/texts.py:600
+#: models.py:178 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:600
msgid "Title"
msgstr "Titre"
@@ -70,20 +69,15 @@
msgid "Format"
msgstr "Format"
-#: models.py:180
-#: views/texts.py:692
+#: models.py:180 views/texts.py:692
msgid "Content"
msgstr "Texte"
-#: models.py:181
-#: models.py:633
-#: templates/site/help.html:39
+#: models.py:181 models.py:633 templates/site/help.html:39
msgid "Tags"
msgstr "Tags"
-#: models.py:183
-#: templates/site/text_history.html:80
-#: views/user.py:223
+#: models.py:183 templates/site/text_history.html:80 views/user.py:223
msgid "Note"
msgstr "Note"
@@ -109,7 +103,8 @@
#: models.py:627
msgid "Allow email messages from other users"
-msgstr "Autoriser les participants de l'espace de travail à vous envoyer un email"
+msgstr ""
+"Autoriser les participants de l'espace de travail à vous envoyer un email"
#: models.py:628
msgid "Preferred language"
@@ -195,8 +190,7 @@
msgid "User %(username)s has activated his account"
msgstr "L'utilisateur %(username)s a activé son compte"
-#: models.py:812
-#: models.py:820
+#: models.py:812 models.py:820
#, python-format
msgid "by \"%(username)s\""
msgstr "par \"%(username)s\""
@@ -250,8 +244,7 @@
msgid "Bulgarian"
msgstr "Bulgare"
-#: static_i18n.py:6
-#: static_i18n.py:11
+#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
msgstr "Observateur"
@@ -363,8 +356,7 @@
msgid "An error has occurred."
msgstr "Une erreur s'est produite."
-#: templates/site/activate.html:10
-#: templates/site/user_activate.html:10
+#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:330
msgid "Activate your account"
msgstr "Activer votre compte"
@@ -373,8 +365,7 @@
msgid "Activate"
msgstr "Activer"
-#: templates/site/contact.html:6
-#: templates/site/layout/footer.html:9
+#: templates/site/contact.html:6 templates/site/layout/footer.html:9
#: templates/site/macros/user_actions.html:20
msgid "Contact"
msgstr "Contact"
@@ -385,22 +376,16 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29
-#: templates/site/settings_data.html:58
-#: templates/site/settings_design.html:29
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42
-#: templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38
-#: templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29
-#: templates/site/user_mass_add.html:34
+#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
#: templates/site/user_mass_add_text.html:38
msgid "Cancel"
msgstr "Annuler"
-#: templates/site/dashboard.html:12
-#: templates/site/macros/main_tabs.html:10
+#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
msgid "Dashboard"
msgstr "Tableau de bord"
@@ -408,20 +393,16 @@
msgid "Actions"
msgstr "Actions"
-#: templates/site/dashboard.html:48
-#: templates/site/text_create_content.html:4
+#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
#: templates/site/text_create_content.html:28
-#: templates/site/text_create_upload.html:26
-#: templates/site/text_list.html:40
+#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
#: templates/site/layout/header.html:10
msgid "Write a text"
msgstr "Ecrire un texte"
-#: templates/site/dashboard.html:49
-#: templates/site/text_create_content.html:30
+#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
#: templates/site/text_create_upload.html:4
-#: templates/site/text_create_upload.html:28
-#: templates/site/text_list.html:42
+#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
#: templates/site/layout/header.html:11
msgid "Upload a text"
msgstr "Charger un texte"
@@ -451,13 +432,11 @@
msgid "user %(user)s awaits approval"
msgstr "l'utilisateur %(user)s est en attente d'approbation"
-#: templates/site/dashboard.html:80
-#: templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
msgid "approve"
msgstr "accepter"
-#: templates/site/dashboard.html:80
-#: templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
msgid "refuse"
msgstr "refuser"
@@ -467,21 +446,26 @@
#: templates/site/dashboard.html:85
#: templates/site/macros/user_moderation.html:8
-msgid "Are you sure you want to approve this user's membership to the workspace?"
-msgstr "Etes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de travail ?"
+msgid ""
+"Are you sure you want to approve this user's membership to the workspace?"
+msgstr ""
+"Etes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de "
+"travail ?"
#: templates/site/dashboard.html:94
#: templates/site/macros/user_moderation.html:17
-msgid "Are you sure you want to refuse this user's membership to the workspace?"
-msgstr "Etes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de travail ?"
+msgid ""
+"Are you sure you want to refuse this user's membership to the workspace?"
+msgstr ""
+"Etes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de "
+"travail ?"
#: templates/site/dashboard.html:106
#, python-format
msgid "registered %(duration)s ago"
msgstr "enregistré il y a %(duration)s"
-#: templates/site/dashboard.html:120
-#: templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
msgid "comment"
msgstr "commentaire"
@@ -506,8 +490,7 @@
msgid "Are you sure you want to refuse this comment?"
msgstr "Etes vous sûr de vouloir refuser ce commentaire ?"
-#: templates/site/dashboard.html:168
-#: templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
#, python-format
msgid "modified %(duration)s ago"
msgstr "modifié il y a %(duration)s"
@@ -516,8 +499,7 @@
msgid "Recent texts"
msgstr "Textes récents"
-#: templates/site/dashboard.html:186
-#: templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
msgid "all"
msgstr "tous"
@@ -528,8 +510,7 @@
msgstr[0] "%(nb_comments)s commentaire"
msgstr[1] "%(nb_comments)s commentaires"
-#: templates/site/dashboard.html:206
-#: templates/site/text_list.html:221
+#: templates/site/dashboard.html:206 templates/site/text_list.html:221
msgid "No texts yet"
msgstr "Aucun texte"
@@ -553,10 +534,8 @@
msgid "Access"
msgstr "Accès"
-#: templates/site/dashboard.html:233
-#: templates/site/dashboard.html.py:244
-#: templates/site/text_list.html:206
-#: templates/site/user_list.html:158
+#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/text_list.html:206 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Chargement ..."
@@ -602,29 +581,23 @@
msgid "No comments yet"
msgstr "Aucun commentaire"
-#: templates/site/followup.html:7
-#: templates/site/macros/main_tabs.html:16
+#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
#: templates/site/macros/text_tabs.html:22
msgid "Followup"
msgstr "Suivi"
-#: templates/site/followup.html:20
-#: templates/site/help.html:58
+#: templates/site/followup.html:20 templates/site/help.html:58
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Flux"
-#: templates/site/followup.html:22
-#: templates/site/text_followup.html:24
+#: templates/site/followup.html:22 templates/site/text_followup.html:24
msgid "Public feed"
msgstr "Flux public"
-#: templates/site/followup.html:22
-#: templates/site/followup.html.py:35
-#: templates/site/help.html:6
-#: templates/site/help.html.py:14
-#: templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
+#: templates/site/followup.html:22 templates/site/followup.html.py:35
+#: templates/site/help.html:6 templates/site/help.html.py:14
+#: templates/site/text_embed.html:27 templates/site/layout/footer.html:13
#: templates/site/macros/form_fields.html:15
msgid "Help"
msgstr "Aide"
@@ -637,8 +610,7 @@
msgid "This is the public feed for the workspace."
msgstr "Ceci est le flux public de l'espace de travail."
-#: templates/site/followup.html:35
-#: templates/site/text_followup.html:37
+#: templates/site/followup.html:35 templates/site/text_followup.html:37
msgid "Private feed"
msgstr "Flux privé"
@@ -647,16 +619,19 @@
msgstr "Flux privé de l'espace de travail"
#: templates/site/followup.html:43
-msgid "This is the private feed for the workspace. Don't share this address with others unless you want them to see all activities on the workspace."
-msgstr "Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités de l'espace de travail."
+msgid ""
+"This is the private feed for the workspace. Don't share this address with "
+"others unless you want them to see all activities on the workspace."
+msgstr ""
+"Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que "
+"si vous voulez que d'autres que vous-même puissent suivre toutes les "
+"activités de l'espace de travail."
-#: templates/site/followup.html:45
-#: templates/site/text_followup.html:47
+#: templates/site/followup.html:45 templates/site/text_followup.html:47
msgid "Reset private feed url"
msgstr "Réinitialiser l'adresse du flux privé"
-#: templates/site/followup.html:49
-#: templates/site/text_followup.html:51
+#: templates/site/followup.html:49 templates/site/text_followup.html:51
msgid "Activate private feed"
msgstr "Activer le flux privé"
@@ -664,8 +639,7 @@
msgid "The private feed for this workspace is not yet activated."
msgstr "Le flux privé de cet espace de travail n'est pas encore activé."
-#: templates/site/followup.html:55
-#: templates/site/text_followup.html:58
+#: templates/site/followup.html:55 templates/site/text_followup.html:58
msgid "Email notifications"
msgstr "Notifications par email"
@@ -674,47 +648,55 @@
msgstr "S'abonner aux notifications de l'espace de travail"
#: templates/site/followup.html:62
-msgid "Subscribe to all replies notifications in discussions where you have participated"
-msgstr "S'abonner aux notifications concernant les commentaires ou réponses dans les discussions auxquelles vous avez participé"
+msgid ""
+"Subscribe to all replies notifications in discussions where you have "
+"participated"
+msgstr ""
+"S'abonner aux notifications concernant les commentaires ou réponses dans les "
+"discussions auxquelles vous avez participé"
-#: templates/site/forgot_pw.html:6
-#: templates/site/forgot_pw.html.py:14
-#: templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
+#: templates/site/forgot_pw.html:27
+msgid "Reset my password"
+msgstr "Réinitialiser mon mot de passe"
+
+#: templates/site/forgot_pw.html:35
+msgid "This link is invalid."
+msgstr "Ce lien est invalid."
+
+#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
msgid "Forgot password?"
msgstr "Mot de passe oublié ?"
-#: templates/site/forgot_pw.html:24
-msgid "Remind my password"
-msgstr ""
-
#: templates/site/help.html:16
msgid "General Presentation"
msgstr "Présentation Générale"
#: templates/site/help.html:18
msgid "co-ment is a web based text annotation system."
-msgstr ""
+msgstr "co-ment est un système de commentaire de texte sur le web."
#: templates/site/help.html:20
msgid "Glossary"
msgstr "Glossaire"
-#: templates/site/help.html:22
-#: templates/site/help.html.py:25
+#: templates/site/help.html:22 templates/site/help.html.py:25
msgid "Collaboration"
-msgstr ""
+msgstr "Collaboration"
#: templates/site/help.html:26
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
-#: templates/site/help.html:26
-#: templates/site/help.html.py:37
+#: templates/site/help.html:26 templates/site/help.html.py:37
msgid "Click here for more details"
msgstr ""
#: templates/site/help.html:26
-msgid "The basic assumption in the collaboration model is that some users will have an overall management role, while others will have roles that are defined in relationship with texts or a given text."
+msgid ""
+"The basic assumption in the collaboration model is that some users will have "
+"an overall management role, while others will have roles that are defined in "
+"relationship with texts or a given text."
msgstr ""
#: templates/site/help.html:29
@@ -727,8 +709,15 @@
#: templates/site/help.html:33
msgid ""
-"Comment moderation is the process of editing/removing comments from a text. The moderator role is the collection of permissions required to edit/remove a comment submitted by users of the workspace.\n"
-" Although this is not the default, you can require comments to be approved before becoming public by unticking the \"a posteriori moderation\" box in the settings for the text. If you do so, comments from users with an Observer or Commentator role won't be visible to users who do not have moderation permissions before a user (with at least Moderator role) approves them."
+"Comment moderation is the process of editing/removing comments from a text. "
+"The moderator role is the collection of permissions required to edit/remove "
+"a comment submitted by users of the workspace.\n"
+" Although this is not the default, you can require comments to be "
+"approved before becoming public by unticking the \"a posteriori moderation\" "
+"box in the settings for the text. If you do so, comments from users with an "
+"Observer or Commentator role won't be visible to users who do not have "
+"moderation permissions before a user (with at least Moderator role) approves "
+"them."
msgstr ""
#: templates/site/help.html:36
@@ -740,20 +729,30 @@
msgstr ""
#: templates/site/help.html:37
-msgid "Unapproved or pending comments are visible only to Managers, Editors and Moderators. Approved comments are visible to users with any role. The pending state exists only when a priori moderation is selected in settings."
+msgid ""
+"Unapproved or pending comments are visible only to Managers, Editors and "
+"Moderators. Approved comments are visible to users with any role. The "
+"pending state exists only when a priori moderation is selected in settings."
msgstr ""
#: templates/site/help.html:40
-msgid "We believe that an adequate use of tags is sufficient to implement a variety of workflows for processing comments. You can use tags for signalling TODOs or decisions on future revisions. You can also use them to classify comments according to the issues or topics they address."
+msgid ""
+"We believe that an adequate use of tags is sufficient to implement a variety "
+"of workflows for processing comments. You can use tags for signalling TODOs "
+"or decisions on future revisions. You can also use them to classify comments "
+"according to the issues or topics they address."
msgstr ""
#: templates/site/help.html:42
-#, fuzzy
msgid "Linking to a comment"
-msgstr "Peut éditer le/les commentaires"
+msgstr "Lien vers un commentaire"
#: templates/site/help.html:43
-msgid "You may find yourself needing to link to a comment from another one. In such case you can do so by copying your target comment's permalink that shows up when you hover over the paragraph (¶) sign at the end of the comment title."
+msgid ""
+"You may find yourself needing to link to a comment from another one. In such "
+"case you can do so by copying your target comment's permalink that shows up "
+"when you hover over the paragraph (¶) sign at the end of the comment "
+"title."
msgstr ""
#: templates/site/help.html:45
@@ -761,7 +760,10 @@
msgstr ""
#: templates/site/help.html:46
-msgid "The scope of the comment is the part of the text to which it applies. A comment's scope can be modified by anyone who has a role allowing to modify the comment."
+msgid ""
+"The scope of the comment is the part of the text to which it applies. A "
+"comment's scope can be modified by anyone who has a role allowing to modify "
+"the comment."
msgstr ""
#: templates/site/help.html:48
@@ -769,21 +771,30 @@
msgstr ""
#: templates/site/help.html:49
-msgid "When you create a new version of the text, comments are duplicated. In case the text edition did not change the scope of the comment, it will be kept \"as is\". If the text of the comment scope has been modified then a decision has to be made regarding the conservation of such comments in the new version: you'll be given a choice of either keep them in the new version as \"detached\" from the text (they do not have a scope in the new version's but are still visible when browsing, and you can give them a new scope) or simply removed from the new version."
+msgid ""
+"When you create a new version of the text, comments are duplicated. In case "
+"the text edition did not change the scope of the comment, it will be kept "
+"\"as is\". If the text of the comment scope has been modified then a "
+"decision has to be made regarding the conservation of such comments in the "
+"new version: you'll be given a choice of either keep them in the new version "
+"as \"detached\" from the text (they do not have a scope in the new version's "
+"but are still visible when browsing, and you can give them a new scope) or "
+"simply removed from the new version."
msgstr ""
#: templates/site/help.html:52
-#, fuzzy
msgid "Notification and feeds"
-msgstr "Notification désactivée."
+msgstr "Notification et flux."
#: templates/site/help.html:55
-#, fuzzy
msgid "Email notification"
-msgstr "Notifications par email"
+msgstr "Notification par email"
#: templates/site/help.html:56
-msgid "Email notifications are a way for users to be informed by email when a new comment is added on a text or a text is edited and a new version gets created."
+msgid ""
+"Email notifications are a way for users to be informed by email when a new "
+"comment is added on a text or a text is edited and a new version gets "
+"created."
msgstr ""
#: templates/site/help.html:59
@@ -791,16 +802,21 @@
msgstr ""
#: templates/site/help.html:59
-msgid "You can subscribe to the feed for a specific text or to a global feed for the full workspace."
+msgid ""
+"You can subscribe to the feed for a specific text or to a global feed for "
+"the full workspace."
msgstr ""
#: templates/site/help.html:61
-#, fuzzy
msgid "Public and private feeds"
-msgstr "Flux privé"
+msgstr "Flux privé et public"
#: templates/site/help.html:62
-msgid "The public feed includes all the events publically accessible on the workspace or a specific text. The private feed includes all events: do not publicize it to people who are not registered in your workspace unless you really want them to know what's happening in it."
+msgid ""
+"The public feed includes all the events publically accessible on the "
+"workspace or a specific text. The private feed includes all events: do not "
+"publicize it to people who are not registered in your workspace unless you "
+"really want them to know what's happening in it."
msgstr ""
#: templates/site/help.html:64
@@ -808,69 +824,83 @@
msgstr ""
#: templates/site/help.html:65
-msgid "You can embed your text into a page of your own website. Visitors will be able to add comments without leaving your website if the anonymous users' roles on the text allow it. For a proper test condition when embedding in your own site, in particular for experiencing links referencing comments in the same or different text, be sure your are not logged into your workspace in another tab of your browser."
+msgid ""
+"You can embed your text into a page of your own website. Visitors will be "
+"able to add comments without leaving your website if the anonymous users' "
+"roles on the text allow it. For a proper test condition when embedding in "
+"your own site, in particular for experiencing links referencing comments in "
+"the same or different text, be sure your are not logged into your workspace "
+"in another tab of your browser."
msgstr ""
-#: templates/site/help.html:69
-#: templates/site/help.html.py:71
-#, fuzzy
+#: templates/site/help.html:69 templates/site/help.html.py:71
msgid "Roles"
-msgstr "Rôle"
+msgstr "Rôles"
#: templates/site/help.html:72
msgid "Roles are predefined sets of permissions."
msgstr ""
#: templates/site/help.html:73
-msgid "A text is visible to the public (non-logged-in visitors, aka anonymous users) only if anonymous users are given a role on the text."
+msgid ""
+"A text is visible to the public (non-logged-in visitors, aka anonymous "
+"users) only if anonymous users are given a role on the text."
msgstr ""
-#: templates/site/help.html:74
-#: templates/site/text_share.html:88
+#: templates/site/help.html:74 templates/site/text_share.html:88
msgid "Text role"
msgstr "Rôle sur le texte"
#: templates/site/help.html:75
-msgid "A text role is a role that is set for a specific user on a specific text. It can be used to override a possibly existing workspace-level role or to give a user a role on a text (and not on every text in the workspace)."
+msgid ""
+"A text role is a role that is set for a specific user on a specific text. It "
+"can be used to override a possibly existing workspace-level role or to give "
+"a user a role on a text (and not on every text in the workspace)."
msgstr ""
-#: templates/site/help.html:76
-#: views/site.py:185
+#: templates/site/help.html:76 views/site.py:185
msgid "Role model"
msgstr "Modèle des rôles"
#: templates/site/help.html:77
-msgid "A role model is a role set useful in a specific use case. When you set up a co-ment service, you have to select a role model. The default model addresses most cases. A specialized role model such as \"teacher\" includes specific roles making in this particular case possible for comments to be privately shared between a teacher and each student."
+msgid ""
+"A role model is a role set useful in a specific use case. When you set up a "
+"co-ment service, you have to select a role model. The default model "
+"addresses most cases. A specialized role model such as \"teacher\" includes "
+"specific roles making in this particular case possible for comments to be "
+"privately shared between a teacher and each student."
msgstr ""
#: templates/site/help.html:80
-#, fuzzy
msgid "Text edition"
-msgstr "Modification suivante"
+msgstr "Edition du texte"
#: templates/site/help.html:83
-#, fuzzy
msgid "Text formats"
-msgstr "Notifications du texte"
+msgstr "Formats du texte"
#: templates/site/help.html:84
-msgid "There are at this date 3 text formats: markdown (default/preferred format), HTML and RST."
+msgid ""
+"There are at this date 3 text formats: markdown (default/preferred format), "
+"HTML and RST."
msgstr ""
#: templates/site/help.html:88
msgid "Markdown"
-msgstr ""
+msgstr "Markdown"
#: templates/site/help.html:89
-msgid "Unless some import needs make it preferable to use HTML, we recommend that you use markdown for creating or importing texts. Our software and Web services use the pandoc extended version of markdown."
+msgid ""
+"Unless some import needs make it preferable to use HTML, we recommend that "
+"you use markdown for creating or importing texts. Our software and Web "
+"services use the pandoc extended version of markdown."
msgstr ""
#: templates/site/help.html:89
msgid "Read more about this"
-msgstr ""
+msgstr "En savoir plus"
-#: templates/site/login.html:8
-#: templates/site/login_form.html:19
+#: templates/site/login.html:8 templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
msgstr "Se connecter"
@@ -880,8 +910,7 @@
msgid "%(wname)s Login"
msgstr "Se connecter à %(wname)s"
-#: templates/site/login_form.html:20
-#: templates/site/register.html:8
+#: templates/site/login_form.html:20 templates/site/register.html:8
#: templates/site/layout/header.html:18
msgid "Register"
msgstr "S'enregistrer"
@@ -906,20 +935,26 @@
msgid "Deactivate"
msgstr "Désactiver"
-#: templates/site/profile.html:6
-#: templates/site/profile.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Votre profil (%(username)s)"
-#: templates/site/profile.html:26
+#: templates/site/profile.html:17 templates/site/profile_pw.html:17
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+msgid "Password"
+msgstr "Mot de passe"
+
+#: templates/site/profile.html:33 templates/site/profile_pw.html:33
#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40
-#: templates/site/text_edit.html:36
-#: templates/site/text_settings.html:23
-#: templates/site/text_share.html:153
-#: templates/site/user_activate.html:27
-#: templates/site/user_list.html:210
+#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
+#: templates/site/text_settings.html:23 templates/site/text_share.html:153
+#: templates/site/user_activate.html:27 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Enregistrer"
@@ -929,59 +964,39 @@
msgid "%(wname)s Registration"
msgstr "S'enregistrer sur %(wname)s"
-#: templates/site/reset_pw.html:6
-#: templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
#: templates/site/reset_pw.html:24
msgid "Reset your password"
-msgstr ""
+msgstr "Réinitialiser votre mot de passe"
-#: templates/site/settings.html:5
-#: templates/site/settings_data.html:5
-#: templates/site/settings_design.html:5
-#: templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Paramètres"
-#: templates/site/settings.html:21
-#: templates/site/settings_data.html:21
-#: templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
msgid "General"
msgstr "Général"
-#: templates/site/settings.html:23
-#: templates/site/settings_data.html:23
-#: templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
msgstr "Apparence"
-#: templates/site/settings.html:38
-#: templates/site/settings_data.html:69
-#: templates/site/settings_design.html:40
-msgid "Are you sure you want to change the role model? All roles (except managers) will be resetted!"
-msgstr "Etes-vous sur de vouloir modifier le modèle des rôles ? Tous les roles actifs (excepté les gestionnaires) seront remis à zéro !"
-
-#: templates/site/settings_data.html:25
-msgid "Data"
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
+msgid ""
+"Are you sure you want to change the role model? All roles (except managers) "
+"will be resetted!"
msgstr ""
+"Etes-vous sur de vouloir modifier le modèle des rôles ? Tous les roles "
+"actifs (excepté les gestionnaires) seront remis à zéro !"
-#: templates/site/settings_data.html:36
-msgid "Export data"
-msgstr ""
-
-#: templates/site/settings_data.html:45
-msgid "Import data"
-msgstr ""
-
-#: templates/site/settings_data.html:60
#: templates/site/settings_design.html:31
msgid "Delete logo"
msgstr "Supprimer le logo"
#: templates/site/text_create_content.html:26
-#: templates/site/text_create_upload.html:24
-#: templates/site/text_list.html:37
+#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
msgid "Text list"
msgstr "Textes"
@@ -995,19 +1010,29 @@
#: templates/site/text_embed.html:26
msgid "Copy this code into your site to display text with comments."
-msgstr "Copier ce code dans votre site pour afficher le texte et ses commentaires."
+msgstr ""
+"Copier ce code dans votre site pour afficher le texte et ses commentaires."
#: templates/site/text_embed.html:26
-msgid "Users will also be able to add comments from your site depending on anonymous users' roles."
-msgstr " Les utilisateurs pourront ajouter leurs commentaires (si vous avez activé cette possiblité)."
+msgid ""
+"Users will also be able to add comments from your site depending on "
+"anonymous users' roles."
+msgstr ""
+" Les utilisateurs pourront ajouter leurs commentaires (si vous avez activé "
+"cette possiblité)."
#: templates/site/text_embed.html:36
msgid "Warning:"
msgstr "Attention: "
#: templates/site/text_embed.html:36
-msgid "You won't successfully embed the text before you give anonymous users a role allowing them to view the text."
-msgstr "Vous ne pourrez pas encapsuler votre texte dans un site externe si vous ne donnez pas aux utilisateurs anonymes un rôle leur permettant de voir le texte."
+msgid ""
+"You won't successfully embed the text before you give anonymous users a role "
+"allowing them to view the text."
+msgstr ""
+"Vous ne pourrez pas encapsuler votre texte dans un site externe si vous ne "
+"donnez pas aux utilisateurs anonymes un rôle leur permettant de voir le "
+"texte."
#: templates/site/text_followup.html:7
msgid "Text followup"
@@ -1027,16 +1052,25 @@
msgstr "Flux privé du texte"
#: templates/site/text_followup.html:45
-msgid "This is the private feed for the text. Don't share this address with others unless you want them to see all activities on this text."
-msgstr "Ceci est le flux privé du texte. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités du texte."
+msgid ""
+"This is the private feed for the text. Don't share this address with others "
+"unless you want them to see all activities on this text."
+msgstr ""
+"Ceci est le flux privé du texte. Ne partagez cette adresse que si vous "
+"voulez que d'autres que vous-même puissent suivre toutes les activités du "
+"texte."
#: templates/site/text_followup.html:53
msgid "The private feed for this text is not yet activated."
msgstr "Le flux privé de ce texte n'est pas encore activé."
#: templates/site/text_followup.html:61
-msgid "You will receive text notifications because you subscribed to notifications at the workspace level"
-msgstr "Vous recevrez les notifications de ce texte parce que vous vous êtes abonné aux notifications au niveau de l'espace de travail tout entier"
+msgid ""
+"You will receive text notifications because you subscribed to notifications "
+"at the workspace level"
+msgstr ""
+"Vous recevrez les notifications de ce texte parce que vous vous êtes abonné "
+"aux notifications au niveau de l'espace de travail tout entier"
#: templates/site/text_followup.html:64
msgid "Subscribe to all text notifications"
@@ -1070,8 +1104,7 @@
msgid "Selection"
msgstr "Sélection"
-#: templates/site/text_history.html:81
-#: templates/site/text_list.html:137
+#: templates/site/text_history.html:81 templates/site/text_list.html:137
msgid "Author"
msgstr "Auteur"
@@ -1079,13 +1112,11 @@
msgid "Created"
msgstr "Crée"
-#: templates/site/text_history.html:83
-#: templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:139
msgid "# comments"
msgstr "nb. de commentaires"
-#: templates/site/text_history.html:103
-#: templates/site/text_list.html:159
+#: templates/site/text_history.html:103 templates/site/text_list.html:159
msgid "View"
msgstr "Voir"
@@ -1098,8 +1129,7 @@
msgid "Revert to this version"
msgstr "Revenir à cette version"
-#: templates/site/text_history.html:106
-#: templates/site/text_list.html:80
+#: templates/site/text_history.html:106 templates/site/text_list.html:80
#: templates/site/text_list.html.py:161
msgid "Delete"
msgstr "Supprimer"
@@ -1121,8 +1151,11 @@
#: templates/site/text_history_compare.html:32
#, python-format
-msgid "Comparison between version #%(version_1_number)s and #%(version_2_number)s"
-msgstr "Différences entre les versions n°%(version_1_number)s et n°%(version_2_number)s"
+msgid ""
+"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgstr ""
+"Différences entre les versions n°%(version_1_number)s et n°%"
+"(version_2_number)s"
#: templates/site/text_history_compare.html:34
msgid "Next modification"
@@ -1144,8 +1177,7 @@
msgid "Next version"
msgstr "Version suivante"
-#: templates/site/text_history_version.html:45
-#: views/texts.py:478
+#: templates/site/text_history_version.html:45 views/texts.py:478
#: views/texts.py:479
#, python-format
msgid "by %(author)s"
@@ -1155,44 +1187,35 @@
msgid "Texts"
msgstr "Textes"
-#: templates/site/text_list.html:47
-#: templates/site/text_share.html:35
-#: templates/site/user_list.html:7
-#: templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40
-#: templates/site/user_list.html.py:116
+#: templates/site/text_list.html:47 templates/site/text_share.html:35
+#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
+#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
msgid "People' list"
msgstr "Liste des utilisateurs"
-#: templates/site/text_list.html:50
-#: templates/site/text_share.html:40
+#: templates/site/text_list.html:50 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr "Filtrer avec le mot-clé"
-#: templates/site/text_list.html:52
-#: templates/site/text_share.html:42
+#: templates/site/text_list.html:52 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Tous"
-#: templates/site/text_list.html:79
-#: templates/site/user_list.html:72
+#: templates/site/text_list.html:79 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Actions multiples"
-#: templates/site/text_list.html:83
-#: templates/site/user_list.html:81
+#: templates/site/text_list.html:83 templates/site/user_list.html:81
msgid "Apply"
msgstr "Appliquer"
-#: templates/site/text_list.html:104
-#: templates/site/user_list.html:102
+#: templates/site/text_list.html:104 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Etes vous sûr ?"
-#: templates/site/text_list.html:136
-#: templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texte"
@@ -1200,8 +1223,7 @@
msgid "Modified"
msgstr "Modifié"
-#: templates/site/text_list.html:140
-#: templates/site/user_list.html:136
+#: templates/site/text_list.html:140 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Activités de la dernière semaine"
@@ -1216,8 +1238,7 @@
msgid "Filter by tag: %(tag_name)s"
msgstr "Filtrer avec le mot-clé : %(tag_name)s"
-#: templates/site/text_list.html:160
-#: templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Editer"
@@ -1234,58 +1255,51 @@
msgid "Edit user"
msgstr "Editer l'utilisateur"
-#: templates/site/text_share.html:27
-#: templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23
-#: templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20
-#: templates/site/user_mass_add.html:20
+#: templates/site/text_share.html:27 templates/site/user_add.html:20
+#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
+#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
#: templates/site/user_mass_add_text.html:23
msgid "Users' list"
msgstr "Liste des utilisateurs"
-#: templates/site/text_share.html:29
-#: templates/site/user_add.html:6
-#: templates/site/user_add.html.py:22
-#: templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25
-#: templates/site/user_contact.html:19
-#: templates/site/user_edit.html:22
-#: templates/site/user_list.html:34
+#: templates/site/text_share.html:29 templates/site/user_add.html:6
+#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
+#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_edit.html:22 templates/site/user_list.html:34
#: templates/site/user_mass_add.html:22
#: templates/site/user_mass_add_text.html:6
#: templates/site/user_mass_add_text.html:25
msgid "Add a new user"
msgstr "Ajouter un utilisateur"
-#: templates/site/text_share.html:31
-#: templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27
-#: templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6
-#: templates/site/user_mass_add.html:24
+#: templates/site/text_share.html:31 templates/site/user_add.html:24
+#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
+#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
#: templates/site/user_mass_add_text.html:27
msgid "Add users in bulk"
msgstr "Ajouter des utilisateurs en masse"
-#: templates/site/text_share.html:38
-#: templates/site/user_list.html:43
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
msgid "Hide suspended users"
msgstr "Masquer les utilisateurs désactivés"
-#: templates/site/text_share.html:38
-#: templates/site/user_list.html:43
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
msgid "Display suspended users"
msgstr "Afficher les utilisateurs désactivés"
-#: templates/site/text_share.html:86
-#: templates/site/user_list.html:132
+#: templates/site/text_share.html:86 templates/site/user_list.html:132
msgid "User"
msgstr "Utilisateur"
#: templates/site/text_share.html:87
-msgid "The 'Workspace role' is the global role that applies to every text, you can give a user a particular role on this text using the 'text role' column on the right"
-msgstr "Le 'rôle dans l'espace de travail' est le rôle global qui s'applique à tous les textes. Vous pouvez donner à un utilisateur particulier un rôle différent sur ce texte via la colonne 'rôle sur le texte' à droite"
+msgid ""
+"The 'Workspace role' is the global role that applies to every text, you can "
+"give a user a particular role on this text using the 'text role' column on "
+"the right"
+msgstr ""
+"Le 'rôle dans l'espace de travail' est le rôle global qui s'applique à tous "
+"les textes. Vous pouvez donner à un utilisateur particulier un rôle "
+"différent sur ce texte via la colonne 'rôle sur le texte' à droite"
#: templates/site/text_share.html:87
msgid "Workspace role"
@@ -1296,15 +1310,12 @@
msgid "This role has been overriden on this text by a text role: %(rolename)s"
msgstr "Ce rôle a été surchargé par un rôle sur le texte : %(rolename)s"
-#: templates/site/text_share.html:128
-#: templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24
-#: templates/site/user_list.html:177
+#: templates/site/text_share.html:128 templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
msgid "Edit anonymous users"
msgstr "Editer 'l'utilisateur anonyme'"
-#: templates/site/text_share.html:128
-#: templates/site/user_list.html:177
+#: templates/site/text_share.html:128 templates/site/user_list.html:177
msgid "Anonymous users"
msgstr "Utilisateurs anonymes"
@@ -1341,18 +1352,20 @@
"The user will receive an email invitation to join the workspace.\n"
"You can customize the email sent by using the 'Note' field bellow."
msgstr ""
-"L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail.\n"
+"L'utilisateur recevra un email d'invitation à rejoindre l'espace de "
+"travail.\n"
"Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
#: templates/site/user_add_text.html:29
msgid "The user will receive an email invitation to join the workspace."
-msgstr "L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail."
+msgstr ""
+"L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail."
-#: templates/site/user_add_text.html:30
-#: templates/site/user_mass_add.html:27
+#: templates/site/user_add_text.html:30 templates/site/user_mass_add.html:27
#: templates/site/user_mass_add_text.html:30
msgid "You can customize the email sent by using the 'Note' field bellow."
-msgstr "Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
+msgstr ""
+"Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
#: templates/site/user_contact.html:6
msgid "Contact user"
@@ -1363,19 +1376,16 @@
msgid "Contact user %(username)s"
msgstr "Contacter l'utilisateur %(username)s"
-#: templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24
+#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
#, python-format
msgid "Edit user %(username)s"
msgstr "Editer l'utilisateur %(username)s"
-#: templates/site/user_list.html:73
-#: templates/site/macros/user_actions.html:28
+#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
msgid "Suspend access"
msgstr "Désactiver l'accès"
-#: templates/site/user_list.html:74
-#: templates/site/macros/user_actions.html:23
+#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
msgid "Enable access"
msgstr "Activer l'accès"
@@ -1384,8 +1394,7 @@
msgid "Change role to %(role_name)s"
msgstr "Modifier le rôle en %(role_name)s"
-#: templates/site/user_list.html:133
-#: views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:283
msgid "Email"
msgstr "Email"
@@ -1400,7 +1409,9 @@
#: templates/site/user_mass_add.html:26
#: templates/site/user_mass_add_text.html:29
msgid "The users will receive an email invitation to join the workspace."
-msgstr "Les utilisateurs recevront un email d'invitation à rejoindre l'espace de travail."
+msgstr ""
+"Les utilisateurs recevront un email d'invitation à rejoindre l'espace de "
+"travail."
#: templates/site/layout/base_text.html:16
#: templates/site/layout/base_workspace.html:20
@@ -1425,10 +1436,6 @@
msgid "About"
msgstr "A propos"
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr "Profil"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Se déconnecter"
@@ -1474,8 +1481,12 @@
msgstr "par %(name)s le %(date)s"
#: templates/site/macros/text_editor.html:43
-msgid "You have attempted to leave this page. Unsaved changes will be lost. Are you sure you want to exit this page?"
-msgstr "Vous avez tenté de quitter la page. Les modifications non sauvegardées seront perdues. Etes vous sûr de vouloir quitter cette page ?"
+msgid ""
+"You have attempted to leave this page. Unsaved changes will be lost. Are you "
+"sure you want to exit this page?"
+msgstr ""
+"Vous avez tenté de quitter la page. Les modifications non sauvegardées "
+"seront perdues. Etes vous sûr de vouloir quitter cette page ?"
#: templates/site/macros/text_meta.html:6
#, python-format
@@ -1517,15 +1528,21 @@
#: templates/site/macros/user_actions.html:38
msgid "Are you sure you want to suspend this user's access to the workspace?"
-msgstr "Etes vous sûr de vouloir désactiver l'accès de cet utilisateur à l'espace de travail ?"
+msgstr ""
+"Etes vous sûr de vouloir désactiver l'accès de cet utilisateur à l'espace de "
+"travail ?"
#: templates/site/macros/user_actions.html:47
msgid "Are you sure you want to enable this user's access to the workspace?"
-msgstr "Etes vous sûr de vouloir activer l'accès de cet utilisateur à l'espace de travail ?"
+msgstr ""
+"Etes vous sûr de vouloir activer l'accès de cet utilisateur à l'espace de "
+"travail ?"
#: templates/site/macros/user_actions.html:56
msgid "Are you sure you want to send this user an invitation to the workspace?"
-msgstr "Etes vous sûr de vouloir envoyer à cet utilisateur une invitation à rejoindre l'espace de travail ?"
+msgstr ""
+"Etes vous sûr de vouloir envoyer à cet utilisateur une invitation à "
+"rejoindre l'espace de travail ?"
#: templates/site/macros/user_moderation.html:3
msgid "Approve"
@@ -1548,8 +1565,11 @@
msgstr "Charger un fichier (optionnel)"
#: views/create.py:27
-msgid "Upload a file from your computer instead of using the direct input above"
-msgstr "Charger un fichier de votre ordinateur plutôt que d'utiliser le champ de saisie ci-dessus"
+msgid ""
+"Upload a file from your computer instead of using the direct input above"
+msgstr ""
+"Charger un fichier de votre ordinateur plutôt que d'utiliser le champ de "
+"saisie ci-dessus"
#: views/create.py:38
msgid "You should specify a file to upload."
@@ -1559,8 +1579,7 @@
msgid "The title of your text"
msgstr "Le titre de votre texte"
-#: views/create.py:71
-#: views/create.py:108
+#: views/create.py:71 views/create.py:108
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "Le texte \"%(text_title)s\" a été créé"
@@ -1605,8 +1624,7 @@
msgid "Private activity feed for text %(text_title)s"
msgstr "Flux public pour le texte %(text_title)s"
-#: views/followup.py:31
-#: views/followup.py:80
+#: views/followup.py:31 views/followup.py:80
msgid "Private feed activated."
msgstr "Flux privé activé."
@@ -1630,9 +1648,7 @@
msgid "Private notifications feed reseted."
msgstr "Flux privé réinitialisé."
-#: views/site.py:82
-#: views/texts.py:130
-#: views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:545
msgid "You're logged in!"
msgstr "Vous êtes connecté !"
@@ -1677,25 +1693,30 @@
msgstr "S'enregistrer sur l'espace de travail"
#: views/site.py:176
-msgid "Can users register themselves into the workspace? (if not, only invitations by managers can create new users)"
-msgstr "Les utilisateurs peuvent-ils s'enregistrer sur l'espace de travail ? (dans le cas contraire l'ajout d'utilisateurs à l'espace de travail peut seulement se faire par l'envoi d'invitations par les gestionnaires)"
+msgid ""
+"Can users register themselves into the workspace? (if not, only invitations "
+"by managers can create new users)"
+msgstr ""
+"Les utilisateurs peuvent-ils s'enregistrer sur l'espace de travail ? (dans "
+"le cas contraire l'ajout d'utilisateurs à l'espace de travail peut seulement "
+"se faire par l'envoi d'invitations par les gestionnaires)"
#: views/site.py:180
msgid "Workspace registration moderation"
msgstr "Modération de l'enregistrement sur l'espace de travail"
#: views/site.py:181
-msgid "Should new users be moderated (registration will require manager's approval)?"
-msgstr "Les nouveaux utilisateurs doivent-ils être modérés (l'enregistrement exigera alors l'approbation par un gestionnaire) ?"
+msgid ""
+"Should new users be moderated (registration will require manager's approval)?"
+msgstr ""
+"Les nouveaux utilisateurs doivent-ils être modérés (l'enregistrement exigera "
+"alors l'approbation par un gestionnaire) ?"
#: views/site.py:186
msgid "Change the roles available in the workspace"
msgstr "Modifie les rôles disponibles dans l'espace de travail"
-#: views/site.py:201
-#: views/site.py:207
-#: views/site.py:235
-#: views/site.py:244
+#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
msgid "Settings saved"
msgstr "Paramètres sauvegardés"
@@ -1708,28 +1729,23 @@
msgstr "Code html de l'espace de travail"
#: views/site.py:218
-msgid "Add stylesheets etc. Warning: this code will be added to the workspace code, make sure you know what you're doing before adding something here."
-msgstr "Ajouter des feuilles de style etc.. Attention : ce code sera ajouté à celui de l'espace de travail, à manipuler avec prudence."
-
-#: views/site.py:252
-msgid "Username or email"
+msgid ""
+"Add stylesheets etc. Warning: this code will be added to the workspace code, "
+"make sure you know what you're doing before adding something here."
msgstr ""
-
-#: views/site.py:279
-msgid "How to reset your password"
-msgstr "Ré-initialiser votre mot de passe"
+"Ajouter des feuilles de style etc.. Attention : ce code sera ajouté à celui "
+"de l'espace de travail, à manipuler avec prudence."
-#: views/site.py:281
-msgid "A link to reset your password has been sent to the profile email. Please check your email."
-msgstr "Un lien pour réinitialiser votre mot de passe a été envoyé à votre email."
+#: views/site.py:253
+msgid ""
+"A link to reset your password has been sent to the profile email. Please "
+"check your email."
+msgstr ""
+"Un lien pour réinitialiser votre mot de passe a été envoyé à votre email."
-#: views/site.py:283
-msgid "No user found."
-msgstr "Pas d'utilisateur trouvé."
-
-#: views/site.py:299
-msgid "Your password has been changed."
-msgstr "Votre mot de passe a été modifié."
+#: views/site.py:257 views/user.py:428
+msgid "Password changed"
+msgstr "Votre mot de passe a été modifié"
#: views/texts.py:163
#, python-format
@@ -1768,7 +1784,8 @@
#: views/texts.py:626
msgid "Keep comments (if not affected by the edit)"
-msgstr "Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
+msgstr ""
+"Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
#: views/texts.py:690
msgid "Name (optional)"
@@ -1781,11 +1798,10 @@
#: views/texts.py:741
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
-msgstr "Une nouvelle version (copiée depuis la version %(version_title)s) a été créée"
+msgstr ""
+"Une nouvelle version (copiée depuis la version %(version_title)s) a été créée"
-#: views/texts.py:849
-#: views/user.py:79
-#: views/user.py:99
+#: views/texts.py:849 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr "%(count)i rôle(s) d'utilisateur modifié(s)"
@@ -1818,15 +1834,23 @@
#: views/user.py:164
msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
-msgstr "Ajouter des emails multiples (un par ligne ou séparés par \",\" or \";\")"
+msgstr ""
+"Ajouter des emails multiples (un par ligne ou séparés par \",\" or \";\")"
#: views/user.py:181
msgid "Workspace level role"
msgstr "Rôle dans l'espace de travail"
#: views/user.py:182
-msgid "This role will apply to every text in the workspace. To share only a (few) texts with this user, you can leave this blank and delegate roles on texts once the user is created."
-msgstr "Ce rôle s'appliquera à tous les textes dans l'espace de travail. Pour partager seulement quelques textes avec cet utilisateur, vous pouvez laisser ce champ vide et déléguer les rôles sur les textes une fois l'utilisateur créé."
+msgid ""
+"This role will apply to every text in the workspace. To share only a (few) "
+"texts with this user, you can leave this blank and delegate roles on texts "
+"once the user is created."
+msgstr ""
+"Ce rôle s'appliquera à tous les textes dans l'espace de travail. Pour "
+"partager seulement quelques textes avec cet utilisateur, vous pouvez laisser "
+"ce champ vide et déléguer les rôles sur les textes une fois l'utilisateur "
+"créé."
#: views/user.py:198
msgid "Text level role"
@@ -1857,8 +1881,7 @@
msgid "This username is already in use. Please supply a different username."
msgstr "Ce nom d'utilisateur est déjà utilisé. Merci d'en fournir un autre."
-#: views/user.py:320
-#: views/user.py:336
+#: views/user.py:320 views/user.py:336
msgid "Your account has been activated. You're now logged-in."
msgstr "Votre compte a été activé. Vous êtes maintenant connecté."
@@ -1891,70 +1914,96 @@
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Une nouvelle invitation a été envoyée à l'utilisateur %(prof)s."
-#: views/user.py:407
+#: views/user.py:410
msgid "Profile updated"
msgstr "Profil mis à jour"
-#: views/user.py:437
+#: views/user.py:456
msgid "Anonymous user role modified."
msgstr "Role de l'utilisateur anonyme modifié."
-#: views/user.py:459
+#: views/user.py:478
msgid "User modified"
msgstr "Utilisateur modifié"
-#: views/user.py:474
+#: views/user.py:493
msgid "Subject"
msgstr "Sujet"
-#: views/user.py:475
+#: views/user.py:494
msgid "Subject of the email"
msgstr "Sujet du message"
-#: views/user.py:478
+#: views/user.py:497
msgid "Body"
msgstr "Corps"
-#: views/user.py:479
+#: views/user.py:498
msgid "Body of the email"
msgstr "Corps du message"
-#: views/user.py:499
+#: views/user.py:518
msgid "Email sent."
msgstr "Email envoyé."
-#: views/user.py:520
+#: views/user.py:539
msgid "This account is suspended, contact the workspace administrator."
-msgstr "Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de travail."
+msgstr ""
+"Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de "
+"travail."
-#: views/user.py:551
+#: views/user.py:570
msgid "You've been logged out."
msgstr "Vous êtes déconnecté."
-#: views/user.py:567
-msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
-msgstr "Enregistrement réussi, vous recevrez un message de confirmation quand un gestionnaire de l'espace de travail aura activé votre compte."
+#: views/user.py:586
+msgid ""
+"You've been registered, you will receive a confirmation mail once a "
+"moderator has approved your membership."
+msgstr ""
+"Enregistrement réussi, vous recevrez un message de confirmation quand un "
+"gestionnaire de l'espace de travail aura activé votre compte."
-#: views/user.py:570
-msgid "You've been registered, please check your email for the confirm message."
+#: views/user.py:589
+msgid ""
+"You've been registered, please check your email for the confirm message."
msgstr "Enregistrement réussi, un message de confirmation vous a été envoyé"
+#~ msgid "Your password has been reset."
+#~ msgstr "Votre mot de passe a été changé"
+
+#~ msgid "Username or email"
+#~ msgstr "Nom d'usager ou email"
+
+#~ msgid "How to reset your password"
+#~ msgstr "Ré-initialiser votre mot de passe"
+
+#~ msgid "No user found."
+#~ msgstr "Pas d'utilisateur trouvé."
+
#~ msgid "How do you want to print?"
#~ msgstr "Comment voulez vous imprimer ?"
+
#~ msgid "Design"
#~ msgstr "Design"
+
#~ msgid "%(workspace_name)s's workspace"
#~ msgstr "espace de travail : %(workspace_name)s"
+
#~ msgid "Versions:"
#~ msgstr "Versions :"
+
#~ msgid "created %(v1created)s"
#~ msgstr "créé le %(v1created)s"
+
#~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
#~ msgstr "Différences entre les versions n°%(v1_nid)s et n°%(v2_nid)s :"
+
#~ msgid "Version #%(version_number)s created on %(date)s"
#~ msgstr "Version n°%(version_number)s créée le %(date)s :"
+
#~ msgid "Contact from user: %(name)s / %(email)s"
#~ msgstr "Contact de l'utilisateur %(name)s / %(email)s"
+
#~ msgid "%(title)s"
#~ msgstr "%(title)s"
-
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po Mon Mar 22 12:50:42 2010 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 16:15+0100\n"
+"POT-Creation-Date: 2010-03-22 12:40+0100\n"
"PO-Revision-Date: 2010-02-24 01:37+0900\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: <no@li.org>\n"
@@ -375,8 +375,7 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_data.html:58
-#: templates/site/settings_design.html:29
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:47
#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
@@ -650,12 +649,16 @@
msgstr "Abonner på varsler for svar i diskusjoner hvor du har deltatt"
#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/login_form.html:21
-msgid "Forgot password?"
+#: templates/site/forgot_pw.html:27
+msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:24
-msgid "Remind my password"
+#: templates/site/forgot_pw.html:35
+msgid "This link is invalid."
+msgstr ""
+
+#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+msgid "Forgot password?"
msgstr ""
#: templates/site/help.html:16
@@ -936,11 +939,22 @@
msgstr "Stopp"
#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Din profil (%(username)s)"
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/profile.html:17 templates/site/profile_pw.html:17
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+msgid "Password"
+msgstr ""
+
+#: templates/site/profile.html:33 templates/site/profile_pw.html:33
+#: templates/site/text_create_content.html:45
#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
#: templates/site/text_settings.html:23 templates/site/text_share.html:153
#: templates/site/user_activate.html:27 templates/site/user_list.html:210
@@ -958,25 +972,21 @@
msgid "Reset your password"
msgstr ""
-#: templates/site/settings.html:5 templates/site/settings_data.html:5
-#: templates/site/settings_design.html:5 templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Innstillinger"
-#: templates/site/settings.html:21 templates/site/settings_data.html:21
-#: templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
msgid "General"
msgstr "Generell"
-#: templates/site/settings.html:23 templates/site/settings_data.html:23
-#: templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
msgstr "Utseende"
-#: templates/site/settings.html:38 templates/site/settings_data.html:69
-#: templates/site/settings_design.html:40
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
msgid ""
"Are you sure you want to change the role model? All roles (except managers) "
"will be resetted!"
@@ -984,19 +994,7 @@
"Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli "
"nullstilt!"
-#: templates/site/settings_data.html:25
-msgid "Data"
-msgstr ""
-
-#: templates/site/settings_data.html:36
-msgid "Export data"
-msgstr ""
-
-#: templates/site/settings_data.html:45
-msgid "Import data"
-msgstr ""
-
-#: templates/site/settings_data.html:60 templates/site/settings_design.html:31
+#: templates/site/settings_design.html:31
msgid "Delete logo"
msgstr "Slett logo"
@@ -1435,10 +1433,6 @@
msgid "About"
msgstr "Om"
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr "Profil"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Logg ut"
@@ -1643,7 +1637,7 @@
msgid "Private notifications feed reseted."
msgstr "Strøm for private varsler nullstilt."
-#: views/site.py:82 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:545
msgid "You're logged in!"
msgstr "Du er logget inn!"
@@ -1731,27 +1725,15 @@
"Legg til stilark (CSS) osv. Advarsel: denne koden vil bli lagt til koden for "
"arbeidsområde. Sørg for at du vet hva du gjør før du legger noe til her."
-#: views/site.py:252
-msgid "Username or email"
-msgstr ""
-
-#: views/site.py:279
-msgid "How to reset your password"
-msgstr ""
-
-#: views/site.py:281
+#: views/site.py:253
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:283
-msgid "No user found."
-msgstr ""
-
-#: views/site.py:299
+#: views/site.py:257 views/user.py:428
#, fuzzy
-msgid "Your password has been changed."
+msgid "Password changed"
msgstr "Teksten %(text_title)s har blitt opprettet"
#: views/texts.py:163
@@ -1919,48 +1901,48 @@
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Ny invitasjon har blitt sendt til brukeren %(prof)s."
-#: views/user.py:407
+#: views/user.py:410
msgid "Profile updated"
msgstr "Profil oppdatert"
-#: views/user.py:437
+#: views/user.py:456
msgid "Anonymous user role modified."
msgstr "Rollen for anonyme brukere har blitt endret."
-#: views/user.py:459
+#: views/user.py:478
msgid "User modified"
msgstr "Bruker endret."
-#: views/user.py:474
+#: views/user.py:493
msgid "Subject"
msgstr "Emne"
-#: views/user.py:475
+#: views/user.py:494
msgid "Subject of the email"
msgstr "Emne for eposten"
-#: views/user.py:478
+#: views/user.py:497
msgid "Body"
msgstr "Tekst"
-#: views/user.py:479
+#: views/user.py:498
msgid "Body of the email"
msgstr "Epostteksten"
-#: views/user.py:499
+#: views/user.py:518
msgid "Email sent."
msgstr "Eposten er blitt sendt."
-#: views/user.py:520
+#: views/user.py:539
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
-#: views/user.py:551
+#: views/user.py:570
msgid "You've been logged out."
msgstr "Du er logget ut."
-#: views/user.py:567
+#: views/user.py:586
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -1968,11 +1950,15 @@
"Du er blitt registert. Du vil motta en epost med bekreftelse når en "
"administrator godkjenner ditt medlemskap."
-#: views/user.py:570
+#: views/user.py:589
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr "Du er blitt registert. Se din epost for en melding med bekreftelsen."
+#, fuzzy
+#~ msgid "Your password has been reset."
+#~ msgstr "Teksten %(text_title)s har blitt opprettet"
+
#~ msgid "How do you want to print?"
#~ msgstr "Hvordan ønsker du å skrive ut?"
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Mar 22 12:50:42 2010 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 16:14+0100\n"
+"POT-Creation-Date: 2010-03-22 12:39+0100\n"
"PO-Revision-Date: 2010-02-24 01:36+0900\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -369,8 +369,7 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_data.html:58
-#: templates/site/settings_design.html:29
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:47
#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
@@ -645,12 +644,16 @@
"Receber todas os avisos de resposta em discussões nas quais você participou"
#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/login_form.html:21
-msgid "Forgot password?"
+#: templates/site/forgot_pw.html:27
+msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:24
-msgid "Remind my password"
+#: templates/site/forgot_pw.html:35
+msgid "This link is invalid."
+msgstr ""
+
+#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+msgid "Forgot password?"
msgstr ""
#: templates/site/help.html:16
@@ -931,11 +934,22 @@
msgstr "Desativar"
#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Seu perfil (%(username)s)"
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/profile.html:17 templates/site/profile_pw.html:17
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr "Perfil"
+
+#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+msgid "Password"
+msgstr ""
+
+#: templates/site/profile.html:33 templates/site/profile_pw.html:33
+#: templates/site/text_create_content.html:45
#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
#: templates/site/text_settings.html:23 templates/site/text_share.html:153
#: templates/site/user_activate.html:27 templates/site/user_list.html:210
@@ -953,44 +967,28 @@
msgid "Reset your password"
msgstr ""
-#: templates/site/settings.html:5 templates/site/settings_data.html:5
-#: templates/site/settings_design.html:5 templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Configurações"
-#: templates/site/settings.html:21 templates/site/settings_data.html:21
-#: templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
#, fuzzy
msgid "General"
msgstr "Genérico"
-#: templates/site/settings.html:23 templates/site/settings_data.html:23
-#: templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
msgstr ""
-#: templates/site/settings.html:38 templates/site/settings_data.html:69
-#: templates/site/settings_design.html:40
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
msgid ""
"Are you sure you want to change the role model? All roles (except managers) "
"will be resetted!"
msgstr "Confirmar alteração de "
-#: templates/site/settings_data.html:25
-msgid "Data"
-msgstr ""
-
-#: templates/site/settings_data.html:36
-msgid "Export data"
-msgstr ""
-
-#: templates/site/settings_data.html:45
-msgid "Import data"
-msgstr ""
-
-#: templates/site/settings_data.html:60 templates/site/settings_design.html:31
+#: templates/site/settings_design.html:31
#, fuzzy
msgid "Delete logo"
msgstr "Apagar"
@@ -1441,10 +1439,6 @@
msgid "About"
msgstr "Sobre"
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr "Perfil"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Sair"
@@ -1652,7 +1646,7 @@
msgid "Private notifications feed reseted."
msgstr "Feed privado de avisos restabelecido."
-#: views/site.py:82 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:545
msgid "You're logged in!"
msgstr "Você entrou!"
@@ -1739,26 +1733,14 @@
"make sure you know what you're doing before adding something here."
msgstr ""
-#: views/site.py:252
-msgid "Username or email"
-msgstr ""
-
-#: views/site.py:279
-msgid "How to reset your password"
-msgstr ""
-
-#: views/site.py:281
+#: views/site.py:253
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:283
-msgid "No user found."
-msgstr ""
-
-#: views/site.py:299
-msgid "Your password has been changed."
+#: views/site.py:257 views/user.py:428
+msgid "Password changed"
msgstr ""
#: views/texts.py:163
@@ -1927,49 +1909,49 @@
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Um novo convite foi enviado ao usuário %(prof)s."
-#: views/user.py:407
+#: views/user.py:410
msgid "Profile updated"
msgstr "Perfil atualizado"
-#: views/user.py:437
+#: views/user.py:456
msgid "Anonymous user role modified."
msgstr "Função de usuário anônimo alterada."
-#: views/user.py:459
+#: views/user.py:478
msgid "User modified"
msgstr "Usuário alterado"
-#: views/user.py:474
+#: views/user.py:493
msgid "Subject"
msgstr "Assunto"
-#: views/user.py:475
+#: views/user.py:494
msgid "Subject of the email"
msgstr "Assunto do email"
-#: views/user.py:478
+#: views/user.py:497
msgid "Body"
msgstr "Corpo"
-#: views/user.py:479
+#: views/user.py:498
msgid "Body of the email"
msgstr "Corpo do email"
-#: views/user.py:499
+#: views/user.py:518
msgid "Email sent."
msgstr "Email enviado."
-#: views/user.py:520
+#: views/user.py:539
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Essa conta estpa suspensa, entre em contato com o administrador da área de "
"trabalho."
-#: views/user.py:551
+#: views/user.py:570
msgid "You've been logged out."
msgstr "Você saiu."
-#: views/user.py:567
+#: views/user.py:586
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -1977,12 +1959,16 @@
"Você se inscreveu. Você receberá um email de confirmação quando o moderador "
"aprovar sua participação."
-#: views/user.py:570
+#: views/user.py:589
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Você se inscreveu. Favor verifique em seu email a mensagem de confirmação."
+#, fuzzy
+#~ msgid "Your password has been reset."
+#~ msgstr "O acesso do usuário %(prof)s foi rejeitado."
+
#~ msgid "How do you want to print?"
#~ msgstr "Como você quer imprimir?"
--- a/src/cm/templates/email/forgot_pw.txt Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/templates/email/forgot_pw.txt Mon Mar 22 12:50:42 2010 +0100
@@ -1,4 +1,11 @@
-{% extends "email/base_email.txt" %}{% load i18n %}{% block content %}
-{% blocktrans %}Click the following link to reset your password:{% endblocktrans %}
-{{ CONF.site_url }}{{ reset_url }}
-{% endblock %}
\ No newline at end of file
+{% load i18n %}{% autoescape off %}
+{% trans "You're receiving this e-mail because you requested a password reset" %}
+{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
+
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
+{% endblock %}
+{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
+
+{% endautoescape %}
--- a/src/cm/templates/site/forgot_pw.html Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/templates/site/forgot_pw.html Mon Mar 22 12:50:42 2010 +0100
@@ -3,7 +3,7 @@
{% load i18n %}
{% block title %}
-{% blocktrans %}Forgot password?{% endblocktrans %}
+{% blocktrans %}Reset my password{% endblocktrans %}
{% endblock %}
{% block head %}
@@ -11,8 +11,11 @@
{% block content %}
-<h1>{% blocktrans %}Forgot password?{% endblocktrans %}</h1>
+<h1>{% blocktrans %}Reset my password{% endblocktrans %}</h1>
+
+{% if form %}
<form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
+
<table class="wide_form">
<tbody>
{% include "site/macros/form_fields.html" %}
@@ -21,10 +24,25 @@
</td>
<td>
<label></label>
- <input name="remind" type="submit" value="{% blocktrans %}Remind my password{% endblocktrans %}"/>
+ <input name="remind" type="submit" value="{% blocktrans %}Reset my password{% endblocktrans %}"/>
</td>
</tr>
</tbody>
</table>
</form>
+{% else %}
+<center>
+{% blocktrans %}This link is invalid.{% endblocktrans %}
+
+
+<br />
+
+<a href="{% url forgot-pw %}">{% blocktrans %}Forgot password?{% endblocktrans %}</a>
+
+</center>
+
+<br />
+<br />
+<br />
+{% endif %}
{% endblock %}
\ No newline at end of file
--- a/src/cm/templates/site/profile.html Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/templates/site/profile.html Mon Mar 22 12:50:42 2010 +0100
@@ -12,6 +12,13 @@
{% block content %}
<h1>{% blocktrans with user.username as username %}Your profile ({{ username }}){% endblocktrans %}</h1>
+
+<ul class="sub_list">
+ <li class="active_sub">{% blocktrans %}Profile{% endblocktrans %}</li>
+ <li> / </li>
+ <li><a href="{% url profile-pw %}">{% blocktrans %}Password{% endblocktrans %}</a></li>
+</ul>
+
<form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
<table class="wide_form">
<tbody>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/templates/site/profile_pw.html Mon Mar 22 12:50:42 2010 +0100
@@ -0,0 +1,39 @@
+{% extends "site/layout/base_workspace.html" %}
+{% load com %}
+{% load i18n %}
+
+{% block title %}
+{% blocktrans with user.username as username %}Your profile ({{ username }}){% endblocktrans %}
+{% endblock %}
+
+{% block head %}
+{% endblock %}
+
+{% block content %}
+
+<h1>{% blocktrans with user.username as username %}Your profile ({{ username }}){% endblocktrans %}</h1>
+
+<ul class="sub_list">
+ <li><a href="{% url profile %}">{% blocktrans %}Profile{% endblocktrans %}</a></li>
+ <li> / </li>
+ <li class="active_sub">{% blocktrans %}Password{% endblocktrans %}</li>
+</ul>
+
+<form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
+<table class="wide_form">
+ <tbody>
+ {% for form in forms %}
+ {% include "site/macros/form_fields.html" %}
+ {% endfor %}
+ <tr>
+ <td style="vertical-align: top; width: 20%; text-align:right;">
+ </td>
+ <td>
+ <label></label>
+ <input name="save" type="submit" value="{% blocktrans %}Save{% endblocktrans %}"/>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</form>
+{% endblock %}
\ No newline at end of file
--- a/src/cm/urls.py Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/urls.py Mon Mar 22 12:50:42 2010 +0100
@@ -14,6 +14,7 @@
from cm.views.followup import *
from cm.views import i18n
+
urlpatterns = patterns('',
)
@@ -31,10 +32,9 @@
# user login/logout/profile pages
url(r'^login/$', login, name="login"),
url(r'^register/$', register, name="register"),
- url(r'^forgot-pw/$', forgot_pw, name="forgot-pw"),
- url(r'^reset-pw/(?P<adminkey>\w*)/$', reset_pw, name="reset-pw"),
url(r'^logout/$', logout, name="logout"),
url(r'^profile/$', profile, name="profile"),
+ url(r'^profile-pw/$', profile_pw, name="profile-pw"),
# users
url(r'^user/$', user_list, name="user"),
@@ -113,6 +113,17 @@
url(r'^wysiwyg-preview/(?P<format>\w*)/$', text_wysiwyg_preview, name="text-wysiwyg-preview"),
)
+# this is to make django.contrib.auth.views work with our templates
+from django.contrib.sites.models import Site
+Site._meta.installed = False
+
+urlpatterns += patterns('django.contrib.auth.views',
+ (r'^password_reset/$', 'password_reset', {'template_name': 'site/forgot_pw.html', 'email_template_name':'email/forgot_pw.txt', 'post_reset_redirect':'/password_reset/done/'}, 'forgot-pw'),
+ (r'^password_reset/done/$', password_reset_done),
+ (r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'password_reset_confirm', {'template_name': 'site/forgot_pw.html', 'post_reset_redirect':'/reset/done/'}),
+ (r'^reset/done/$', password_reset_complete),
+)
+
# static pages
urlpatterns += patterns('django.views.generic.simple',
url(r'^help/format/$', 'direct_to_template', {'template': 'static/help_format.html'}, name='help-format'),
--- a/src/cm/views/site.py Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/views/site.py Mon Mar 22 12:50:42 2010 +0100
@@ -247,62 +247,15 @@
form = SettingsDesignForm()
return render_to_response('site/settings_design.html', {'form' : form}, context_instance=RequestContext(request))
-
-class ForgotPWForm(forms.Form):
- name_or_email = forms.CharField(label=ugettext_lazy("Username or email"),
- required=True,
- )
-
-def forgot_pw(request):
- if request.method == 'POST':
- form = ForgotPWForm(data=request.POST)
- if form.is_valid() :
- name_or_email = form.cleaned_data.get("name_or_email")
- # try email
- user = None
- try:
- user = User.objects.get(email__iexact = name_or_email)
- except User.DoesNotExist:
- pass
- # try email
- try:
- user = User.objects.get(username__exact = name_or_email)
- except User.DoesNotExist:
- pass
- if user:
- message = render_to_string('email/forgot_pw.txt',
- {
- 'reset_url' : reverse('reset-pw', args=[user.get_profile().adminkey]),
- 'CONF': Configuration.objects
- })
-
- send_mail(_(u'How to reset your password'), message, Configuration.objects['email_from'], [user.email])
-
- display_message(request, _(u'A link to reset your password has been sent to the profile email. Please check your email.'))
- else:
- display_message(request, _(u'No user found.'))
- return HttpResponseRedirect(reverse('index'))
- else:
- form = ForgotPWForm()
-
- return render_to_response('site/forgot_pw.html', {'form' : form}, context_instance=RequestContext(request))
+
-from django.contrib.auth.forms import SetPasswordForm
+def password_reset_done(request):
+ display_message(request, _(u'A link to reset your password has been sent to the profile email. Please check your email.'))
+ return HttpResponseRedirect(reverse('index'))
-def reset_pw(request, adminkey):
- try:
- profile = UserProfile.objects.get(adminkey=adminkey)
- if request.method == 'POST':
- form = SetPasswordForm(profile.user,data=request.POST)
- if form.is_valid():
- form.save()
- display_message(request, _(u'Your password has been changed.'))
- return HttpResponseRedirect(reverse('index'))
- else:
- form = SetPasswordForm(profile.user)
- return render_to_response('site/reset_pw.html', {'form' : form}, context_instance=RequestContext(request))
- except UserProfile.DoesNotExist:
- from django.http import Http404
+def password_reset_complete(request):
+ display_message(request, _(u'Password changed'))
+ return HttpResponseRedirect(reverse('index'))
def help(request):
return render_to_response('site/help.html', context_instance=RequestContext(request))
--- a/src/cm/views/user.py Mon Mar 22 11:02:39 2010 +0100
+++ b/src/cm/views/user.py Mon Mar 22 12:50:42 2010 +0100
@@ -394,6 +394,8 @@
return HttpResponse('') # no redirect because this is called by js
raise UnauthorizedException('')
+from django.contrib.auth.forms import PasswordChangeForm
+
@login_required()
def profile(request):
user = request.user
@@ -401,6 +403,7 @@
if request.method == 'POST':
userform = UserForm(request.POST, instance=user)
userprofileform = MyUserProfileForm(request.POST, instance=profile)
+
if userform.is_valid() and userprofileform.is_valid():
userform.save()
userprofileform.save()
@@ -414,6 +417,22 @@
'title' : 'Profile',
}, context_instance=RequestContext(request))
+@login_required()
+def profile_pw(request):
+ user = request.user
+ profile = user.get_profile()
+ if request.method == 'POST':
+ pwform = PasswordChangeForm(profile.user, data = request.POST)
+ if pwform.is_valid():
+ pwform.save()
+ display_message(request, _(u'Password changed'))
+ return HttpResponseRedirect(reverse('profile'))
+ else:
+ pwform = PasswordChangeForm(profile.user)
+ return render_to_response('site/profile_pw.html', {'forms' : [pwform],
+ 'title' : 'Password',
+ }, context_instance=RequestContext(request))
+
class AnonUserRoleForm(UserRoleForm):
def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
initial=None, error_class=ErrorList, label_suffix=':',