--- a/README.txt Wed Mar 17 23:44:39 2010 +0100
+++ b/README.txt Mon Mar 22 11:02:39 2010 +0100
@@ -42,7 +42,7 @@
Installation (development install)
============
1. Install python2.5+ and all required libraries
- (ubuntu users : 'sudo apt-get install python python-magic python-setuptools python-uno libyaml-0-1 python-dev git-core python-utidylib')
+ (ubuntu users : 'sudo apt-get install python python-magic python-setuptools python-uno libyaml-0-1 python-yaml python-dev git-core python-utidylib')
2. Install pandoc
(ubuntu users : 'sudo apt-get install pandoc')
3. Install openoffice (headless mode) [used for document conversion]
--- a/settings_local_sample.py Wed Mar 17 23:44:39 2010 +0100
+++ b/settings_local_sample.py Mon Mar 22 11:02:39 2010 +0100
@@ -37,8 +37,6 @@
ADMIN_MEDIA_PREFIX = '/media/'
-MEDIA_ROOT = 'urls'
-
ADMINS = (
('Comt admin', CONTACT_DEST),
)
Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/bg/LC_MESSAGES/django.po Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/bg/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:52+0100\n"
+"POT-Creation-Date: 2010-03-19 16:15+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"
@@ -72,7 +72,7 @@
msgid "Content"
msgstr "Съдържание"
-#: models.py:181 models.py:633
+#: models.py:181 models.py:633 templates/site/help.html:39
msgid "Tags"
msgstr "Тагове"
@@ -167,53 +167,8 @@
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr ""
-" гщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщ"
-"щщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщДостъпът към работното място "
-"е разрешен на потребителя %(username)s"
+" гщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщДостъпът "
+"към работното място е разрешен на потребителя %(username)s"
#: models.py:754
#, python-format
@@ -422,7 +377,8 @@
#: 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_data.html:58
+#: 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
@@ -632,7 +588,8 @@
msgid "Followup"
msgstr "В отговор"
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20 templates/site/help.html:58
+#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "захранване"
@@ -641,8 +598,8 @@
msgstr "Публично захранване"
#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
+#: 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 "Помощ"
@@ -700,6 +657,257 @@
"Абонирайте се към всички уведомления отнасящи се до коментари или отговори "
"към дискусийте в който сте участвали"
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
+#: templates/site/login_form.html:21
+msgid "Forgot password?"
+msgstr ""
+
+#: templates/site/forgot_pw.html:24
+msgid "Remind my password"
+msgstr ""
+
+#: templates/site/help.html:16
+msgid "General Presentation"
+msgstr ""
+
+#: templates/site/help.html:18
+msgid "co-ment is a web based text annotation system."
+msgstr ""
+
+#: templates/site/help.html:20
+msgid "Glossary"
+msgstr ""
+
+#: templates/site/help.html:22 templates/site/help.html.py:25
+msgid "Collaboration"
+msgstr ""
+
+#: 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
+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."
+msgstr ""
+
+#: templates/site/help.html:29
+#, fuzzy
+msgid "Comments"
+msgstr "коментари"
+
+#: templates/site/help.html:32
+#, fuzzy
+msgid "Moderation"
+msgstr "Модератор"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:36
+#, fuzzy
+msgid "States"
+msgstr "Запамети"
+
+#: templates/site/help.html:37
+msgid "co-ment uses states to implement moderation policies."
+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."
+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."
+msgstr ""
+
+#: templates/site/help.html:42
+#, fuzzy
+msgid "Linking to a comment"
+msgstr "Може да редактира коментар"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:45
+msgid "Scope"
+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."
+msgstr ""
+
+#: templates/site/help.html:48
+msgid "Keeping your comments across versions"
+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."
+msgstr ""
+
+#: templates/site/help.html:52
+#, fuzzy
+msgid "Notification and feeds"
+msgstr "Уведомяването е дезактивирано."
+
+#: templates/site/help.html:55
+#, fuzzy
+msgid "Email notification"
+msgstr "Уведомления чрез е-майл"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:59
+msgid "Web feed definition on Wikipedia"
+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."
+msgstr ""
+
+#: templates/site/help.html:61
+#, fuzzy
+msgid "Public and private feeds"
+msgstr "Частно захранване"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:64
+msgid "Text embedding"
+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."
+msgstr ""
+
+#: templates/site/help.html:69 templates/site/help.html.py:71
+#, fuzzy
+msgid "Roles"
+msgstr "Роля"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:74 templates/site/text_share.html:88
+msgid "Text role"
+msgstr "Роля в текста"
+
+#: 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)."
+msgstr ""
+
+#: templates/site/help.html:76 views/site.py:185
+msgid "Role model"
+msgstr "Модел на роля"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:80
+#, fuzzy
+msgid "Text edition"
+msgstr "Следваща модификация"
+
+#: templates/site/help.html:83
+#, fuzzy
+msgid "Text formats"
+msgstr "Известия отнасящи се за текста"
+
+#: templates/site/help.html:84
+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 ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Read more about this"
+msgstr ""
+
#: templates/site/login.html:8 templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
@@ -753,21 +961,30 @@
msgid "%(wname)s Registration"
msgstr "%(wname)s Регистрация"
-#: 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/reset_pw.html:6 templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:24
+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/macros/text_tabs.html:19
msgid "Settings"
msgstr "Настройки"
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_data.html:21
+#: templates/site/settings_design.html:21
msgid "General"
msgstr "Основен"
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_data.html:23
+#: templates/site/settings_design.html:23
msgid "Appearance"
msgstr "Външен вид"
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
+#: 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!"
@@ -775,7 +992,19 @@
"Сигурни ли сти, че искате да промените моделът на ролите? Всички роли (освен "
"на мениджърите) ще бъдат реинициализирани! "
-#: templates/site/settings_design.html:31
+#: 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
msgid "Delete logo"
msgstr "Изтрийте логото"
@@ -926,11 +1155,13 @@
#: templates/site/text_history_compare.html:31
#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34, python-format
+#: templates/site/text_history_version.html:34
+#, python-format
msgid "Version %(version_number)s"
msgstr "версия #%(version_number)s"
-#: templates/site/text_history_compare.html:32, python-format
+#: templates/site/text_history_compare.html:32
+#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
msgstr "Разлики между версия #%(version_1_number)s и #%(version_2_number)s"
@@ -956,7 +1187,8 @@
msgstr "Следваща версия"
#: templates/site/text_history_version.html:45 views/texts.py:478
-#: views/texts.py:479, python-format
+#: views/texts.py:479
+#, python-format
msgid "by %(author)s"
msgstr "от %(author)s"
@@ -1082,10 +1314,6 @@
msgid "Workspace role"
msgstr "Роля в работното място"
-#: templates/site/text_share.html:88
-msgid "Text role"
-msgstr "Роля в текста"
-
#: templates/site/text_share.html:101
#, python-format
msgid "This role has been overriden on this text by a text role: %(rolename)s"
@@ -1273,11 +1501,13 @@
"Вие се опитахте да напуснете тази страница. Незапаметените промени ще бъдат "
"загубени. Сигурни ли сте, че искате да напуснете тази страница?"
-#: templates/site/macros/text_meta.html:6, python-format
+#: templates/site/macros/text_meta.html:6
+#, python-format
msgid "last modified %(duration)s ago"
msgstr "последна промяна преди %(duration)s"
-#: templates/site/macros/text_meta.html:8, python-format
+#: templates/site/macros/text_meta.html:8
+#, fuzzy, python-format
msgid "1 version"
msgid_plural "%(versions_number)s versions"
msgstr[0] "1 версия"
@@ -1362,7 +1592,7 @@
msgid "The title of your text"
msgstr "Заглавие на вашия текст"
-#: views/create.py:70 views/create.py:107
+#: views/create.py:71 views/create.py:108
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "Текстът \"%(text_title)s\" е създаден"
@@ -1431,51 +1661,51 @@
msgid "Private notifications feed reseted."
msgstr "Частното захранване на уведомяването е реинициализирано."
-#: views/site.py:81 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:526
msgid "You're logged in!"
msgstr "Вие сте включени!"
-#: views/site.py:99
+#: views/site.py:100
msgid "Your name"
msgstr "Вашето име"
-#: views/site.py:101
+#: views/site.py:102
msgid "Your email address"
msgstr "Вашият имейл"
-#: views/site.py:104
+#: views/site.py:105
msgid "Subject of the message"
msgstr "Тема на съобщението"
-#: views/site.py:105
+#: views/site.py:106
msgid "Body of the message"
msgstr "Главна част на съобщението"
-#: views/site.py:107
+#: views/site.py:108
msgid "Send me a copy of the email"
msgstr "Изпратете ми копие он имейла"
-#: views/site.py:133
+#: views/site.py:134
msgid "Copy of message:"
msgstr "Копие на съобщението:"
-#: views/site.py:135
+#: views/site.py:136
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Имейлът е изпратен. Ще ви отговорим възможно тай бързо."
-#: views/site.py:164
+#: views/site.py:165
msgid "Workspace name"
msgstr "Име на работноно място"
-#: views/site.py:169
+#: views/site.py:170
msgid "Workspace tagline"
msgstr "Лозунг на работното място"
-#: views/site.py:174
+#: views/site.py:175
msgid "Workspace registration"
msgstr "Регистрация към работното място"
-#: views/site.py:175
+#: views/site.py:176
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1483,45 +1713,63 @@
"Могат ли потребителите да се регистрират в работното място? (ако не, само "
"покана от менидър може да създаде нов потребител)"
-#: views/site.py:179
+#: views/site.py:180
msgid "Workspace registration moderation"
msgstr "Модериране на регистрация към работното място"
-#: views/site.py:180
+#: views/site.py:181
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"Трябва ли новите потребители да са модерирани?(Регистрацията ще изисква "
"одобрение на мениджър)"
-#: views/site.py:184
-msgid "Role model"
-msgstr "Модел на роля"
-
-#: views/site.py:185
+#: views/site.py:186
msgid "Change the roles available in the workspace"
msgstr "Променете ролите в работното място"
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
msgid "Settings saved"
msgstr "Настройките са запаметени"
-#: views/site.py:214
+#: views/site.py:215
msgid "Workspace logo"
msgstr "Лого на работното място"
-#: views/site.py:216
+#: views/site.py:217
msgid "Workspace html code"
msgstr "Код html на работното място"
-#: views/site.py:217
+#: 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 ""
-"Добавете лист за стилове и др, "
-"Предупреждение: този код ще бъде добавен към кода на работното място, "
-"уверете се, че познавате рисковете преди да добавите нещо тук,"
+"Добавете лист за стилове и др, Предупреждение: този код ще бъде добавен към "
+"кода на работното място, уверете се, че познавате рисковете преди да "
+"добавите нещо тук,"
+
+#: views/site.py:252
+msgid "Username or email"
+msgstr ""
+
+#: views/site.py:279
+msgid "How to reset your password"
+msgstr ""
+
+#: views/site.py:281
+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."
+msgstr ""
#: views/texts.py:163
#, python-format
@@ -1533,7 +1781,8 @@
msgid "Text %(text_title)s deleted"
msgstr "Текстът %(text_title)s е изтит"
-#: views/texts.py:219, python-format
+#: views/texts.py:219
+#, python-format
msgid "Text version %(text_version_title)s deleted"
msgstr "Версията на текста %(text_version_title)s е изтит"
@@ -1569,7 +1818,8 @@
msgid "Email (optional)"
msgstr "Майл (по избор)"
-#: views/texts.py:741, python-format
+#: views/texts.py:741
+#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr "Нова версия (копирана от %(version_title)s версия ) е създадена"
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:52+0100\n"
+"POT-Creation-Date: 2010-03-19 16:16+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"
@@ -70,7 +70,7 @@
msgid "Content"
msgstr ""
-#: models.py:181 models.py:633
+#: models.py:181 models.py:633 templates/site/help.html:39
msgid "Tags"
msgstr ""
@@ -372,7 +372,8 @@
#: 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_data.html:58
+#: 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
@@ -578,7 +579,8 @@
msgid "Followup"
msgstr ""
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20 templates/site/help.html:58
+#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr ""
@@ -587,8 +589,8 @@
msgstr ""
#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
+#: 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 ""
@@ -641,6 +643,247 @@
"participated"
msgstr ""
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
+#: templates/site/login_form.html:21
+msgid "Forgot password?"
+msgstr ""
+
+#: templates/site/forgot_pw.html:24
+msgid "Remind my password"
+msgstr ""
+
+#: templates/site/help.html:16
+msgid "General Presentation"
+msgstr ""
+
+#: templates/site/help.html:18
+msgid "co-ment is a web based text annotation system."
+msgstr ""
+
+#: templates/site/help.html:20
+msgid "Glossary"
+msgstr ""
+
+#: templates/site/help.html:22 templates/site/help.html.py:25
+msgid "Collaboration"
+msgstr ""
+
+#: 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
+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."
+msgstr ""
+
+#: templates/site/help.html:29
+msgid "Comments"
+msgstr ""
+
+#: templates/site/help.html:32
+msgid "Moderation"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:36
+msgid "States"
+msgstr ""
+
+#: templates/site/help.html:37
+msgid "co-ment uses states to implement moderation policies."
+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."
+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."
+msgstr ""
+
+#: templates/site/help.html:42
+msgid "Linking to a comment"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:45
+msgid "Scope"
+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."
+msgstr ""
+
+#: templates/site/help.html:48
+msgid "Keeping your comments across versions"
+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."
+msgstr ""
+
+#: templates/site/help.html:52
+msgid "Notification and feeds"
+msgstr ""
+
+#: templates/site/help.html:55
+msgid "Email notification"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:59
+msgid "Web feed definition on Wikipedia"
+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."
+msgstr ""
+
+#: templates/site/help.html:61
+msgid "Public and private feeds"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:64
+msgid "Text embedding"
+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."
+msgstr ""
+
+#: templates/site/help.html:69 templates/site/help.html.py:71
+msgid "Roles"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:74 templates/site/text_share.html:88
+msgid "Text role"
+msgstr ""
+
+#: 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)."
+msgstr ""
+
+#: templates/site/help.html:76 views/site.py:185
+msgid "Role model"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:80
+msgid "Text edition"
+msgstr ""
+
+#: templates/site/help.html:83
+msgid "Text formats"
+msgstr ""
+
+#: templates/site/help.html:84
+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 ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Read more about this"
+msgstr ""
+
#: templates/site/login.html:8 templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
@@ -694,27 +937,48 @@
msgid "%(wname)s Registration"
msgstr ""
-#: 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/reset_pw.html:6 templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:24
+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/macros/text_tabs.html:19
msgid "Settings"
msgstr ""
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_data.html:21
+#: templates/site/settings_design.html:21
msgid "General"
msgstr ""
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_data.html:23
+#: templates/site/settings_design.html:23
msgid "Appearance"
msgstr ""
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
+#: 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 ""
-#: templates/site/settings_design.html:31
+#: 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
msgid "Delete logo"
msgstr ""
@@ -1012,10 +1276,6 @@
msgid "Workspace role"
msgstr ""
-#: templates/site/text_share.html:88
-msgid "Text role"
-msgstr ""
-
#: templates/site/text_share.html:101
#, python-format
msgid "This role has been overriden on this text by a text role: %(rolename)s"
@@ -1277,7 +1537,7 @@
msgid "The title of your text"
msgstr ""
-#: views/create.py:70 views/create.py:107
+#: views/create.py:71 views/create.py:108
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr ""
@@ -1346,91 +1606,109 @@
msgid "Private notifications feed reseted."
msgstr ""
-#: views/site.py:81 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:526
msgid "You're logged in!"
msgstr ""
-#: views/site.py:99
+#: views/site.py:100
msgid "Your name"
msgstr ""
-#: views/site.py:101
+#: views/site.py:102
msgid "Your email address"
msgstr ""
-#: views/site.py:104
+#: views/site.py:105
msgid "Subject of the message"
msgstr ""
-#: views/site.py:105
+#: views/site.py:106
msgid "Body of the message"
msgstr ""
-#: views/site.py:107
+#: views/site.py:108
msgid "Send me a copy of the email"
msgstr ""
-#: views/site.py:133
+#: views/site.py:134
msgid "Copy of message:"
msgstr ""
-#: views/site.py:135
+#: views/site.py:136
msgid "Email sent. We will get back to you as quickly as possible."
msgstr ""
-#: views/site.py:164
+#: views/site.py:165
msgid "Workspace name"
msgstr ""
-#: views/site.py:169
+#: views/site.py:170
msgid "Workspace tagline"
msgstr ""
-#: views/site.py:174
+#: views/site.py:175
msgid "Workspace registration"
msgstr ""
-#: views/site.py:175
+#: views/site.py:176
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
msgstr ""
-#: views/site.py:179
+#: views/site.py:180
msgid "Workspace registration moderation"
msgstr ""
-#: views/site.py:180
+#: views/site.py:181
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
-#: views/site.py:184
-msgid "Role model"
-msgstr ""
-
-#: views/site.py:185
+#: views/site.py:186
msgid "Change the roles available in the workspace"
msgstr ""
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
msgid "Settings saved"
msgstr ""
-#: views/site.py:214
+#: views/site.py:215
msgid "Workspace logo"
msgstr ""
-#: views/site.py:216
+#: views/site.py:217
msgid "Workspace html code"
msgstr ""
-#: views/site.py:217
+#: 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 ""
+#: views/site.py:252
+msgid "Username or email"
+msgstr ""
+
+#: views/site.py:279
+msgid "How to reset your password"
+msgstr ""
+
+#: views/site.py:281
+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."
+msgstr ""
+
#: views/texts.py:163
#, python-format
msgid "%(nb_texts)i text(s) deleted"
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/django.po Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:53+0100\n"
+"POT-Creation-Date: 2010-03-19 16:15+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"
@@ -67,7 +67,7 @@
msgid "Content"
msgstr "Contenido"
-#: models.py:181 models.py:633
+#: models.py:181 models.py:633 templates/site/help.html:39
msgid "Tags"
msgstr "Etiquetas"
@@ -369,7 +369,8 @@
#: 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_data.html:58
+#: 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
@@ -581,7 +582,8 @@
msgid "Followup"
msgstr ""
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20 templates/site/help.html:58
+#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Respuestas"
@@ -590,8 +592,8 @@
msgstr "Respuesta pública"
#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
+#: 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 "Ayuda"
@@ -651,6 +653,258 @@
"Subscribirse a todos los avisos de comentario/respuesta de los debates en "
"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?"
+msgstr ""
+
+#: templates/site/forgot_pw.html:24
+msgid "Remind my password"
+msgstr ""
+
+#: templates/site/help.html:16
+msgid "General Presentation"
+msgstr ""
+
+#: templates/site/help.html:18
+msgid "co-ment is a web based text annotation system."
+msgstr ""
+
+#: templates/site/help.html:20
+msgid "Glossary"
+msgstr ""
+
+#: templates/site/help.html:22 templates/site/help.html.py:25
+msgid "Collaboration"
+msgstr ""
+
+#: 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
+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."
+msgstr ""
+
+#: templates/site/help.html:29
+#, fuzzy
+msgid "Comments"
+msgstr "comentarios"
+
+#: templates/site/help.html:32
+#, fuzzy
+msgid "Moderation"
+msgstr "Moderador"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:36
+#, fuzzy
+msgid "States"
+msgstr "Guardar"
+
+#: templates/site/help.html:37
+msgid "co-ment uses states to implement moderation policies."
+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."
+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."
+msgstr ""
+
+#: templates/site/help.html:42
+#, fuzzy
+msgid "Linking to a comment"
+msgstr "Puede editar comentarios"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:45
+msgid "Scope"
+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."
+msgstr ""
+
+#: templates/site/help.html:48
+msgid "Keeping your comments across versions"
+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."
+msgstr ""
+
+#: templates/site/help.html:52
+#, fuzzy
+msgid "Notification and feeds"
+msgstr "Avisos"
+
+#: templates/site/help.html:55
+#, fuzzy
+msgid "Email notification"
+msgstr "Avisos de correo electrónico"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:59
+msgid "Web feed definition on Wikipedia"
+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."
+msgstr ""
+
+#: templates/site/help.html:61
+#, fuzzy
+msgid "Public and private feeds"
+msgstr "Respuesta privada"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:64
+msgid "Text embedding"
+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."
+msgstr ""
+
+#: templates/site/help.html:69 templates/site/help.html.py:71
+#, fuzzy
+msgid "Roles"
+msgstr "Perfil"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:74 templates/site/text_share.html:88
+#, fuzzy
+msgid "Text role"
+msgstr "Nivel del perfil del texto"
+
+#: 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)."
+msgstr ""
+
+#: templates/site/help.html:76 views/site.py:185
+msgid "Role model"
+msgstr "Modelo de perfiles"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:80
+#, fuzzy
+msgid "Text edition"
+msgstr "Avisos del texto"
+
+#: templates/site/help.html:83
+#, fuzzy
+msgid "Text formats"
+msgstr "Avisos del texto"
+
+#: templates/site/help.html:84
+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 ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Read more about this"
+msgstr ""
+
#: templates/site/login.html:8 templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
@@ -704,22 +958,31 @@
msgid "%(wname)s Registration"
msgstr "Registro de %(wname)s"
-#: 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/reset_pw.html:6 templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:24
+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/macros/text_tabs.html:19
msgid "Settings"
msgstr "Ajustes"
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_data.html:21
+#: templates/site/settings_design.html:21
#, fuzzy
msgid "General"
msgstr "Genérico"
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_data.html:23
+#: templates/site/settings_design.html:23
msgid "Appearance"
msgstr ""
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
+#: 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!"
@@ -727,7 +990,19 @@
"¿Está seguro/a de querer cambiar el modelo de perfiles? ¡Todos los roles "
"(excepto los administradores) se reiniciarán!"
-#: templates/site/settings_design.html:31
+#: 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
#, fuzzy
msgid "Delete logo"
msgstr "Borrar"
@@ -1053,11 +1328,6 @@
msgid "Workspace role"
msgstr "Perfil del espacio de trabajo"
-#: templates/site/text_share.html:88
-#, fuzzy
-msgid "Text role"
-msgstr "Nivel del perfil del texto"
-
#: templates/site/text_share.html:101
#, fuzzy, python-format
msgid "This role has been overriden on this text by a text role: %(rolename)s"
@@ -1339,7 +1609,7 @@
msgid "The title of your text"
msgstr "El título de su texto"
-#: views/create.py:70 views/create.py:107
+#: views/create.py:71 views/create.py:108
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "El texto \"%(text_title)s\" ha sido creado"
@@ -1409,51 +1679,51 @@
msgid "Private notifications feed reseted."
msgstr "Respuesta de avisos privados reiniciada"
-#: views/site.py:81 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:526
msgid "You're logged in!"
msgstr "¡Se ha conectado!"
-#: views/site.py:99
+#: views/site.py:100
msgid "Your name"
msgstr "Su nombre"
-#: views/site.py:101
+#: views/site.py:102
msgid "Your email address"
msgstr "Su dirección de correo electrónico"
-#: views/site.py:104
+#: views/site.py:105
msgid "Subject of the message"
msgstr "Asunto del mensaje"
-#: views/site.py:105
+#: views/site.py:106
msgid "Body of the message"
msgstr "Cuerpo del mensaje"
-#: views/site.py:107
+#: views/site.py:108
msgid "Send me a copy of the email"
msgstr "Enviarme una copia del correo electrónico"
-#: views/site.py:133
+#: views/site.py:134
msgid "Copy of message:"
msgstr "Copia del mensaje:"
-#: views/site.py:135
+#: views/site.py:136
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Correo enviado. Se lo devolveremos tan pronto como sea posible."
-#: views/site.py:164
+#: views/site.py:165
msgid "Workspace name"
msgstr "Nombre del espacio de trabajo"
-#: views/site.py:169
+#: views/site.py:170
msgid "Workspace tagline"
msgstr "Etiqueta del espacio de trabajo"
-#: views/site.py:174
+#: views/site.py:175
msgid "Workspace registration"
msgstr "Registro del espacio de trabajo"
-#: views/site.py:175
+#: views/site.py:176
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1462,11 +1732,11 @@
"contrario, sólo se podrán usar las invitaciones enviadas por los "
"administradores para crear nuevos usuarios)"
-#: views/site.py:179
+#: views/site.py:180
msgid "Workspace registration moderation"
msgstr "Moderación del registro del espacio de trabajo"
-#: views/site.py:180
+#: views/site.py:181
#, fuzzy
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
@@ -1474,34 +1744,53 @@
"¿Deben moderarse los usuarios nuevos? (el registro requerirá la aprobación "
"del administrador)"
-#: views/site.py:184
-msgid "Role model"
-msgstr "Modelo de perfiles"
-
-#: views/site.py:185
+#: views/site.py:186
msgid "Change the roles available in the workspace"
msgstr "Cambiar los perfiles disponibles en el espacio de trabajo"
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
msgid "Settings saved"
msgstr "Ajustes guardados"
-#: views/site.py:214
+#: views/site.py:215
#, fuzzy
msgid "Workspace logo"
msgstr "Perfil del espacio de trabajo"
-#: views/site.py:216
+#: views/site.py:217
#, fuzzy
msgid "Workspace html code"
msgstr "Perfil del espacio de trabajo"
-#: views/site.py:217
+#: 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 ""
+#: views/site.py:252
+msgid "Username or email"
+msgstr ""
+
+#: views/site.py:279
+msgid "How to reset your password"
+msgstr ""
+
+#: views/site.py:281
+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
+#, fuzzy
+msgid "Your password has been changed."
+msgstr "Su texto \"%(title)s\" se ha creado"
+
#: views/texts.py:163
#, python-format
msgid "%(nb_texts)i text(s) deleted"
@@ -1778,15 +2067,9 @@
#~ msgid "Contact from user: %(name)s / %(email)s"
#~ msgstr "Contacto del usuario: %(name)s / %(email)s"
-#~ msgid "Your text \"%(title)s\" has been created."
-#~ msgstr "Su texto \"%(title)s\" se ha creado"
-
#~ msgid "To publish it click on the following link:"
#~ msgstr "Para publicarlo, haga clic en el siguiente enlace"
-#~ msgid "Notifications"
-#~ msgstr "Avisos"
-
#~ msgid "%(title)s"
#~ msgstr "%(title)s"
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:53+0100\n"
-"PO-Revision-Date: 2010-02-24 01:37+0900\n"
+"POT-Creation-Date: 2010-03-19 16:16+0100\n"
+"PO-Revision-Date: 2010-03-19 16:19+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
+#: 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"
@@ -190,7 +195,8 @@
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\""
@@ -242,9 +248,10 @@
#: settings.py:110
msgid "Bulgarian"
-msgstr ""
+msgstr "Bulgare"
-#: static_i18n.py:6 static_i18n.py:11
+#: static_i18n.py:6
+#: static_i18n.py:11
msgid "Observer"
msgstr "Observateur"
@@ -356,7 +363,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 +373,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 +385,22 @@
#: 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_data.html:58
+#: 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 +408,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 +451,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 +467,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 +506,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:201
#, python-format
msgid "modified %(duration)s ago"
msgstr "modifié il y a %(duration)s"
@@ -499,7 +516,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,7 +528,8 @@
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"
@@ -534,8 +553,10 @@
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 ..."
@@ -581,21 +602,28 @@
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/text_followup.html:22
+#: 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/text_embed.html:27
+#: 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"
@@ -609,7 +637,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é"
@@ -618,19 +647,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é"
@@ -638,7 +664,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"
@@ -647,14 +674,203 @@
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é"
+
+#: templates/site/forgot_pw.html:6
+#: templates/site/forgot_pw.html.py:14
+#: 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 ""
+
+#: templates/site/help.html:20
+msgid "Glossary"
+msgstr "Glossaire"
+
+#: templates/site/help.html:22
+#: templates/site/help.html.py:25
+msgid "Collaboration"
+msgstr ""
+
+#: 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
+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."
+msgstr ""
+
+#: templates/site/help.html:29
+msgid "Comments"
+msgstr "Commentaires"
+
+#: templates/site/help.html:32
+msgid "Moderation"
+msgstr "Modération"
+
+#: templates/site/help.html:33
msgid ""
-"Subscribe to all replies notifications in discussions where you have "
-"participated"
+"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
+msgid "States"
+msgstr "Etats"
+
+#: templates/site/help.html:37
+msgid "co-ment uses states to implement moderation policies."
+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."
+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."
+msgstr ""
+
+#: templates/site/help.html:42
+#, fuzzy
+msgid "Linking to a comment"
+msgstr "Peut éditer le/les commentaires"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:45
+msgid "Scope"
+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."
+msgstr ""
+
+#: templates/site/help.html:48
+msgid "Keeping your comments across versions"
+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."
msgstr ""
-"S'abonner aux notifications concernant les commentaires ou réponses dans les "
-"discussions auxquelles vous avez participé"
+
+#: templates/site/help.html:52
+#, fuzzy
+msgid "Notification and feeds"
+msgstr "Notification désactivée."
+
+#: templates/site/help.html:55
+#, fuzzy
+msgid "Email notification"
+msgstr "Notifications 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."
+msgstr ""
+
+#: templates/site/help.html:59
+msgid "Web feed definition on Wikipedia"
+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."
+msgstr ""
+
+#: templates/site/help.html:61
+#, fuzzy
+msgid "Public and private feeds"
+msgstr "Flux privé"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:64
+msgid "Text embedding"
+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."
+msgstr ""
+
+#: templates/site/help.html:69
+#: templates/site/help.html.py:71
+#, fuzzy
+msgid "Roles"
+msgstr "Rôle"
+
+#: templates/site/help.html:72
+msgid "Roles are predefined sets of permissions."
+msgstr ""
-#: templates/site/login.html:8 templates/site/login_form.html:19
+#: 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."
+msgstr ""
+
+#: 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)."
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:80
+#, fuzzy
+msgid "Text edition"
+msgstr "Modification suivante"
+
+#: templates/site/help.html:83
+#, fuzzy
+msgid "Text formats"
+msgstr "Notifications du texte"
+
+#: templates/site/help.html:84
+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 ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Read more about this"
+msgstr ""
+
+#: templates/site/login.html:8
+#: templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
msgstr "Se connecter"
@@ -664,7 +880,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"
@@ -689,15 +906,20 @@
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
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Votre profil (%(username)s)"
-#: templates/site/profile.html:26 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/profile.html:26
+#: 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/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Enregistrer"
@@ -707,34 +929,59 @@
msgid "%(wname)s Registration"
msgstr "S'enregistrer sur %(wname)s"
-#: 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/reset_pw.html:6
+#: templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:24
+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/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_data.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_data.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!"
+#: 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"
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"
@@ -748,29 +995,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"
@@ -790,25 +1027,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"
@@ -842,7 +1070,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"
@@ -850,11 +1079,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"
@@ -867,7 +1098,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"
@@ -889,11 +1121,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"
@@ -915,7 +1144,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"
@@ -925,35 +1155,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"
@@ -961,7 +1200,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"
@@ -976,7 +1216,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"
@@ -993,71 +1234,77 @@
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"
msgstr "Rôle dans l'espace de travail"
-#: templates/site/text_share.html:88
-msgid "Text role"
-msgstr "Rôle sur le texte"
-
#: templates/site/text_share.html:101
#, python-format
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"
@@ -1094,20 +1341,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"
@@ -1118,16 +1363,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"
@@ -1136,7 +1384,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"
@@ -1151,9 +1400,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
@@ -1227,12 +1474,8 @@
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
@@ -1274,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"
@@ -1311,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."
@@ -1325,7 +1559,8 @@
msgid "The title of your text"
msgstr "Le titre de votre texte"
-#: views/create.py:70 views/create.py:107
+#: 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éé"
@@ -1370,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é."
@@ -1394,97 +1630,106 @@
msgid "Private notifications feed reseted."
msgstr "Flux privé réinitialisé."
-#: views/site.py:81 views/texts.py:130 views/user.py:526
+#: views/site.py:82
+#: views/texts.py:130
+#: views/user.py:526
msgid "You're logged in!"
msgstr "Vous êtes connecté !"
-#: views/site.py:99
+#: views/site.py:100
msgid "Your name"
msgstr "Votre nom"
-#: views/site.py:101
+#: views/site.py:102
msgid "Your email address"
msgstr "Votre Email"
-#: views/site.py:104
+#: views/site.py:105
msgid "Subject of the message"
msgstr "Sujet du message"
-#: views/site.py:105
+#: views/site.py:106
msgid "Body of the message"
msgstr "Corps du message"
-#: views/site.py:107
+#: views/site.py:108
msgid "Send me a copy of the email"
msgstr "M'envoyer une copie du message"
-#: views/site.py:133
+#: views/site.py:134
msgid "Copy of message:"
msgstr "Copie du message :"
-#: views/site.py:135
+#: views/site.py:136
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Message envoyé. Nous vous répondrons dans les meilleurs délais."
-#: views/site.py:164
+#: views/site.py:165
msgid "Workspace name"
msgstr "Nom de l'espace de travail"
-#: views/site.py:169
+#: views/site.py:170
msgid "Workspace tagline"
msgstr "Slogan de l'espace de travail"
-#: views/site.py:174
+#: views/site.py:175
msgid "Workspace registration"
msgstr "S'enregistrer sur l'espace de travail"
-#: views/site.py:175
-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: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)"
-#: views/site.py:179
+#: views/site.py:180
msgid "Workspace registration moderation"
msgstr "Modération de l'enregistrement sur l'espace de travail"
-#: views/site.py:180
-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: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) ?"
-#: views/site.py:184
-msgid "Role model"
-msgstr "Modèle des rôles"
-
-#: views/site.py:185
+#: 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:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:201
+#: views/site.py:207
+#: views/site.py:235
+#: views/site.py:244
msgid "Settings saved"
msgstr "Paramètres sauvegardés"
-#: views/site.py:214
+#: views/site.py:215
msgid "Workspace logo"
msgstr "Logo de l'espace de travail"
-#: views/site.py:216
+#: views/site.py:217
msgid "Workspace html code"
msgstr "Code html de l'espace de travail"
-#: views/site.py:217
-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."
+#: 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"
msgstr ""
-"Ajouter des feuilles de style etc.. Attention : ce code sera ajouté à celui "
-"de l'espace de travail, à manipuler avec prudence."
+
+#: views/site.py:279
+msgid "How to reset your password"
+msgstr "Ré-initialiser votre mot de passe"
+
+#: 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: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/texts.py:163
#, python-format
@@ -1523,8 +1768,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)"
@@ -1537,10 +1781,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)"
@@ -1573,23 +1818,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"
@@ -1620,7 +1857,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é."
@@ -1687,53 +1925,36 @@
#: views/user.py:520
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
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."
+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."
+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 "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 "Your text \"%(title)s\" has been created."
-#~ msgstr "Votre texte \"%(title)s\" a été créé."
-
#~ 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 Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:51+0100\n"
+"POT-Creation-Date: 2010-03-19 16:15+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"
@@ -73,7 +73,7 @@
msgid "Content"
msgstr "Innhold"
-#: models.py:181 models.py:633
+#: models.py:181 models.py:633 templates/site/help.html:39
msgid "Tags"
msgstr "Etiketter"
@@ -241,7 +241,7 @@
#: settings.py:110
msgid "Bulgarian"
-msgstr ""
+msgstr "Bulgarsk"
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
@@ -375,7 +375,8 @@
#: 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_data.html:58
+#: 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
@@ -581,7 +582,8 @@
msgid "Followup"
msgstr "Oppfølgning"
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20 templates/site/help.html:58
+#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Strømmer"
@@ -590,8 +592,8 @@
msgstr "Offentlig strøm"
#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
+#: 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 "Hjelp"
@@ -647,6 +649,257 @@
"participated"
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?"
+msgstr ""
+
+#: templates/site/forgot_pw.html:24
+msgid "Remind my password"
+msgstr ""
+
+#: templates/site/help.html:16
+msgid "General Presentation"
+msgstr ""
+
+#: templates/site/help.html:18
+msgid "co-ment is a web based text annotation system."
+msgstr ""
+
+#: templates/site/help.html:20
+msgid "Glossary"
+msgstr ""
+
+#: templates/site/help.html:22 templates/site/help.html.py:25
+msgid "Collaboration"
+msgstr ""
+
+#: 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
+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."
+msgstr ""
+
+#: templates/site/help.html:29
+#, fuzzy
+msgid "Comments"
+msgstr "merknader"
+
+#: templates/site/help.html:32
+#, fuzzy
+msgid "Moderation"
+msgstr "Moderator"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:36
+#, fuzzy
+msgid "States"
+msgstr "Lagre"
+
+#: templates/site/help.html:37
+msgid "co-ment uses states to implement moderation policies."
+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."
+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."
+msgstr ""
+
+#: templates/site/help.html:42
+#, fuzzy
+msgid "Linking to a comment"
+msgstr "Kan endre merknader"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:45
+msgid "Scope"
+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."
+msgstr ""
+
+#: templates/site/help.html:48
+msgid "Keeping your comments across versions"
+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."
+msgstr ""
+
+#: templates/site/help.html:52
+#, fuzzy
+msgid "Notification and feeds"
+msgstr "Varsel stoppet."
+
+#: templates/site/help.html:55
+#, fuzzy
+msgid "Email notification"
+msgstr "Epostvarsler"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:59
+msgid "Web feed definition on Wikipedia"
+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."
+msgstr ""
+
+#: templates/site/help.html:61
+#, fuzzy
+msgid "Public and private feeds"
+msgstr "Privat strøm"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:64
+msgid "Text embedding"
+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."
+msgstr ""
+
+#: templates/site/help.html:69 templates/site/help.html.py:71
+#, fuzzy
+msgid "Roles"
+msgstr "Rolle"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:74 templates/site/text_share.html:88
+msgid "Text role"
+msgstr "Tekstrolle"
+
+#: 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)."
+msgstr ""
+
+#: templates/site/help.html:76 views/site.py:185
+msgid "Role model"
+msgstr "Rollemodell"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:80
+#, fuzzy
+msgid "Text edition"
+msgstr "Neste endring"
+
+#: templates/site/help.html:83
+#, fuzzy
+msgid "Text formats"
+msgstr "Tekstvarsler"
+
+#: templates/site/help.html:84
+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 ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Read more about this"
+msgstr ""
+
#: templates/site/login.html:8 templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
@@ -700,21 +953,30 @@
msgid "%(wname)s Registration"
msgstr "Registrering på %(wname)s"
-#: 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/reset_pw.html:6 templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:24
+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/macros/text_tabs.html:19
msgid "Settings"
msgstr "Innstillinger"
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_data.html:21
+#: templates/site/settings_design.html:21
msgid "General"
msgstr "Generell"
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_data.html:23
+#: templates/site/settings_design.html:23
msgid "Appearance"
msgstr "Utseende"
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
+#: 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!"
@@ -722,7 +984,19 @@
"Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli "
"nullstilt!"
-#: templates/site/settings_design.html:31
+#: 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
msgid "Delete logo"
msgstr "Slett logo"
@@ -1032,10 +1306,6 @@
msgid "Workspace role"
msgstr "Rolle for arbeidsområde"
-#: templates/site/text_share.html:88
-msgid "Text role"
-msgstr "Tekstrolle"
-
#: templates/site/text_share.html:101
#, python-format
msgid "This role has been overriden on this text by a text role: %(rolename)s"
@@ -1304,7 +1574,7 @@
msgid "The title of your text"
msgstr "Overskriften for din tekst"
-#: views/create.py:70 views/create.py:107
+#: views/create.py:71 views/create.py:108
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "Teksten %(text_title)s har blitt opprettet"
@@ -1373,52 +1643,52 @@
msgid "Private notifications feed reseted."
msgstr "Strøm for private varsler nullstilt."
-#: views/site.py:81 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:526
msgid "You're logged in!"
msgstr "Du er logget inn!"
-#: views/site.py:99
+#: views/site.py:100
msgid "Your name"
msgstr "Ditt navn"
-#: views/site.py:101
+#: views/site.py:102
msgid "Your email address"
msgstr "Din epostadresse"
-#: views/site.py:104
+#: views/site.py:105
msgid "Subject of the message"
msgstr "Emne"
-#: views/site.py:105
+#: views/site.py:106
msgid "Body of the message"
msgstr "Tekst"
-#: views/site.py:107
+#: views/site.py:108
msgid "Send me a copy of the email"
msgstr "Send meg en kopi av eposten"
-#: views/site.py:133
+#: views/site.py:134
msgid "Copy of message:"
msgstr "Kopi av meldingen:"
-#: views/site.py:135
+#: views/site.py:136
msgid "Email sent. We will get back to you as quickly as possible."
msgstr ""
"Eposten er blitt sendt. Vi vil komme tilbake til deg så raskt som mulig."
-#: views/site.py:164
+#: views/site.py:165
msgid "Workspace name"
msgstr "Navn for arbeidsområde"
-#: views/site.py:169
+#: views/site.py:170
msgid "Workspace tagline"
msgstr "Beskrivelse av arbeidsområde"
-#: views/site.py:174
+#: views/site.py:175
msgid "Workspace registration"
msgstr "Registering på arbeidsområde"
-#: views/site.py:175
+#: views/site.py:176
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1426,38 +1696,34 @@
"Skal brukere kunne registrere seg på arbeidsområdet? (Hvis ikke, må brukere "
"inviteres av en administrator.)"
-#: views/site.py:179
+#: views/site.py:180
msgid "Workspace registration moderation"
msgstr "Godkjenning av registreringer på arbeidsområde"
-#: views/site.py:180
+#: views/site.py:181
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"Skal nye brukere godkjennes (registrering vil kreve administratorens "
"godkjenning)"
-#: views/site.py:184
-msgid "Role model"
-msgstr "Rollemodell"
-
-#: views/site.py:185
+#: views/site.py:186
msgid "Change the roles available in the workspace"
msgstr "Endre roller i arbeidsområdet"
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
msgid "Settings saved"
msgstr "Innstillinger lagret"
-#: views/site.py:214
+#: views/site.py:215
msgid "Workspace logo"
msgstr "Logo for arbeidsområde"
-#: views/site.py:216
+#: views/site.py:217
msgid "Workspace html code"
msgstr "HTML kode for arbeidsområde"
-#: views/site.py:217
+#: 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."
@@ -1465,6 +1731,29 @@
"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
+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
+#, fuzzy
+msgid "Your password has been changed."
+msgstr "Teksten %(text_title)s har blitt opprettet"
+
#: views/texts.py:163
#, python-format
msgid "%(nb_texts)i text(s) deleted"
@@ -1710,10 +1999,6 @@
#~ msgid "Contact from user: %(name)s / %(email)s"
#~ msgstr "Kontakt bruker %(username)s"
-#, fuzzy
-#~ msgid "Your text \"%(title)s\" has been created."
-#~ msgstr "Teksten %(text_title)s har blitt opprettet"
-
#~ msgid "%(title)s"
#~ msgstr "%(title)s"
Binary file src/cm/locale/no/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/djangojs.po Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/djangojs.po Mon Mar 22 11:02:39 2010 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-10 22:01+0100\n"
-"PO-Revision-Date: 2010-02-15 08:00+0100\n"
+"PO-Revision-Date: 2010-03-17 22:00+0100\n"
"Last-Translator: Kirill Miazine <km@krot.org>\n"
"Language-Team: <no@li.org>\n"
"MIME-Version: 1.0\n"
@@ -245,9 +245,8 @@
msgstr "Skriv ut tekst"
#: media/js/client/f_printDialog.js:12
-#, fuzzy
msgid "How do you want to print?"
-msgstr "Ønsker du å fortsette?"
+msgstr "Hvordan ønsker du å skrive ut?"
#: media/js/client/f_printDialog.js:13
msgid "Export text"
@@ -255,7 +254,7 @@
#: media/js/client/f_printDialog.js:13
msgid "Choose file format"
-msgstr ""
+msgstr "Velg filformat"
#: media/js/client/f_printDialog.js:40
msgid "using markers only, no background colors"
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Mar 22 11:02:39 2010 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:51+0100\n"
+"POT-Creation-Date: 2010-03-19 16:14+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"
@@ -67,7 +67,7 @@
msgid "Content"
msgstr "Conteúdo"
-#: models.py:181 models.py:633
+#: models.py:181 models.py:633 templates/site/help.html:39
msgid "Tags"
msgstr "Palavras-chave"
@@ -369,7 +369,8 @@
#: 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_data.html:58
+#: 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
@@ -575,7 +576,8 @@
msgid "Followup"
msgstr "Acompanhamento"
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20 templates/site/help.html:58
+#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Feeds"
@@ -584,8 +586,8 @@
msgstr "Feed público"
#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
+#: 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 "Ajuda"
@@ -642,6 +644,257 @@
msgstr ""
"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?"
+msgstr ""
+
+#: templates/site/forgot_pw.html:24
+msgid "Remind my password"
+msgstr ""
+
+#: templates/site/help.html:16
+msgid "General Presentation"
+msgstr ""
+
+#: templates/site/help.html:18
+msgid "co-ment is a web based text annotation system."
+msgstr ""
+
+#: templates/site/help.html:20
+msgid "Glossary"
+msgstr ""
+
+#: templates/site/help.html:22 templates/site/help.html.py:25
+msgid "Collaboration"
+msgstr ""
+
+#: 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
+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."
+msgstr ""
+
+#: templates/site/help.html:29
+#, fuzzy
+msgid "Comments"
+msgstr "comentários"
+
+#: templates/site/help.html:32
+#, fuzzy
+msgid "Moderation"
+msgstr "Moderador"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:36
+#, fuzzy
+msgid "States"
+msgstr "Salvar"
+
+#: templates/site/help.html:37
+msgid "co-ment uses states to implement moderation policies."
+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."
+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."
+msgstr ""
+
+#: templates/site/help.html:42
+#, fuzzy
+msgid "Linking to a comment"
+msgstr "Pode editar comentário"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:45
+msgid "Scope"
+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."
+msgstr ""
+
+#: templates/site/help.html:48
+msgid "Keeping your comments across versions"
+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."
+msgstr ""
+
+#: templates/site/help.html:52
+#, fuzzy
+msgid "Notification and feeds"
+msgstr "Aviso desativado."
+
+#: templates/site/help.html:55
+#, fuzzy
+msgid "Email notification"
+msgstr "Aviso de 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."
+msgstr ""
+
+#: templates/site/help.html:59
+msgid "Web feed definition on Wikipedia"
+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."
+msgstr ""
+
+#: templates/site/help.html:61
+#, fuzzy
+msgid "Public and private feeds"
+msgstr "Feed privado"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:64
+msgid "Text embedding"
+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."
+msgstr ""
+
+#: templates/site/help.html:69 templates/site/help.html.py:71
+#, fuzzy
+msgid "Roles"
+msgstr "Função"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:74 templates/site/text_share.html:88
+msgid "Text role"
+msgstr "Função do texto"
+
+#: 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)."
+msgstr ""
+
+#: templates/site/help.html:76 views/site.py:185
+msgid "Role model"
+msgstr "Função modelo"
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:80
+#, fuzzy
+msgid "Text edition"
+msgstr "Aviso de texto"
+
+#: templates/site/help.html:83
+#, fuzzy
+msgid "Text formats"
+msgstr "Aviso de texto"
+
+#: templates/site/help.html:84
+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 ""
+
+#: 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."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Read more about this"
+msgstr ""
+
#: templates/site/login.html:8 templates/site/login_form.html:19
#: templates/site/layout/header.html:17
msgid "Login"
@@ -695,28 +948,49 @@
msgid "%(wname)s Registration"
msgstr "%(wname)s Inscrição"
-#: 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/reset_pw.html:6 templates/site/reset_pw.html.py:14
+#: templates/site/reset_pw.html:24
+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/macros/text_tabs.html:19
msgid "Settings"
msgstr "Configurações"
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21 templates/site/settings_data.html:21
+#: templates/site/settings_design.html:21
#, fuzzy
msgid "General"
msgstr "Genérico"
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23 templates/site/settings_data.html:23
+#: templates/site/settings_design.html:23
msgid "Appearance"
msgstr ""
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
+#: 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 "Confirmar alteração de "
-#: templates/site/settings_design.html:31
+#: 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
#, fuzzy
msgid "Delete logo"
msgstr "Apagar"
@@ -1038,10 +1312,6 @@
msgid "Workspace role"
msgstr "Função da área de trabalho"
-#: templates/site/text_share.html:88
-msgid "Text role"
-msgstr "Função do texto"
-
#: templates/site/text_share.html:101
#, python-format
msgid "This role has been overriden on this text by a text role: %(rolename)s"
@@ -1313,7 +1583,7 @@
msgid "The title of your text"
msgstr "O título do seu texto"
-#: views/create.py:70 views/create.py:107
+#: views/create.py:71 views/create.py:108
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "O texto \"%(text_title)s\" foi criado"
@@ -1382,51 +1652,51 @@
msgid "Private notifications feed reseted."
msgstr "Feed privado de avisos restabelecido."
-#: views/site.py:81 views/texts.py:130 views/user.py:526
+#: views/site.py:82 views/texts.py:130 views/user.py:526
msgid "You're logged in!"
msgstr "Você entrou!"
-#: views/site.py:99
+#: views/site.py:100
msgid "Your name"
msgstr "Seu nome"
-#: views/site.py:101
+#: views/site.py:102
msgid "Your email address"
msgstr "Seu endereço de email"
-#: views/site.py:104
+#: views/site.py:105
msgid "Subject of the message"
msgstr "Assunto da mensagem"
-#: views/site.py:105
+#: views/site.py:106
msgid "Body of the message"
msgstr "Corpo da mensagem"
-#: views/site.py:107
+#: views/site.py:108
msgid "Send me a copy of the email"
msgstr "Envie-me uma cópia do email"
-#: views/site.py:133
+#: views/site.py:134
msgid "Copy of message:"
msgstr "Cópia da mensagem:"
-#: views/site.py:135
+#: views/site.py:136
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Email enviado. Retornaremos assim que possível."
-#: views/site.py:164
+#: views/site.py:165
msgid "Workspace name"
msgstr "Nome da área de trabalho"
-#: views/site.py:169
+#: views/site.py:170
msgid "Workspace tagline"
msgstr "Slogan da área de trabalho"
-#: views/site.py:174
+#: views/site.py:175
msgid "Workspace registration"
msgstr "Registro da área de trabalho"
-#: views/site.py:175
+#: views/site.py:176
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1434,45 +1704,63 @@
"Usuários podem se inscrever na área de trabalho? (se não, apenas convites "
"por gerentes podem criar novos usuários)"
-#: views/site.py:179
+#: views/site.py:180
msgid "Workspace registration moderation"
msgstr "Moderação de registro da área de trabalho"
-#: views/site.py:180
+#: views/site.py:181
#, fuzzy
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"Novos usuários devem ser moderados? (registro exigirá aprovação de gerente) "
-#: views/site.py:184
-msgid "Role model"
-msgstr "Função modelo"
-
-#: views/site.py:185
+#: views/site.py:186
msgid "Change the roles available in the workspace"
msgstr "Alterar as funções disponível na área de trabalho"
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
msgid "Settings saved"
msgstr "Configurações salvas"
-#: views/site.py:214
+#: views/site.py:215
#, fuzzy
msgid "Workspace logo"
msgstr "Função da área de trabalho"
-#: views/site.py:216
+#: views/site.py:217
#, fuzzy
msgid "Workspace html code"
msgstr "Função da área de trabalho"
-#: views/site.py:217
+#: 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 ""
+#: views/site.py:252
+msgid "Username or email"
+msgstr ""
+
+#: views/site.py:279
+msgid "How to reset your password"
+msgstr ""
+
+#: views/site.py:281
+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."
+msgstr ""
+
#: views/texts.py:163
#, python-format
msgid "%(nb_texts)i text(s) deleted"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/templates/email/forgot_pw.txt Mon Mar 22 11:02:39 2010 +0100
@@ -0,0 +1,4 @@
+{% 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/templates/site/forgot_pw.html Mon Mar 22 11:02:39 2010 +0100
@@ -0,0 +1,30 @@
+{% extends "site/layout/base_workspace.html" %}
+{% load com %}
+{% load i18n %}
+
+{% block title %}
+{% blocktrans %}Forgot password?{% endblocktrans %}
+{% endblock %}
+
+{% block head %}
+{% endblock %}
+
+{% block content %}
+
+<h1>{% blocktrans %}Forgot password?{% endblocktrans %}</h1>
+<form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
+<table class="wide_form">
+ <tbody>
+ {% include "site/macros/form_fields.html" %}
+ <tr>
+ <td style="vertical-align: top; width: 20%; text-align:right;">
+ </td>
+ <td>
+ <label></label>
+ <input name="remind" type="submit" value="{% blocktrans %}Remind my password{% endblocktrans %}"/>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</form>
+{% endblock %}
\ No newline at end of file
--- a/src/cm/templates/site/login_form.html Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/templates/site/login_form.html Mon Mar 22 11:02:39 2010 +0100
@@ -16,8 +16,9 @@
</td>
<td>
<label></label>
- <input name="login" type="submit" value="{% blocktrans %}Login{% endblocktrans %}"/>
- {% if CONF.workspace_registration %}<a href="{% url register %}">{% blocktrans %}Register{% endblocktrans %}</a>{% endif %}
+ <input name="login" type="submit" value="{% blocktrans %}Login{% endblocktrans %}"/>
+ {% if CONF.workspace_registration %}<br/><a href="{% url register %}">{% blocktrans %}Register{% endblocktrans %}</a>{% endif %}
+ <br /><a href="{% url forgot-pw %}">{% blocktrans %}Forgot password?{% endblocktrans %}</a>
</td>
</tr>
</tbody>
--- a/src/cm/templates/site/non_authenticated_index.html Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/templates/site/non_authenticated_index.html Mon Mar 22 11:02:39 2010 +0100
@@ -20,7 +20,7 @@
<h2>{% blocktrans count public_texts|length as counter %}One public text{% plural %}{{ counter }} public texts{% endblocktrans %}</h2>
<ul>
{% for text in public_texts %}
-<li><a title="{{ text.title }}" href="{% url text-view text.key %}">{{ text.title }}</a>
+<li style="padding-bottom:10px;"><a title="{{ text.title }}" href="{% url text-view text.key %}">{{ text.title }}</a>
<br/>
{% include "site/macros/text_meta.html" %}
</li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/templates/site/reset_pw.html Mon Mar 22 11:02:39 2010 +0100
@@ -0,0 +1,30 @@
+{% extends "site/layout/base_workspace.html" %}
+{% load com %}
+{% load i18n %}
+
+{% block title %}
+{% blocktrans %}Reset your password{% endblocktrans %}
+{% endblock %}
+
+{% block head %}
+{% endblock %}
+
+{% block content %}
+
+<h1>{% blocktrans %}Reset your password{% endblocktrans %}</h1>
+<form id="profile" enctype="multipart/form-data" class="wizard-form" action="." method="post">
+<table class="wide_form">
+ <tbody>
+ {% include "site/macros/form_fields.html" %}
+ <tr>
+ <td style="vertical-align: top; width: 20%; text-align:right;">
+ </td>
+ <td>
+ <label></label>
+ <input name="reset" type="submit" value="{% blocktrans %}Reset your password{% endblocktrans %}"/>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</form>
+{% endblock %}
\ No newline at end of file
--- a/src/cm/urls.py Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/urls.py Mon Mar 22 11:02:39 2010 +0100
@@ -31,6 +31,8 @@
# 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"),
@@ -130,7 +132,7 @@
if settings.DEBUG:
urlpatterns += patterns('',
(r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
-
+
(r'^cmmedia/(?P<path>.*)$', 'django.views.static.serve', {'document_root': 'src/cm/media/'}),
(r'^robots.txt$', 'django.views.static.serve', {'document_root': 'src/cm/media/', 'path':'robots.txt'}),
(r'^favicon.ico$', 'django.views.static.serve', {'document_root': 'src/cm/media/', 'path':'favicon.ico'}),
--- a/src/cm/views/site.py Wed Mar 17 23:44:39 2010 +0100
+++ b/src/cm/views/site.py Mon Mar 22 11:02:39 2010 +0100
@@ -19,6 +19,7 @@
from django.template.loader import render_to_string
from django.utils.translation import get_language, ugettext as _, ugettext_lazy
from django.views.generic.list_detail import object_list
+from django.contrib.auth.models import User
from cm.models import Text, TextVersion, Attachment, Comment, Configuration, Activity
ACTIVITY_PAGINATION = 10
@@ -247,6 +248,62 @@
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 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 help(request):
return render_to_response('site/help.html', context_instance=RequestContext(request))