Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/bg/LC_MESSAGES/django.po Mon Mar 22 12:53:08 2010 +0100
+++ b/src/cm/locale/bg/LC_MESSAGES/django.po Mon Mar 22 15:49:15 2010 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 12:39+0100\n"
+"POT-Creation-Date: 2010-03-22 15:10+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"
@@ -129,18 +129,18 @@
msgstr "Покана"
#: models.py:746
-#, python-format
-msgid "Text %(link_to_text)s edited"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Текстът %(link_to_text)s е променен"
#: models.py:747
-#, python-format
-msgid "Text %(link_to_text)s edited (new version created)"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Текстът %(link_to_text)s е променен (създадена е нова версия)"
#: models.py:748
-#, python-format
-msgid "Text %(link_to_text)s added"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Текстът %(link_to_text)s е добавен"
#: models.py:749
@@ -149,8 +149,9 @@
msgstr "Текстът %(link_to_text)s е изтрит"
#: models.py:750
-#, python-format
-msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
+#, fuzzy, python-format
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Коментарът %(link_to_comment)s е добавен към текста %(link_to_text)s"
#: models.py:751
@@ -191,12 +192,17 @@
msgid "User %(username)s has activated his account"
msgstr "Потребителя %(username)s активира своя акаунт"
-#: models.py:812 models.py:820
+#: models.py:806
+#, fuzzy
+msgid "anonymous"
+msgstr "Анонимни потребители"
+
+#: models.py:813 models.py:821
#, python-format
msgid "by \"%(username)s\""
msgstr "От \"%(username)s\""
-#: models.py:814
+#: models.py:815
#, python-format
msgid "%(time_since)s ago"
msgstr "преди %(time_since)s"
@@ -429,8 +435,7 @@
msgstr "В очакване"
#: templates/site/dashboard.html:76
-#, python-format
-#, fuzzy
+#, fuzzy, python-format
msgid "user %(user)s awaits approval"
msgstr "Потребителят е в очакване на одобрение"
@@ -492,7 +497,7 @@
msgid "Are you sure you want to refuse this comment?"
msgstr "Сигурни ли сте, че искате да откажете този коментар?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
#, python-format
msgid "modified %(duration)s ago"
msgstr "променен преди %(duration)s"
@@ -512,57 +517,64 @@
msgstr[0] "%(nb_comments)s коментар"
msgstr[1] "%(nb_comments)s коментара"
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#, fuzzy, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "1 версия"
+msgstr[1] "Версий"
+
+#: templates/site/dashboard.html:208 templates/site/text_list.html:221
msgid "No texts yet"
msgstr "Все още няма текст "
-#: templates/site/dashboard.html:225
+#: templates/site/dashboard.html:227
msgid "Workspace activity"
msgstr "Дейност на работното място"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "month"
msgstr "месец"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "week"
msgstr "седмица"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "24 hours"
msgstr "24 часа"
-#: templates/site/dashboard.html:232
+#: templates/site/dashboard.html:234
msgid "Access"
msgstr "Достъп"
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
#: templates/site/text_list.html:206 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Зареждане..."
-#: templates/site/dashboard.html:243
+#: templates/site/dashboard.html:245
msgid "Commenting"
msgstr "Коментари"
-#: templates/site/dashboard.html:262
+#: templates/site/dashboard.html:264
msgid "Activities"
msgstr "Дейности"
-#: templates/site/dashboard.html:265
+#: templates/site/dashboard.html:267
msgid "texts"
msgstr "Текстовете"
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
msgid "comments"
msgstr "коментари"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:270
msgid "users"
msgstr "потребители"
-#: templates/site/dashboard.html:308
+#: templates/site/dashboard.html:310
msgid "No activities"
msgstr "Няма дейности"
@@ -579,7 +591,12 @@
msgid "created %(duration)s ago"
msgstr "създадени преди %(duration)s"
-#: templates/site/dashboard_bloc_recent_comments.html:28
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, fuzzy, python-format
+msgid "by %(username)s"
+msgstr "От \"%(username)s\""
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
msgid "No comments yet"
msgstr "Все още няма коментари"
@@ -1501,13 +1518,6 @@
msgid "last modified %(duration)s ago"
msgstr "последна промяна преди %(duration)s"
-#: templates/site/macros/text_meta.html:8
-#, fuzzy, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] "1 версия"
-msgstr[1] "Версий"
-
#: templates/site/macros/text_tabs.html:15
msgid "People"
msgstr "Потребители"
@@ -1807,8 +1817,7 @@
msgstr "Нова версия (копирана от %(version_title)s версия ) е създадена"
#: views/texts.py:849 views/user.py:79 views/user.py:99
-#, python-format
-#, fuzzy
+#, fuzzy, python-format
msgid "%(count)i user(s) role modified"
msgstr "роля(и) на потребителя са изменени"
@@ -1817,8 +1826,7 @@
msgstr "Параметрите са актуализирани"
#: views/user.py:61
-#, python-format
-#, fuzzy
+#, fuzzy, python-format
msgid "%(count)i User's access suspended"
msgstr "достъп на потребителя дезактивиран(и)"
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po Mon Mar 22 12:53:08 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po Mon Mar 22 15:49:15 2010 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 12:41+0100\n"
+"POT-Creation-Date: 2010-03-22 15:11+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"
@@ -128,17 +128,17 @@
#: models.py:746
#, python-format
-msgid "Text %(link_to_text)s edited"
+msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr ""
#: models.py:747
#, python-format
-msgid "Text %(link_to_text)s edited (new version created)"
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr ""
#: models.py:748
#, python-format
-msgid "Text %(link_to_text)s added"
+msgid "Text %(link_to_text)s added by %(creator)s"
msgstr ""
#: models.py:749
@@ -148,7 +148,8 @@
#: models.py:750
#, python-format
-msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr ""
#: models.py:751
@@ -186,12 +187,16 @@
msgid "User %(username)s has activated his account"
msgstr ""
-#: models.py:812 models.py:820
+#: models.py:806
+msgid "anonymous"
+msgstr ""
+
+#: models.py:813 models.py:821
#, python-format
msgid "by \"%(username)s\""
msgstr ""
-#: models.py:814
+#: models.py:815
#, python-format
msgid "%(time_since)s ago"
msgstr ""
@@ -482,7 +487,7 @@
msgid "Are you sure you want to refuse this comment?"
msgstr ""
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
#, python-format
msgid "modified %(duration)s ago"
msgstr ""
@@ -502,57 +507,64 @@
msgstr[0] ""
msgstr[1] ""
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/site/dashboard.html:208 templates/site/text_list.html:221
msgid "No texts yet"
msgstr ""
-#: templates/site/dashboard.html:225
+#: templates/site/dashboard.html:227
msgid "Workspace activity"
msgstr ""
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "month"
msgstr ""
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "week"
msgstr ""
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "24 hours"
msgstr ""
-#: templates/site/dashboard.html:232
+#: templates/site/dashboard.html:234
msgid "Access"
msgstr ""
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
#: templates/site/text_list.html:206 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr ""
-#: templates/site/dashboard.html:243
+#: templates/site/dashboard.html:245
msgid "Commenting"
msgstr ""
-#: templates/site/dashboard.html:262
+#: templates/site/dashboard.html:264
msgid "Activities"
msgstr ""
-#: templates/site/dashboard.html:265
+#: templates/site/dashboard.html:267
msgid "texts"
msgstr ""
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
msgid "comments"
msgstr ""
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:270
msgid "users"
msgstr ""
-#: templates/site/dashboard.html:308
+#: templates/site/dashboard.html:310
msgid "No activities"
msgstr ""
@@ -569,7 +581,12 @@
msgid "created %(duration)s ago"
msgstr ""
-#: templates/site/dashboard_bloc_recent_comments.html:28
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, python-format
+msgid "by %(username)s"
+msgstr ""
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
msgid "No comments yet"
msgstr ""
@@ -1453,13 +1470,6 @@
msgid "last modified %(duration)s ago"
msgstr ""
-#: templates/site/macros/text_meta.html:8
-#, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] ""
-msgstr[1] ""
-
#: templates/site/macros/text_tabs.html:15
msgid "People"
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 12:53:08 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po Mon Mar 22 15:49:15 2010 +0100
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 12:40+0100\n"
+"POT-Creation-Date: 2010-03-22 15:10+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"
@@ -124,18 +124,18 @@
msgstr "Invitación"
#: models.py:746
-#, python-format
-msgid "Text %(link_to_text)s edited"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Texto %(link_to_text)s editado "
#: models.py:747
-#, python-format
-msgid "Text %(link_to_text)s edited (new version created)"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Texto %(link_to_text)s editado (se ha creado una nueva versión)"
#: models.py:748
-#, python-format
-msgid "Text %(link_to_text)s added"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Texto %(link_to_text)s añadido"
#: models.py:749
@@ -144,8 +144,9 @@
msgstr "Texto %(link_to_text)s eliminado"
#: models.py:750
-#, python-format
-msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
+#, fuzzy, python-format
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Comentario %(link_to_comment)s añadido al texto %(link_to_text)s"
#: models.py:751
@@ -183,12 +184,17 @@
msgid "User %(username)s has activated his account"
msgstr "El usuario %(username)s ha activado su cuenta"
-#: models.py:812 models.py:820
+#: models.py:806
+#, fuzzy
+msgid "anonymous"
+msgstr "Usuarios anónimos"
+
+#: models.py:813 models.py:821
#, python-format
msgid "by \"%(username)s\""
msgstr "por \"%(username)s\""
-#: models.py:814
+#: models.py:815
#, python-format
msgid "%(time_since)s ago"
msgstr "hace %(time_since)s"
@@ -484,7 +490,7 @@
msgid "Are you sure you want to refuse this comment?"
msgstr "¿Está seguro/a de que desea rechazar este comentario?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
#, python-format
msgid "modified %(duration)s ago"
msgstr "modificado hace %(duration)s"
@@ -504,58 +510,65 @@
msgstr[0] "%(nb_comments)s Comentario"
msgstr[1] "%(nb_comments)s Comentarios"
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#, fuzzy, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "Versiones"
+msgstr[1] "Versiones"
+
+#: templates/site/dashboard.html:208 templates/site/text_list.html:221
msgid "No texts yet"
msgstr "Aún no hay ningún texto"
-#: templates/site/dashboard.html:225
+#: templates/site/dashboard.html:227
msgid "Workspace activity"
msgstr "Actividad del espacio de trabajo"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "month"
msgstr "mes"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "week"
msgstr "semana"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "24 hours"
msgstr "24 horas"
-#: templates/site/dashboard.html:232
+#: templates/site/dashboard.html:234
msgid "Access"
msgstr "Acceso"
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
#: templates/site/text_list.html:206 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Cargando..."
-#: templates/site/dashboard.html:243
+#: templates/site/dashboard.html:245
msgid "Commenting"
msgstr "Comentando"
-#: templates/site/dashboard.html:262
+#: templates/site/dashboard.html:264
msgid "Activities"
msgstr "Actividades"
-#: templates/site/dashboard.html:265
+#: templates/site/dashboard.html:267
msgid "texts"
msgstr "textos"
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
msgid "comments"
msgstr "comentarios"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:270
#, fuzzy
msgid "users"
msgstr "usuarios"
-#: templates/site/dashboard.html:308
+#: templates/site/dashboard.html:310
msgid "No activities"
msgstr "Sin actividad"
@@ -572,7 +585,12 @@
msgid "created %(duration)s ago"
msgstr "creado hace %(duration)s"
-#: templates/site/dashboard_bloc_recent_comments.html:28
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, fuzzy, python-format
+msgid "by %(username)s"
+msgstr "por \"%(username)s\""
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
msgid "No comments yet"
msgstr "Aún no hay ningún comentario"
@@ -1517,13 +1535,6 @@
msgid "last modified %(duration)s ago"
msgstr "modificado hace %(duration)s"
-#: templates/site/macros/text_meta.html:8
-#, fuzzy, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] "Versiones"
-msgstr[1] "Versiones"
-
#: templates/site/macros/text_tabs.html:15
msgid "People"
msgstr "Personas"
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po Mon Mar 22 12:53:08 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po Mon Mar 22 15:49:15 2010 +0100
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 12:41+0100\n"
-"PO-Revision-Date: 2010-03-22 12:39+0100\n"
+"POT-Creation-Date: 2010-03-22 15:11+0100\n"
+"PO-Revision-Date: 2010-03-22 15:13+0100\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: <en@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,8 @@
"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"
@@ -48,7 +45,8 @@
msgid "comment removed"
msgstr "commentaire supprimé"
-#: client.py:209 client.py:274
+#: client.py:209
+#: client.py:274
msgid "comment saved"
msgstr "commentaire sauvé"
@@ -60,8 +58,11 @@
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"
@@ -69,15 +70,20 @@
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"
@@ -103,8 +109,7 @@
#: 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"
@@ -132,18 +137,18 @@
#: models.py:746
#, python-format
-msgid "Text %(link_to_text)s edited"
-msgstr "Le texte %(link_to_text)s a été édité"
+msgid "Text %(link_to_text)s edited by %(creator)s"
+msgstr "Le texte %(link_to_text)s a été édité par %(creator)s"
#: models.py:747
#, python-format
-msgid "Text %(link_to_text)s edited (new version created)"
-msgstr "Le texte %(link_to_text)s a été édité (nouvelle version créée)"
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
+msgstr "Le texte %(link_to_text)s a été édité (nouvelle version créée) par %(creator)s"
#: models.py:748
#, python-format
-msgid "Text %(link_to_text)s added"
-msgstr "Le texte %(link_to_text)s a été ajouté"
+msgid "Text %(link_to_text)s added by %(creator)s"
+msgstr "Le texte %(link_to_text)s a été ajouté par %(creator)s"
#: models.py:749
#, python-format
@@ -152,8 +157,8 @@
#: models.py:750
#, python-format
-msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
-msgstr "Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s"
+msgid "Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
+msgstr "Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s par %(creator)s"
#: models.py:751
#, python-format
@@ -190,12 +195,17 @@
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:806
+msgid "anonymous"
+msgstr "anonyme"
+
+#: models.py:813
+#: models.py:821
#, python-format
msgid "by \"%(username)s\""
msgstr "par \"%(username)s\""
-#: models.py:814
+#: models.py:815
#, python-format
msgid "%(time_since)s ago"
msgstr "il y a %(time_since)s"
@@ -244,7 +254,8 @@
msgid "Bulgarian"
msgstr "Bulgare"
-#: static_i18n.py:6 static_i18n.py:11
+#: static_i18n.py:6
+#: static_i18n.py:11
msgid "Observer"
msgstr "Observateur"
@@ -356,7 +367,8 @@
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"
@@ -365,7 +377,8 @@
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"
@@ -376,16 +389,21 @@
#: templates/site/contact.html:26
#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 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"
@@ -393,16 +411,20 @@
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"
@@ -432,11 +454,13 @@
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"
@@ -446,26 +470,21 @@
#: 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"
@@ -490,7 +509,8 @@
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:203
#, python-format
msgid "modified %(duration)s ago"
msgstr "modifié il y a %(duration)s"
@@ -499,7 +519,8 @@
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"
@@ -510,57 +531,68 @@
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:202
+#: templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "1 version"
+msgstr[1] "%(versions_number)s versions"
+
+#: templates/site/dashboard.html:208
+#: templates/site/text_list.html:221
msgid "No texts yet"
msgstr "Aucun texte"
-#: templates/site/dashboard.html:225
+#: templates/site/dashboard.html:227
msgid "Workspace activity"
msgstr "Activités dans l'espace de travail"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "month"
msgstr "mois"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "week"
msgstr "semaine"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "24 hours"
msgstr "24 heures"
-#: templates/site/dashboard.html:232
+#: templates/site/dashboard.html:234
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:235
+#: templates/site/dashboard.html.py:246
+#: templates/site/text_list.html:206
+#: templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Chargement ..."
-#: templates/site/dashboard.html:243
+#: templates/site/dashboard.html:245
msgid "Commenting"
msgstr "Commentaires"
-#: templates/site/dashboard.html:262
+#: templates/site/dashboard.html:264
msgid "Activities"
msgstr "Activités"
-#: templates/site/dashboard.html:265
+#: templates/site/dashboard.html:267
msgid "texts"
msgstr "textes"
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
msgid "comments"
msgstr "commentaires"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:270
msgid "users"
msgstr "utilisateurs"
-#: templates/site/dashboard.html:308
+#: templates/site/dashboard.html:310
msgid "No activities"
msgstr "Pas d'activités"
@@ -577,27 +609,38 @@
msgid "created %(duration)s ago"
msgstr "créé il y a %(duration)s"
-#: templates/site/dashboard_bloc_recent_comments.html:28
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, python-format
+msgid "by %(username)s"
+msgstr "par %(username)s"
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
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"
@@ -610,7 +653,8 @@
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é"
@@ -619,19 +663,16 @@
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é"
@@ -639,7 +680,8 @@
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"
@@ -648,14 +690,11 @@
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/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"
@@ -664,7 +703,8 @@
msgid "This link is invalid."
msgstr "Ce lien est invalide."
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:40
+#: templates/site/login_form.html:21
msgid "Forgot password?"
msgstr "Mot de passe oublié ?"
@@ -680,7 +720,8 @@
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 "Collaboration"
@@ -688,15 +729,13 @@
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
@@ -709,15 +748,8 @@
#: 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
@@ -729,18 +761,11 @@
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
@@ -748,11 +773,7 @@
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
@@ -760,10 +781,7 @@
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
@@ -771,15 +789,7 @@
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
@@ -791,10 +801,7 @@
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
@@ -802,9 +809,7 @@
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
@@ -812,11 +817,7 @@
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
@@ -824,16 +825,11 @@
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
+#: templates/site/help.html:69
+#: templates/site/help.html.py:71
msgid "Roles"
msgstr "Rôles"
@@ -842,33 +838,25 @@
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
@@ -880,9 +868,7 @@
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
@@ -890,17 +876,15 @@
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 "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"
@@ -910,7 +894,8 @@
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"
@@ -935,26 +920,34 @@
msgid "Deactivate"
msgstr "Désactiver"
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.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:17 templates/site/profile_pw.html:17
+#: 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
+#: 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/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"
@@ -964,39 +957,42 @@
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 "Réinitialiser votre mot de passe"
-#: 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/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_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_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_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.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_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"
@@ -1010,29 +1006,19 @@
#: 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"
@@ -1052,25 +1038,16 @@
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"
@@ -1104,7 +1081,8 @@
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"
@@ -1112,11 +1090,13 @@
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"
@@ -1129,7 +1109,8 @@
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"
@@ -1151,11 +1132,8 @@
#: 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"
@@ -1177,7 +1155,8 @@
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"
@@ -1187,35 +1166,44 @@
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"
@@ -1223,7 +1211,8 @@
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"
@@ -1238,7 +1227,8 @@
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"
@@ -1255,51 +1245,58 @@
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"
@@ -1310,12 +1307,15 @@
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"
@@ -1352,20 +1352,18 @@
"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"
@@ -1376,16 +1374,19 @@
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"
@@ -1394,7 +1395,8 @@
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"
@@ -1409,9 +1411,7 @@
#: 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
@@ -1481,25 +1481,14 @@
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
msgid "last modified %(duration)s ago"
msgstr "modifié il y a %(duration)s"
-#: templates/site/macros/text_meta.html:8
-#, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] "1 version"
-msgstr[1] "%(versions_number)s versions"
-
#: templates/site/macros/text_tabs.html:15
msgid "People"
msgstr "Utilisateurs"
@@ -1528,21 +1517,15 @@
#: 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"
@@ -1565,11 +1548,8 @@
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."
@@ -1579,7 +1559,8 @@
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éé"
@@ -1624,7 +1605,8 @@
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é."
@@ -1648,7 +1630,9 @@
msgid "Private notifications feed reseted."
msgstr "Flux privé réinitialisé."
-#: views/site.py:82 views/texts.py:130 views/user.py:545
+#: views/site.py:82
+#: views/texts.py:130
+#: views/user.py:545
msgid "You're logged in!"
msgstr "Vous êtes connecté !"
@@ -1693,30 +1677,25 @@
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"
@@ -1729,21 +1708,15 @@
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."
+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: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."
+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:257 views/user.py:428
+#: views/site.py:257
+#: views/user.py:428
msgid "Password changed"
msgstr "Votre mot de passe a été modifié"
@@ -1784,8 +1757,7 @@
#: 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)"
@@ -1798,10 +1770,11 @@
#: 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)"
@@ -1834,23 +1807,15 @@
#: 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"
@@ -1881,7 +1846,8 @@
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é."
@@ -1948,62 +1914,44 @@
#: 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:570
msgid "You've been logged out."
msgstr "Vous êtes déconnecté."
#: 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."
+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:589
-msgid ""
-"You've been registered, please check your email for the confirm message."
+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 12:53:08 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po Mon Mar 22 15:49:15 2010 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 12:40+0100\n"
+"POT-Creation-Date: 2010-03-22 15:10+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"
@@ -130,18 +130,18 @@
msgstr "Invitasjon"
#: models.py:746
-#, python-format
-msgid "Text %(link_to_text)s edited"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Tekst %(link_to_text)s endret"
#: models.py:747
-#, python-format
-msgid "Text %(link_to_text)s edited (new version created)"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Tekst %(link_to_text)s endret (ny versjon opprettet)"
#: models.py:748
-#, python-format
-msgid "Text %(link_to_text)s added"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Tekst %(link_to_text)s lagt til"
#: models.py:749
@@ -150,8 +150,9 @@
msgstr "Tekst %(link_to_text)s slettet"
#: models.py:750
-#, python-format
-msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
+#, fuzzy, python-format
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Merknad %(link_to_comment)s lagt til teksten %(link_to_text)s"
#: models.py:751
@@ -189,12 +190,17 @@
msgid "User %(username)s has activated his account"
msgstr "Bruker %(username)s har aktivert kontoen"
-#: models.py:812 models.py:820
+#: models.py:806
+#, fuzzy
+msgid "anonymous"
+msgstr "Anonyme brukere"
+
+#: models.py:813 models.py:821
#, python-format
msgid "by \"%(username)s\""
msgstr "av %(username)s"
-#: models.py:814
+#: models.py:815
#, python-format
msgid "%(time_since)s ago"
msgstr "for %(time_since)s siden"
@@ -485,7 +491,7 @@
msgid "Are you sure you want to refuse this comment?"
msgstr "Ønsker du å nekte å godkjenne denne merknaden?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
#, python-format
msgid "modified %(duration)s ago"
msgstr "endret for %(duration)s siden"
@@ -505,57 +511,64 @@
msgstr[0] "%(nb_comments)s merknad"
msgstr[1] "%(nb_comments)s merknader"
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "Versjoner"
+msgstr[1] "Versjoner"
+
+#: templates/site/dashboard.html:208 templates/site/text_list.html:221
msgid "No texts yet"
msgstr "Ingen tekster ennå"
-#: templates/site/dashboard.html:225
+#: templates/site/dashboard.html:227
msgid "Workspace activity"
msgstr "Aktivitet i arbeidsområde"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "month"
msgstr "måned"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "week"
msgstr "uke"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "24 hours"
msgstr "24 timer"
-#: templates/site/dashboard.html:232
+#: templates/site/dashboard.html:234
msgid "Access"
msgstr "Tilgang"
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
#: templates/site/text_list.html:206 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Laster..."
-#: templates/site/dashboard.html:243
+#: templates/site/dashboard.html:245
msgid "Commenting"
msgstr "Kommentering"
-#: templates/site/dashboard.html:262
+#: templates/site/dashboard.html:264
msgid "Activities"
msgstr "Aktivitetsjournal"
-#: templates/site/dashboard.html:265
+#: templates/site/dashboard.html:267
msgid "texts"
msgstr "tekster"
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
msgid "comments"
msgstr "merknader"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:270
msgid "users"
msgstr "brukere"
-#: templates/site/dashboard.html:308
+#: templates/site/dashboard.html:310
msgid "No activities"
msgstr "Ingen aktiviteter"
@@ -572,7 +585,12 @@
msgid "created %(duration)s ago"
msgstr "opprettet for %(duration)s siden"
-#: templates/site/dashboard_bloc_recent_comments.html:28
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, fuzzy, python-format
+msgid "by %(username)s"
+msgstr "av %(username)s"
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
msgid "No comments yet"
msgstr "Ingen merknader ennå"
@@ -1490,13 +1508,6 @@
msgid "last modified %(duration)s ago"
msgstr "endret for %(duration)s siden"
-#: templates/site/macros/text_meta.html:8
-#, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] "Versjoner"
-msgstr[1] "Versjoner"
-
#: templates/site/macros/text_tabs.html:15
msgid "People"
msgstr "Personer"
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 12:53:08 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Mar 22 15:49:15 2010 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-22 12:39+0100\n"
+"POT-Creation-Date: 2010-03-22 15:09+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"
@@ -124,18 +124,18 @@
msgstr "Convite"
#: models.py:746
-#, python-format
-msgid "Text %(link_to_text)s edited"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Texto %(link_to_text)s editado"
#: models.py:747
-#, python-format
-msgid "Text %(link_to_text)s edited (new version created)"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Texto %(link_to_text)s editado (criada nova versão)"
#: models.py:748
-#, python-format
-msgid "Text %(link_to_text)s added"
+#, fuzzy, python-format
+msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Texto %(link_to_text)s adicionado"
#: models.py:749
@@ -144,8 +144,9 @@
msgstr "Texto %(link_to_text)s removido"
#: models.py:750
-#, python-format
-msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
+#, fuzzy, python-format
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Comentário %(link_to_comment)s adicionado ao texto %(link_to_text)s "
#: models.py:751
@@ -183,12 +184,17 @@
msgid "User %(username)s has activated his account"
msgstr "O usuário %(username)s ativou sua conta"
-#: models.py:812 models.py:820
+#: models.py:806
+#, fuzzy
+msgid "anonymous"
+msgstr "Usuários anônimos"
+
+#: models.py:813 models.py:821
#, python-format
msgid "by \"%(username)s\""
msgstr "por \"%(username)s\""
-#: models.py:814
+#: models.py:815
#, python-format
msgid "%(time_since)s ago"
msgstr "há %(time_since)s"
@@ -479,7 +485,7 @@
msgid "Are you sure you want to refuse this comment?"
msgstr "Confirmar rejeição desse comentário?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
#, python-format
msgid "modified %(duration)s ago"
msgstr "modificado há %(duration)s"
@@ -499,57 +505,64 @@
msgstr[0] "%(nb_comments)s commentário"
msgstr[1] "%(nb_comments)s commentárioss"
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#, fuzzy, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "Versões"
+msgstr[1] "Versões"
+
+#: templates/site/dashboard.html:208 templates/site/text_list.html:221
msgid "No texts yet"
msgstr "Sem textos ainda"
-#: templates/site/dashboard.html:225
+#: templates/site/dashboard.html:227
msgid "Workspace activity"
msgstr "Atividade na área de trabalho"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "month"
msgstr "mês"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "week"
msgstr "semana"
-#: templates/site/dashboard.html:226
+#: templates/site/dashboard.html:228
msgid "24 hours"
msgstr "24 horas"
-#: templates/site/dashboard.html:232
+#: templates/site/dashboard.html:234
msgid "Access"
msgstr "Acessar"
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
#: templates/site/text_list.html:206 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Carregando"
-#: templates/site/dashboard.html:243
+#: templates/site/dashboard.html:245
msgid "Commenting"
msgstr "Comentando"
-#: templates/site/dashboard.html:262
+#: templates/site/dashboard.html:264
msgid "Activities"
msgstr "Atividades"
-#: templates/site/dashboard.html:265
+#: templates/site/dashboard.html:267
msgid "texts"
msgstr "textos"
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
msgid "comments"
msgstr "comentários"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:270
msgid "users"
msgstr "usuário"
-#: templates/site/dashboard.html:308
+#: templates/site/dashboard.html:310
msgid "No activities"
msgstr "Sem atividades"
@@ -566,7 +579,12 @@
msgid "created %(duration)s ago"
msgstr "criado há %(duration)s"
-#: templates/site/dashboard_bloc_recent_comments.html:28
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, fuzzy, python-format
+msgid "by %(username)s"
+msgstr "por \"%(username)s\""
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
msgid "No comments yet"
msgstr "Sem comentários ainda"
@@ -1497,13 +1515,6 @@
msgid "last modified %(duration)s ago"
msgstr "modificado há %(duration)s"
-#: templates/site/macros/text_meta.html:8
-#, fuzzy, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] "Versões"
-msgstr[1] "Versões"
-
#: templates/site/macros/text_tabs.html:15
msgid "People"
msgstr "Pessoas"
--- a/src/cm/models.py Mon Mar 22 12:53:08 2010 +0100
+++ b/src/cm/models.py Mon Mar 22 15:49:15 2010 +0100
@@ -743,11 +743,11 @@
#type/msg
MSGS = {
- 'text_edited' : ugettext_lazy(u'Text %(link_to_text)s edited'),
- 'text_edited_new_version' : ugettext_lazy(u'Text %(link_to_text)s edited (new version created)'),
- 'text_created' : ugettext_lazy(u'Text %(link_to_text)s added'),
+ 'text_edited' : ugettext_lazy(u'Text %(link_to_text)s edited by %(creator)s'),
+ 'text_edited_new_version' : ugettext_lazy(u'Text %(link_to_text)s edited (new version created) by %(creator)s'),
+ 'text_created' : ugettext_lazy(u'Text %(link_to_text)s added by %(creator)s'),
'text_removed' : ugettext_lazy(u'Text %(link_to_text)s removed'),
- 'comment_created' : ugettext_lazy(u'Comment %(link_to_comment)s added on text %(link_to_text)s'),
+ 'comment_created' : ugettext_lazy(u'Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s'),
'comment_removed' : ugettext_lazy(u'Comment %(link_to_comment)s removed from text %(link_to_text)s'),
'user_created' : ugettext_lazy(u'User %(username)s added'),
'user_enabled' : ugettext_lazy(u'User %(username)s access to workspace enabled'),
@@ -803,6 +803,7 @@
'link_to_text' : self.linkable_text_title(html=html, link=link) if self.text else None,
'link_to_comment' : self.linkable_comment_title(html=html, link=link) if self.comment else None,
'username' : self.user.username if self.user else None,
+ 'creator' : self.originator_user.username if self.originator_user else ugettext_lazy(u'anonymous'),
})
return ''
--- a/src/cm/templates/site/dashboard.html Mon Mar 22 12:53:08 2010 +0100
+++ b/src/cm/templates/site/dashboard.html Mon Mar 22 15:49:15 2010 +0100
@@ -198,7 +198,9 @@
</span>
<div style="padding-left:22px;" class="dashlog_metadata">
{% nb_comments text as nb_comments %}
- {% blocktrans count nb_comments as nb_comments %}{{ nb_comments }} comment{% plural %}{{ nb_comments }} comments{% endblocktrans %}, {% blocktrans with text.modified|timesince as duration %}modified {{ duration }} ago{% endblocktrans %}
+ {% blocktrans count nb_comments as nb_comments %}{{ nb_comments }} comment{% plural %}{{ nb_comments }} comments{% endblocktrans %},
+ {% blocktrans count text.get_versions_number as versions_number %}1 version{% plural%}{{ versions_number }} versions{% endblocktrans %},
+ {% blocktrans with text.modified|timesince as duration %}modified {{ duration }} ago{% endblocktrans %}
</div>
</div>
</li>
--- a/src/cm/templates/site/dashboard_bloc_recent_comments.html Mon Mar 22 12:53:08 2010 +0100
+++ b/src/cm/templates/site/dashboard_bloc_recent_comments.html Mon Mar 22 15:49:15 2010 +0100
@@ -20,7 +20,8 @@
<a href="{% url text-view-show-comment comment.text_version.text.key comment.id_key %}">{{ comment.title }}</a> {% blocktrans %}on text{% endblocktrans %} <a href="{% url text-view comment.text_version.text.key %}">{{ comment.text_version.title }}</a>
</span>
<div style="padding-left:22px;" class="dashlog_metadata">
- {% blocktrans with comment.created|timesince as duration %}created {{ duration }} ago{% endblocktrans %}
+ {% blocktrans with comment.created|timesince as duration %}created {{ duration }} ago{% endblocktrans %},
+ {% blocktrans with comment.get_name as username %}by {{ username }}{% endblocktrans %}
</div>
</div>
</li>