Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/bg/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/bg/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 15:02+0200\n"
+"POT-Creation-Date: 2014-03-19 16:36+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"
@@ -17,205 +17,223 @@
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: client.py:29
+#: client.py:30
msgid ""
"A selection is required. Select in the text the part your comment applies to."
msgstr ""
"Необходим е избор. Изберете частта от текста, върху която се отнася вашият "
"коментар."
-#: client.py:138
+#: client.py:144
msgid "name is required"
msgstr "името е задължително"
-#: client.py:141
+#: client.py:147
msgid "email is required"
msgstr "имейлът е задължителен"
-#: client.py:143
+#: client.py:149
msgid "invalid email"
msgstr "невалиден имейл"
-#: client.py:145
+#: client.py:151
msgid "title is required"
msgstr "заглавието е задължително"
-#: client.py:147
+#: client.py:153
msgid "content is required"
msgstr "текстът е задължителен"
-#: client.py:162
+#: client.py:168
msgid "comment removed"
msgstr "коментарът е изтрит."
-#: client.py:213 client.py:278
+#: client.py:221 client.py:286
msgid "comment saved"
msgstr "коментарът е запаметен"
-#: client.py:280
+#: client.py:288
msgid "comment saved, it is being held for moderation"
msgstr "коментарът е запаметен, запазен е за модериране"
-#: client.py:314
+#: client.py:326 client.py:335 client.py:337
msgid "me"
msgstr "ми"
-#: client.py:316
+#: client.py:328 client.py:335 client.py:337
msgid "author"
msgstr "автор"
-#: client.py:341
+#: client.py:387
msgid "Tags input must be no longer than 250 characters."
msgstr "Таговете не трябва да надвишават 250 символа."
-#: models.py:184 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:630
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
msgid "Title"
msgstr "Заглавие"
-#: models.py:185
+#: models.py:189
msgid "Format"
msgstr "Формат"
-#: models.py:186 views/texts.py:725
+#: models.py:190 views/texts.py:721
msgid "Content"
msgstr "Съдържание"
-#: models.py:187 models.py:643 templates/site/help.html:47
+#: models.py:191 models.py:625 templates/site/help.html:56
msgid "Tags"
msgstr "Тагове"
-#: models.py:189 templates/site/text_history.html:80 views/user.py:223
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
msgid "Note"
msgstr "Бележка"
-#: models.py:191
+#: models.py:195
msgid "Moderation a posteriori?"
msgstr "Модерирането се извършва по-късно."
-#: models.py:307
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Етикет за първата категория на коментари"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Етикет за втората категория на коментари"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Етикет за трета категория коментари"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Етикет за четвърта категория на коментари"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Етикет за пета категория на коментари"
+
+#: models.py:289
msgid "Format:"
msgstr "Формат"
-#: models.py:545
+#: models.py:528
msgid "name"
msgstr "име"
-#: models.py:546
+#: models.py:529
msgid "description"
msgstr "описание"
-#: models.py:637
+#: models.py:619
msgid "Allow contact"
msgstr "Разрешете връзка"
-#: models.py:637
+#: models.py:619
msgid "Allow email messages from other users"
msgstr "Разрешете имейл съобщения от други потребители"
-#: models.py:638
+#: models.py:620
msgid "Preferred language"
msgstr "Предпочитан език"
-#: models.py:641
+#: models.py:623
msgid "Suspended access"
msgstr "Преустановен достъп"
-#: models.py:665
+#: models.py:647
msgid "suspended"
msgstr "прекъснат"
-#: models.py:667
+#: models.py:649
msgid "waiting approval"
msgstr "в очакване на одобрение"
-#: models.py:673
+#: models.py:655
msgid "pending"
msgstr "предстоящ"
-#: models.py:688
+#: models.py:670
msgid "Invitation"
msgstr "Покана"
-#: models.py:756
-#, fuzzy, python-format
+#: models.py:732
+#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
-msgstr "Текстът %(link_to_text)s е променен"
-
-#: models.py:757
-#, fuzzy, python-format
+msgstr "Текстът %(link_to_text)s редактирана от %(creator)s"
+
+#: models.py:733
+#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
-msgstr "Текстът %(link_to_text)s е променен (създадена е нова версия)"
-
-#: models.py:758
-#, fuzzy, python-format
+msgstr "Текстът %(link_to_text)s е променен (създадена е нова версия) от %(creator)s"
+
+#: models.py:734
+#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
-msgstr "Текстът %(link_to_text)s е добавен"
-
-#: models.py:763
+msgstr "Текстът %(link_to_text)s е добавен от %(creator)s"
+
+#: models.py:735
+#, python-format
msgid "Text %(link_to_text)s imported by %(creator)s"
msgstr "Текст %(link_to_text)s внесени от %(creator)s"
-#: models.py:759
+#: models.py:736
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Текстът %(link_to_text)s е изтрит"
-#: models.py:760
-#, fuzzy, python-format
+#: models.py:737
+#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
-msgstr "Коментарът %(link_to_comment)s е добавен към текста %(link_to_text)s"
-
-#: models.py:761
+msgstr "Коментарът %(link_to_comment)s е добавен към текста %(link_to_text)s от %(creator)s"
+
+#: models.py:738
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr "Коментарът %(link_to_comment)s към текста %(link_to_text)s е изтрит"
-#: models.py:762
+#: models.py:739
#, python-format
msgid "User %(username)s added"
msgstr "Потребителя %(username)s е добавен"
-#: models.py:763
+#: models.py:740
#, python-format
msgid "User %(username)s access to workspace enabled"
-msgstr ""
-" гщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщДостъпът "
-"към работното място е разрешен на потребителя %(username)s"
-
-#: models.py:764
+msgstr " гщДостъпът към работното място е разрешен на потребителя %(username)s"
+
+#: models.py:741
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Достъпът към работното място е отказан на потребителя %(username)s"
-#: models.py:765
+#: models.py:742
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr ""
"Достъпът към работното място е преустановен на потребителя %(username)s"
-#: models.py:766
+#: models.py:743
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Достъпът към работното място е активиран на потребителя %(username)s"
-#: models.py:767
+#: models.py:744
#, python-format
msgid "User %(username)s has activated his account"
msgstr "Потребителя %(username)s активира своя акаунт"
-#: models.py:816
-#, fuzzy
+#: models.py:793
msgid "anonymous"
msgstr "Анонимни потребители"
-#: models.py:823 models.py:831
+#: models.py:800 models.py:808
#, python-format
msgid "by \"%(username)s\""
msgstr "От \"%(username)s\""
-#: models.py:825
+#: models.py:802
#, python-format
msgid "%(time_since)s ago"
msgstr "преди %(time_since)s"
@@ -228,7 +246,7 @@
msgid "Email:"
msgstr "Email:"
-#: notifications.py:60
+#: notifications.py:61 templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr "Уведомление:"
@@ -240,30 +258,34 @@
msgid "Class (education)"
msgstr "Клас"
-#: settings.py:105
+#: settings.py:110
msgid "French"
msgstr "Френски"
-#: settings.py:106
+#: settings.py:111
msgid "English"
msgstr "Английски"
-#: settings.py:107
+#: settings.py:112
msgid "Norwegian"
msgstr "Норвежки"
-#: settings.py:108
+#: settings.py:113
msgid "Brazilian Portuguese"
msgstr "Бразилски Португалски"
-#: settings.py:109
+#: settings.py:114
msgid "Spanish"
msgstr "Испански"
-#: settings.py:110
+#: settings.py:115
msgid "Bulgarian"
msgstr "Български"
+#: settings.py:116
+msgid "Italian"
+msgstr ""
+
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
msgstr "Наблюдател"
@@ -380,12 +402,85 @@
msgid "API Documentation"
msgstr ""
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr ""
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Свържете се с потребителя %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "Текстът \"%(title)s\" е създаден"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr ""
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "обратно към работното място"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
msgid "Activate your account"
msgstr "Активирайте Вашия акаунт"
-#: templates/site/activate.html:23
+#: templates/site/activate.html:32
msgid "Activate"
msgstr "Активиране"
@@ -394,15 +489,16 @@
msgid "Contact"
msgstr "Контакт"
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
msgid "Send"
msgstr "Изпращане"
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
#: templates/site/settings.html:29 templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:49
-#: templates/site/text_create_upload.html:44 templates/site/user_add.html:34
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
#: templates/site/user_mass_add_text.html:38
@@ -419,9 +515,9 @@
#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
-#: templates/site/layout/header.html:10
-#, fuzzy
+#: templates/site/layout/header.html:13
msgid "Create a text"
msgstr "Напишете текст"
@@ -430,9 +526,10 @@
msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
#: templates/site/text_create_upload.html:4
#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
-#: templates/site/layout/header.html:11
+#: templates/site/layout/header.html:14
msgid "Upload a text"
msgstr "Качване на текст"
@@ -442,58 +539,60 @@
"Word document)"
msgstr ""
-#: templates/site/dashboard.html:50
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
#: templates/site/text_create_import.html:4
#: templates/site/text_create_import.html:30
-#: templates/site/text_create_content.html:32
-#: templates/site/text_create_upload.html:30
-#: templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
msgid "Import a co-mented text"
msgstr "Импортиране cо-ментира текст"
#: templates/site/dashboard.html:50
-msgid "Import a text, possibly with comments and attachments, which has been previously exported in XML format from co-ment interface"
-msgstr "Импортиране на текст, с възможност за коментари и прикачени файлове, който е бил преди, изнесени във формат XML от co-ment"
-
-#: templates/site/dashboard.html:50
-msgid "Invite user"
-msgstr "Покани потребител"
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
+msgstr ""
+"Импортиране на текст, с възможност за коментари и прикачени файлове, който е "
+"бил преди, изнесени във формат XML от co-ment"
#: templates/site/dashboard.html:51
-msgid "Edit your profile"
-msgstr "Редактиране на вашия профил"
+msgid "Invite user"
+msgstr "Покани потребител"
#: templates/site/dashboard.html:52
+msgid "Edit your profile"
+msgstr "Редактиране на вашия профил"
+
+#: templates/site/dashboard.html:53
msgid "View text list"
msgstr "Преглед на списъка с текстове"
-#: templates/site/dashboard.html:53
+#: templates/site/dashboard.html:54
msgid "Configure workspace"
msgstr "Конфигуриране на работното място"
-#: templates/site/dashboard.html:64
+#: templates/site/dashboard.html:65
msgid "Moderation queue"
msgstr "В очакване"
-#: templates/site/dashboard.html:76
-#, fuzzy, python-format
+#: templates/site/dashboard.html:77
+#, python-format
msgid "user %(user)s awaits approval"
-msgstr "Потребителят е в очакване на одобрение"
-
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+msgstr "потребител %(user)s чака одобрение"
+
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "approve"
msgstr "Приемам"
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "refuse"
msgstr "Отказвам"
-#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html:81
msgid "membership"
msgstr "членство"
-#: templates/site/dashboard.html:85
+#: templates/site/dashboard.html:86
#: templates/site/macros/user_moderation.html:8
msgid ""
"Are you sure you want to approve this user's membership to the workspace?"
@@ -501,7 +600,7 @@
"Сигурни ли сте, че искате да приемете достъпа на този потребител към "
"работното място?"
-#: templates/site/dashboard.html:94
+#: templates/site/dashboard.html:95
#: templates/site/macros/user_moderation.html:17
msgid ""
"Are you sure you want to refuse this user's membership to the workspace?"
@@ -509,114 +608,115 @@
"Сигурни ли сте, че искате да откажете достъпа на този потребител към "
"работното място?"
-#: templates/site/dashboard.html:106
+#: templates/site/dashboard.html:107
#, python-format
msgid "registered %(duration)s ago"
msgstr "регистриран преди %(duration)s"
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
msgid "comment"
msgstr "коментар"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
#, python-format
msgid "by %(cuser)s on text"
msgstr "от %(cuser)s на текста"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
msgid "awaits approval"
msgstr "в очакване на одобрение"
-#: templates/site/dashboard.html:127
+#: templates/site/dashboard.html:128
msgid "view in context"
msgstr "виж в контекста"
-#: templates/site/dashboard.html:132
+#: templates/site/dashboard.html:133
msgid "Are you sure you want to approve this comment?"
msgstr "Сигурни ли сте, че искате да одобри този коментар?"
-#: templates/site/dashboard.html:149
+#: templates/site/dashboard.html:150
msgid "Are you sure you want to refuse this comment?"
msgstr "Сигурни ли сте, че искате да откажете този коментар?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
#, python-format
msgid "modified %(duration)s ago"
msgstr "променен преди %(duration)s"
-#: templates/site/dashboard.html:186
+#: templates/site/dashboard.html:187
msgid "Recent texts"
msgstr "Нови текстове"
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
msgid "all"
msgstr "всички"
-#: templates/site/dashboard.html:201
+#: templates/site/dashboard.html:202
#, python-format
msgid "%(nb_comments)s comment"
msgid_plural "%(nb_comments)s comments"
msgstr[0] "%(nb_comments)s коментар"
-msgstr[1] "%(nb_comments)s коментара"
-
-#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
-#, fuzzy, python-format
+msgstr[1] "%(nb_comments)s коментари"
+
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
+#, python-format
msgid "1 version"
msgid_plural "%(versions_number)s versions"
msgstr[0] "1 версия"
-msgstr[1] "Версий"
-
-#: templates/site/dashboard.html:208 templates/site/text_list.html:223
+msgstr[1] "%(versions_number)s версий"
+
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
msgid "No texts yet"
msgstr "Все още няма текст "
-#: templates/site/dashboard.html:227
+#: templates/site/dashboard.html:228
msgid "Workspace activity"
msgstr "Дейност на работното място"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "month"
msgstr "месец"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "week"
msgstr "седмица"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "24 hours"
msgstr "24 часа"
-#: templates/site/dashboard.html:234
+#: templates/site/dashboard.html:235
msgid "Access"
msgstr "Достъп"
-#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:208 templates/site/user_list.html:158
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Зареждане..."
-#: templates/site/dashboard.html:245
+#: templates/site/dashboard.html:246
msgid "Commenting"
msgstr "Коментари"
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:265
msgid "Activities"
msgstr "Дейности"
-#: templates/site/dashboard.html:267
+#: templates/site/dashboard.html:268
msgid "texts"
msgstr "Текстовете"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:269
msgid "comments"
msgstr "коментари"
-#: templates/site/dashboard.html:270
+#: templates/site/dashboard.html:271
msgid "users"
msgstr "потребители"
-#: templates/site/dashboard.html:310
+#: templates/site/dashboard.html:311
msgid "No activities"
msgstr "Няма дейности"
@@ -634,7 +734,7 @@
msgstr "създадени преди %(duration)s"
#: templates/site/dashboard_bloc_recent_comments.html:24
-#, fuzzy, python-format
+#, python-format
msgid "by %(username)s"
msgstr "От \"%(username)s\""
@@ -647,7 +747,7 @@
msgid "Followup"
msgstr "В отговор"
-#: templates/site/followup.html:20 templates/site/help.html:66
+#: templates/site/followup.html:20 templates/site/help.html:75
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "захранване"
@@ -657,8 +757,8 @@
msgstr "Публично захранване"
#: 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:11
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
#: templates/site/macros/form_fields.html:20
msgid "Help"
msgstr "Помощ"
@@ -716,91 +816,86 @@
"Абонирайте се към всички уведомления отнасящи се до коментари или отговори "
"към дискусийте в който сте участвали"
-#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/forgot_pw.html:27
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:35
+#: templates/site/forgot_pw.html:44
msgid "This link is invalid."
msgstr ""
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
msgid "Forgot password?"
msgstr ""
-#: templates/site/help.html:16
+#: templates/site/help.html:25
msgid "General Presentation"
msgstr ""
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "co-ment is a web based text annotation system."
msgstr ""
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "COMT is the open source software behind it"
msgstr ""
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "See www.co-ment.com for more details"
msgstr ""
-#: templates/site/help.html:20
+#: templates/site/help.html:29
msgid "Glossary"
msgstr ""
-#: templates/site/help.html:22
-#, fuzzy
+#: templates/site/help.html:31
msgid "Contents"
msgstr "Съдържание"
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
msgid "Collaboration"
msgstr ""
-#: templates/site/help.html:25 templates/site/help.html.py:37
-#, fuzzy
+#: templates/site/help.html:34 templates/site/help.html.py:46
msgid "Comments"
msgstr "коментари"
-#: templates/site/help.html:26 templates/site/help.html.py:60
-#, fuzzy
+#: templates/site/help.html:35 templates/site/help.html.py:69
msgid "Notification and feeds"
msgstr "Уведомяването е дезактивирано."
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
-#, fuzzy
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
msgid "Roles"
msgstr "Роля"
-#: templates/site/help.html:28 templates/site/help.html.py:88
+#: templates/site/help.html:37 templates/site/help.html.py:97
#: templates/site/text_list.html:12
msgid "Texts"
msgstr "Текстове"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
-#: templates/site/help.html:34 templates/site/help.html.py:45
+#: templates/site/help.html:43 templates/site/help.html.py:54
msgid "Click here for more details"
msgstr ""
-#: templates/site/help.html:34
+#: templates/site/help.html:43
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:40
-#, fuzzy
+#: templates/site/help.html:49
msgid "Moderation"
msgstr "Модератор"
-#: templates/site/help.html:41
+#: templates/site/help.html:50
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 "
@@ -813,23 +908,22 @@
"them."
msgstr ""
-#: templates/site/help.html:44
-#, fuzzy
+#: templates/site/help.html:53
msgid "States"
msgstr "Запамети"
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid "co-ment uses states to implement moderation policies."
msgstr ""
-#: templates/site/help.html:45
+#: templates/site/help.html:54
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:48
+#: templates/site/help.html:57
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 "
@@ -837,12 +931,11 @@
"according to the issues or topics they address."
msgstr ""
-#: templates/site/help.html:50
-#, fuzzy
+#: templates/site/help.html:59
msgid "Linking to a comment"
msgstr "Може да редактира коментар"
-#: templates/site/help.html:51
+#: templates/site/help.html:60
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 "
@@ -850,22 +943,22 @@
"title."
msgstr ""
-#: templates/site/help.html:53
+#: templates/site/help.html:62
msgid "Scope"
msgstr ""
-#: templates/site/help.html:54
+#: templates/site/help.html:63
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:56
+#: templates/site/help.html:65
msgid "Keeping your comments across versions"
msgstr ""
-#: templates/site/help.html:57
+#: templates/site/help.html:66
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 "
@@ -877,34 +970,32 @@
"simply removed from the new version."
msgstr ""
-#: templates/site/help.html:63
-#, fuzzy
+#: templates/site/help.html:72
msgid "Email notification"
msgstr "Уведомления чрез е-майл"
-#: templates/site/help.html:64
+#: templates/site/help.html:73
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:67
+#: templates/site/help.html:76
msgid "Web feed definition on Wikipedia"
msgstr ""
-#: templates/site/help.html:67
+#: templates/site/help.html:76
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:69
-#, fuzzy
+#: templates/site/help.html:78
msgid "Public and private feeds"
msgstr "Частно захранване"
-#: templates/site/help.html:70
+#: templates/site/help.html:79
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 "
@@ -912,11 +1003,11 @@
"really want them to know what's happening in it."
msgstr ""
-#: templates/site/help.html:72
+#: templates/site/help.html:81
msgid "Text embedding"
msgstr ""
-#: templates/site/help.html:73
+#: templates/site/help.html:82
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' "
@@ -926,32 +1017,32 @@
"in another tab of your browser."
msgstr ""
-#: templates/site/help.html:80
+#: templates/site/help.html:89
msgid "Roles are predefined sets of permissions."
msgstr ""
-#: templates/site/help.html:81
+#: templates/site/help.html:90
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:82 templates/site/text_share.html:88
+#: templates/site/help.html:91 templates/site/text_share.html:88
msgid "Text role"
msgstr "Роля в текста"
-#: templates/site/help.html:83
+#: templates/site/help.html:92
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:84 views/site.py:185
+#: templates/site/help.html:93 views/site.py:187
msgid "Role model"
msgstr "Модел на роля"
-#: templates/site/help.html:85
+#: templates/site/help.html:94
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 "
@@ -960,11 +1051,11 @@
"privately shared between a teacher and each student."
msgstr ""
-#: templates/site/help.html:91
+#: templates/site/help.html:100
msgid "Create or upload?"
msgstr ""
-#: templates/site/help.html:92
+#: templates/site/help.html:101
msgid ""
"There are 3 main ways to produce a text in co-ment. If you start from "
"scratch, create your text in markdown format. If you start from an existing "
@@ -973,34 +1064,33 @@
"editor."
msgstr ""
-#: templates/site/help.html:96
-#, fuzzy
+#: templates/site/help.html:105
msgid "Text formats"
msgstr "Известия отнасящи се за текста"
-#: templates/site/help.html:97
+#: templates/site/help.html:106
msgid ""
"There are at this date 3 text formats: markdown (default/preferred format), "
"HTML and RST."
msgstr ""
-#: templates/site/help.html:101
+#: templates/site/help.html:110
msgid "Markdown"
msgstr ""
-#: templates/site/help.html:102
+#: templates/site/help.html:111
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:102
+#: templates/site/help.html:111
msgid "Read more about this"
msgstr ""
#: templates/site/login.html:8 templates/site/login_form.html:19
-#: templates/site/layout/header.html:17
+#: templates/site/layout/header.html:21
msgid "Login"
msgstr "Логин"
@@ -1010,16 +1100,16 @@
msgstr "%(wname)s логин"
#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:18
+#: templates/site/layout/header.html:22
msgid "Register"
msgstr "Регистрация"
#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
+#: templates/site/layout/header.html:11
msgid "Home"
msgstr "Начало"
-#: templates/site/non_authenticated_index.html:20
+#: templates/site/non_authenticated_index.html:28
#, python-format
msgid "One public text"
msgid_plural "%(counter)s public texts"
@@ -1030,46 +1120,47 @@
msgid "Deactivate notification"
msgstr "Дезактивирайте уведомленията"
-#: templates/site/notifications_desactivate.html:31
+#: templates/site/notifications_desactivate.html:39
msgid "Deactivate"
msgstr "Дезактивирай"
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Вашият профил (%(username)s)"
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:14
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
msgid "Profile"
msgstr "Профил"
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
msgid "Password"
msgstr ""
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/text_edit.html:37
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
#: 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/user_activate.html:36 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Запамети"
-#: templates/site/register.html:19
+#: templates/site/register.html:27
#, python-format
msgid "%(wname)s Registration"
msgstr "%(wname)s Регистрация"
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
msgid "Reset your password"
msgstr ""
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:185 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Настройки"
@@ -1095,24 +1186,21 @@
msgstr "Изтрийте логото"
#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
msgid "Text list"
msgstr "Списък на текстовете"
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr "Известия отнасящи се за текста"
-
-#: templates/site/text_embed.html:25
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
msgid "Embed text"
msgstr "Капсулиране на текста"
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid "Copy this code into your site to display text with comments."
msgstr ""
"Копирайте този код във вашия сайт, за да афиширате текста и коментарите"
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid ""
"Users will also be able to add comments from your site depending on "
"anonymous users' roles."
@@ -1184,161 +1272,160 @@
msgstr "Сравнете последните две версий"
#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
msgid "Most recent version"
msgstr "Най—нова версия"
#: templates/site/text_history.html:63
#: templates/site/text_history_compare.html:30
#: templates/site/text_history_version.html:31
-#, fuzzy
msgid "Original version"
msgstr "Оригинална версия"
-#: templates/site/text_history.html:67
+#: templates/site/text_history.html:69
msgid "Compare selected versions"
msgstr "Сравнете избраните версий"
-#: templates/site/text_history.html:77
+#: templates/site/text_history.html:79
msgid "Version"
msgstr "Версия"
-#: templates/site/text_history.html:78
+#: templates/site/text_history.html:80
msgid "Selection"
msgstr "Подбор"
-#: templates/site/text_history.html:81 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "Author"
msgstr "Автор"
-#: templates/site/text_history.html:82
+#: templates/site/text_history.html:84
msgid "Created"
msgstr "Създаден"
-#: templates/site/text_history.html:83 templates/site/text_list.html:141
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
msgid "# comments"
msgstr "# коментари"
-#: templates/site/text_history.html:105 templates/site/text_list.html:161
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
msgid "View"
msgstr "Виж"
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr "Сравнете с предишни версий"
-#: templates/site/text_history.html:108
+#: templates/site/text_history.html:110
msgid "Revert to this version"
msgstr "Върнете се към тази версия"
-#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_compare.html:32
msgid "Previous modification"
msgstr "Предишни модификаций"
-#: templates/site/text_history_compare.html:31
#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
#, python-format
msgid "Version %(version_number)s"
msgstr "версия #%(version_number)s"
-#: templates/site/text_history_compare.html:32
+#: templates/site/text_history_compare.html:35
#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
msgstr "Разлики между версия #%(version_1_number)s и #%(version_2_number)s"
-#: templates/site/text_history_compare.html:34
+#: templates/site/text_history_compare.html:37
msgid "Next modification"
msgstr "Следваща модификация"
-#: templates/site/text_history_compare.html:44
+#: templates/site/text_history_compare.html:46
msgid "No differences"
msgstr "Няма разлики"
-#: templates/site/text_history_version.html:31
+#: templates/site/text_history_version.html:34
msgid "Previous version"
msgstr "Предходна версия"
-#: templates/site/text_history_version.html:36
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Следваща версия"
+
+#: templates/site/text_history_version.html:42
msgid "Compare with next version"
msgstr "Сравнете със следващата версия"
-#: templates/site/text_history_version.html:37
-msgid "Next version"
-msgstr "Следваща версия"
-
-#: templates/site/text_history_version.html:45 views/texts.py:496
-#: views/texts.py:497
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
#, python-format
msgid "by %(author)s"
msgstr "от %(author)s"
-#: templates/site/text_list.html:51 templates/site/text_share.html:40
+#: templates/site/text_list.html:53 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr "Филтър с ключовата дума"
-#: templates/site/text_list.html:53 templates/site/text_share.html:42
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Всички"
-#: templates/site/text_list.html:81 templates/site/user_list.html:72
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Множествени действия"
-#: templates/site/text_list.html:82 templates/site/text_list.html.py:163
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
msgid "Delete"
msgstr "Изтриване"
-#: templates/site/text_list.html:85 templates/site/user_list.html:81
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
msgid "Apply"
msgstr "Приложи"
-#: templates/site/text_list.html:106 templates/site/user_list.html:102
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Сигурни ли сте?"
-#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Текст"
-#: templates/site/text_list.html:140
+#: templates/site/text_list.html:142
msgid "Modified"
msgstr "Изменен"
-#: templates/site/text_list.html:142 templates/site/user_list.html:136
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Дейност от изминалата седмица"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "Тагове"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr "Филтър по тагове: %(tag_name)s"
-#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Редактиране"
-#: templates/site/text_list.html:169
+#: templates/site/text_list.html:171
msgid "Are you sure you want to delete this text?"
msgstr "Сигурни ли сте, че искате да изтриете този текст?"
-#: templates/site/text_list.html:182
+#: templates/site/text_list.html:184
msgid "Users"
msgstr "Потребители"
-#: templates/site/text_list.html:200
+#: templates/site/text_list.html:202
msgid "Edit user"
msgstr "Редактиране на потребител"
@@ -1413,35 +1500,36 @@
msgid "Anonymous users"
msgstr "Анонимни потребители"
-#: templates/site/text_view_frame.html:64
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
msgid "add a comment"
msgstr "добави коментар"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:65
msgid "Filter comments"
msgstr "Филтрирай коментарите"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:66
msgid "Preferences"
msgstr "Предпочитания"
-#: templates/site/text_view_frame.html:76
+#: templates/site/text_view_frame.html:67
msgid "Text preferences"
msgstr "Предпочитания за текста"
-#: templates/site/text_view_frame.html:93
+#: templates/site/text_view_frame.html:74
msgid "Loading text…"
msgstr "Зареждане на текст…"
-#: templates/site/text_view_frame.html:104
+#: templates/site/text_view_frame.html:92
msgid "Which comments?"
msgstr "Кой коментар?"
-#: templates/site/text_view_frame.html:112
+#: templates/site/text_view_frame.html:100
msgid "How should comments' scope be shown in text?"
msgstr "Как да бъде показан обхватът на коментарите в текста?"
-#: templates/site/unauthorized.html:5
+#: templates/site/unauthorized.html:14
msgid "Unauthorized"
msgstr "Неразрешен"
@@ -1493,7 +1581,7 @@
msgid "Change role to %(role_name)s"
msgstr "Сменете ролятя на %(role_name)s"
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:284
msgid "Email"
msgstr "Имейл"
@@ -1517,11 +1605,6 @@
msgstr ""
"Потребителят ще получи покана по имейл да се присъедини към работното място."
-#: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:20
-msgid "back to workspace"
-msgstr "обратно към работното място"
-
#: templates/site/layout/base_workspace.html:30
#, python-format
msgid "%(nb_texts)s text"
@@ -1536,7 +1619,11 @@
msgstr[0] "%(nb_users)s потребител"
msgstr[1] "%(nb_users)s потребителя"
-#: templates/site/layout/header.html:15
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "политика за поверителност"
+
+#: templates/site/layout/header.html:19
msgid "Logout"
msgstr "Излез"
@@ -1591,7 +1678,7 @@
msgid "Share"
msgstr "Сподели"
-#: templates/site/macros/text_comments.html:18
+#: templates/site/macros/text_comments.html:16
#, python-format
msgid "by %(name)s on %(date)s"
msgstr "от %(name)s на %(date)s"
@@ -1669,18 +1756,18 @@
msgid "unknown"
msgstr "неизвестен"
-#: views/create.py:26
-msgid "Upload file (optional)"
-msgstr "Качи файл (по избор)"
-
-#: views/create.py:27
+#: views/create.py:30
+msgid "Upload file"
+msgstr "Качи файл"
+
+#: views/create.py:31
msgid ""
"Upload a file from your computer instead of using the direct input above"
msgstr ""
"Качете файл от вашия компютър вместо да използвате полето за директно "
"изписване на файла"
-#: views/create.py:38
+#: views/create.py:42 views/create.py:59
msgid "You should specify a file to upload."
msgstr "Необходимо е да изберете файл за качване."
@@ -1693,27 +1780,33 @@
msgstr "Качи изнесеното преди XML файл от вашия компютър"
#: views/create.py:65
-msgid "The imported file should be an XML file generated by co-ment when exporting a text and comments."
-msgstr "Внесеното файла трябва да бъде един XML файл, генериран от co-ment, при износ на текст и коментари."
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
+msgstr ""
+"Внесеното файла трябва да бъде един XML файл, генериран от co-ment, при "
+"износ на текст и коментари."
#: views/create.py:71
msgid "No co_ment_text node found in XML."
msgstr "Не co_ment_text_node възел в XML."
#: views/create.py:76
+#, python-format
msgid "No %(tag)s node found in XML."
msgstr "Не %(tag)s възел в XML."
-#: views/create.py:46
+#: views/create.py:85
msgid "The title of your text"
msgstr "Заглавие на вашия текст"
-#: views/create.py:71 views/create.py:108
+#: views/create.py:109 views/create.py:144
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "Текстът \"%(text_title)s\" е създаден"
-#: views/create.py:244
+#: views/create.py:247
+#, python-format
msgid "Text \"%(text_title)s\" has been imported"
msgstr "Текстът \"%(text_title)s\" е внесено"
@@ -1781,51 +1874,51 @@
msgid "Private notifications feed reseted."
msgstr "Частното захранване на уведомяването е реинициализирано."
-#: views/site.py:82 views/texts.py:131 views/user.py:545
+#: views/site.py:84 views/texts.py:136 views/user.py:548
msgid "You're logged in!"
msgstr "Вие сте включени!"
-#: views/site.py:100
+#: views/site.py:102
msgid "Your name"
msgstr "Вашето име"
-#: views/site.py:102
+#: views/site.py:104
msgid "Your email address"
msgstr "Вашият имейл"
-#: views/site.py:105
+#: views/site.py:107
msgid "Subject of the message"
msgstr "Тема на съобщението"
-#: views/site.py:106
+#: views/site.py:108
msgid "Body of the message"
msgstr "Главна част на съобщението"
-#: views/site.py:108
+#: views/site.py:110
msgid "Send me a copy of the email"
msgstr "Изпратете ми копие он имейла"
-#: views/site.py:134
+#: views/site.py:136
msgid "Copy of message:"
msgstr "Копие на съобщението:"
-#: views/site.py:136
+#: views/site.py:138
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Имейлът е изпратен. Ще ви отговорим възможно тай бързо."
-#: views/site.py:165
+#: views/site.py:167
msgid "Workspace name"
msgstr "Име на работноно място"
-#: views/site.py:170
+#: views/site.py:172
msgid "Workspace tagline"
msgstr "Лозунг на работното място"
-#: views/site.py:175
+#: views/site.py:177
msgid "Workspace registration"
msgstr "Регистрация към работното място"
-#: views/site.py:176
+#: views/site.py:178
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1833,144 +1926,194 @@
"Могат ли потребителите да се регистрират в работното място? (ако не, само "
"покана от менидър може да създаде нов потребител)"
-#: views/site.py:180
+#: views/site.py:182
msgid "Workspace registration moderation"
msgstr "Модериране на регистрация към работното място"
-#: views/site.py:181
+#: views/site.py:183
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"Трябва ли новите потребители да са модерирани?(Регистрацията ще изисква "
"одобрение на мениджър)"
-#: views/site.py:186
+#: views/site.py:188
msgid "Change the roles available in the workspace"
msgstr "Променете ролите в работното място"
-#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+"Параграфи включително най-малко един коментар на тази категория ще има "
+"вертикална лента с този цвят: "
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
msgid "Settings saved"
msgstr "Настройките са запаметени"
-#: views/site.py:215
+#: views/site.py:247
msgid "Workspace logo"
msgstr "Лого на работното място"
-#: views/site.py:217
-#, fuzzy
-msgid "Custom css rules"
+#: views/site.py:249
+msgid "Custom CSS rules"
msgstr "Избор CSS правила"
-#: views/site.py:218
-#, fuzzy
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
-msgstr "Добави стилови правила във формат на CSS (не включва <code><style></code> HTML тагове). Внимание: този код ще бъде добавен към цялото съдържание, уверете се, че знаеш какво правиш, преди да се прибави нещо тук."
-
-#: views/site.py:223
-#, fuzzy
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+"Добави стилови правила във формат на CSS (не включва <code><style></"
+"code> HTML тагове). Внимание: този код ще бъде добавен към цялото "
+"съдържание, уверете се, че знаеш какво правиш, преди да се прибави нещо тук."
+
+#: views/site.py:255
msgid "Custom font"
msgstr "По поръчка на шрифта"
-#: views/site.py:225
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Индивидуално алтернатива шрифт семейство 'модерни', 'класически' и 'код', че посетителите могат да избират за тялото на сътрудничество на текстове. Въведете кома списък, разделен на шрифта семейства. Имена на семейство шрифтове, включително космически герои трябва да бъде затворен в двойни кавички. Напр. "
-
-#: views/site.py:229
-#, fuzzy
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+"Индивидуално алтернатива шрифт семейство 'модерни', 'класически' и 'код', че "
+"посетителите могат да избират за тялото на сътрудничество на текстове. "
+"Въведете кома списък, разделен на шрифта семейства. Имена на семейство "
+"шрифтове, включително космически герои трябва да бъде затворен в двойни "
+"кавички. Напр. "
+
+#: views/site.py:261
msgid "Custom font for titles"
msgstr "Персонализиран шрифт за титли"
-#: views/site.py:231
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Custom семейството алтернатива шрифт за 'модерни', 'класически' и 'код', че посетителите могат да избират за заглавия (h1 до h6) за съвместно текстове. Въведете кома списък, разделен на шрифта семейства. Имена на семейство шрифтове, включително космически герои трябва да бъде затворен в двойни кавички. Напр. "
-
-#: views/site.py:253
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+"Custom семейството алтернатива шрифт за 'модерни', 'класически' и 'код', че "
+"посетителите могат да избират за заглавия (h1 до h6) за съвместно текстове. "
+"Въведете кома списък, разделен на шрифта семейства. Имена на семейство "
+"шрифтове, включително космически герои трябва да бъде затворен в двойни "
+"кавички. Напр. "
+
+#: views/site.py:319
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:257 views/user.py:428
+#: views/site.py:323 views/user.py:431
msgid "Password changed"
msgstr ""
-#: views/texts.py:164
+#: views/texts.py:169
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr "%(nb_texts)i изтрит(и) текстове"
-#: views/texts.py:209
+#: views/texts.py:214
#, python-format
msgid "Text %(text_title)s deleted"
msgstr "Текстът %(text_title)s е изтит"
-#: views/texts.py:220
+#: views/texts.py:226
#, python-format
msgid "Text version %(text_version_title)s deleted"
msgstr "Версията на текста %(text_version_title)s е изтит"
-#: views/texts.py:634
+#: views/texts.py:624
msgid "Note (optional)"
msgstr "Бележка (по избор)"
-#: views/texts.py:638
+#: views/texts.py:628
msgid "Add a note to explain the modifications made to the text"
msgstr "Добавете бележка за да обясните промените извършени върху текста"
-#: views/texts.py:648
+#: views/texts.py:638
msgid "New version (optional)"
msgstr "Нова версия (по избор)"
-#: views/texts.py:651
+#: views/texts.py:641
msgid "Create a new version of this text (recommended)"
msgstr "Създайте нова версия на текста (препоръчително)"
-#: views/texts.py:654
+#: views/texts.py:644
msgid "Keep comments (optional)"
msgstr "Запазете коментарите (по избор)"
-#: views/texts.py:657
+#: views/texts.py:647
msgid "Keep comments (if not affected by the edit)"
msgstr "Запазете коментарите (ако не са засегнати от редактирането)"
-#: views/texts.py:614
-#, fuzzy
+#: views/texts.py:650
msgid "Detach comments (optional)"
msgstr "Откъснете коментарите (по избор)"
-#: views/texts.py:617
-#, fuzzy
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
-msgstr "Ако някои коментари бяха прикрепени на chunck на текст, който се променя, проверете тази опция, за да се запазят тези коментари няма възможност. Оставете тази опция без отметка, ако искате, че такива коментари се заличават. Тази опция се игнорира, ако предишния 'Запазете коментарите' опция не е маркирана."
-
-#: views/texts.py:723
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+"Ако някои коментари бяха прикрепени на chunck на текст, който се променя, "
+"проверете тази опция, за да се запазят тези коментари няма възможност. "
+"Оставете тази опция без отметка, ако искате, че такива коментари се "
+"заличават. Тази опция се игнорира, ако предишния 'Запазете коментарите' "
+"опция не е маркирана."
+
+#: views/texts.py:719
msgid "Name (optional)"
msgstr "Име (по избор)"
-#: views/texts.py:724
+#: views/texts.py:720
msgid "Email (optional)"
msgstr "Майл (по избор)"
-#: views/texts.py:776
+#: views/texts.py:773
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr "Нова версия (копирана от %(version_title)s версия ) е създадена"
-#: views/texts.py:884 views/user.py:79 views/user.py:99
-#, fuzzy, python-format
+#: views/texts.py:885 views/user.py:79 views/user.py:99
+#, python-format
msgid "%(count)i user(s) role modified"
-msgstr "роля(и) на потребителя са изменени"
-
-#: views/texts.py:942
+msgstr "%(count)i потребител (и) роля модифициран"
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr ""
+"Оставете празно, за да използвате стойността конфигуриран за работната площ."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+"За да деактивирате тази категория за този текст, независимо от "
+"конфигурацията на работната област, въведете: "
+
+#: views/texts.py:949
msgid "Text settings updated"
msgstr "Параметрите са актуализирани"
#: views/user.py:61
-#, fuzzy, python-format
+#, python-format
msgid "%(count)i User's access suspended"
-msgstr "достъп на потребителя дезактивиран(и)"
+msgstr "%(count)i окачен потребител(и) за достъп"
#: views/user.py:68
#, python-format
@@ -2021,100 +2164,99 @@
msgid "Optional text to add to invitation email"
msgstr "Допълнителен текст, който може да бъде добавен в имейл поканата"
-#: views/user.py:259
+#: views/user.py:260
#, python-format
msgid "%(nb_users)d user added"
msgid_plural "%(nb_users)d users added"
msgstr[0] "Потребителят %(nb_users)d е добавен"
msgstr[1] "Потребителите %(nb_users)d са добавени"
-#: views/user.py:277
-#, fuzzy
+#: views/user.py:278
msgid "Add user"
msgid_plural "Add users"
msgstr[0] "Добавяне на нов потребител"
msgstr[1] "Добавяне на нов потребител"
-#: views/user.py:299
+#: views/user.py:300
msgid "This username is already in use. Please supply a different username."
msgstr "Вече съществува потребител с това име. Моля изберете друго име."
-#: views/user.py:320 views/user.py:336
+#: views/user.py:321 views/user.py:338
msgid "Your account has been activated. You're now logged-in."
msgstr "Вашият акаунт е активиран. Вие сте свързани."
-#: views/user.py:331
+#: views/user.py:333
msgid "activate account"
msgstr "акивиране на акаунта"
-#: views/user.py:361
+#: views/user.py:363
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr "Достъпът на потребителя %(prof)s е дезактивиран."
-#: views/user.py:367
+#: views/user.py:369
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr "Достъпът на потребителя %(prof)s е отказан."
-#: views/user.py:379
+#: views/user.py:382
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr "Достъпът на потребителя %(prof)s е възстановен."
-#: views/user.py:383
+#: views/user.py:386
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr "Достъпът на потребителя %(prof)s е активиран."
-#: views/user.py:393
+#: views/user.py:396
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Нова покана е изпратена на потребителя %(prof)s."
-#: views/user.py:410
+#: views/user.py:413
msgid "Profile updated"
msgstr "Профилът е актуализиран"
-#: views/user.py:456
+#: views/user.py:459
msgid "Anonymous user role modified."
msgstr "Ролята на анонимния потребител е променена."
-#: views/user.py:478
+#: views/user.py:481
msgid "User modified"
msgstr "Променен потребител"
-#: views/user.py:493
+#: views/user.py:496
msgid "Subject"
msgstr "Тема"
-#: views/user.py:494
+#: views/user.py:497
msgid "Subject of the email"
msgstr "Тема на имейлa"
-#: views/user.py:497
+#: views/user.py:500
msgid "Body"
msgstr "Основна част"
-#: views/user.py:498
+#: views/user.py:501
msgid "Body of the email"
msgstr "Основна част на майла"
-#: views/user.py:518
+#: views/user.py:521
msgid "Email sent."
msgstr "Имейлът е изпратен"
-#: views/user.py:539
+#: views/user.py:542
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Този акаунт е дезактивиран. Моля контактирайте администратор на работното "
"място."
-#: views/user.py:574
+#: views/user.py:577
msgid "You've been logged out."
msgstr "Вие сте офлайн"
-#: views/user.py:590
+#: views/user.py:593
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2123,13 +2265,16 @@
"изпратено на вашия имейл, след като вашия акаунт е активиран от "
"администратор на работното място"
-#: views/user.py:593
+#: views/user.py:596
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Регистрацията завърши успешно, едно потвърдително съобщение е изпратено на "
"вашия имейл"
+#~ msgid "Text notifications"
+#~ msgstr "Известия отнасящи се за текста"
+
#~ msgid "Are you sure you want to delete this version?"
#~ msgstr "Сигурни ли сте, че искате да изтриете тази версия?"
@@ -2141,11 +2286,11 @@
#~ msgstr[0] "Запамети този потребител"
#~ msgstr[1] "Запамети тези потребители"
-#, fuzzy
+#
#~ msgid "Text edition"
#~ msgstr "Следваща модификация"
-#, fuzzy
+#
#~ msgid "Your password has been reset."
#~ msgstr "Достъпът на потребителя %(prof)s е отказан."
@@ -2169,48 +2314,3 @@
#~ msgid "How do you want to print?"
#~ msgstr "Как искате да бъде напечатано?"
-
-#: models.py:266 views/site.py:191
-#, fuzzy
-msgid "Label for the first category of comments"
-msgstr "Етикет за първата категория на коментари"
-
-#: models.py:267 views/site.py:197
-#, fuzzy
-msgid "Label for the second category of comments"
-msgstr "Етикет за втората категория на коментари"
-
-#: models.py:268 views/site.py:203
-#, fuzzy
-msgid "Label for the third category of comments"
-msgstr "Етикет за трета категория коментари"
-
-#: models.py:269 views/site.py:209
-#, fuzzy
-msgid "Label for the fourth category of comments"
-msgstr "Етикет за четвърта категория на коментари"
-
-#: models.py:270 views/site.py:215
-#, fuzzy
-msgid "Label for the fifth category of comments"
-msgstr "Етикет за пета категория на коментари"
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-#, fuzzy
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr "Параграфи включително най-малко един коментар на тази категория ще има вертикална лента с този цвят: "
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "Leave blank to use the value configured for the workspace."
-msgstr "Оставете празно, за да използвате стойността конфигуриран за работната площ."
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr "За да деактивирате тази категория за този текст, независимо от конфигурацията на работната област, въведете: "
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr "политика за поверителност"
Binary file src/cm/locale/bg/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/bg/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/bg/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 17:01+0200\n"
+"POT-Creation-Date: 2014-03-21 16:16+0100\n"
"PO-Revision-Date: 2010-03-10 21:26+0100\n"
"Last-Translator: RBE <qsdf>\n"
"Language-Team: Français <kde-i18n-doc@kde.org>\n"
@@ -17,75 +17,105 @@
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: media/js/client/c_addcomment_form.js:52
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
msgid "New comment"
msgstr "Нов коментар"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
msgid "New comment will be canceled, continue?"
msgstr "Новия коментар ще бъде отменен искате ли да продължите?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
msgid "Warning"
msgstr "Предупреждение"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
msgid "Started reply will be canceled, continue?"
msgstr "Написаният до сега коментар ще бъде изтрит, искате ли да продължите?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
msgid "Started comment edition will be canceled, continue?"
msgstr "Започнатият коментар ще бъде отменен, искате ли да продължите?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
+msgstr "Таблица на съдържанието"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
msgid "change comment state to pending"
msgstr "Сменете на статуса на коментара на 'в очакване'"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
msgid "change comment state to approved"
msgstr "Променете статуса на коментара на одобрен"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
msgid "change comment state to unapproved"
msgstr "променете състоянието на коментара на неодобрен"
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "отменете промяната на състоянието на този коментар"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
msgid "pending"
msgstr "в очакване"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
msgid "approved"
msgstr "одобрен"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "неодобрен"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "отказ"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
msgid "show replies"
msgstr "покажи отговорите"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "промени на:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "отговор"
+msgstr[1] "отговори"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "редактиране на коментарът"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
msgid "delete comment"
msgstr "изтрийте коментарът"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
msgid "edit"
msgstr "редактиране"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
msgid "delete"
msgstr "изтрий"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
#: media/js/client/c_interface_forms.js:15
msgid "close"
msgstr "затвори"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
msgid "show scope"
msgstr "афиширане на обхвата"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
msgid ""
"Comment is detached: it was created on a previous version and text it "
"applied to has been modified or removed."
@@ -93,33 +123,27 @@
"Коментарът е отделен : той е създаден към предишна версия и текстът, към "
"който е принадлежал е променен или изтрит. "
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
msgid "last modified on %(date)s"
msgstr "последна промяна на %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
msgid "Permalink to this comment"
msgstr "Постоянен линк към този коментар"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:305
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
msgid "by %(name)s, created on %(date)s"
msgstr "от %(name)s, създаден на %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr "отменете промяната на състоянието на този коментар"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
-msgid "unapproved"
-msgstr "неодобрен"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "категория"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr "отказ"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr "редактиране на коментарът"
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] " коментар"
+msgstr[1] " коментари"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
msgid "No selection yet"
@@ -154,72 +178,78 @@
msgstr "Коментарът ще се отнася за тази част от текста:"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
msgid "Save"
msgstr "Запамети"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:101
-#: media/js/site/text_edit.js:104
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
msgid "Cancel"
msgstr "Отказ"
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr "Промяна на коментар"
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
-msgstr "промени на:"
-
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:579
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] "отговор"
-msgstr[1] "отговори"
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Категория:"
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr "Нов отговор"
-
-#: media/js/client/c_scopes.js:318
-msgid " comment"
-msgid_plural " comments"
-msgstr[0] " коментар"
-msgstr[1] " коментари"
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr "грешка:"
-
-#: media/js/client/c_sync.js:57
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
msgid "no filtered comments left"
msgstr "няма останали коментари, след прилагане на филтъра"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid ""
"Do you want to be notified of all replies in all discussions you "
"participated in?"
msgstr ""
"Искате ли да бъдете уведомени за всички дискусии, в които сте участвали?"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid "Reply notification"
msgstr "Съобщение за отговор"
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
msgid "could not save comment"
msgstr "коментарът не можа да бъде запаметен"
-#: media/js/client/c_sync.js:223
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
msgid "Are you sure you want to delete this comment?"
msgstr "Сигурни ли сте, че искате да изтриете този коментар?"
-#: media/js/client/c_sync.js:227
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
msgid "could not remove comment"
msgstr "коментарът не можа да бъде изтрит"
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Промяна на коментар"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "грешка:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Нов отговор"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "персонализирани"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "модерен"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "класически"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "код"
+
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
msgid "print from the browser"
msgstr "напечатване от браузъра"
@@ -233,26 +263,30 @@
msgstr "Изтегляне на мarkdown фаил (.mkd)"
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "print in PDF format"
+msgstr "отпечатате в PDF формат"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
msgid "download portable object format file (.pdf)"
msgstr "Изтегляне на pdf файл (.pdf)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
msgid "download latex file (.tex)"
msgstr "изтегляне на latex фаил (.tex)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
msgid "download open document file (.odt)"
msgstr "Изтегляне на open файл (.odt)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
msgid "download microsoft word file (.doc)"
msgstr "Изтегляне на microsoft word файл (.doc)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
msgid "download microsoft word 2007 file (.docx)"
msgstr "Изтегляне на microsoft word 2007 файл (.docx)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
msgid "download ebook (.epub)"
msgstr "Изтегляне на ebook (.epub)"
@@ -260,43 +294,43 @@
msgid "download XML file for re-importing text and comments"
msgstr "изтеглите XML файл за повторен внос текст и коментари"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "Print text"
msgstr "Отпечатване на текстa"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "How do you want to print?"
msgstr "Как искате да напечатате текста?"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Export text"
msgstr "Експортиране на текст"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Choose file format"
msgstr "Изберете формат на файл"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
msgid "using markers only, no background colors"
msgstr "използване само на маркери, без цвят на фона"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:42
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
msgid "using markers and background colors"
msgstr "използване на маркери и фонови цветове"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
msgid "all (%(nb_comments)s)"
msgstr "всички (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:55
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
msgid "current filtered ones (%(nb_comments)s)"
msgstr "филтрирани в момента (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:57
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
msgid "none (0)"
msgstr "нито един (0)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:90
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
msgid "Go !"
msgstr "Go!"
@@ -304,348 +338,311 @@
msgid "loading..."
msgstr "зареждане..."
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
msgid "click to show options"
msgstr "кликнете за да се афишират всички възможности"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
msgid "click to hide options"
msgstr "кликнете за да скриете опциите"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
msgid "Text"
msgstr "Текст"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
msgid "Search"
msgstr "Търсене"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
-#: media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
msgid "Reset"
msgstr "Реинициализиране"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
msgid "Hide all Comments"
msgstr "Скрий всички коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
msgid "Authors"
msgstr "Автори"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
msgid "States"
msgstr "Състояния"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
msgid "Dates"
msgstr "Дати"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
msgid "Tags"
msgstr "Тагове"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Категории"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
msgid "view previous comment"
msgstr "виж предишните коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
msgid "view next comment"
msgstr "виж следващите коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
msgid "view first comment"
msgstr "виж първия коментар"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
msgid "view last next comment"
msgstr "виж последния коментар"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
msgid "view all comments"
msgstr "Виж всички коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr "Виж всички отстранени коментари"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "Покажи / скрий напредналия интерфейс"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "Покажи / скрий таблица на съдържанието"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
msgid "print document with/without comments"
msgstr "Напечатай документа с/без коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:185
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
msgid "export document with/without comments"
msgstr "Експортирай документа с/без коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:186
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
msgid "toggle full screen view"
msgstr "Преминете на цял екран"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
+msgstr "захранване на текста"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
msgid "add a comment"
msgstr "добавете коментар"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
msgid "filter:"
msgstr "филтър:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:209
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
msgid "browse by:"
msgstr "Подреждане по:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
msgid "location"
msgstr "място"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:212
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
msgid "modification"
msgstr "модификация"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:332
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr "подравнете отговорите на коментарите на ляво, за да се открие текста"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
msgid "thread discussions"
msgstr ""
"подравнете отговорите към коментарите, за да се види нишката на дискусията"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:366
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
msgid "Text style"
msgstr "Стил на текста"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:411
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
msgid "Animation duration"
msgstr "Продължителност на анимацията "
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:420
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
msgid "(0.001 to 1 second)"
msgstr "(0.001 до 1 секунда)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:446
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
msgid "preferences reset (will apply on next load)"
msgstr "Предпочитания на инициализиране (прилагат се при зареждане на текста)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:452
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
msgid "preferences saved (will apply on next load)"
msgstr ""
"Предпочитанията са запазени (ще бъдат приложени при зареждане на текста)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:556
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
msgid "filter reset"
msgstr "инициализиране на филтъра"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:566
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
msgid "filter applied"
msgstr "филтърът е приложен"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:572
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
msgid "discussion"
msgid_plural "discussions"
msgstr[0] "дискусия"
msgstr[1] "дискусии"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:576
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
msgid "comment"
msgid_plural "comments"
msgstr[0] "коментар"
msgstr[1] "коментари"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:601
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
msgid "all"
msgstr "всички"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:619
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
msgid "last 24 hours (%(nb_comments)s)"
msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
msgstr[0] "последните 24 часа (%(nb_comments)s)"
msgstr[1] "последните %(nb_days)s дена (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:733
-#: media/js/site/text_edit.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
msgid "No"
msgstr "Не"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:734
-#: media/js/site/text_edit.js:89
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
msgid "Yes"
msgstr "Да"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
msgid "First Level Heading"
msgstr "Заглавие от първо ниво"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
msgid "Your title here..."
msgstr "Вашето заглавие е тук..."
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
msgid "Second Level Heading"
msgstr "Заглавие от второ ниво"
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
msgid "Heading 3"
msgstr "Заглавие 3"
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
msgid "Heading 4"
msgstr "Заглавие 4"
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
msgid "Heading 5"
msgstr "Заглавие 5"
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
msgid "Heading 6"
msgstr "Заглавие 6"
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
msgid "Bold"
msgstr "Дебел шрифт"
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
msgid "Italic"
msgstr "Наклонен шрифт"
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
msgid "Bulleted List"
msgstr "Списък с водещи символи"
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
msgid "Numeric List"
msgstr "Номериран списък"
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
msgid "Picture"
msgstr "Картина"
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
msgid "Link"
msgstr "Връзка"
-#: media/js/markitup/sets.js:37
+#: media/js/markitup/sets.js:36
msgid "Quotes"
msgstr "Цитати"
-#: media/js/markitup/sets.js:38
+#: media/js/markitup/sets.js:37
msgid "Code Block / Code"
msgstr "Блок код / Код"
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
msgid "Preview"
msgstr "Предварителен преглед"
-#: media/js/markitup/sets.js:71
+#: media/js/markitup/sets.js:72
msgid "Paragraph"
msgstr "Параграф"
-#: media/js/markitup/sets.js:75
+#: media/js/markitup/sets.js:76
msgid "Stroke through"
msgstr "Задраскан"
-#: media/js/markitup/sets.js:79
+#: media/js/markitup/sets.js:80
msgid "List element"
msgstr "Елемент на списък"
-#: media/js/markitup/sets.js:82
+#: media/js/markitup/sets.js:83
msgid "Your text to link..."
msgstr "Вашият текст за връзка ..."
-#: media/js/markitup/sets.js:84
+#: media/js/markitup/sets.js:85
msgid "Clean"
msgstr "Изтрий"
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr "модерен"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr "класически"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr "код"
-
-#: media/js/site/c_text_view_comments.js:21
-#, fuzzy
-msgid "custom"
-msgstr "персонализирани"
-
-#: media/js/site/f_text_view_frame.js:182
-msgid "view all detached comments"
-msgstr "Виж всички отстранени коментари"
-
-#: media/js/site/f_text_view_frame.js:183
-msgid "toggle advance interface"
-msgstr "Покажи / скрий напредналия интерфейс"
-
-#: media/js/site/f_text_view_frame.js:193
-msgid "toggle table of contents"
-msgstr "Покажи / скрий таблица на съдържанието"
-
-#: media/js/site/f_text_view_frame.js:187
-msgid "text feed"
-msgstr "захранване на текста"
-
-#: media/js/site/f_text_view_frame.js:329
-msgid "unthread discussions"
-msgstr "подравнете отговорите на коментарите на ляво, за да се открие текста"
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-"Тези коментари трябва ли да са откъснати (запазени без обхват) или да бъдат "
-"изтрити от новата версия? "
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] "%(nb_comments)s е приложен към текста, който е променен."
-msgstr[1] "%(nb_comments)s са приложени към текста, който е променен."
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr "(Ние ви предлагаме да създадете нова версия)"
-
-#: media/js/site/text_edit.js:67
+#: media/js/site/text_edit.js:10
msgid "You chose not to create a new version all comments will be deleted"
msgstr ""
"Тъй като вие избрахте да не създадете нова версия, всички коментари ще бъдат "
"изтрити"
-#: media/js/site/text_edit.js:69
+#: media/js/site/text_edit.js:12
msgid "Do you want to continue?"
msgstr "Искате ли да продължите?"
-#: media/js/site/text_edit.js:102
-msgid "Detach"
-msgstr "Отделете"
+#~ msgid ""
+#~ "Should these comments be detached (i.e. kept with no scope) or removed "
+#~ "from new version?"
+#~ msgstr ""
+#~ "Тези коментари трябва ли да са откъснати (запазени без обхват) или да "
+#~ "бъдат изтрити от новата версия? "
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr "Махнете"
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] "%(nb_comments)s е приложен към текста, който е променен."
+#~ msgstr[1] "%(nb_comments)s са приложени към текста, който е променен."
-#: media/js/client/c_toc.js:45
-msgid "Table of contents"
-msgstr "Таблица на съдържанието"
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Ние ви предлагаме да създадете нова версия)"
+
+#~ msgid "Detach"
+#~ msgstr "Отделете"
+
+#~ msgid "Remove"
+#~ msgstr "Махнете"
#, fuzzy
#~ msgid " reply"
#~ msgid_plural " replies"
#~ msgstr[0] "отговор"
#~ msgstr[1] "отговор"
-
-#: media/js/client/c_icomment.js:330
-#, fuzzy
-msgid "category"
-msgstr "категория"
-
-#: media/js/client/c_interface_form.js:52
-#, fuzzy
-msgid "Category:"
-msgstr "Категория:"
-
-#: media/js/site/f_text_view_frame.js:123
-#, fuzzy
-msgid "Categories"
-msgstr "Категории"
Binary file src/cm/locale/de/LC_MESSAGES/django.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/de/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,2262 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Martin Burmester <martin.burmester@hamburg.gruene.de>, 2012.
+# Simon Descarpentries <simon.descarpentries@sopinspace.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: test1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-20 12:30+0100\n"
+"PO-Revision-Date: 2012-10-22 05:17+0100\n"
+"Last-Translator: Martin Burmester <martin.burmester@hamburg.gruene.de>\n"
+"Language-Team: LANGUAGE <martin.burmester@hamburg.gruene.de>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Basepath: /Users/martin/Downloads/comt-1.3.0/src/cm/\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: client.py:30
+msgid ""
+"A selection is required. Select in the text the part your comment applies to."
+msgstr ""
+"Eine Auswahl ist erforderlich. Markieren den Teil im Text auf den sich Ihr "
+"Kommentar bezieht."
+
+#: client.py:144
+msgid "name is required"
+msgstr "Name ist erforderlich"
+
+#: client.py:147
+msgid "email is required"
+msgstr "E-Mail ist erforderlich"
+
+#: client.py:149
+msgid "invalid email"
+msgstr "Ungültige E-Mail"
+
+#: client.py:151
+msgid "title is required"
+msgstr "Titel ist erforderlich"
+
+#: client.py:153
+msgid "content is required"
+msgstr "Inhalt ist erforderlich"
+
+#: client.py:168
+msgid "comment removed"
+msgstr "Kommentar entfernt"
+
+#: client.py:221 client.py:286
+msgid "comment saved"
+msgstr "Kommentar gespeichert"
+
+#: client.py:288
+msgid "comment saved, it is being held for moderation"
+msgstr "Kommentar gespeichert, aber zur Moderation zurückgehalten"
+
+#: client.py:326 client.py:335 client.py:337
+msgid "me"
+msgstr "mir"
+
+#: client.py:328 client.py:335 client.py:337
+msgid "author"
+msgstr "Autor"
+
+#: client.py:387
+msgid "Tags input must be no longer than 250 characters."
+msgstr "Tags Eingabe darf nicht länger als 250 Zeichen sein."
+
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
+msgid "Title"
+msgstr "Titel"
+
+#: models.py:189
+msgid "Format"
+msgstr "Format"
+
+#: models.py:190 views/texts.py:721
+msgid "Content"
+msgstr "Inhalt"
+
+#: models.py:191 models.py:625 templates/site/help.html:56
+msgid "Tags"
+msgstr "Schlagworte"
+
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
+msgid "Note"
+msgstr "Notiz"
+
+#: models.py:195
+msgid "Moderation a posteriori?"
+msgstr "a posteriori Moderation?"
+
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Label für die erste Kategorie der Kommentare"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Label für die zweite Kategorie von Kommentaren"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Label für die dritte Kategorie von Kommentaren"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Label für die vierte Kategorie von Kommentaren"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Label für die fünfte Kategorie Kommentare"
+
+#: models.py:289
+msgid "Format:"
+msgstr "Format:"
+
+#: models.py:528
+msgid "name"
+msgstr "Name"
+
+#: models.py:529
+msgid "description"
+msgstr "Beschreibung"
+
+#: models.py:619
+msgid "Allow contact"
+msgstr "Kontaktieren erlauben"
+
+#: models.py:619
+msgid "Allow email messages from other users"
+msgstr "E-Mails von anderen BenutzerInnen erlauben"
+
+#: models.py:620
+msgid "Preferred language"
+msgstr "Bevorzugte Sprache"
+
+#: models.py:623
+msgid "Suspended access"
+msgstr "Zugriff gesperrt"
+
+#: models.py:647
+msgid "suspended"
+msgstr "gesperrt"
+
+#: models.py:649
+msgid "waiting approval"
+msgstr "warte auf Bestätigung"
+
+#: models.py:655
+msgid "pending"
+msgstr "schwebend"
+
+#: models.py:670
+msgid "Invitation"
+msgstr "Einladung"
+
+#: models.py:732
+#, python-format
+msgid "Text %(link_to_text)s edited by %(creator)s"
+msgstr "Text %(link_to_text)s bearbeitet von %(creator)s"
+
+#: models.py:733
+#, python-format
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
+msgstr "Text %(link_to_text)s bearbeitet (new version created) von %(creator)s"
+
+#: models.py:734
+#, python-format
+msgid "Text %(link_to_text)s added by %(creator)s"
+msgstr "Text %(link_to_text)s hinzugefügt von %(creator)s"
+
+#: models.py:735
+#, python-format
+msgid "Text %(link_to_text)s imported by %(creator)s"
+msgstr "Text %(link_to_text)s bearbeitet von %(creator)s"
+
+#: models.py:736
+#, python-format
+msgid "Text %(link_to_text)s removed"
+msgstr "Text %(link_to_text)s entfernt"
+
+#: models.py:737
+#, python-format
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
+msgstr ""
+"Kommentar %(link_to_comment)s hinzugefügt zu Text %(link_to_text)s von "
+"%(creator)s"
+
+#: models.py:738
+#, python-format
+msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
+msgstr "Kommentar %(link_to_comment)s entfernt von Text %(link_to_text)s"
+
+#: models.py:739
+#, python-format
+msgid "User %(username)s added"
+msgstr "BenutzerIn %(username)s hinzugefügt"
+
+#: models.py:740
+#, python-format
+msgid "User %(username)s access to workspace enabled"
+msgstr "Zugriff für BenutzerIn %(username)s zu Arbeitsbereich freigegeben"
+
+#: models.py:741
+#, python-format
+msgid "User %(username)s access to workspace refused"
+msgstr "Zugriff für BenutzerIn %(username)s zu Arbeitsbereich verweigert"
+
+#: models.py:742
+#, python-format
+msgid "User %(username)s access to workspace suspended"
+msgstr "Zugriff für BenutzerIn %(username)s zu Arbeitsbereich gesperrt"
+
+#: models.py:743
+#, python-format
+msgid "User %(username)s access to workspace activated"
+msgstr "Zugriff für BenutzerIn %(username)s zu Arbeitsbereich aktiviert "
+
+#: models.py:744
+#, python-format
+msgid "User %(username)s has activated his account"
+msgstr "BenutzerIn %(username)s hat ihr/sein Konto aktiviert"
+
+#: models.py:793
+msgid "anonymous"
+msgstr "anonym"
+
+#: models.py:800 models.py:808
+#, python-format
+msgid "by \"%(username)s\""
+msgstr "von \"%(username)s\""
+
+#: models.py:802
+#, python-format
+msgid "%(time_since)s ago"
+msgstr "vor %(time_since)s"
+
+#: models_base.py:53
+msgid "Name:"
+msgstr "Name:"
+
+#: models_base.py:54
+msgid "Email:"
+msgstr "E-Mail:"
+
+#: notifications.py:61 templates/email/activity_notification.txt:1
+msgid "Notification:"
+msgstr "Benachrichtigung:"
+
+#: role_models.py:7
+msgid "Generic"
+msgstr "generisch"
+
+#: role_models.py:7
+msgid "Class (education)"
+msgstr "Klasse"
+
+#: settings.py:110
+msgid "French"
+msgstr "Französisch"
+
+#: settings.py:111
+msgid "English"
+msgstr "Englisch"
+
+#: settings.py:112
+msgid "Norwegian"
+msgstr "Norwegisch"
+
+#: settings.py:113
+msgid "Brazilian Portuguese"
+msgstr "Brasillianisches Portugiesisch"
+
+#: settings.py:114
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: settings.py:115
+msgid "Bulgarian"
+msgstr "Bulgarisch"
+
+#: settings.py:116
+msgid "Italian"
+msgstr "Italienisch"
+
+#: settings.py:117
+msgid "German"
+msgstr "Deutsch"
+
+#: static_i18n.py:6 static_i18n.py:11
+msgid "Observer"
+msgstr "BeobachterIn"
+
+#: static_i18n.py:7
+msgid "Manager"
+msgstr "ManagerIn"
+
+#: static_i18n.py:8
+msgid "Editor"
+msgstr "VerfasserIn"
+
+#: static_i18n.py:9
+msgid "Moderator"
+msgstr "ModeratorIn"
+
+#: static_i18n.py:10
+msgid "Commentator"
+msgstr "KommentatorIn"
+
+#: static_i18n.py:12
+msgid "Participant"
+msgstr "TeilnehmerIn"
+
+#: static_i18n.py:15
+msgid "Can view text"
+msgstr "Kann Text betrachten"
+
+#: static_i18n.py:16
+msgid "Can edit text"
+msgstr "Kann Text bearbeiten"
+
+#: static_i18n.py:17
+msgid "Can create text"
+msgstr "Kann Text erzeugen"
+
+#: static_i18n.py:18
+msgid "Can delete text"
+msgstr "Kann Text löschen"
+
+#: static_i18n.py:19
+msgid "Can manage text"
+msgstr "Kann Text verwalten"
+
+#: static_i18n.py:20
+msgid "Can create comment"
+msgstr "Kann Kommentare erzeugen"
+
+#: static_i18n.py:21
+msgid "Can delete comment"
+msgstr "Kann Kommentare löschen"
+
+#: static_i18n.py:22
+msgid "Can delete own comment"
+msgstr "Kann eigene Kommentare löschen"
+
+#: static_i18n.py:23
+msgid "Can view approved comment"
+msgstr "Kann freigegebene Kommentare betrachten"
+
+#: static_i18n.py:24
+msgid "Can view own comment"
+msgstr "Kann eigene Kommentare betrachten"
+
+#: static_i18n.py:25
+msgid "Can view unapproved comment"
+msgstr "Kann noch nicht freigegebene Kommentare betrachten"
+
+#: static_i18n.py:26
+msgid "Can edit comment"
+msgstr "Kann Kommentare betrachten"
+
+#: static_i18n.py:27
+msgid "Can edit own comment"
+msgstr "Kann eigene Kommentare bearbeiten"
+
+#: static_i18n.py:28
+msgid "Can manage workspace"
+msgstr "Kann Arbeitsbereich verwalten"
+
+#: static_i18n.py:29
+msgid "Can view workspace"
+msgstr "Kann Arbeitsbereich betrachten"
+
+#: static_i18n.py:32
+msgid "Teacher"
+msgstr "LehrerIn"
+
+#: static_i18n.py:33
+msgid "Student"
+msgstr "SchülerIn"
+
+#: static_i18n.py:34
+msgid "Individual student"
+msgstr "einzelneR SchülerIn"
+
+#: templates/404.html:4
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
+
+#: templates/404.html:6
+msgid "The requested page could not be found."
+msgstr "Die angeforderte Seite konnte nicht gefunden werden."
+
+#: templates/500.html:4
+msgid "Server Error"
+msgstr "Serverfehler"
+
+#: templates/500.html:6
+msgid "An error has occurred."
+msgstr "Ein Fehler ist aufgetreten."
+
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr "API Dokumentation"
+
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr "Sie wurden eingeladen, um den Arbeitsbereich %(workspace_name)s beitreten."
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr "Klicken Sie auf den folgenden Link, um Ihre Anmeldung abzuschließen und Zugriff auf den Arbeitsbereich:"
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr "Wenn Sie möchten, um von dieser Benachrichtigung abzubestellen, klicken Sie auf den folgenden Link: %(SITE_URL)s%(desactivate_notification_url)s"
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Sie erhalten diese E-Mail, weil Sie eine Kennwortrücksetz angefordert"
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "für Ihr Benutzerkonto bei %(site_name)s"
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr "Bitte gehen Sie auf der folgenden Seite und wählen Sie ein neues Passwort:"
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr "Ihr Benutzername, falls Sie es vergessen haben:"
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Kontaktieren Sie aus Benutzer : %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "Text \"%(title)s\" wurde erzeugt"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr "So veröffentlichen Sie es auf den folgenden Link klicken:"
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "zurück zur Arbeisfläche"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
+msgid "Activate your account"
+msgstr "Aktiviere dein Konto"
+
+#: templates/site/activate.html:32
+msgid "Activate"
+msgstr "Aktivieren"
+
+#: templates/site/contact.html:6 templates/site/layout/footer.html:7
+#: templates/site/macros/user_actions.html:20
+msgid "Contact"
+msgstr "Kontakt"
+
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
+msgid "Send"
+msgstr "Senden"
+
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
+#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
+#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/user_mass_add_text.html:38
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+msgid "Dashboard"
+msgstr "Instrumententafel"
+
+#: templates/site/dashboard.html:43
+msgid "Actions"
+msgstr "Aktionen"
+
+#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
+#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/layout/header.html:13
+msgid "Create a text"
+msgstr "Erzeuge einen Text"
+
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr ""
+"Einen Text im Browser schreiben oder einen Text aus der Zwischenablage "
+"einfügen"
+
+#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
+#: templates/site/text_create_upload.html:4
+#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/layout/header.html:14
+msgid "Upload a text"
+msgstr "Text hochladen"
+
+#: templates/site/dashboard.html:49
+msgid ""
+"Upload a document from your computer (Text document, Open Format document, "
+"Word document)"
+msgstr ""
+"Ein Dokument vom Computer hochladen (Textdokument, Open Format Dokument, "
+"Word Dokument)"
+
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
+#: templates/site/text_create_import.html:4
+#: templates/site/text_create_import.html:30
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
+msgid "Import a co-mented text"
+msgstr "Importieren einer Co-mentiert Text"
+
+#: templates/site/dashboard.html:50
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
+msgstr "Importieren Sie einen Text, möglicherweise mit Kommentaren und Anhängen, die zuvor in XML-Format von co-ment-Schnittstelle exportiert wurde"
+
+#: templates/site/dashboard.html:51
+msgid "Invite user"
+msgstr "BenutzerIn einladen"
+
+#: templates/site/dashboard.html:52
+msgid "Edit your profile"
+msgstr "Dein Profil bearbeiten"
+
+#: templates/site/dashboard.html:53
+msgid "View text list"
+msgstr "Textliste betrachten"
+
+#: templates/site/dashboard.html:54
+msgid "Configure workspace"
+msgstr "Arbeitsfläche konfigurieren"
+
+#: templates/site/dashboard.html:65
+msgid "Moderation queue"
+msgstr "Moderationswarteschlange"
+
+#: templates/site/dashboard.html:77
+#, python-format
+msgid "user %(user)s awaits approval"
+msgstr "BenutzerIn %(user)s wartet auf Freigabe"
+
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
+msgid "approve"
+msgstr "freigeben"
+
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
+msgid "refuse"
+msgstr "ablehnen"
+
+#: templates/site/dashboard.html:81
+msgid "membership"
+msgstr "Mittgliedschaft"
+
+#: templates/site/dashboard.html:86
+#: templates/site/macros/user_moderation.html:8
+msgid ""
+"Are you sure you want to approve this user's membership to the workspace?"
+msgstr ""
+"Die Mitgliedschaft der/des BenutzerIn zu der Arbeitsfläche wirklich "
+"bestätigen?"
+
+#: templates/site/dashboard.html:95
+#: templates/site/macros/user_moderation.html:17
+msgid ""
+"Are you sure you want to refuse this user's membership to the workspace?"
+msgstr ""
+"Die Mitgliedschaft der/des BenutzerIn zu der Arbeitsfläche wirklich "
+"verweigern?"
+
+#: templates/site/dashboard.html:107
+#, python-format
+msgid "registered %(duration)s ago"
+msgstr "vor %(duration)s registriert"
+
+#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
+msgid "comment"
+msgstr "Kommentar"
+
+#: templates/site/dashboard.html:122
+#, python-format
+msgid "by %(cuser)s on text"
+msgstr "von %(cuser)s zu Text"
+
+#: templates/site/dashboard.html:122
+msgid "awaits approval"
+msgstr "wartet auf Freigabe"
+
+#: templates/site/dashboard.html:128
+msgid "view in context"
+msgstr "im Kontext betrachten"
+
+#: templates/site/dashboard.html:133
+msgid "Are you sure you want to approve this comment?"
+msgstr "Diesen Kommentar wirklich freigeben?"
+
+#: templates/site/dashboard.html:150
+msgid "Are you sure you want to refuse this comment?"
+msgstr "Diesen Kommentar wirklich ablehnen?"
+
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
+#, python-format
+msgid "modified %(duration)s ago"
+msgstr "vor %(duration)s geändert"
+
+#: templates/site/dashboard.html:187
+msgid "Recent texts"
+msgstr "Neue Texte"
+
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
+msgid "all"
+msgstr "alle"
+
+#: templates/site/dashboard.html:202
+#, python-format
+msgid "%(nb_comments)s comment"
+msgid_plural "%(nb_comments)s comments"
+msgstr[0] "%(nb_comments)s Kommentar"
+msgstr[1] "%(nb_comments)s Kommentare"
+
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "eine Version"
+msgstr[1] "%(versions_number)s Versionen"
+
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
+msgid "No texts yet"
+msgstr "Noch keine Texte"
+
+#: templates/site/dashboard.html:228
+msgid "Workspace activity"
+msgstr "Arbeitsfläche aktiviert"
+
+#: templates/site/dashboard.html:229
+msgid "month"
+msgstr "Monat"
+
+#: templates/site/dashboard.html:229
+msgid "week"
+msgstr "Woche"
+
+#: templates/site/dashboard.html:229
+msgid "24 hours"
+msgstr "24 Stunden"
+
+#: templates/site/dashboard.html:235
+msgid "Access"
+msgstr "Zugriff"
+
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
+#: templates/site/user_list.html.py:188
+msgid "Loading..."
+msgstr "Laden..."
+
+#: templates/site/dashboard.html:246
+msgid "Commenting"
+msgstr "Kommentieren"
+
+#: templates/site/dashboard.html:265
+msgid "Activities"
+msgstr "Aktivitäten"
+
+#: templates/site/dashboard.html:268
+msgid "texts"
+msgstr "Texte"
+
+#: templates/site/dashboard.html:269
+msgid "comments"
+msgstr "Kommentare"
+
+#: templates/site/dashboard.html:271
+msgid "users"
+msgstr "BenutzerInnen"
+
+#: templates/site/dashboard.html:311
+msgid "No activities"
+msgstr "Keine Aktivitäten"
+
+#: templates/site/dashboard_bloc_recent_comments.html:9
+msgid "Recent comments"
+msgstr "Letzte Kommentare"
+
+#: templates/site/dashboard_bloc_recent_comments.html:20
+msgid "on text"
+msgstr "zu Text"
+
+#: templates/site/dashboard_bloc_recent_comments.html:23
+#, python-format
+msgid "created %(duration)s ago"
+msgstr "erzeugt vor %(duration)s"
+
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, python-format
+msgid "by %(username)s"
+msgstr "von %(username)s"
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
+msgid "No comments yet"
+msgstr "Noch keine Kommentare"
+
+#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/macros/text_tabs.html:22
+msgid "Followup"
+msgstr "Fortsetzen"
+
+#: templates/site/followup.html:20 templates/site/help.html:75
+#: templates/site/text_followup.html:22
+msgid "Feeds"
+msgstr "Feeds"
+
+#: templates/site/followup.html:22 templates/site/text_followup.html:24
+msgid "Public feed"
+msgstr "Öffentlicher feed"
+
+#: templates/site/followup.html:22 templates/site/followup.html.py:35
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
+#: templates/site/macros/form_fields.html:20
+msgid "Help"
+msgstr "Hilfe"
+
+#: templates/site/followup.html:25
+msgid "Public feed for workspace"
+msgstr "Öffentlicher feed für Arbeitsfläche"
+
+#: templates/site/followup.html:29
+msgid "This is the public feed for the workspace."
+msgstr "Dies ist der öffentliche feed für die Arbeitsfläche."
+
+#: templates/site/followup.html:35 templates/site/text_followup.html:37
+msgid "Private feed"
+msgstr "Privater feed"
+
+#: templates/site/followup.html:39
+msgid "Private feed for workspace"
+msgstr "Privater feed für Arbeitsfläche"
+
+#: 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 ""
+"Dies ist der private feed für die Arbeitsfläche. Teile die Adresse nicht mit "
+"anderen, wenn Du nicht willst, dass diese alle Aktivitäten zu diesem Text "
+"sehen."
+
+#: templates/site/followup.html:45 templates/site/text_followup.html:47
+msgid "Reset private feed url"
+msgstr "URL des privaten feed zurücksetzen."
+
+#: templates/site/followup.html:49 templates/site/text_followup.html:51
+msgid "Activate private feed"
+msgstr "Privaten feed aktivieren"
+
+#: templates/site/followup.html:51
+msgid "The private feed for this workspace is not yet activated."
+msgstr ""
+"Der private feed für diese Arbeitsfläche ist noch nicht aktiviert worden."
+
+#: templates/site/followup.html:55 templates/site/text_followup.html:58
+msgid "Email notifications"
+msgstr "E-Mail Benachrichtigungen"
+
+#: templates/site/followup.html:58
+msgid "Subscribe to workspace notifications"
+msgstr "Arbeitsflächenbenachrichtigungen abonnieren."
+
+#: templates/site/followup.html:62
+msgid ""
+"Subscribe to all replies notifications in discussions where you have "
+"participated"
+msgstr ""
+"Alle Benachrichtigungen für Antworten in Diskussionen an denen Du "
+"teilgenommen hast, abonnieren"
+
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
+msgid "Reset my password"
+msgstr "Mein Passwort zurücksetzten"
+
+#: templates/site/forgot_pw.html:44
+msgid "This link is invalid."
+msgstr "Dieser Verweis ist ungültig."
+
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
+msgid "Forgot password?"
+msgstr "Passwort vergessen?"
+
+#: templates/site/help.html:25
+msgid "General Presentation"
+msgstr "Allgemeine Darstellung"
+
+#: templates/site/help.html:27
+msgid "co-ment is a web based text annotation system."
+msgstr "co-ment ist ein webbasiertes Textannotationssystem."
+
+#: templates/site/help.html:27
+msgid "COMT is the open source software behind it"
+msgstr "COMT ist die Open-Source-Software dahinter"
+
+#: templates/site/help.html:27
+msgid "See www.co-ment.com for more details"
+msgstr "Siehe www.co-ment.com für weitere details"
+
+#: templates/site/help.html:29
+msgid "Glossary"
+msgstr "Gloassar"
+
+#: templates/site/help.html:31
+msgid "Contents"
+msgstr "Inhalt"
+
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
+msgid "Collaboration"
+msgstr "Zusammenarbeit"
+
+#: templates/site/help.html:34 templates/site/help.html.py:46
+msgid "Comments"
+msgstr "Kommentare"
+
+#: templates/site/help.html:35 templates/site/help.html.py:69
+msgid "Notification and feeds"
+msgstr "Benachrichtigungen und feeds"
+
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
+msgid "Roles"
+msgstr "Rollen"
+
+#: templates/site/help.html:37 templates/site/help.html.py:97
+#: templates/site/text_list.html:12
+msgid "Texts"
+msgstr "Texte"
+
+#: templates/site/help.html:43
+msgid "co-ment 2 collaboration is based on assigning roles for users."
+msgstr "c-ment 2 Zusammenarbeit ist auf die Zuweisung von Rollen für Benutzer."
+
+#: templates/site/help.html:43 templates/site/help.html.py:54
+msgid "Click here for more details"
+msgstr "Für mehr Details hier klicken"
+
+#: templates/site/help.html:43
+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:49
+msgid "Moderation"
+msgstr "Moderation"
+
+#: templates/site/help.html:50
+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:53
+msgid "States"
+msgstr "Zustände"
+
+#: templates/site/help.html:54
+msgid "co-ment uses states to implement moderation policies."
+msgstr ""
+
+#: templates/site/help.html:54
+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:57
+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:59
+msgid "Linking to a comment"
+msgstr "Auf einen Kommentar verweisen"
+
+#: templates/site/help.html:60
+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:62
+msgid "Scope"
+msgstr "Bereich"
+
+#: templates/site/help.html:63
+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:65
+msgid "Keeping your comments across versions"
+msgstr "Kommentare über verschiedene Versionen erhalten"
+
+#: templates/site/help.html:66
+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:72
+msgid "Email notification"
+msgstr "E-Mail benachrichtigung"
+
+#: templates/site/help.html:73
+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:76
+msgid "Web feed definition on Wikipedia"
+msgstr "Web feed Definition auf Wikipedia"
+
+#: templates/site/help.html:76
+msgid ""
+"You can subscribe to the feed for a specific text or to a global feed for "
+"the full workspace."
+msgstr ""
+"Du kannst den feed für einen einzelnen Text oder einen globalen feed für die "
+"ganze Arbeitsfläche abonnieren."
+
+#: templates/site/help.html:78
+msgid "Public and private feeds"
+msgstr "Öffentliche und private feeds"
+
+#: templates/site/help.html:79
+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:81
+msgid "Text embedding"
+msgstr "Text Einbettung"
+
+#: templates/site/help.html:82
+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 you are not logged into your workspace "
+"in another tab of your browser."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Roles are predefined sets of permissions."
+msgstr "Rollen sind vordefinierte Mengen von Rechten."
+
+#: templates/site/help.html:90
+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:91 templates/site/text_share.html:88
+msgid "Text role"
+msgstr "Textrolle"
+
+#: templates/site/help.html:92
+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:93 views/site.py:187
+msgid "Role model"
+msgstr "Rollenmodell"
+
+#: templates/site/help.html:94
+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:100
+msgid "Create or upload?"
+msgstr "Erzeugen oder hochladen?"
+
+#: templates/site/help.html:101
+msgid ""
+"There are 3 main ways to produce a text in co-ment. If you start from "
+"scratch, create your text in markdown format. If you start from an existing "
+"file upload it to a markdown format. If you start from a Web page, create a "
+"text with HTML as format, and copy and paste the full Web page into the "
+"editor."
+msgstr ""
+
+#: templates/site/help.html:105
+msgid "Text formats"
+msgstr "Textformate"
+
+#: templates/site/help.html:106
+msgid ""
+"There are at this date 3 text formats: markdown (default/preferred format), "
+"HTML and RST."
+msgstr ""
+
+#: templates/site/help.html:110
+msgid "Markdown"
+msgstr "Markdown"
+
+#: templates/site/help.html:111
+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:111
+msgid "Read more about this"
+msgstr "Mehr darüber lesen."
+
+#: templates/site/login.html:8 templates/site/login_form.html:19
+#: templates/site/layout/header.html:21
+msgid "Login"
+msgstr "Anmeldung"
+
+#: templates/site/login_form.html:7
+#, python-format
+msgid "%(wname)s Login"
+msgstr "%(wname)s Anmeldung"
+
+#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/layout/header.html:22
+msgid "Register"
+msgstr "Registrieren"
+
+#: templates/site/non_authenticated_index.html:10
+#: templates/site/layout/header.html:11
+msgid "Home"
+msgstr "Startseite"
+
+#: templates/site/non_authenticated_index.html:28
+#, python-format
+msgid "One public text"
+msgid_plural "%(counter)s public texts"
+msgstr[0] "Ein öffentlicher Text"
+msgstr[1] "%(counter)s öffentliche Texte"
+
+#: templates/site/notifications_desactivate.html:8
+msgid "Deactivate notification"
+msgstr "Benachrichtigung deaktivieren"
+
+#: templates/site/notifications_desactivate.html:39
+msgid "Deactivate"
+msgstr "Deaktivieren"
+
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
+#, python-format
+msgid "Your profile (%(username)s)"
+msgstr "Dein Profil (%(username)s)"
+
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
+#: templates/site/text_settings.html:23 templates/site/text_share.html:153
+#: templates/site/user_activate.html:36 templates/site/user_list.html:210
+#: templates/site/layout/base_workspace_form.html:32
+msgid "Save"
+msgstr "Speichern"
+
+#: templates/site/register.html:27
+#, python-format
+msgid "%(wname)s Registration"
+msgstr "%(wname)s Registrierung"
+
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
+msgid "Reset your password"
+msgstr "Dein Passwort zurücksetzten"
+
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:185 templates/site/macros/main_tabs.html:14
+#: templates/site/macros/text_tabs.html:19
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
+msgid "General"
+msgstr "Allgemein"
+
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
+msgid "Appearance"
+msgstr "Darstellung"
+
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
+msgid ""
+"Are you sure you want to change the role model? All roles (except managers) "
+"will be resetted!"
+msgstr "Sind Sie sicher, dass Sie die Rolle Modell ändern? Alle Rollen (außer Manager) wird zurückgesetzt werden!"
+
+#: templates/site/settings_design.html:31
+msgid "Delete logo"
+msgstr "Logo löschen"
+
+#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
+#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+msgid "Text list"
+msgstr "Textliste"
+
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
+msgid "Embed text"
+msgstr "Text einbetten"
+
+#: templates/site/text_embed.html:30
+msgid "Copy this code into your site to display text with comments."
+msgstr ""
+"Diesen Text auf Deine Seite kopieren um den Text mit Kommentaren anzuzeigen."
+
+#: templates/site/text_embed.html:30
+msgid ""
+"Users will also be able to add comments from your site depending on "
+"anonymous users' roles."
+msgstr "Benutzer können auch die Kommentare von Ihrer Website je nach Rollen anonyme Benutzer 'hinzufügen zu können."
+
+#: templates/site/text_embed.html:36
+msgid "Warning:"
+msgstr "Warnung:"
+
+#: 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 "Sie werden nicht erfolgreich den Text einzubetten, bevor Sie geben anonyme Benutzer eine Rolle es ihnen ermöglicht, den Text anzuzeigen."
+
+#: templates/site/text_followup.html:7
+msgid "Text followup"
+msgstr "Text-Followup"
+
+#: templates/site/text_followup.html:27
+#, python-format
+msgid "Public feed for text %(title)s"
+msgstr "Öffentlicher feed zu Text %(title)s"
+
+#: templates/site/text_followup.html:31
+msgid "This is the public feed for the text."
+msgstr "Dies ist der öffentliche feed für den Text."
+
+#: templates/site/text_followup.html:41
+msgid "Private feed for text "
+msgstr "Privater feed für den Text."
+
+#: 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 ""
+"Dies ist ein privater feed für den Text. Teile die Adresse nicht mit "
+"anderen, wenn Du nicht willst, dass diese alle Aktivitäten zu diesem Text "
+"sehen."
+
+#: templates/site/text_followup.html:53
+msgid "The private feed for this text is not yet activated."
+msgstr "Der private feed für diesen Text ist noch nicht aktiviert."
+
+#: templates/site/text_followup.html:61
+msgid ""
+"You will receive text notifications because you subscribed to notifications "
+"at the workspace level"
+msgstr "Sie werden Text-Benachrichtigungen erhalten, weil Sie Meldungen in der Arbeitsbereichsebene abonniert"
+
+#: templates/site/text_followup.html:64
+msgid "Subscribe to all text notifications"
+msgstr "Alle Textbenachrichtigungen abbonieren."
+
+#: templates/site/text_history.html:56
+#: templates/site/text_history_compare.html:28
+#: templates/site/text_history_version.html:28
+msgid "Version list"
+msgstr "Versionsliste"
+
+#: templates/site/text_history.html:59
+msgid "Compare last two versions"
+msgstr "Die letzten zwei Versionen vergleichen"
+
+#: templates/site/text_history.html:61
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
+msgid "Most recent version"
+msgstr "Aktuellste Version"
+
+#: templates/site/text_history.html:63
+#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_version.html:31
+msgid "Original version"
+msgstr "Urfassung"
+
+#: templates/site/text_history.html:69
+msgid "Compare selected versions"
+msgstr "Ausgewählte Versionen vergleichen"
+
+#: templates/site/text_history.html:79
+msgid "Version"
+msgstr "Version"
+
+#: templates/site/text_history.html:80
+msgid "Selection"
+msgstr "Auswahl"
+
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
+msgid "Author"
+msgstr "AutorIn"
+
+#: templates/site/text_history.html:84
+msgid "Created"
+msgstr "Erzeugt"
+
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
+msgid "# comments"
+msgstr "# Kommentare"
+
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
+msgid "View"
+msgstr "Anzeigen"
+
+#: templates/site/text_history.html:108
+#: templates/site/text_history_version.html:32
+msgid "Compare with previous version"
+msgstr "Mit vorheriger Version vergleichen"
+
+#: templates/site/text_history.html:110
+msgid "Revert to this version"
+msgstr "Zu dieser Version zurücksetzen"
+
+#: templates/site/text_history_compare.html:32
+msgid "Previous modification"
+msgstr "Vorherige Änderung"
+
+#: templates/site/text_history_compare.html:33
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
+#, python-format
+msgid "Version %(version_number)s"
+msgstr "Version %(version_number)s"
+
+#: templates/site/text_history_compare.html:35
+#, python-format
+msgid ""
+"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgstr ""
+"Vergleich zwischen Version #%(version_1_number)s und #%(version_2_number)s"
+
+#: templates/site/text_history_compare.html:37
+msgid "Next modification"
+msgstr "Nächste Änderung"
+
+#: templates/site/text_history_compare.html:46
+msgid "No differences"
+msgstr "Keine Unterschiede"
+
+#: templates/site/text_history_version.html:34
+msgid "Previous version"
+msgstr "Vorherige Version"
+
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Nächste Version"
+
+#: templates/site/text_history_version.html:42
+msgid "Compare with next version"
+msgstr "Mit nächster Version vergleichen"
+
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
+#, python-format
+msgid "by %(author)s"
+msgstr "von %(author)s"
+
+#: templates/site/text_list.html:53 templates/site/text_share.html:40
+#: templates/site/user_list.html:45
+msgid "Filter by tag:"
+msgstr "Nach Schlagwort filtern:"
+
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
+#: templates/site/user_list.html:47
+msgid "All"
+msgstr "Alle"
+
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
+msgid "Bulk Actions"
+msgstr "Aktionen für große Mengen"
+
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
+msgid "Delete"
+msgstr "Löschen"
+
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
+msgid "Apply"
+msgstr "Anwenden"
+
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
+msgid "Are you sure?"
+msgstr "Bist Du sicher?"
+
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
+msgid "Text"
+msgstr "Text"
+
+#: templates/site/text_list.html:142
+msgid "Modified"
+msgstr "Geändert"
+
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
+msgid "Last week activity"
+msgstr "Aktivität der letzten Woche"
+
+#: templates/site/text_list.html:160
+#: templates/site/macros/user_actions.html:13
+msgid "tags:"
+msgstr "Schlagworte:"
+
+#: templates/site/text_list.html:160
+#: templates/site/macros/user_actions.html:13
+#, python-format
+msgid "Filter by tag: %(tag_name)s"
+msgstr "Nach Schlagwort filtern: %(tag_name)s"
+
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
+#: templates/site/macros/user_actions.html:19
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: templates/site/text_list.html:171
+msgid "Are you sure you want to delete this text?"
+msgstr "Diesen Text wirklich löschen?"
+
+#: templates/site/text_list.html:184
+msgid "Users"
+msgstr "BenutzerInnen"
+
+#: templates/site/text_list.html:202
+msgid "Edit user"
+msgstr "BenutzerIn bearbeiten"
+
+#: templates/site/text_share.html:27 templates/site/user_add.html:20
+#: templates/site/user_add_text.html:23 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 "BenutzerInnenliste"
+
+#: 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:22
+#: 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 "BenutzerIn hinzufügen"
+
+#: templates/site/text_share.html:31 templates/site/user_add.html:24
+#: templates/site/user_add_text.html:27 templates/site/user_contact.html:24
+#: 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 "Große Menge von BenutzerInnen hinzufügen"
+
+#: templates/site/text_share.html:35 templates/site/user_contact.html:20
+#: 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 "Personenliste"
+
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
+msgid "Hide suspended users"
+msgstr "Gesperrte BenutzerInnen verbergen"
+
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
+msgid "Display suspended users"
+msgstr "Gesperrte BenutzerInnen anzeigen"
+
+#: templates/site/text_share.html:86 templates/site/user_list.html:132
+msgid "User"
+msgstr "BenutzerIn"
+
+#: 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 "Die 'Workspace-Rolle' ist der globale Rolle, die jedem Text gilt, können Sie einem Benutzer eine bestimmte Rolle in diesem Text über die Spalte 'Text Rolle' auf der rechten Seite geben"
+
+#: templates/site/text_share.html:87
+msgid "Workspace role"
+msgstr "Arbeisflächenrolle"
+
+#: templates/site/text_share.html:101
+#, python-format
+msgid "This role has been overriden on this text by a text role: %(rolename)s"
+msgstr "Diese Rolle hat auf diesen Text durch einen Text überschrieben worden Rolle: %(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
+msgid "Edit anonymous users"
+msgstr "Anonyme BenutzerInnen bearbeiten"
+
+#: templates/site/text_share.html:128 templates/site/user_list.html:177
+msgid "Anonymous users"
+msgstr "Anonyme BenutzerIn"
+
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
+msgid "add a comment"
+msgstr "einen Kommentar hinzufügen"
+
+#: templates/site/text_view_frame.html:65
+msgid "Filter comments"
+msgstr "Kommentare filtern"
+
+#: templates/site/text_view_frame.html:66
+msgid "Preferences"
+msgstr "Eigenschaften"
+
+#: templates/site/text_view_frame.html:67
+msgid "Text preferences"
+msgstr "Texteigenschaften"
+
+#: templates/site/text_view_frame.html:74
+msgid "Loading text…"
+msgstr "Lade Text..."
+
+#: templates/site/text_view_frame.html:92
+msgid "Which comments?"
+msgstr "Welcher Kommentar?"
+
+#: templates/site/text_view_frame.html:100
+msgid "How should comments' scope be shown in text?"
+msgstr "Wie soll der Bereich eines Kommentars im dargestellt werden?"
+
+#: templates/site/unauthorized.html:14
+msgid "Unauthorized"
+msgstr "Unautorisiert"
+
+#: templates/site/user_add.html:26
+msgid ""
+"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 ""
+"Die/Der BenutzerIn wird per E-Mail eine Einladung der Arbeitsfläche "
+"beizutreten erhalten.\n"
+" Die E-Mail kann über das 'Notiz' Feld unten angepasst werden."
+
+#: templates/site/user_add_text.html:29
+msgid "The user will receive an email invitation to join the workspace."
+msgstr ""
+"Die/Der BenutzerIn wird per E-Mail eine Einladung der Arbeitsfläche "
+"beizutreten erhalten."
+
+#: 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 "Die E-Mail kann über das 'Notiz' Feld unten angepasst werden."
+
+#: templates/site/user_contact.html:6
+msgid "Contact user"
+msgstr "BenutzerIn kontaktieren"
+
+#: templates/site/user_contact.html:26
+#, python-format
+msgid "Contact user %(username)s"
+msgstr "BenutzerIn %(username)s kontaktieren"
+
+#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#, python-format
+msgid "Edit user %(username)s"
+msgstr "BenutzerIn %(username)s bearbeiten"
+
+#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+msgid "Suspend access"
+msgstr "Zugriff sperren"
+
+#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+msgid "Enable access"
+msgstr "Zugriff ermöglichen"
+
+#: templates/site/user_list.html:76
+#, python-format
+msgid "Change role to %(role_name)s"
+msgstr "Ändere Rolle in %(role_name)s"
+
+#: templates/site/user_list.html:133 views/user.py:284
+msgid "Email"
+msgstr "E-Mail"
+
+#: templates/site/user_list.html:134
+msgid "Date joined"
+msgstr "Datum des Beitritts"
+
+#: templates/site/user_list.html:135
+msgid "Role"
+msgstr "Rolle"
+
+#: templates/site/user_list.html:177
+msgid ""
+"Those are non-registered users. Assign them a role to open your texts to "
+"simple visitors."
+msgstr "Das sind nicht-registrierte Benutzer. Ordnen Sie ihnen eine Rolle, um Ihre Texte, einfache Besucher zu öffnen."
+
+#: 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 ""
+"Die/Der BenutzerIn wird per E-Mail eine Einladung der Arbeitsfläche "
+"beizutreten erhalten."
+
+#: templates/site/layout/base_workspace.html:30
+#, python-format
+msgid "%(nb_texts)s text"
+msgid_plural "%(nb_texts)s texts"
+msgstr[0] "%(nb_texts)s Text"
+msgstr[1] "%(nb_texts)s Texte"
+
+#: templates/site/layout/base_workspace.html:30
+#, python-format
+msgid "%(nb_users)s user"
+msgid_plural "%(nb_users)s users"
+msgstr[0] "%(nb_users)s BenuterIn"
+msgstr[1] "%(nb_users)s BenuterInnen"
+
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "Datenschutz"
+
+#: templates/site/layout/header.html:19
+msgid "Logout"
+msgstr "Abmelden"
+
+#: templates/site/macros/form_fields.html:11
+msgid ""
+"Markdown (or rst) is a structured format which permit simple formatting with "
+"simple textual syntax. We recommend you use the 'markown' format unless you "
+"want to paste HTML (in which case you should use the 'html' format)."
+msgstr ""
+"Markdown (oder rat) ist ein strukturiertes Format, das einfache "
+"Formatierungen mit einer einfach Syntax ermöglicht. Wir empfehlen die "
+"Verwendung des 'markdown' Formates, außer es soll HTML eingefügt werden (in "
+"diesem Fall sollte das Format 'html' gewählt werden)."
+
+#: templates/site/macros/form_fields.html:14
+msgid ""
+"Markdown (or rst) is a structured format which permit simple formatting with "
+"simple textual syntax. We recommend you use the 'markdown' format if your "
+"text is mostly text and/or if you will create many revisions of your text. "
+"You can use the 'html' format if your text will not be edited or if you want "
+"to preserve complex formatting (tables, images, etc.)."
+msgstr ""
+"Markdown (oder rat) ist ein strukturiertes Format, das einfache "
+"Formatierungen mit einer einfach Syntax ermöglicht. Wir empfehlen die "
+"Verwendung des 'markdown' Formates wenn es sich bei dem Text hauptsächlich "
+"um Text handelt und/oder wenn viele Versionen des Textes erzeugt werden "
+"sollen. Das 'html' Format kann ausgewählt werden, wenn der Text nicht "
+"bearbeitet werden wird oder wenn komplexe Formatierungen (Tabellen, Bilder, "
+"usw.) erhalten werden sollen."
+
+#: templates/site/macros/main_tabs.html:11
+#, python-format
+msgid "Texts (%(nb_texts)s)"
+msgstr "Texte (%(nb_texts)s)"
+
+#: templates/site/macros/main_tabs.html:13
+#, python-format
+msgid "People (%(nb_users)s)"
+msgstr "Personen (%(nb_users)s)"
+
+#: templates/site/macros/paginator.html:5
+msgid "Previous page"
+msgstr "Vorherige Seite"
+
+#: templates/site/macros/paginator.html:6
+#, python-format
+msgid "%(sindex)s-%(eindex)s of %(pcount)s"
+msgstr "%(sindex)s-%(eindex)s von %(pcount)s"
+
+#: templates/site/macros/paginator.html:7
+msgid "Next page"
+msgstr "Nächste Seite"
+
+#: templates/site/macros/paginator.html:9
+msgid "View all"
+msgstr "Alle anzeigen"
+
+#: templates/site/macros/paginator.html:11
+msgid "paginate"
+msgstr "paginieren"
+
+#: templates/site/macros/text_actions.html:12
+msgid "Share"
+msgstr "Teilen"
+
+#: templates/site/macros/text_comments.html:16
+#, python-format
+msgid "by %(name)s on %(date)s"
+msgstr "von %(name)s am %(date)s"
+
+#: templates/site/macros/text_editor.html:66
+msgid ""
+"You have attempted to leave this page. Unsaved changes will be lost. Are you "
+"sure you want to exit this page?"
+msgstr ""
+"Du versuchst die Seite zu verlassen. Nicht gespeicherte Änderungen gehen "
+"dabei verloren. Willst du die Seite wirklich verlassen?"
+
+#: templates/site/macros/text_meta.html:6
+#, python-format
+msgid "last modified %(duration)s ago"
+msgstr "zuletzt geändert vor %(duration)s"
+
+#: templates/site/macros/text_tabs.html:15
+msgid "People"
+msgstr "Personen"
+
+#: templates/site/macros/text_tabs.html:17
+msgid "Versions"
+msgstr "Versionen"
+
+#: templates/site/macros/text_tabs.html:24
+msgid "Embed"
+msgstr "Einbetten"
+
+#: templates/site/macros/user_actions.html:6
+#: templates/site/macros/user_actions.html:17
+msgid "Your profile"
+msgstr "Dein Profil"
+
+#: templates/site/macros/user_actions.html:8
+#, python-format
+msgid "Edit user %(userprint)s"
+msgstr "BenutzerIn %(userprint)s bearbeiten"
+
+#: templates/site/macros/user_actions.html:29
+msgid "(Re-)send invitation"
+msgstr "Einladungen (erneut) senden"
+
+#: templates/site/macros/user_actions.html:38
+msgid "Are you sure you want to suspend this user's access to the workspace?"
+msgstr ""
+"Den Zugriff dieser/dieses BenutzerIn auf die Arbeitsfläche wirklich sperren?"
+
+#: templates/site/macros/user_actions.html:47
+msgid "Are you sure you want to enable this user's access to the workspace?"
+msgstr ""
+"Den Zugriff dieser/dieses BenutzerIn auf die Arbeitsfläche wirklich "
+"freigeben?"
+
+#: templates/site/macros/user_actions.html:56
+msgid "Are you sure you want to send this user an invitation to the workspace?"
+msgstr ""
+"Dieser/Dieses BenutzerIn wirklich eine Einladung für die Arbeitsfläche "
+"senden?"
+
+#: templates/site/macros/user_moderation.html:3
+msgid "Approve"
+msgstr "Bestätigen"
+
+#: templatetags/com.py:146
+msgid "F j, Y \\a\\t g:i a"
+msgstr "F j, Y \\a\\t g:i a"
+
+#: utils/date.py:6
+msgid "%Y-%m-%d %H:%M"
+msgstr "%d.%m.%Y %H:%M"
+
+#: utils/diff.py:53
+msgid "unknown"
+msgstr "unbekannt"
+
+#: views/create.py:30
+msgid "Upload file"
+msgstr "Datei hochladen"
+
+#: views/create.py:31
+msgid ""
+"Upload a file from your computer instead of using the direct input above"
+msgstr ""
+"Eine Datei vom Computer hochladen anstatt die direkte Eingabe zu verwenden"
+
+#: views/create.py:42 views/create.py:59
+msgid "You should specify a file to upload."
+msgstr "Eine Datei zum hochladen angeben."
+
+#: views/create.py:49
+msgid "Upload XML file"
+msgstr "XML-Datei hochladen"
+
+#: views/create.py:50
+msgid "Upload a previously exported XML file from your computer"
+msgstr "Von Ihrem Computer hochladen zuvor exportierte XML-Datei"
+
+#: views/create.py:65
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
+msgstr "Die importierte Datei sollte eine durch Co-ment erzeugt, wenn ein Text und Kommentare XML-Datei sein."
+
+#: views/create.py:71
+msgid "No co_ment_text node found in XML."
+msgstr "Kein co_ment_text Knoten in XML gefunden."
+
+#: views/create.py:76
+#, python-format
+msgid "No %(tag)s node found in XML."
+msgstr "Kein Knoten im XML-%(tag)s gefunden."
+
+#: views/create.py:85
+msgid "The title of your text"
+msgstr "Der Titel deines Textes"
+
+#: views/create.py:109 views/create.py:144
+#, python-format
+msgid "Text \"%(text_title)s\" has been created"
+msgstr "Text \"%(text_title)s\" wurde erzeugt"
+
+#: views/create.py:247
+#, python-format
+msgid "Text \"%(text_title)s\" has been imported"
+msgstr "Text \"%(text_title)s\" importiert wurde"
+
+#: views/feeds.py:25
+#, python-format
+msgid "%(workspace_name)s's public feed"
+msgstr "%(workspace_name)s öffentlicher feed"
+
+#: views/feeds.py:26
+#, python-format
+msgid "Workspace %(workspace_name)s public activity feed"
+msgstr "Öffentlicher Aktivitätsfeed der Arbeitsfäche %(workspace_name)s"
+
+#: views/feeds.py:36
+#, python-format
+msgid "%(workspace_name)s's private feed"
+msgstr "%(workspace_name)s privater feed"
+
+#: views/feeds.py:37
+#, python-format
+msgid "Workspace %(workspace_name)s private feed"
+msgstr "Privater feed der Arbeitsfäche %(workspace_name)s"
+
+#: views/feeds.py:72
+#, python-format
+msgid "Text %(text_title)s's public feed"
+msgstr "Öffentlicher feed des Textes %(text_title)s"
+
+#: views/feeds.py:73
+#, python-format
+msgid "Public activity feed for text %(text_title)s"
+msgstr "Öffentlicher Aktivitätsfeed des Textes %(text_title)s"
+
+#: views/feeds.py:84
+#, python-format
+msgid "Text %(text_title)s's private feed"
+msgstr "Privater feed des Textes %(text_title)s"
+
+#: views/feeds.py:85
+#, python-format
+msgid "Private activity feed for text %(text_title)s"
+msgstr "Privater Aktivitätsfeed des Textes %(text_title)s"
+
+#: views/followup.py:31 views/followup.py:80
+msgid "Private feed activated."
+msgstr "Privater feed aktiviert."
+
+#: views/followup.py:34
+msgid "Private feed reseted."
+msgstr "Privater feed zurückgesetzt."
+
+#: views/followup.py:52
+msgid "This notification has already been deactivated."
+msgstr "Diese Benachrichtigung wurde bereits deaktiviert."
+
+#: views/followup.py:58
+msgid "Notification deactivated."
+msgstr "Benachrichtigungen deaktiviert?"
+
+#: views/followup.py:62
+msgid "Deactivate notification?"
+msgstr "Benachrichtigungen deaktivieren?"
+
+#: views/followup.py:84
+msgid "Private notifications feed reseted."
+msgstr "Privater Benachrichtigungsfeed zurückgesetzt."
+
+#: views/site.py:84 views/texts.py:136 views/user.py:548
+msgid "You're logged in!"
+msgstr "Du bist angemeldet!"
+
+#: views/site.py:102
+msgid "Your name"
+msgstr "Dein Name"
+
+#: views/site.py:104
+msgid "Your email address"
+msgstr "Deine E-Mail Adresse"
+
+#: views/site.py:107
+msgid "Subject of the message"
+msgstr "Betreff der Nachricht"
+
+#: views/site.py:108
+msgid "Body of the message"
+msgstr "Imhalt der Nachricht"
+
+#: views/site.py:110
+msgid "Send me a copy of the email"
+msgstr "Sende mir eine Kopie der E-Mail"
+
+#: views/site.py:136
+msgid "Copy of message:"
+msgstr "Kopie der Nachricht:"
+
+#: views/site.py:138
+msgid "Email sent. We will get back to you as quickly as possible."
+msgstr "E-Mail gesendet. Wir werden so schnell wie möglich antworten."
+
+#: views/site.py:167
+msgid "Workspace name"
+msgstr "Arbeitsflächenname"
+
+#: views/site.py:172
+msgid "Workspace tagline"
+msgstr "Arbeitsflächenunterteil"
+
+#: views/site.py:177
+msgid "Workspace registration"
+msgstr "Arbeitsflächenregistrierung"
+
+#: views/site.py:178
+msgid ""
+"Can users register themselves into the workspace? (if not, only invitations "
+"by managers can create new users)"
+msgstr "Können Benutzer registrieren sich in den Arbeitsbereich? (wenn nicht, kann nur Einladungen von Managern neue Benutzer erstellen)"
+
+#: views/site.py:182
+msgid "Workspace registration moderation"
+msgstr "Arbeitsflächen-Registrierung-Moderation"
+
+#: views/site.py:183
+msgid ""
+"Should new users be moderated (registration will require manager's approval)?"
+msgstr "Sollten neue Benutzer moderiert werden (Anmeldung erhalten Genehmigung Managers erfordern)?"
+
+#: views/site.py:188
+msgid "Change the roles available in the workspace"
+msgstr "Die möglichen Rollen in der Arbeitsfläche."
+
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr "Absätze mit mindestens einem Kommentar von dieser Kategorie wird eine vertikale Leiste mit dieser Farbe haben:"
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
+msgid "Settings saved"
+msgstr "Einstellungen gespeichert"
+
+#: views/site.py:247
+msgid "Workspace logo"
+msgstr "Arbeitsfläche Logo"
+
+#: views/site.py:249
+msgid "Custom CSS rules"
+msgstr "Benutzerdefinierte CSS-Regeln"
+
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+
+#: views/site.py:255
+msgid "Custom font"
+msgstr "Individuelle Schrift"
+
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+
+#: views/site.py:261
+msgid "Custom font for titles"
+msgstr "Benutzerdefinierte Schriftart für Titel"
+
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+
+#: views/site.py:319
+msgid ""
+"A link to reset your password has been sent to the profile email. Please "
+"check your email."
+msgstr ""
+"Ein Link um dein Passwort zurückzusetzen wurde an die in deinem Profil "
+"angegebene E-Mail Adresse gesendet. Bitte überprüfe deine Mailbox."
+
+#: views/site.py:323 views/user.py:431
+msgid "Password changed"
+msgstr "Passwort geändert"
+
+#: views/texts.py:169
+#, python-format
+msgid "%(nb_texts)i text(s) deleted"
+msgstr "%(nb_texts)i text(s) gelöscht"
+
+#: views/texts.py:214
+#, python-format
+msgid "Text %(text_title)s deleted"
+msgstr "Text %(text_title)s gelöscht"
+
+#: views/texts.py:226
+#, python-format
+msgid "Text version %(text_version_title)s deleted"
+msgstr "Text Version %(text_version_title)s gelöscht"
+
+#: views/texts.py:624
+msgid "Note (optional)"
+msgstr "Notiz (optional)"
+
+#: views/texts.py:628
+msgid "Add a note to explain the modifications made to the text"
+msgstr "Füge eine Notiz hinzu um die Änderung am Text zu erläutern"
+
+#: views/texts.py:638
+msgid "New version (optional)"
+msgstr "Neue Version (optional)"
+
+#: views/texts.py:641
+msgid "Create a new version of this text (recommended)"
+msgstr "Eine neue Version dieses Textes erzeugen (empfohlen)"
+
+#: views/texts.py:644
+msgid "Keep comments (optional)"
+msgstr "Kommentare erhalten (optional)"
+
+#: views/texts.py:647
+msgid "Keep comments (if not affected by the edit)"
+msgstr "Kommentare erhalten (wenn nicht von Änderung betroffen)"
+
+#: views/texts.py:650
+msgid "Detach comments (optional)"
+msgstr "Kommentare erhalten (optional)"
+
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+
+#: views/texts.py:719
+msgid "Name (optional)"
+msgstr "Name (optional)"
+
+#: views/texts.py:720
+msgid "Email (optional)"
+msgstr "E-Mail (optional)"
+
+#: views/texts.py:773
+#, python-format
+msgid "A new version (copied from version %(version_title)s) has been created"
+msgstr "Eine neue Version (Kopie von Version %(version_title)s) wurde erzeugt"
+
+#: views/texts.py:885 views/user.py:79 views/user.py:99
+#, python-format
+msgid "%(count)i user(s) role modified"
+msgstr "Rollen von %(count)i BenutzerInnen geändert"
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr "Dies ist der öffentliche feed für die Arbeitsfläche."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr "Um diese Kategorie für diesen Text, was auch immer die Konfiguration für den Arbeitsbereich, geben Sie deaktivieren: "
+
+#: views/texts.py:949
+msgid "Text settings updated"
+msgstr "Text Einstellungen aktualisiert"
+
+#: views/user.py:61
+#, python-format
+msgid "%(count)i User's access suspended"
+msgstr "Zugriff von %(count)i BenutzerInnen gesperrt"
+
+#: views/user.py:68
+#, python-format
+msgid "%(count)i User's access enabled"
+msgstr "Zugriff von %(count)i BenutzerInnen ermöglicht"
+
+#: views/user.py:140
+msgid "E-mail address"
+msgstr "E-Mail Adresse"
+
+#: views/user.py:160
+msgid "This user is already a member."
+msgstr "Diese® BenutzerIn ist schon Mitglied"
+
+#: views/user.py:163
+msgid "Emails"
+msgstr "E-Mails"
+
+#: views/user.py:164
+msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
+msgstr ""
+"Füge mehere E-Mail Adressen je eine pro Zeile (oder getrennt durch \",\" von "
+"\";\") hinzu"
+
+#: views/user.py:181
+msgid "Workspace level role"
+msgstr "Workspace-Ebene Rolle"
+
+#: 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 "Diese Rolle wird für jeden Text in den Arbeitsbereich gelten. Um nur ein (wenigen) Texte mit diesem Benutzer freigeben, können Sie dieses Feld leer lassen und delegieren Aufgaben an Texten, sobald der Benutzer wird erstellt."
+
+#: views/user.py:198
+msgid "Text level role"
+msgstr "Text-Ebene Rolle"
+
+#: views/user.py:199
+msgid "This role will apply only to this text."
+msgstr "Diese Rolle wird nur auf diesen Text angewandt."
+
+#: views/user.py:224
+msgid "Optional text to add to invitation email"
+msgstr "Optionaler Text der zur Einladungs-E-Mail hinzugefügt wird."
+
+#: views/user.py:260
+#, python-format
+msgid "%(nb_users)d user added"
+msgid_plural "%(nb_users)d users added"
+msgstr[0] "%(nb_users)d BenutzerIn hinzugefügt"
+msgstr[1] "%(nb_users)d BenutzerInnnen hinzugefügt"
+
+#: views/user.py:278
+msgid "Add user"
+msgid_plural "Add users"
+msgstr[0] "BenutzerIn hinzufügen"
+msgstr[1] "BenutzerInnen hinzufügen"
+
+#: views/user.py:300
+msgid "This username is already in use. Please supply a different username."
+msgstr ""
+"Dieser Benutzername ist schon vergeben. Bitte einen anderen Benutzernamen "
+"angeben."
+
+#: views/user.py:321 views/user.py:338
+msgid "Your account has been activated. You're now logged-in."
+msgstr "Dein Konto wurde aktiviert. Du bist jetzt angemeldet."
+
+#: views/user.py:333
+msgid "activate account"
+msgstr "Konto aktivieren"
+
+#: views/user.py:363
+#, python-format
+msgid "User's access %(prof)s has been suspended."
+msgstr "Der Zugriff der/des BenutzerIn %(prof)s wurde gesperrt."
+
+#: views/user.py:369
+#, python-format
+msgid "User's access %(prof)s has been refused."
+msgstr "Der Zugriff der/des BenutzerIn %(prof)s wurde verweigert."
+
+#: views/user.py:382
+#, python-format
+msgid "User's access %(prof)s has been restored."
+msgstr "Der Zugriff der/des BenutzerIn %(prof)s wurde wiederhergestellt."
+
+#: views/user.py:386
+#, python-format
+msgid "User's access %(prof)s has been approved."
+msgstr "Der Zugriff der/des BenutzerIn %(prof)s wurde bestätigt."
+
+#: views/user.py:396
+#, python-format
+msgid "A new invitation has been sent to user %(prof)s."
+msgstr "Eine neue Einladung wurde an die BenutzerIn %(prof)s gesendet."
+
+#: views/user.py:413
+msgid "Profile updated"
+msgstr "Profil aktualisiert"
+
+#: views/user.py:459
+msgid "Anonymous user role modified."
+msgstr "Anonyme Benutzerrolle geändert."
+
+#: views/user.py:481
+msgid "User modified"
+msgstr "BenutzerIn modifiziert"
+
+#: views/user.py:496
+msgid "Subject"
+msgstr "Betreff"
+
+#: views/user.py:497
+msgid "Subject of the email"
+msgstr "Betreff der E-Mail"
+
+#: views/user.py:500
+msgid "Body"
+msgstr "Inhalt"
+
+#: views/user.py:501
+msgid "Body of the email"
+msgstr "Inhalt der E-Mail"
+
+#: views/user.py:521
+msgid "Email sent."
+msgstr "E-Mail gesendet."
+
+#: views/user.py:542
+msgid "This account is suspended, contact the workspace administrator."
+msgstr ""
+"Dieses Konto ist gesperrt, kontaktiere den Arbeitsflächenadministrator."
+
+#: views/user.py:577
+msgid "You've been logged out."
+msgstr "Du wurdest abgemeldet"
+
+#: views/user.py:593
+msgid ""
+"You've been registered, you will receive a confirmation mail once a "
+"moderator has approved your membership."
+msgstr ""
+"Du wurdest registriert, Du erhältst eine Bestätigung per E-Mail sobald ein "
+"Moderator deine Mitgliedschaft bestätigt hat."
+
+#: views/user.py:596
+msgid ""
+"You've been registered, please check your email for the confirm message."
+msgstr ""
+"Du wurdest registriert, bitte überprüfe dein Postfach für eine Bestätigung "
+"per E-Mail."
+
+#~ msgid "Text notifications"
+#~ msgstr "Textbenachrichtigungen"
+
+#~ msgid "Workspace html code"
+#~ msgstr "Arbeitsfläche HTML Code"
Binary file src/cm/locale/de/LC_MESSAGES/djangojs.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/de/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,643 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: test1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-21 16:25+0100\n"
+"PO-Revision-Date: 2012-10-22 03:49+0100\n"
+"Last-Translator: Martin Burmester <martin.burmester@hamburg.gruene.de>\n"
+"Language-Team: LANGUAGE <martin.burmester@hamburg.gruene.de>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Basepath: /Users/martin/Downloads/comt-1.3.0/src/cm/\n"
+
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
+msgid "New comment"
+msgstr "Neuer Kommentar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+msgid "New comment will be canceled, continue?"
+msgstr "Neuer Kommentar wird abgebrochen, fortsetzen?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
+msgid "Warning"
+msgstr "Warnung"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
+msgid "Started reply will be canceled, continue?"
+msgstr "Angefangene Antwort wird abgebrochen, fortsetzen?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
+msgid "Started comment edition will be canceled, continue?"
+msgstr "Begonnene Änderung an Kommentar wird abgebrochen, fortsetzen?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
+msgstr "Inhaltsverzeichnis"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+msgid "change comment state to pending"
+msgstr "ändere Kommentar-Zustand in schwebend"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+msgid "change comment state to approved"
+msgstr "ändere Kommentar-Zustand in bestätigt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
+msgid "change comment state to unapproved"
+msgstr "ändere Kommentar-Zustand in unbestätigt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "Änderung des Zustand dieses Kommentars abbrechen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+msgid "pending"
+msgstr "schwebend"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
+msgid "approved"
+msgstr "bestätigt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "unbestätigt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "abbrechen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
+msgid "show replies"
+msgstr "zeige Antworten"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "ändern in:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "Antwort"
+msgstr[1] "Antworten"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "Kommentar bearbeiten"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+msgid "delete comment"
+msgstr "Kommentar löschen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+msgid "edit"
+msgstr "bearbeiten"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+msgid "delete"
+msgstr "löschen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_interface_forms.js:15
+msgid "close"
+msgstr "schließen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+msgid "show scope"
+msgstr "Bereich anzeigen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
+msgid ""
+"Comment is detached: it was created on a previous version and text it "
+"applied to has been modified or removed."
+msgstr ""
+"Kommentar ist abgehängt: er wurde zu einer vorherigen Version erzeugt und "
+"bezieht sich auf Text der geändert oder gelöscht wurde"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
+msgid "last modified on %(date)s"
+msgstr "zuletzt geändert am %(date)s"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
+msgid "Permalink to this comment"
+msgstr "Permalink zu diesem Kommentar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
+msgid "by %(name)s, created on %(date)s"
+msgstr "von %(name)s, erzeugt am %(date)s"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "Kategorie"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
+msgid "No selection yet"
+msgstr "Noch keine Auswahl"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:4
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:5
+msgid "E-mail address:"
+msgstr "E-Mail Adresse:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:6
+msgid "Title:"
+msgstr "Titel:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:7
+msgid "Content:"
+msgstr "Inhalt:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:8
+msgid "Tag:"
+msgstr "Schlagwort:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:11
+msgid "Modify comment's scope:"
+msgstr "Den Bereich des Kommentars ändern:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:13
+msgid "Comment will apply to this selection:"
+msgstr "Kommentar wird sich auf diese Auswahl beziehen:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
+msgid "Save"
+msgstr "Speichern"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Kategorie:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
+msgid "no filtered comments left"
+msgstr "keine gefilterten Kommentare übrig"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
+msgid ""
+"Do you want to be notified of all replies in all discussions you "
+"participated in?"
+msgstr ""
+"Willst Du über alle Antworten in Diskussionen an denen Du teilgenommen hast "
+"benachrichtig werden?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
+msgid "Reply notification"
+msgstr "Antwortbenachrichtigung"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
+msgid "could not save comment"
+msgstr "Kommentar konnte nicht gespeichert werden"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
+msgid "Are you sure you want to delete this comment?"
+msgstr "Soll dieser Kommentar wirklich gelöscht werden?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
+msgid "could not remove comment"
+msgstr "Kommentar konnte nicht entfernt werden"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Kommentar bearbeiten"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "Fehler:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Neue Antwort"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "gewählten"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "modern"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "klassisch"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "Code"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
+msgid "print from the browser"
+msgstr "aus dem Browser drucken"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:6
+msgid "download html file (.html)"
+msgstr "HTML-Datei (.html) herunterladen"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:7
+msgid "download markdown file (.mkd)"
+msgstr "Markdown-Datei (.mkd) herunterladen"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "print in PDF format"
+msgstr "Drucken im PDF-Format"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+msgid "download portable object format file (.pdf)"
+msgstr "PDF-Datei (.pdf) herunterladen"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
+msgid "download latex file (.tex)"
+msgstr "LaTeX-Datei (.tex) herunterladen"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
+msgid "download open document file (.odt)"
+msgstr "Open-Document-Datei (.odt) herunterladen"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+msgid "download microsoft word file (.doc)"
+msgstr "Download Microsoft Word-Datei (. doc)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+msgid "download microsoft word 2007 file (.docx)"
+msgstr "Download Microsoft Word 2007-Datei (. docx)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
+msgid "download ebook (.epub)"
+msgstr "ebook downloaden (. epub)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:21
+msgid "download XML file for re-importing text and comments"
+msgstr "Download XML-Datei für die Wieder Importieren von Text und Kommentare"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
+msgid "Print text"
+msgstr "Text drucken"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
+msgid "How do you want to print?"
+msgstr "Wie soll gedruckt werden?"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
+msgid "Export text"
+msgstr "Text exportieren"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
+msgid "Choose file format"
+msgstr "Dateiformat wählen"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
+msgid "using markers only, no background colors"
+msgstr "benutze nur Marker, keine Hintergrundfarben"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
+msgid "using markers and background colors"
+msgstr "benutze nur Marker und Hintergrundfarben"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
+msgid "all (%(nb_comments)s)"
+msgstr "alle (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
+msgid "current filtered ones (%(nb_comments)s)"
+msgstr "aktuell Gefilterte (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
+msgid "none (0)"
+msgstr "keine (0)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
+msgid "Go !"
+msgstr "Los !"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_message.js:18
+msgid "loading..."
+msgstr "laden..."
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
+msgid "click to show options"
+msgstr "klicken um Optionen zu zeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
+msgid "click to hide options"
+msgstr "klicken um Optionen zu verbergen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
+msgid "Text"
+msgstr "Text"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
+msgid "Search"
+msgstr "Suchen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+msgid "Hide all Comments"
+msgstr "Alle Kommentare verbergen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+msgid "Authors"
+msgstr "Autoren"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
+msgid "States"
+msgstr "Zustände"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+msgid "Dates"
+msgstr "Daten"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
+msgid "Tags"
+msgstr "Schlagworte"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Kategorien"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
+msgid "view previous comment"
+msgstr "vorherige Version anzeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
+msgid "view next comment"
+msgstr "nächste Version anzeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
+msgid "view first comment"
+msgstr "ersten Kommentar anzeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
+msgid "view last next comment"
+msgstr "letzten nächsten Kommentar anzeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
+msgid "view all comments"
+msgstr "alle Kommentare anzeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr "alle abgehängten Kommentare anzeigen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "Fortgeschrittene Schnittstelle an-/abschalten"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "Knieinhaltsverzeichnis"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
+msgid "print document with/without comments"
+msgstr "Dokument mit/ohne Kommentare drucken"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
+msgid "export document with/without comments"
+msgstr "Dokument mit/ohne Kommentare exportieren"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
+msgid "toggle full screen view"
+msgstr "Vollbild an-/ausschalten"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
+msgstr "Text feed"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
+msgid "add a comment"
+msgstr "Kommentar hinzufügen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
+msgid "filter:"
+msgstr "Filter:"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
+msgid "browse by:"
+msgstr "betrachten nach:"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
+msgid "location"
+msgstr "Ort"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
+msgid "modification"
+msgstr "Änderung"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr "Diskussion nicht als Fäden darstellen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
+msgid "thread discussions"
+msgstr "Diskussion als Fäden darstellen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
+msgid "Text style"
+msgstr "Text-Stil"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
+msgid "Animation duration"
+msgstr "Dauer der Animation"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
+msgid "(0.001 to 1 second)"
+msgstr "(0,001 bis 1 Sekunde)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
+msgid "preferences reset (will apply on next load)"
+msgstr "Einstellungen zurückgesetzt (wird beim nächsten Laden angewandt)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
+msgid "preferences saved (will apply on next load)"
+msgstr "Einstellungen gespeichert (wird beim nächsten Laden angewandt)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
+msgid "filter reset"
+msgstr "Filter zurückgesetzt"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
+msgid "filter applied"
+msgstr "Filter angewendet"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
+msgid "discussion"
+msgid_plural "discussions"
+msgstr[0] "Diskussion"
+msgstr[1] "Diskussionen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
+msgid "all"
+msgstr "alle"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
+msgid "last 24 hours (%(nb_comments)s)"
+msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
+msgstr[0] "letzte 24 Stunden (%(nb_comments)s)"
+msgstr[1] "letzte %(nb_days)s Tage (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
+msgid "No"
+msgstr "Nein"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
+msgid "Yes"
+msgstr "Ja"
+
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
+msgid "First Level Heading"
+msgstr "Überschrift erster Ordnung"
+
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
+msgid "Your title here..."
+msgstr "Dein Titel hier..."
+
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
+msgid "Second Level Heading"
+msgstr "Überschrift zweiter Ordnung"
+
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
+msgid "Heading 3"
+msgstr "Überschrift 3"
+
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
+msgid "Heading 4"
+msgstr "Überschrift 4"
+
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
+msgid "Heading 5"
+msgstr "Überschrift 5"
+
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
+msgid "Heading 6"
+msgstr "Überschrift 6"
+
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
+msgid "Bold"
+msgstr "Fett"
+
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
+msgid "Italic"
+msgstr "Kursiv"
+
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
+msgid "Bulleted List"
+msgstr "Ungeordnete Liste"
+
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
+msgid "Numeric List"
+msgstr "Nummerierte Liste"
+
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
+msgid "Picture"
+msgstr "Bild"
+
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
+msgid "Link"
+msgstr "Verweis"
+
+#: media/js/markitup/sets.js:36
+msgid "Quotes"
+msgstr "Zitat"
+
+#: media/js/markitup/sets.js:37
+msgid "Code Block / Code"
+msgstr "Code"
+
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
+msgid "Preview"
+msgstr "Vorschau"
+
+#: media/js/markitup/sets.js:72
+msgid "Paragraph"
+msgstr "Absatz"
+
+#: media/js/markitup/sets.js:76
+msgid "Stroke through"
+msgstr "Durchgestrichen"
+
+#: media/js/markitup/sets.js:80
+msgid "List element"
+msgstr "Listenelement"
+
+#: media/js/markitup/sets.js:83
+msgid "Your text to link..."
+msgstr "Text zum verweisen..."
+
+#: media/js/markitup/sets.js:85
+msgid "Clean"
+msgstr "Sauber"
+
+#: media/js/site/text_edit.js:10
+msgid "You chose not to create a new version all comments will be deleted"
+msgstr "Keine neuer Version erzeugt - alle Kommentare werden gelöscht"
+
+#: media/js/site/text_edit.js:12
+msgid "Do you want to continue?"
+msgstr "Weiter?"
+
+#~ msgid ""
+#~ "Should these comments be detached (i.e. kept with no scope) or removed "
+#~ "from new version?"
+#~ msgstr ""
+#~ "Sollen diese Kommentare abgetrennt werden (ohne Bereich behalten werden) "
+#~ "oder von neuen Versionen entfernt werden?"
+
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] ""
+#~ "%(nb_comments)s Kommentar bezieht sich auf einen modifizierten Text."
+#~ msgstr[1] ""
+#~ "%(nb_comments)s Kommentare bezieht sich auf einen modifizierten Text."
+
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Es sollte eine neue Version erzeugt werden)"
+
+#~ msgid "Detach"
+#~ msgstr "Abtrennen"
+
+#~ msgid "Remove"
+#~ msgstr "Entfernen"
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 15:01+0200\n"
+"POT-Creation-Date: 2014-03-18 18:00+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"
@@ -17,199 +16,220 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: client.py:29
+#: client.py:30
msgid ""
"A selection is required. Select in the text the part your comment applies to."
msgstr ""
-#: client.py:138
+#: client.py:144
msgid "name is required"
msgstr ""
-#: client.py:141
+#: client.py:147
msgid "email is required"
msgstr ""
-#: client.py:143
+#: client.py:149
msgid "invalid email"
msgstr ""
-#: client.py:145
+#: client.py:151
msgid "title is required"
msgstr ""
-#: client.py:147
+#: client.py:153
msgid "content is required"
msgstr ""
-#: client.py:162
+#: client.py:168
msgid "comment removed"
msgstr ""
-#: client.py:213 client.py:278
+#: client.py:221 client.py:286
msgid "comment saved"
msgstr ""
-#: client.py:280
+#: client.py:288
msgid "comment saved, it is being held for moderation"
msgstr ""
-#: client.py:314
+#: client.py:326 client.py:335 client.py:337
msgid "me"
msgstr ""
-#: client.py:316
+#: client.py:328 client.py:335 client.py:337
msgid "author"
msgstr ""
-#: client.py:341
+#: client.py:387
msgid "Tags input must be no longer than 250 characters."
msgstr ""
-#: models.py:184 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:630
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
msgid "Title"
msgstr ""
-#: models.py:185
+#: models.py:189
msgid "Format"
msgstr ""
-#: models.py:186 views/texts.py:725
+#: models.py:190 views/texts.py:721
msgid "Content"
msgstr ""
-#: models.py:187 models.py:643 templates/site/help.html:47
+#: models.py:191 models.py:625 templates/site/help.html:56
msgid "Tags"
msgstr ""
-#: models.py:189 templates/site/text_history.html:80 views/user.py:223
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
msgid "Note"
msgstr ""
-#: models.py:191
+#: models.py:195
msgid "Moderation a posteriori?"
msgstr ""
-#: models.py:307
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr ""
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr ""
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr ""
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr ""
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr ""
+
+#: models.py:289
msgid "Format:"
msgstr ""
-#: models.py:545
+#: models.py:528
msgid "name"
msgstr ""
-#: models.py:546
+#: models.py:529
msgid "description"
msgstr ""
-#: models.py:637
+#: models.py:619
msgid "Allow contact"
msgstr ""
-#: models.py:637
+#: models.py:619
msgid "Allow email messages from other users"
msgstr ""
-#: models.py:638
+#: models.py:620
msgid "Preferred language"
msgstr ""
-#: models.py:641
+#: models.py:623
msgid "Suspended access"
msgstr ""
-#: models.py:665
+#: models.py:647
msgid "suspended"
msgstr ""
-#: models.py:667
+#: models.py:649
msgid "waiting approval"
msgstr ""
-#: models.py:673
+#: models.py:655
msgid "pending"
msgstr ""
-#: models.py:688
+#: models.py:670
msgid "Invitation"
msgstr ""
-#: models.py:756
+#: models.py:732
#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr ""
-#: models.py:757
+#: models.py:733
#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr ""
-#: models.py:758
+#: models.py:734
#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr ""
-#: models.py:763
+#: models.py:735
+#, python-format
msgid "Text %(link_to_text)s imported by %(creator)s"
msgstr ""
-#: models.py:759
+#: models.py:736
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr ""
-#: models.py:760
+#: models.py:737
#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr ""
-#: models.py:761
+#: models.py:738
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr ""
-#: models.py:762
+#: models.py:739
#, python-format
msgid "User %(username)s added"
msgstr ""
-#: models.py:763
+#: models.py:740
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr ""
-#: models.py:764
+#: models.py:741
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr ""
-#: models.py:765
+#: models.py:742
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr ""
-#: models.py:766
+#: models.py:743
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr ""
-#: models.py:767
+#: models.py:744
#, python-format
msgid "User %(username)s has activated his account"
msgstr ""
-#: models.py:816
+#: models.py:793
msgid "anonymous"
msgstr ""
-#: models.py:823 models.py:831
+#: models.py:800 models.py:808
#, python-format
msgid "by \"%(username)s\""
msgstr ""
-#: models.py:825
+#: models.py:802
#, python-format
msgid "%(time_since)s ago"
msgstr ""
@@ -222,7 +242,7 @@
msgid "Email:"
msgstr ""
-#: notifications.py:60
+#: notifications.py:61 templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr ""
@@ -234,30 +254,34 @@
msgid "Class (education)"
msgstr ""
-#: settings.py:105
+#: settings.py:110
msgid "French"
msgstr ""
-#: settings.py:106
+#: settings.py:111
msgid "English"
msgstr ""
-#: settings.py:107
+#: settings.py:112
msgid "Norwegian"
msgstr ""
-#: settings.py:108
+#: settings.py:113
msgid "Brazilian Portuguese"
msgstr ""
-#: settings.py:109
+#: settings.py:114
msgid "Spanish"
msgstr ""
-#: settings.py:110
+#: settings.py:115
msgid "Bulgarian"
msgstr ""
+#: settings.py:116
+msgid "Italian"
+msgstr ""
+
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
msgstr ""
@@ -374,12 +398,85 @@
msgid "API Documentation"
msgstr ""
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr ""
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr ""
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr ""
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr ""
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr ""
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
msgid "Activate your account"
msgstr ""
-#: templates/site/activate.html:23
+#: templates/site/activate.html:32
msgid "Activate"
msgstr ""
@@ -388,15 +485,16 @@
msgid "Contact"
msgstr ""
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
msgid "Send"
msgstr ""
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
#: templates/site/settings.html:29 templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:49
-#: templates/site/text_create_upload.html:44 templates/site/user_add.html:34
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
#: templates/site/user_mass_add_text.html:38
@@ -413,8 +511,9 @@
#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
-#: templates/site/layout/header.html:10
+#: templates/site/layout/header.html:13
msgid "Create a text"
msgstr ""
@@ -423,9 +522,10 @@
msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
#: templates/site/text_create_upload.html:4
#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
-#: templates/site/layout/header.html:11
+#: templates/site/layout/header.html:14
msgid "Upload a text"
msgstr ""
@@ -435,177 +535,178 @@
"Word document)"
msgstr ""
-#: templates/site/dashboard.html:50
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
#: templates/site/text_create_import.html:4
#: templates/site/text_create_import.html:30
-#: templates/site/text_create_content.html:32
-#: templates/site/text_create_upload.html:30
-#: templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
msgid "Import a co-mented text"
msgstr ""
#: templates/site/dashboard.html:50
-msgid "Import a text, possibly with comments and attachments, which has been previously exported in XML format from co-ment interface"
-msgstr ""
-
-#: templates/site/dashboard.html:50
-msgid "Invite user"
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
msgstr ""
#: templates/site/dashboard.html:51
-msgid "Edit your profile"
+msgid "Invite user"
msgstr ""
#: templates/site/dashboard.html:52
-msgid "View text list"
+msgid "Edit your profile"
msgstr ""
#: templates/site/dashboard.html:53
+msgid "View text list"
+msgstr ""
+
+#: templates/site/dashboard.html:54
msgid "Configure workspace"
msgstr ""
-#: templates/site/dashboard.html:64
+#: templates/site/dashboard.html:65
msgid "Moderation queue"
msgstr ""
-#: templates/site/dashboard.html:76
+#: templates/site/dashboard.html:77
#, python-format
msgid "user %(user)s awaits approval"
msgstr ""
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "approve"
msgstr ""
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "refuse"
msgstr ""
-#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html:81
msgid "membership"
msgstr ""
-#: templates/site/dashboard.html:85
+#: templates/site/dashboard.html:86
#: templates/site/macros/user_moderation.html:8
msgid ""
"Are you sure you want to approve this user's membership to the workspace?"
msgstr ""
-#: templates/site/dashboard.html:94
+#: templates/site/dashboard.html:95
#: templates/site/macros/user_moderation.html:17
msgid ""
"Are you sure you want to refuse this user's membership to the workspace?"
msgstr ""
-#: templates/site/dashboard.html:106
+#: templates/site/dashboard.html:107
#, python-format
msgid "registered %(duration)s ago"
msgstr ""
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
msgid "comment"
msgstr ""
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
#, python-format
msgid "by %(cuser)s on text"
msgstr ""
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
msgid "awaits approval"
msgstr ""
-#: templates/site/dashboard.html:127
+#: templates/site/dashboard.html:128
msgid "view in context"
msgstr ""
-#: templates/site/dashboard.html:132
+#: templates/site/dashboard.html:133
msgid "Are you sure you want to approve this comment?"
msgstr ""
-#: templates/site/dashboard.html:149
+#: templates/site/dashboard.html:150
msgid "Are you sure you want to refuse this comment?"
msgstr ""
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
#, python-format
msgid "modified %(duration)s ago"
msgstr ""
-#: templates/site/dashboard.html:186
+#: templates/site/dashboard.html:187
msgid "Recent texts"
msgstr ""
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
msgid "all"
msgstr ""
-#: templates/site/dashboard.html:201
+#: templates/site/dashboard.html:202
#, python-format
msgid "%(nb_comments)s comment"
msgid_plural "%(nb_comments)s comments"
msgstr[0] ""
msgstr[1] ""
-#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
#, python-format
msgid "1 version"
msgid_plural "%(versions_number)s versions"
msgstr[0] ""
msgstr[1] ""
-#: templates/site/dashboard.html:208 templates/site/text_list.html:223
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
msgid "No texts yet"
msgstr ""
-#: templates/site/dashboard.html:227
-msgid "Workspace activity"
-msgstr ""
-
-#: templates/site/dashboard.html:228
-msgid "month"
-msgstr ""
-
#: templates/site/dashboard.html:228
+msgid "Workspace activity"
+msgstr ""
+
+#: templates/site/dashboard.html:229
+msgid "month"
+msgstr ""
+
+#: templates/site/dashboard.html:229
msgid "week"
msgstr ""
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "24 hours"
msgstr ""
-#: templates/site/dashboard.html:234
+#: templates/site/dashboard.html:235
msgid "Access"
msgstr ""
-#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:208 templates/site/user_list.html:158
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr ""
-#: templates/site/dashboard.html:245
+#: templates/site/dashboard.html:246
msgid "Commenting"
msgstr ""
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:265
msgid "Activities"
msgstr ""
-#: templates/site/dashboard.html:267
+#: templates/site/dashboard.html:268
msgid "texts"
msgstr ""
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:269
msgid "comments"
msgstr ""
-#: templates/site/dashboard.html:270
+#: templates/site/dashboard.html:271
msgid "users"
msgstr ""
-#: templates/site/dashboard.html:310
+#: templates/site/dashboard.html:311
msgid "No activities"
msgstr ""
@@ -636,7 +737,7 @@
msgid "Followup"
msgstr ""
-#: templates/site/followup.html:20 templates/site/help.html:66
+#: templates/site/followup.html:20 templates/site/help.html:75
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr ""
@@ -646,8 +747,8 @@
msgstr ""
#: 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:11
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
#: templates/site/macros/form_fields.html:20
msgid "Help"
msgstr ""
@@ -700,86 +801,86 @@
"participated"
msgstr ""
-#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/forgot_pw.html:27
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
msgid "Reset my password"
msgstr ""
-#: templates/site/forgot_pw.html:35
+#: templates/site/forgot_pw.html:44
msgid "This link is invalid."
msgstr ""
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
msgid "Forgot password?"
msgstr ""
-#: templates/site/help.html:16
+#: templates/site/help.html:25
msgid "General Presentation"
msgstr ""
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "co-ment is a web based text annotation system."
msgstr ""
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "COMT is the open source software behind it"
msgstr ""
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "See www.co-ment.com for more details"
msgstr ""
-#: templates/site/help.html:20
+#: templates/site/help.html:29
msgid "Glossary"
msgstr ""
-#: templates/site/help.html:22
+#: templates/site/help.html:31
msgid "Contents"
msgstr ""
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
msgid "Collaboration"
msgstr ""
-#: templates/site/help.html:25 templates/site/help.html.py:37
+#: templates/site/help.html:34 templates/site/help.html.py:46
msgid "Comments"
msgstr ""
-#: templates/site/help.html:26 templates/site/help.html.py:60
+#: templates/site/help.html:35 templates/site/help.html.py:69
msgid "Notification and feeds"
msgstr ""
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
msgid "Roles"
msgstr ""
-#: templates/site/help.html:28 templates/site/help.html.py:88
+#: templates/site/help.html:37 templates/site/help.html.py:97
#: templates/site/text_list.html:12
msgid "Texts"
msgstr ""
-#: templates/site/help.html:34
+#: templates/site/help.html:43
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
-#: templates/site/help.html:34 templates/site/help.html.py:45
+#: templates/site/help.html:43 templates/site/help.html.py:54
msgid "Click here for more details"
msgstr ""
-#: templates/site/help.html:34
+#: templates/site/help.html:43
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:40
+#: templates/site/help.html:49
msgid "Moderation"
msgstr ""
-#: templates/site/help.html:41
+#: templates/site/help.html:50
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 "
@@ -792,22 +893,22 @@
"them."
msgstr ""
-#: templates/site/help.html:44
+#: templates/site/help.html:53
msgid "States"
msgstr ""
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid "co-ment uses states to implement moderation policies."
msgstr ""
-#: templates/site/help.html:45
+#: templates/site/help.html:54
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:48
+#: templates/site/help.html:57
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 "
@@ -815,11 +916,11 @@
"according to the issues or topics they address."
msgstr ""
-#: templates/site/help.html:50
+#: templates/site/help.html:59
msgid "Linking to a comment"
msgstr ""
-#: templates/site/help.html:51
+#: templates/site/help.html:60
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 "
@@ -827,22 +928,22 @@
"title."
msgstr ""
-#: templates/site/help.html:53
+#: templates/site/help.html:62
msgid "Scope"
msgstr ""
-#: templates/site/help.html:54
+#: templates/site/help.html:63
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:56
+#: templates/site/help.html:65
msgid "Keeping your comments across versions"
msgstr ""
-#: templates/site/help.html:57
+#: templates/site/help.html:66
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 "
@@ -854,32 +955,32 @@
"simply removed from the new version."
msgstr ""
-#: templates/site/help.html:63
+#: templates/site/help.html:72
msgid "Email notification"
msgstr ""
-#: templates/site/help.html:64
+#: templates/site/help.html:73
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:67
+#: templates/site/help.html:76
msgid "Web feed definition on Wikipedia"
msgstr ""
-#: templates/site/help.html:67
+#: templates/site/help.html:76
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:69
+#: templates/site/help.html:78
msgid "Public and private feeds"
msgstr ""
-#: templates/site/help.html:70
+#: templates/site/help.html:79
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 "
@@ -887,11 +988,11 @@
"really want them to know what's happening in it."
msgstr ""
-#: templates/site/help.html:72
+#: templates/site/help.html:81
msgid "Text embedding"
msgstr ""
-#: templates/site/help.html:73
+#: templates/site/help.html:82
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' "
@@ -901,32 +1002,32 @@
"in another tab of your browser."
msgstr ""
-#: templates/site/help.html:80
+#: templates/site/help.html:89
msgid "Roles are predefined sets of permissions."
msgstr ""
-#: templates/site/help.html:81
+#: templates/site/help.html:90
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:82 templates/site/text_share.html:88
+#: templates/site/help.html:91 templates/site/text_share.html:88
msgid "Text role"
msgstr ""
-#: templates/site/help.html:83
+#: templates/site/help.html:92
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:84 views/site.py:185
+#: templates/site/help.html:93 views/site.py:187
msgid "Role model"
msgstr ""
-#: templates/site/help.html:85
+#: templates/site/help.html:94
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 "
@@ -935,11 +1036,11 @@
"privately shared between a teacher and each student."
msgstr ""
-#: templates/site/help.html:91
+#: templates/site/help.html:100
msgid "Create or upload?"
msgstr ""
-#: templates/site/help.html:92
+#: templates/site/help.html:101
msgid ""
"There are 3 main ways to produce a text in co-ment. If you start from "
"scratch, create your text in markdown format. If you start from an existing "
@@ -948,33 +1049,33 @@
"editor."
msgstr ""
-#: templates/site/help.html:96
+#: templates/site/help.html:105
msgid "Text formats"
msgstr ""
-#: templates/site/help.html:97
+#: templates/site/help.html:106
msgid ""
"There are at this date 3 text formats: markdown (default/preferred format), "
"HTML and RST."
msgstr ""
-#: templates/site/help.html:101
+#: templates/site/help.html:110
msgid "Markdown"
msgstr ""
-#: templates/site/help.html:102
+#: templates/site/help.html:111
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:102
+#: templates/site/help.html:111
msgid "Read more about this"
msgstr ""
#: templates/site/login.html:8 templates/site/login_form.html:19
-#: templates/site/layout/header.html:17
+#: templates/site/layout/header.html:21
msgid "Login"
msgstr ""
@@ -984,16 +1085,16 @@
msgstr ""
#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:18
+#: templates/site/layout/header.html:22
msgid "Register"
msgstr ""
#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
+#: templates/site/layout/header.html:11
msgid "Home"
msgstr ""
-#: templates/site/non_authenticated_index.html:20
+#: templates/site/non_authenticated_index.html:28
#, python-format
msgid "One public text"
msgid_plural "%(counter)s public texts"
@@ -1004,46 +1105,47 @@
msgid "Deactivate notification"
msgstr ""
-#: templates/site/notifications_desactivate.html:31
+#: templates/site/notifications_desactivate.html:39
msgid "Deactivate"
msgstr ""
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
#, python-format
msgid "Your profile (%(username)s)"
msgstr ""
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:14
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
msgid "Profile"
msgstr ""
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
msgid "Password"
msgstr ""
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/text_edit.html:37
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
#: 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/user_activate.html:36 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr ""
-#: templates/site/register.html:19
+#: templates/site/register.html:27
#, python-format
msgid "%(wname)s Registration"
msgstr ""
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
msgid "Reset your password"
msgstr ""
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:185 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr ""
@@ -1067,23 +1169,20 @@
msgstr ""
#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
msgid "Text list"
msgstr ""
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr ""
-
-#: templates/site/text_embed.html:25
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
msgid "Embed text"
msgstr ""
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid "Copy this code into your site to display text with comments."
msgstr ""
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid ""
"Users will also be able to add comments from your site depending on "
"anonymous users' roles."
@@ -1147,8 +1246,8 @@
msgstr ""
#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
msgid "Most recent version"
msgstr ""
@@ -1158,149 +1257,149 @@
msgid "Original version"
msgstr ""
-#: templates/site/text_history.html:67
+#: templates/site/text_history.html:69
msgid "Compare selected versions"
msgstr ""
-#: templates/site/text_history.html:77
+#: templates/site/text_history.html:79
msgid "Version"
msgstr ""
-#: templates/site/text_history.html:78
+#: templates/site/text_history.html:80
msgid "Selection"
msgstr ""
-#: templates/site/text_history.html:81 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "Author"
msgstr ""
-#: templates/site/text_history.html:82
+#: templates/site/text_history.html:84
msgid "Created"
msgstr ""
-#: templates/site/text_history.html:83 templates/site/text_list.html:141
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
msgid "# comments"
msgstr ""
-#: templates/site/text_history.html:105 templates/site/text_list.html:161
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
msgid "View"
msgstr ""
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr ""
-#: templates/site/text_history.html:108
+#: templates/site/text_history.html:110
msgid "Revert to this version"
msgstr ""
-#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_compare.html:32
msgid "Previous modification"
msgstr ""
-#: templates/site/text_history_compare.html:31
#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
#, python-format
msgid "Version %(version_number)s"
msgstr ""
-#: templates/site/text_history_compare.html:32
+#: templates/site/text_history_compare.html:35
#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
msgstr ""
-#: templates/site/text_history_compare.html:34
+#: templates/site/text_history_compare.html:37
msgid "Next modification"
msgstr ""
-#: templates/site/text_history_compare.html:44
+#: templates/site/text_history_compare.html:46
msgid "No differences"
msgstr ""
-#: templates/site/text_history_version.html:31
+#: templates/site/text_history_version.html:34
msgid "Previous version"
msgstr ""
-#: templates/site/text_history_version.html:36
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr ""
+
+#: templates/site/text_history_version.html:42
msgid "Compare with next version"
msgstr ""
-#: templates/site/text_history_version.html:37
-msgid "Next version"
-msgstr ""
-
-#: templates/site/text_history_version.html:45 views/texts.py:496
-#: views/texts.py:497
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
#, python-format
msgid "by %(author)s"
msgstr ""
-#: templates/site/text_list.html:51 templates/site/text_share.html:40
+#: templates/site/text_list.html:53 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr ""
-#: templates/site/text_list.html:53 templates/site/text_share.html:42
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr ""
-#: templates/site/text_list.html:81 templates/site/user_list.html:72
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr ""
-#: templates/site/text_list.html:82 templates/site/text_list.html.py:163
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
msgid "Delete"
msgstr ""
-#: templates/site/text_list.html:85 templates/site/user_list.html:81
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
msgid "Apply"
msgstr ""
-#: templates/site/text_list.html:106 templates/site/user_list.html:102
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr ""
-#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr ""
-#: templates/site/text_list.html:140
+#: templates/site/text_list.html:142
msgid "Modified"
msgstr ""
-#: templates/site/text_list.html:142 templates/site/user_list.html:136
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
msgid "Last week activity"
msgstr ""
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr ""
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr ""
-#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr ""
-#: templates/site/text_list.html:169
+#: templates/site/text_list.html:171
msgid "Are you sure you want to delete this text?"
msgstr ""
-#: templates/site/text_list.html:182
+#: templates/site/text_list.html:184
msgid "Users"
msgstr ""
-#: templates/site/text_list.html:200
+#: templates/site/text_list.html:202
msgid "Edit user"
msgstr ""
@@ -1372,35 +1471,36 @@
msgid "Anonymous users"
msgstr ""
-#: templates/site/text_view_frame.html:64
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
msgid "add a comment"
msgstr ""
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:65
msgid "Filter comments"
msgstr ""
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:66
msgid "Preferences"
msgstr ""
-#: templates/site/text_view_frame.html:76
+#: templates/site/text_view_frame.html:67
msgid "Text preferences"
msgstr ""
-#: templates/site/text_view_frame.html:93
+#: templates/site/text_view_frame.html:74
msgid "Loading text…"
msgstr ""
-#: templates/site/text_view_frame.html:104
+#: templates/site/text_view_frame.html:92
msgid "Which comments?"
msgstr ""
-#: templates/site/text_view_frame.html:112
+#: templates/site/text_view_frame.html:100
msgid "How should comments' scope be shown in text?"
msgstr ""
-#: templates/site/unauthorized.html:5
+#: templates/site/unauthorized.html:14
msgid "Unauthorized"
msgstr ""
@@ -1446,7 +1546,7 @@
msgid "Change role to %(role_name)s"
msgstr ""
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:284
msgid "Email"
msgstr ""
@@ -1469,11 +1569,6 @@
msgid "The users will receive an email invitation to join the workspace."
msgstr ""
-#: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:20
-msgid "back to workspace"
-msgstr ""
-
#: templates/site/layout/base_workspace.html:30
#, python-format
msgid "%(nb_texts)s text"
@@ -1488,7 +1583,11 @@
msgstr[0] ""
msgstr[1] ""
-#: templates/site/layout/header.html:15
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr ""
+
+#: templates/site/layout/header.html:19
msgid "Logout"
msgstr ""
@@ -1543,7 +1642,7 @@
msgid "Share"
msgstr ""
-#: templates/site/macros/text_comments.html:18
+#: templates/site/macros/text_comments.html:16
#, python-format
msgid "by %(name)s on %(date)s"
msgstr ""
@@ -1613,16 +1712,16 @@
msgid "unknown"
msgstr ""
-#: views/create.py:26
-msgid "Upload file (optional)"
+#: views/create.py:30
+msgid "Upload file"
msgstr ""
-#: views/create.py:27
+#: views/create.py:31
msgid ""
"Upload a file from your computer instead of using the direct input above"
msgstr ""
-#: views/create.py:38
+#: views/create.py:42 views/create.py:59
msgid "You should specify a file to upload."
msgstr ""
@@ -1635,7 +1734,9 @@
msgstr ""
#: views/create.py:65
-msgid "The imported file should be an XML file generated by co-ment when exporting a text and comments."
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
msgstr ""
#: views/create.py:71
@@ -1643,19 +1744,21 @@
msgstr ""
#: views/create.py:76
+#, python-format
msgid "No %(tag)s node found in XML."
msgstr ""
-#: views/create.py:46
+#: views/create.py:85
msgid "The title of your text"
msgstr ""
-#: views/create.py:71 views/create.py:108
+#: views/create.py:109 views/create.py:144
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr ""
-#: views/create.py:244
+#: views/create.py:247
+#, python-format
msgid "Text \"%(text_title)s\" has been imported"
msgstr ""
@@ -1723,177 +1826,212 @@
msgid "Private notifications feed reseted."
msgstr ""
-#: views/site.py:82 views/texts.py:131 views/user.py:545
+#: views/site.py:84 views/texts.py:136 views/user.py:548
msgid "You're logged in!"
msgstr ""
-#: views/site.py:100
-msgid "Your name"
-msgstr ""
-
#: views/site.py:102
+msgid "Your name"
+msgstr ""
+
+#: views/site.py:104
msgid "Your email address"
msgstr ""
-#: views/site.py:105
+#: views/site.py:107
msgid "Subject of the message"
msgstr ""
-#: views/site.py:106
-msgid "Body of the message"
-msgstr ""
-
#: views/site.py:108
+msgid "Body of the message"
+msgstr ""
+
+#: views/site.py:110
msgid "Send me a copy of the email"
msgstr ""
-#: views/site.py:134
+#: views/site.py:136
msgid "Copy of message:"
msgstr ""
-#: views/site.py:136
+#: views/site.py:138
msgid "Email sent. We will get back to you as quickly as possible."
msgstr ""
-#: views/site.py:165
+#: views/site.py:167
msgid "Workspace name"
msgstr ""
-#: views/site.py:170
+#: views/site.py:172
msgid "Workspace tagline"
msgstr ""
-#: views/site.py:175
+#: views/site.py:177
msgid "Workspace registration"
msgstr ""
-#: views/site.py:176
+#: views/site.py:178
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
msgstr ""
-#: views/site.py:180
+#: views/site.py:182
msgid "Workspace registration moderation"
msgstr ""
-#: views/site.py:181
+#: views/site.py:183
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
-#: views/site.py:186
+#: views/site.py:188
msgid "Change the roles available in the workspace"
msgstr ""
-#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
msgid "Settings saved"
msgstr ""
-#: views/site.py:215
+#: views/site.py:247
msgid "Workspace logo"
msgstr ""
-#: views/site.py:217
-msgid "Custom css rules"
+#: views/site.py:249
+msgid "Custom CSS rules"
msgstr ""
-#: views/site.py:218
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
msgstr ""
-#: views/site.py:223
+#: views/site.py:255
msgid "Custom font"
msgstr ""
-#: views/site.py:225
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
msgstr ""
-#: views/site.py:229
+#: views/site.py:261
msgid "Custom font for titles"
msgstr ""
-#: views/site.py:231
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
msgstr ""
-#: views/site.py:253
+#: views/site.py:319
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
-#: views/site.py:257 views/user.py:428
+#: views/site.py:323 views/user.py:431
msgid "Password changed"
msgstr ""
-#: views/texts.py:164
+#: views/texts.py:169
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr ""
-#: views/texts.py:209
+#: views/texts.py:214
#, python-format
msgid "Text %(text_title)s deleted"
msgstr ""
-#: views/texts.py:220
+#: views/texts.py:226
#, python-format
msgid "Text version %(text_version_title)s deleted"
msgstr ""
-#: views/texts.py:634
+#: views/texts.py:624
msgid "Note (optional)"
msgstr ""
-#: views/texts.py:638
+#: views/texts.py:628
msgid "Add a note to explain the modifications made to the text"
msgstr ""
-#: views/texts.py:648
+#: views/texts.py:638
msgid "New version (optional)"
msgstr ""
-#: views/texts.py:651
+#: views/texts.py:641
msgid "Create a new version of this text (recommended)"
msgstr ""
-#: views/texts.py:654
+#: views/texts.py:644
msgid "Keep comments (optional)"
msgstr ""
-#: views/texts.py:657
+#: views/texts.py:647
msgid "Keep comments (if not affected by the edit)"
msgstr ""
-#: views/texts.py:614
+#: views/texts.py:650
msgid "Detach comments (optional)"
msgstr ""
-#: views/texts.py:617
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
msgstr ""
-#: views/texts.py:723
+#: views/texts.py:719
msgid "Name (optional)"
msgstr ""
-#: views/texts.py:724
+#: views/texts.py:720
msgid "Email (optional)"
msgstr ""
-#: views/texts.py:776
+#: views/texts.py:773
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr ""
-#: views/texts.py:884 views/user.py:79 views/user.py:99
+#: views/texts.py:885 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr ""
-#: views/texts.py:942
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr ""
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+
+#: views/texts.py:949
msgid "Text settings updated"
msgstr ""
@@ -1946,140 +2084,103 @@
msgid "Optional text to add to invitation email"
msgstr ""
-#: views/user.py:259
+#: views/user.py:260
#, python-format
msgid "%(nb_users)d user added"
msgid_plural "%(nb_users)d users added"
msgstr[0] ""
msgstr[1] ""
-#: views/user.py:277
+#: views/user.py:278
msgid "Add user"
msgid_plural "Add users"
msgstr[0] ""
msgstr[1] ""
-#: views/user.py:299
+#: views/user.py:300
msgid "This username is already in use. Please supply a different username."
msgstr ""
-#: views/user.py:320 views/user.py:336
+#: views/user.py:321 views/user.py:338
msgid "Your account has been activated. You're now logged-in."
msgstr ""
-#: views/user.py:331
+#: views/user.py:333
msgid "activate account"
msgstr ""
-#: views/user.py:361
+#: views/user.py:363
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr ""
-#: views/user.py:367
+#: views/user.py:369
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr ""
-#: views/user.py:379
+#: views/user.py:382
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr ""
-#: views/user.py:383
+#: views/user.py:386
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr ""
-#: views/user.py:393
+#: views/user.py:396
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr ""
-#: views/user.py:410
+#: views/user.py:413
msgid "Profile updated"
msgstr ""
-#: views/user.py:456
+#: views/user.py:459
msgid "Anonymous user role modified."
msgstr ""
-#: views/user.py:478
+#: views/user.py:481
msgid "User modified"
msgstr ""
-#: views/user.py:493
+#: views/user.py:496
msgid "Subject"
msgstr ""
-#: views/user.py:494
-msgid "Subject of the email"
-msgstr ""
-
#: views/user.py:497
+msgid "Subject of the email"
+msgstr ""
+
+#: views/user.py:500
msgid "Body"
msgstr ""
-#: views/user.py:498
+#: views/user.py:501
msgid "Body of the email"
msgstr ""
-#: views/user.py:518
+#: views/user.py:521
msgid "Email sent."
msgstr ""
-#: views/user.py:539
+#: views/user.py:542
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
-#: views/user.py:574
+#: views/user.py:577
msgid "You've been logged out."
msgstr ""
-#: views/user.py:590
+#: views/user.py:593
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
msgstr ""
-#: views/user.py:593
+#: views/user.py:596
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
-
-#: models.py:266 views/site.py:191
-msgid "Label for the first category of comments"
-msgstr ""
-
-#: models.py:267 views/site.py:197
-msgid "Label for the second category of comments"
-msgstr ""
-
-#: models.py:268 views/site.py:203
-msgid "Label for the third category of comments"
-msgstr ""
-
-#: models.py:269 views/site.py:209
-msgid "Label for the fourth category of comments"
-msgstr ""
-
-#: models.py:270 views/site.py:215
-msgid "Label for the fifth category of comments"
-msgstr ""
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr ""
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-msgid "Leave blank to use the value configured for the workspace."
-msgstr ""
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr ""
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr ""
Binary file src/cm/locale/en/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 17:01+0200\n"
+"POT-Creation-Date: 2014-03-21 16:14+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"
@@ -17,107 +17,131 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: media/js/client/c_addcomment_form.js:52
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
msgid "New comment"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
msgid "New comment will be canceled, continue?"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
msgid "Warning"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
msgid "Started reply will be canceled, continue?"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
msgid "Started comment edition will be canceled, continue?"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
-msgid "change comment state to pending"
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+msgid "change comment state to pending"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
msgid "change comment state to approved"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
msgid "change comment state to unapproved"
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
-msgid "pending"
+msgid "cancel changing the state of this comment"
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+msgid "pending"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
msgid "approved"
msgstr ""
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr ""
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
msgid "show replies"
msgstr ""
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] ""
+msgstr[1] ""
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
-msgid "delete comment"
+msgid "edit comment"
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
-msgid "edit"
+msgid "delete comment"
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+msgid "edit"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
msgid "delete"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
#: media/js/client/c_interface_forms.js:15
msgid "close"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
msgid "show scope"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
msgid ""
"Comment is detached: it was created on a previous version and text it "
"applied to has been modified or removed."
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
msgid "last modified on %(date)s"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
msgid "Permalink to this comment"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:305
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
msgid "by %(name)s, created on %(date)s"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr ""
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
-msgid "unapproved"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
msgstr ""
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr ""
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr ""
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] ""
+msgstr[1] ""
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
msgid "No selection yet"
@@ -152,71 +176,77 @@
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
msgid "Save"
msgstr ""
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:101
-#: media/js/site/text_edit.js:104
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
msgid "Cancel"
msgstr ""
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr ""
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
msgstr ""
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:579
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] ""
-msgstr[1] ""
-
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr ""
-
-#: media/js/client/c_scopes.js:318
-msgid " comment"
-msgid_plural " comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr ""
-
-#: media/js/client/c_sync.js:57
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
msgid "no filtered comments left"
msgstr ""
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid ""
"Do you want to be notified of all replies in all discussions you "
"participated in?"
msgstr ""
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid "Reply notification"
msgstr ""
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
msgid "could not save comment"
msgstr ""
-#: media/js/client/c_sync.js:223
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
msgid "Are you sure you want to delete this comment?"
msgstr ""
-#: media/js/client/c_sync.js:227
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
msgid "could not remove comment"
msgstr ""
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr ""
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr ""
+
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
msgid "print from the browser"
msgstr ""
@@ -230,26 +260,30 @@
msgstr ""
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
-msgid "download portable object format file (.pdf)"
+msgid "print in PDF format"
msgstr ""
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
-msgid "download latex file (.tex)"
+msgid "download portable object format file (.pdf)"
msgstr ""
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
-msgid "download open document file (.odt)"
+msgid "download latex file (.tex)"
msgstr ""
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
-msgid "download microsoft word file (.doc)"
+msgid "download open document file (.odt)"
msgstr ""
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+msgid "download microsoft word file (.doc)"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
msgid "download microsoft word 2007 file (.docx)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
msgid "download ebook (.epub)"
msgstr ""
@@ -257,43 +291,43 @@
msgid "download XML file for re-importing text and comments"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "Print text"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "How do you want to print?"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Export text"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Choose file format"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
msgid "using markers only, no background colors"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:42
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
msgid "using markers and background colors"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
msgid "all (%(nb_comments)s)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:55
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
msgid "current filtered ones (%(nb_comments)s)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:57
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
msgid "none (0)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:90
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
msgid "Go !"
msgstr ""
@@ -301,332 +335,280 @@
msgid "loading..."
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
msgid "click to show options"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
msgid "click to hide options"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
msgid "Text"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
msgid "Search"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
-#: media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
msgid "Reset"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
msgid "Hide all Comments"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
-msgid "Authors"
-msgstr ""
-
#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+msgid "Authors"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
msgid "States"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
msgid "Dates"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
msgid "Tags"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
msgid "view previous comment"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
msgid "view next comment"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
msgid "view first comment"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
msgid "view last next comment"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
msgid "view all comments"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
msgid "print document with/without comments"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:185
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
msgid "export document with/without comments"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:186
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
msgid "toggle full screen view"
msgstr ""
-#: media/js/site/f_text_view_frame.js:193
-msgid "toggle table of contents"
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
msgid "add a comment"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
msgid "filter:"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:209
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
msgid "browse by:"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
msgid "location"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:212
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
msgid "modification"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:332
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr ""
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
msgid "thread discussions"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:366
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
msgid "Text style"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:411
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
msgid "Animation duration"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:420
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
msgid "(0.001 to 1 second)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:446
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
msgid "preferences reset (will apply on next load)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:452
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
msgid "preferences saved (will apply on next load)"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:556
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
msgid "filter reset"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:566
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
msgid "filter applied"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:572
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
msgid "discussion"
msgid_plural "discussions"
msgstr[0] ""
msgstr[1] ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:576
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
msgid "comment"
msgid_plural "comments"
msgstr[0] ""
msgstr[1] ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:601
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
msgid "all"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:619
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
msgid "last 24 hours (%(nb_comments)s)"
msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
msgstr[0] ""
msgstr[1] ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:733
-#: media/js/site/text_edit.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
msgid "No"
msgstr ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:734
-#: media/js/site/text_edit.js:89
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
msgid "Yes"
msgstr ""
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
msgid "First Level Heading"
msgstr ""
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
msgid "Your title here..."
msgstr ""
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
msgid "Second Level Heading"
msgstr ""
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
msgid "Heading 3"
msgstr ""
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
msgid "Heading 4"
msgstr ""
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
msgid "Heading 5"
msgstr ""
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
msgid "Heading 6"
msgstr ""
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
msgid "Bold"
msgstr ""
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
msgid "Italic"
msgstr ""
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
msgid "Bulleted List"
msgstr ""
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
msgid "Numeric List"
msgstr ""
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
msgid "Picture"
msgstr ""
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
msgid "Link"
msgstr ""
-#: media/js/markitup/sets.js:37
+#: media/js/markitup/sets.js:36
msgid "Quotes"
msgstr ""
-#: media/js/markitup/sets.js:38
+#: media/js/markitup/sets.js:37
msgid "Code Block / Code"
msgstr ""
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
msgid "Preview"
msgstr ""
-#: media/js/markitup/sets.js:71
+#: media/js/markitup/sets.js:72
msgid "Paragraph"
msgstr ""
-#: media/js/markitup/sets.js:75
+#: media/js/markitup/sets.js:76
msgid "Stroke through"
msgstr ""
-#: media/js/markitup/sets.js:79
+#: media/js/markitup/sets.js:80
msgid "List element"
msgstr ""
-#: media/js/markitup/sets.js:82
+#: media/js/markitup/sets.js:83
msgid "Your text to link..."
msgstr ""
-#: media/js/markitup/sets.js:84
+#: media/js/markitup/sets.js:85
msgid "Clean"
msgstr ""
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr ""
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr ""
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr ""
-
-#: media/js/site/c_text_view_comments.js:21
-msgid "custom"
-msgstr ""
-
-#: media/js/site/f_text_view_frame.js:182
-msgid "view all detached comments"
-msgstr ""
-
-#: media/js/site/f_text_view_frame.js:183
-msgid "toggle advance interface"
-msgstr ""
-
-#: media/js/site/f_text_view_frame.js:187
-msgid "text feed"
-msgstr ""
-
-#: media/js/site/f_text_view_frame.js:329
-msgid "unthread discussions"
-msgstr ""
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] ""
-msgstr[1] ""
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr ""
-
-#: media/js/site/text_edit.js:67
+#: media/js/site/text_edit.js:10
msgid "You chose not to create a new version all comments will be deleted"
msgstr ""
-#: media/js/site/text_edit.js:69
+#: media/js/site/text_edit.js:12
msgid "Do you want to continue?"
msgstr ""
-
-#: media/js/site/text_edit.js:102
-msgid "Detach"
-msgstr ""
-
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr ""
-
-#: media/js/client/c_toc.js:45
-msgid "Table of contents"
-msgstr ""
-
-#: media/js/client/c_icomment.js:330
-msgid "category"
-msgstr ""
-
-#: media/js/client/c_interface_form.js:52
-msgid "Category:"
-msgstr ""
-
-#: media/js/site/f_text_view_frame.js:123
-msgid "Categories"
-msgstr ""
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -2,11 +2,12 @@
#
# Simon Descarpentries <sid1@sopinspace.com>, 2011
#
+
msgid ""
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 15:02+0200\n"
+"POT-Creation-Date: 2014-03-18 18:02+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"
@@ -15,152 +16,173 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: client.py:29
+#: client.py:30
msgid ""
"A selection is required. Select in the text the part your comment applies to."
msgstr ""
"Se necesita una selección. Seleccione el texto cuya parte desee comentar."
-#: client.py:138
+#: client.py:144
msgid "name is required"
msgstr "el nombre es obligatorio"
-#: client.py:141
+#: client.py:147
msgid "email is required"
msgstr "el email es obligatorio"
-#: client.py:143
+#: client.py:149
msgid "invalid email"
msgstr "dirección de correo electrónico no válida"
-#: client.py:145
+#: client.py:151
msgid "title is required"
msgstr "el título es obligatorio"
-#: client.py:147
+#: client.py:153
msgid "content is required"
msgstr "el contenido es obligatorio"
-#: client.py:162
+#: client.py:168
msgid "comment removed"
msgstr "comentario borrado"
-#: client.py:213 client.py:278
+#: client.py:221 client.py:286
msgid "comment saved"
msgstr "comentario guardado"
-#: client.py:280
+#: client.py:288
msgid "comment saved, it is being held for moderation"
msgstr "comentario guardado, se reserva para moderación"
-#: client.py:314
+#: client.py:326 client.py:335 client.py:337
msgid "me"
msgstr "me"
-#: client.py:316
+#: client.py:328 client.py:335 client.py:337
msgid "author"
msgstr "autor"
-#: client.py:341
+#: client.py:387
msgid "Tags input must be no longer than 250 characters."
msgstr "El contenido de las etiquetas no debe exceder los 250 caracteres"
-#: models.py:184 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:630
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
msgid "Title"
msgstr "Título"
-#: models.py:185
+#: models.py:189
msgid "Format"
msgstr "Formato"
-#: models.py:186 views/texts.py:725
+#: models.py:190 views/texts.py:721
msgid "Content"
msgstr "Contenido"
-#: models.py:187 models.py:643 templates/site/help.html:47
+#: models.py:191 models.py:625 templates/site/help.html:56
msgid "Tags"
msgstr "Etiquetas"
-#: models.py:189 templates/site/text_history.html:80 views/user.py:223
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
msgid "Note"
msgstr "Nota"
-#: models.py:191
+#: models.py:195
msgid "Moderation a posteriori?"
msgstr "¿Moderar a posteriori?"
-#: models.py:307
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Etiqueta para la primera categoría de los comentarios"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Etiqueta para la segunda categoría de los comentarios"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Etiqueta para la tercera categoría de los comentarios"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Etiqueta para la cuarta categoría de los comentarios"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Etiqueta para la quinta categoría de los comentarios"
+
+#: models.py:289
msgid "Format:"
msgstr "Formato:"
-#: models.py:545
+#: models.py:528
msgid "name"
msgstr "nombre"
-#: models.py:546
+#: models.py:529
msgid "description"
msgstr "descripción"
-#: models.py:637
+#: models.py:619
msgid "Allow contact"
msgstr "Permitir contacto"
-#: models.py:637
+#: models.py:619
msgid "Allow email messages from other users"
msgstr "Permitir correos electrónicos de otros usuarios"
-#: models.py:638
+#: models.py:620
msgid "Preferred language"
msgstr "Idioma preferido"
-#: models.py:641
+#: models.py:623
msgid "Suspended access"
msgstr "Acceso anulado"
-#: models.py:665
+#: models.py:647
msgid "suspended"
msgstr "anulado"
-#: models.py:667
+#: models.py:649
msgid "waiting approval"
msgstr "esperando aprobación"
-#: models.py:673
+#: models.py:655
msgid "pending"
msgstr "pendiente"
-#: models.py:688
+#: models.py:670
msgid "Invitation"
msgstr "Invitación"
-#: models.py:756
+#: models.py:732
#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Texto %(link_to_text)s editado por %(creator)s"
-#: models.py:757
+#: models.py:733
#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr ""
"Texto %(link_to_text)s editado (se ha creado una nueva versión por "
"%(creator)s)"
-#: models.py:758
+#: models.py:734
#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Texto %(link_to_text)s añadido por %(creator)s"
-#: models.py:763
+#: models.py:735
+#, python-format
msgid "Text %(link_to_text)s imported by %(creator)s"
msgstr "El texto de %(link_to_text)s importado por %(creator)s"
-#: models.py:759
+#: models.py:736
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Texto %(link_to_text)s eliminado"
-#: models.py:760
+#: models.py:737
#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
@@ -168,51 +190,51 @@
"Comentario %(link_to_comment)s añadido al texto %(link_to_text)s por "
"%(creator)s"
-#: models.py:761
+#: models.py:738
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr "Comentario %(link_to_comment)s eliminado del texto %(link_to_text)s"
-#: models.py:762
+#: models.py:739
#, python-format
msgid "User %(username)s added"
msgstr "Usuario %(username)s añadido"
-#: models.py:763
+#: models.py:740
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Permitido acceso de Usuario %(username)s a espacio de trabajo"
-#: models.py:764
+#: models.py:741
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Denegado el acceso del Usuario %(username)s al espacio de trabajo"
-#: models.py:765
+#: models.py:742
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Anulado el acceso del Usuario %(username)s al espacio de trabajo"
-#: models.py:766
+#: models.py:743
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Activado el acceso del Usuario %(username)s al espacio de trabajo"
-#: models.py:767
+#: models.py:744
#, python-format
msgid "User %(username)s has activated his account"
msgstr "El usuario %(username)s ha activado su cuenta"
-#: models.py:816
+#: models.py:793
msgid "anonymous"
msgstr "Usuarios anónimos"
-#: models.py:823 models.py:831
+#: models.py:800 models.py:808
#, python-format
msgid "by \"%(username)s\""
msgstr "por \"%(username)s\""
-#: models.py:825
+#: models.py:802
#, python-format
msgid "%(time_since)s ago"
msgstr "hace %(time_since)s"
@@ -225,7 +247,7 @@
msgid "Email:"
msgstr "Email"
-#: notifications.py:60
+#: notifications.py:61 templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr "Aviso"
@@ -237,30 +259,34 @@
msgid "Class (education)"
msgstr "Categoría (educación)"
-#: settings.py:105
+#: settings.py:110
msgid "French"
msgstr "Francés"
-#: settings.py:106
+#: settings.py:111
msgid "English"
msgstr "Inglés"
-#: settings.py:107
+#: settings.py:112
msgid "Norwegian"
msgstr "Noruego"
-#: settings.py:108
+#: settings.py:113
msgid "Brazilian Portuguese"
msgstr "Portugués de Brasil"
-#: settings.py:109
+#: settings.py:114
msgid "Spanish"
msgstr "Español"
-#: settings.py:110
+#: settings.py:115
msgid "Bulgarian"
msgstr "Búlgaro"
+#: settings.py:116
+msgid "Italian"
+msgstr "Italiano"
+
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
msgstr "Supervisor"
@@ -377,12 +403,89 @@
msgid "API Documentation"
msgstr "Documentación de API"
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr "Se le ha invitado a unirse al espacio de trabajo %(workspace_name)s."
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+"Haga clic en el siguiente enlace para completar su registro y acceder al "
+"espacio de trabajo:"
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+"Si desea dar de baja este aviso, haga clic en el siguiente enlace: "
+"%(SITE_URL)s%(desactivate_notification_url)s."
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Usted está recibiendo este correo electrónico porque ha solicitado un restablecimiento de contraseña"
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "para la cuenta de usuario en %(site_name)s"
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr "Por favor, vaya a la siguiente página y elegir una nueva contraseña:"
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr "Su nombre de usuario, en caso de que lo hayas olvidado:"
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Contacto del usuario: %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "El texto \"%(title)s\" ha sido creado"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr "Para publicarlo, haga clic en el siguiente enlace"
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "volver al espacio de trabajo"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
msgid "Activate your account"
msgstr "Activar su cuenta"
-#: templates/site/activate.html:23
+#: templates/site/activate.html:32
msgid "Activate"
msgstr "Activar"
@@ -391,15 +494,16 @@
msgid "Contact"
msgstr "Contactar"
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
msgid "Send"
msgstr "Enviar"
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
#: templates/site/settings.html:29 templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:49
-#: templates/site/text_create_upload.html:44 templates/site/user_add.html:34
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
#: templates/site/user_mass_add_text.html:38
@@ -416,8 +520,9 @@
#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
-#: templates/site/layout/header.html:10
+#: templates/site/layout/header.html:13
msgid "Create a text"
msgstr "Escribir un texto"
@@ -427,9 +532,10 @@
"Escribir un texto dentro de tu navegador o pegar lo desde el portapapeles"
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
#: templates/site/text_create_upload.html:4
#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
-#: templates/site/layout/header.html:11
+#: templates/site/layout/header.html:14
msgid "Upload a text"
msgstr "Subir un texto"
@@ -441,58 +547,60 @@
"Cargar un documento desde su ordenador (documentos Texto, OpenDocument "
"format, Word doc.)"
-#: templates/site/dashboard.html:50
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
#: templates/site/text_create_import.html:4
#: templates/site/text_create_import.html:30
-#: templates/site/text_create_content.html:32
-#: templates/site/text_create_upload.html:30
-#: templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
msgid "Import a co-mented text"
msgstr "Importar un texto co-mentado"
#: templates/site/dashboard.html:50
-msgid "Import a text, possibly with comments and attachments, which has been previously exported in XML format from co-ment interface"
-msgstr "Importar un texto, posiblemente con comentarios y archivos adjuntos, lo que ha sido previamente exportadas en formato XML a partir de interfaz de co-ment"
-
-#: templates/site/dashboard.html:50
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
+msgstr ""
+"Importar un texto, posiblemente con comentarios y archivos adjuntos, lo que "
+"ha sido previamente exportadas en formato XML a partir de interfaz de co-ment"
+
+#: templates/site/dashboard.html:51
msgid "Invite user"
msgstr "Invitar a un usuario"
-#: templates/site/dashboard.html:51
-msgid "Edit your profile"
-msgstr "Editar su perfil"
-
#: templates/site/dashboard.html:52
+msgid "Edit your profile"
+msgstr "Editar su perfil"
+
+#: templates/site/dashboard.html:53
msgid "View text list"
msgstr "Visualizar lista de textos"
-#: templates/site/dashboard.html:53
+#: templates/site/dashboard.html:54
msgid "Configure workspace"
msgstr "Configurar espacio de trabajo"
-#: templates/site/dashboard.html:64
+#: templates/site/dashboard.html:65
msgid "Moderation queue"
msgstr "Cola de moderación"
-#: templates/site/dashboard.html:76
+#: templates/site/dashboard.html:77
#, python-format
msgid "user %(user)s awaits approval"
msgstr "El usuario %(user)s está a la espera de aprobación"
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "approve"
msgstr "Aprobar"
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "refuse"
msgstr "Rechazar"
-#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html:81
msgid "membership"
msgstr "Afiliación"
-#: templates/site/dashboard.html:85
+#: templates/site/dashboard.html:86
#: templates/site/macros/user_moderation.html:8
msgid ""
"Are you sure you want to approve this user's membership to the workspace?"
@@ -500,7 +608,7 @@
"¿Está seguro/a de que desea aprobar la afiliación de este usuario al espacio "
"de trabajo?"
-#: templates/site/dashboard.html:94
+#: templates/site/dashboard.html:95
#: templates/site/macros/user_moderation.html:17
msgid ""
"Are you sure you want to refuse this user's membership to the workspace?"
@@ -508,114 +616,115 @@
"¿Está seguro/a de que desea rechazar la afiliación de este usuario al "
"espacio de trabajo?"
-#: templates/site/dashboard.html:106
+#: templates/site/dashboard.html:107
#, python-format
msgid "registered %(duration)s ago"
msgstr "resgistrado hace %(duration)s"
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
msgid "comment"
msgstr "Comentar"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
#, python-format
msgid "by %(cuser)s on text"
msgstr "Por %(cuser)s en el texto"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
msgid "awaits approval"
msgstr "a la espera de aprobación"
-#: templates/site/dashboard.html:127
+#: templates/site/dashboard.html:128
msgid "view in context"
msgstr "ver en contexto"
-#: templates/site/dashboard.html:132
+#: templates/site/dashboard.html:133
msgid "Are you sure you want to approve this comment?"
msgstr "¿Está seguro/a de que desea aprobar este comentario?"
-#: templates/site/dashboard.html:149
+#: templates/site/dashboard.html:150
msgid "Are you sure you want to refuse this comment?"
msgstr "¿Está seguro/a de que desea rechazar este comentario?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
#, python-format
msgid "modified %(duration)s ago"
msgstr "modificado hace %(duration)s"
-#: templates/site/dashboard.html:186
+#: templates/site/dashboard.html:187
msgid "Recent texts"
msgstr "Textos recientes"
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
msgid "all"
msgstr "Todo"
-#: templates/site/dashboard.html:201
+#: templates/site/dashboard.html:202
#, python-format
msgid "%(nb_comments)s comment"
msgid_plural "%(nb_comments)s comments"
msgstr[0] "%(nb_comments)s Comentario"
msgstr[1] "%(nb_comments)s Comentarios"
-#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
#, python-format
msgid "1 version"
msgid_plural "%(versions_number)s versions"
msgstr[0] "1 versión"
msgstr[1] "%(versions_number)s versiones"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:223
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
msgid "No texts yet"
msgstr "Aún no hay ningún texto"
-#: templates/site/dashboard.html:227
-msgid "Workspace activity"
-msgstr "Actividad del espacio de trabajo"
-
-#: templates/site/dashboard.html:228
-msgid "month"
-msgstr "mes"
-
#: templates/site/dashboard.html:228
+msgid "Workspace activity"
+msgstr "Actividad del espacio de trabajo"
+
+#: templates/site/dashboard.html:229
+msgid "month"
+msgstr "mes"
+
+#: templates/site/dashboard.html:229
msgid "week"
msgstr "semana"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "24 hours"
msgstr "24 horas"
-#: templates/site/dashboard.html:234
+#: templates/site/dashboard.html:235
msgid "Access"
msgstr "Acceso"
-#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:208 templates/site/user_list.html:158
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Cargando..."
-#: templates/site/dashboard.html:245
+#: templates/site/dashboard.html:246
msgid "Commenting"
msgstr "Comentando"
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:265
msgid "Activities"
msgstr "Actividades"
-#: templates/site/dashboard.html:267
+#: templates/site/dashboard.html:268
msgid "texts"
msgstr "textos"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:269
msgid "comments"
msgstr "comentarios"
-#: templates/site/dashboard.html:270
+#: templates/site/dashboard.html:271
msgid "users"
msgstr "usuarios"
-#: templates/site/dashboard.html:310
+#: templates/site/dashboard.html:311
msgid "No activities"
msgstr "Sin actividad"
@@ -646,7 +755,7 @@
msgid "Followup"
msgstr "Seguimiento"
-#: templates/site/followup.html:20 templates/site/help.html:66
+#: templates/site/followup.html:20 templates/site/help.html:75
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Respuestas"
@@ -656,8 +765,8 @@
msgstr "Respuesta pública"
#: 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:11
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
#: templates/site/macros/form_fields.html:20
msgid "Help"
msgstr "Ayuda"
@@ -716,76 +825,76 @@
"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/forgot_pw.html:27
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
msgid "Reset my password"
msgstr "Restablecer mi contraseña"
-#: templates/site/forgot_pw.html:35
+#: templates/site/forgot_pw.html:44
msgid "This link is invalid."
msgstr "Este enlace no es válido"
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
msgid "Forgot password?"
msgstr "¿ Olvidó su contraseña ?"
-#: templates/site/help.html:16
+#: templates/site/help.html:25
msgid "General Presentation"
msgstr "Presentación general"
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "co-ment is a web based text annotation system."
msgstr "co-ment es un web basado sistema de anotación de texto."
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "COMT is the open source software behind it"
msgstr "COMT es el software libre detrás"
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "See www.co-ment.com for more details"
msgstr "Ver www.co-ment.com para más detalles"
-#: templates/site/help.html:20
+#: templates/site/help.html:29
msgid "Glossary"
msgstr "Glossario"
-#: templates/site/help.html:22
+#: templates/site/help.html:31
msgid "Contents"
msgstr "Contenido"
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
msgid "Collaboration"
msgstr "Colaboración"
-#: templates/site/help.html:25 templates/site/help.html.py:37
+#: templates/site/help.html:34 templates/site/help.html.py:46
msgid "Comments"
msgstr "Comentarios"
-#: templates/site/help.html:26 templates/site/help.html.py:60
+#: templates/site/help.html:35 templates/site/help.html.py:69
msgid "Notification and feeds"
msgstr "Avisos"
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
msgid "Roles"
msgstr "Perfil"
-#: templates/site/help.html:28 templates/site/help.html.py:88
+#: templates/site/help.html:37 templates/site/help.html.py:97
#: templates/site/text_list.html:12
msgid "Texts"
msgstr "Textos"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
"co-ment 2 colaboración es basada en la asignación de perfiles a los usarios."
-#: templates/site/help.html:34 templates/site/help.html.py:45
+#: templates/site/help.html:43 templates/site/help.html.py:54
msgid "Click here for more details"
msgstr "Clic aquí para más detalles"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
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 "
@@ -795,11 +904,11 @@
"han hechouna función de gestión global, mientras que otros tienen funciones "
"que se definen enla relación con los textos o un texto determinado."
-#: templates/site/help.html:40
+#: templates/site/help.html:49
msgid "Moderation"
msgstr "Moderador"
-#: templates/site/help.html:41
+#: templates/site/help.html:50
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 "
@@ -822,16 +931,16 @@
"los usuarios que no tienen permisos de moderación antes de que un usuario "
"(con al menos el papel de Moderador) aprueba ellos. "
-#: templates/site/help.html:44
+#: templates/site/help.html:53
msgid "States"
msgstr "Estatos"
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid "co-ment uses states to implement moderation policies."
msgstr ""
"co-ment utilisa estados para poner en práctica las políticas de moderación."
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid ""
"Unapproved or pending comments are visible only to Managers, Editors and "
"Moderators. Approved comments are visible to users with any role. The "
@@ -842,7 +951,7 @@
"con cualquier papel. Elpendiente estado sólo existe cuando una moderación a "
"priori es seleccionado en la configuración."
-#: templates/site/help.html:48
+#: templates/site/help.html:57
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 "
@@ -855,11 +964,11 @@
"decisiones sobre las futuras revisiones. También se pueden utilizar para "
"clasificar a los comentariosde acuerdo a los asuntos o temas que tratan."
-#: templates/site/help.html:50
+#: templates/site/help.html:59
msgid "Linking to a comment"
msgstr "Enlace a un comentario"
-#: templates/site/help.html:51
+#: templates/site/help.html:60
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 "
@@ -870,11 +979,11 @@
"puede hacer copiando el permalink del comentario que se muestracuando se "
"pasa sobre el párrafo (¶) firme al final del título del comentario."
-#: templates/site/help.html:53
+#: templates/site/help.html:62
msgid "Scope"
msgstr "Alcance"
-#: templates/site/help.html:54
+#: templates/site/help.html:63
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 "
@@ -884,11 +993,11 @@
"alcance puede ser modificado por cualquiera que tenga un papel que permite "
"modificar el comentari. "
-#: templates/site/help.html:56
+#: templates/site/help.html:65
msgid "Keeping your comments across versions"
msgstr "Mantener sus comentarios a través de versiones"
-#: templates/site/help.html:57
+#: templates/site/help.html:66
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 "
@@ -909,11 +1018,11 @@
"cuando se buscan, y se les puede dar un nuevo ámbito) o simplemente se "
"retira de la nueva versión."
-#: templates/site/help.html:63
+#: templates/site/help.html:72
msgid "Email notification"
msgstr "Avisos de correo electrónico"
-#: templates/site/help.html:64
+#: templates/site/help.html:73
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 "
@@ -923,11 +1032,11 @@
"ser informados por correo electrónico cuando un nuevocomentario se añade en "
"un texto o un texto se edita y se obtiene una nueva versión."
-#: templates/site/help.html:67
+#: templates/site/help.html:76
msgid "Web feed definition on Wikipedia"
msgstr "Web feed definición en la Wikipedia"
-#: templates/site/help.html:67
+#: templates/site/help.html:76
msgid ""
"You can subscribe to the feed for a specific text or to a global feed for "
"the full workspace."
@@ -935,11 +1044,11 @@
"Usted puede suscribirse a la fuente de un texto específico o a una fuente "
"global deel espacio de trabajo completo."
-#: templates/site/help.html:69
+#: templates/site/help.html:78
msgid "Public and private feeds"
msgstr "Fuentes públicas y privadas"
-#: templates/site/help.html:70
+#: templates/site/help.html:79
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 "
@@ -952,11 +1061,11 @@
"en su área de trabajo a menos que usted realmente quiero que sepan lo que "
"está pasando en ella. "
-#: templates/site/help.html:72
+#: templates/site/help.html:81
msgid "Text embedding"
msgstr "Texto incrustación"
-#: templates/site/help.html:73
+#: templates/site/help.html:82
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' "
@@ -972,11 +1081,11 @@
"para los enlaces de referencia en los comentarios del texto asegúrese de que "
"no está conectado a su espacio de trabajo en otra pestaña del navegador."
-#: templates/site/help.html:80
+#: templates/site/help.html:89
msgid "Roles are predefined sets of permissions."
msgstr "Los roles son conjuntos predefinidos de permisos."
-#: templates/site/help.html:81
+#: templates/site/help.html:90
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."
@@ -985,11 +1094,11 @@
"conocido como usuarios anónimos) sólo si los usuarios anónimos se les da un "
"papel en el texto."
-#: templates/site/help.html:82 templates/site/text_share.html:88
+#: templates/site/help.html:91 templates/site/text_share.html:88
msgid "Text role"
msgstr "Nivel de papel del texto"
-#: templates/site/help.html:83
+#: templates/site/help.html:92
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 "
@@ -1001,11 +1110,11 @@
"usuario un papel sobre un texto (y no en todos los textos en el espacio de "
"trabajo)."
-#: templates/site/help.html:84 views/site.py:185
+#: templates/site/help.html:93 views/site.py:187
msgid "Role model"
msgstr "Modelo de perfiles"
-#: templates/site/help.html:85
+#: templates/site/help.html:94
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 "
@@ -1020,11 +1129,11 @@
"funciones específicas que en este caso es posible la formulación de "
"observaciones privada compartida entre un profesor y cada alumno."
-#: templates/site/help.html:91
+#: templates/site/help.html:100
msgid "Create or upload?"
msgstr "¿ Crear o subir ?"
-#: templates/site/help.html:92
+#: templates/site/help.html:101
msgid ""
"There are 3 main ways to produce a text in co-ment. If you start from "
"scratch, create your text in markdown format. If you start from an existing "
@@ -1038,11 +1147,11 @@
"página Web, crear una el texto con HTML como el formato, y copiar y pegar la "
"página web completa en el editor."
-#: templates/site/help.html:96
+#: templates/site/help.html:105
msgid "Text formats"
msgstr "Formatos de texto"
-#: templates/site/help.html:97
+#: templates/site/help.html:106
msgid ""
"There are at this date 3 text formats: markdown (default/preferred format), "
"HTML and RST."
@@ -1050,11 +1159,11 @@
"Por el momento, hay tres formatos de texto : markdown (por defecto / formato "
"preferido), HTML y RST."
-#: templates/site/help.html:101
+#: templates/site/help.html:110
msgid "Markdown"
msgstr "Markdown"
-#: templates/site/help.html:102
+#: templates/site/help.html:111
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 "
@@ -1064,12 +1173,12 @@
"recomiendautilizar markdown para la creación o la importación de textos. "
"Nuestro software y Webservicios uso la versión extendida de Pandoc markdown."
-#: templates/site/help.html:102
+#: templates/site/help.html:111
msgid "Read more about this"
msgstr "Lea mas sobre esto"
#: templates/site/login.html:8 templates/site/login_form.html:19
-#: templates/site/layout/header.html:17
+#: templates/site/layout/header.html:21
msgid "Login"
msgstr "Identificación"
@@ -1079,16 +1188,16 @@
msgstr "Identificación de %(wname)s"
#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:18
+#: templates/site/layout/header.html:22
msgid "Register"
msgstr "Registro"
#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
+#: templates/site/layout/header.html:11
msgid "Home"
msgstr "Inicio"
-#: templates/site/non_authenticated_index.html:20
+#: templates/site/non_authenticated_index.html:28
#, python-format
msgid "One public text"
msgid_plural "%(counter)s public texts"
@@ -1099,46 +1208,47 @@
msgid "Deactivate notification"
msgstr "Desactivar aviso"
-#: templates/site/notifications_desactivate.html:31
+#: templates/site/notifications_desactivate.html:39
msgid "Deactivate"
msgstr "Desactivar"
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Su perfil (%(username)s)"
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:14
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
msgid "Profile"
msgstr "Perfil"
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
msgid "Password"
msgstr "Contraseña"
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/text_edit.html:37
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
#: 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/user_activate.html:36 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Guardar"
-#: templates/site/register.html:19
+#: templates/site/register.html:27
#, python-format
msgid "%(wname)s Registration"
msgstr "Registro de %(wname)s"
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
msgid "Reset your password"
msgstr "Restablecer su contraseña"
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:185 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Ajustes"
@@ -1164,24 +1274,21 @@
msgstr "Borrar logotipo"
#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
msgid "Text list"
msgstr "Lista de textos"
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr "Avisos del texto"
-
-#: templates/site/text_embed.html:25
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
msgid "Embed text"
msgstr "Incorporar texto"
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid "Copy this code into your site to display text with comments."
msgstr ""
"Copia este código en su sitio para mostrar el texto con sus comentarios."
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid ""
"Users will also be able to add comments from your site depending on "
"anonymous users' roles."
@@ -1254,162 +1361,161 @@
msgstr "Comparar las dos últimas versiones"
#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
msgid "Most recent version"
msgstr "Versión más reciente"
#: templates/site/text_history.html:63
#: templates/site/text_history_compare.html:30
#: templates/site/text_history_version.html:31
-#, fuzzy
-msgid "Last version"
+msgid "Original version"
msgstr "Versión original"
-#: templates/site/text_history.html:67
+#: templates/site/text_history.html:69
msgid "Compare selected versions"
msgstr "Comparar las versiones seleccionada"
-#: templates/site/text_history.html:77
+#: templates/site/text_history.html:79
msgid "Version"
msgstr "Versión"
-#: templates/site/text_history.html:78
+#: templates/site/text_history.html:80
msgid "Selection"
msgstr "Selección"
-#: templates/site/text_history.html:81 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "Author"
msgstr "Autor"
-#: templates/site/text_history.html:82
+#: templates/site/text_history.html:84
msgid "Created"
msgstr "Creado"
-#: templates/site/text_history.html:83 templates/site/text_list.html:141
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
msgid "# comments"
msgstr "# comentarios"
-#: templates/site/text_history.html:105 templates/site/text_list.html:161
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
msgid "View"
msgstr "Visualizar"
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr "Diferencias con la versión anterior"
-#: templates/site/text_history.html:108
+#: templates/site/text_history.html:110
msgid "Revert to this version"
msgstr "Volver a esta versión"
-#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_compare.html:32
msgid "Previous modification"
msgstr "Cambios anteriores"
-#: templates/site/text_history_compare.html:31
#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
#, python-format
msgid "Version %(version_number)s"
msgstr "versión %(version_number)s"
-#: templates/site/text_history_compare.html:32
+#: templates/site/text_history_compare.html:35
#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
msgstr ""
"Diferencias entre las versiones #%(version_1_number)s y #%(version_2_number)s"
-#: templates/site/text_history_compare.html:34
+#: templates/site/text_history_compare.html:37
msgid "Next modification"
msgstr "Próximo cambio"
-#: templates/site/text_history_compare.html:44
+#: templates/site/text_history_compare.html:46
msgid "No differences"
msgstr "No diferencias"
-#: templates/site/text_history_version.html:31
+#: templates/site/text_history_version.html:34
msgid "Previous version"
msgstr "Versión anterior"
-#: templates/site/text_history_version.html:36
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Próxima versión"
+
+#: templates/site/text_history_version.html:42
msgid "Compare with next version"
msgstr "Diferencias con la próxima versión"
-#: templates/site/text_history_version.html:37
-msgid "Next version"
-msgstr "Próxima versión"
-
-#: templates/site/text_history_version.html:45 views/texts.py:496
-#: views/texts.py:497
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
#, python-format
msgid "by %(author)s"
msgstr "por %(author)s"
-#: templates/site/text_list.html:51 templates/site/text_share.html:40
+#: templates/site/text_list.html:53 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr "Filtrar por etiqueta :"
-#: templates/site/text_list.html:53 templates/site/text_share.html:42
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Todo"
-#: templates/site/text_list.html:81 templates/site/user_list.html:72
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Acciones masivas"
-#: templates/site/text_list.html:82 templates/site/text_list.html.py:163
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
msgid "Delete"
msgstr "Borrar"
-#: templates/site/text_list.html:85 templates/site/user_list.html:81
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
msgid "Apply"
msgstr "Aplicar"
-#: templates/site/text_list.html:106 templates/site/user_list.html:102
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "¿Está seguro/a?"
-#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texto"
-#: templates/site/text_list.html:140
+#: templates/site/text_list.html:142
msgid "Modified"
msgstr "Modificado"
-#: templates/site/text_list.html:142 templates/site/user_list.html:136
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Actividad de la pasada semana"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "etiquetas :"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr "Filtrar por etiqueta : %(tag_name)s"
-#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Editar"
-#: templates/site/text_list.html:169
+#: templates/site/text_list.html:171
msgid "Are you sure you want to delete this text?"
msgstr "¿Está seguro/a de que desea borrar este texto?"
-#: templates/site/text_list.html:182
+#: templates/site/text_list.html:184
msgid "Users"
msgstr "Usuarios"
-#: templates/site/text_list.html:200
+#: templates/site/text_list.html:202
msgid "Edit user"
msgstr "Editar usuario"
@@ -1486,35 +1592,36 @@
msgid "Anonymous users"
msgstr "Usuarios anónimos"
-#: templates/site/text_view_frame.html:64
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
msgid "add a comment"
msgstr "añadir un comentario"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:65
msgid "Filter comments"
msgstr "Filtrar comentarios"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:66
msgid "Preferences"
msgstr "Preferencias"
-#: templates/site/text_view_frame.html:76
+#: templates/site/text_view_frame.html:67
msgid "Text preferences"
msgstr "Preferencias de texto"
-#: templates/site/text_view_frame.html:93
+#: templates/site/text_view_frame.html:74
msgid "Loading text…"
msgstr "Cargando texto…"
-#: templates/site/text_view_frame.html:104
+#: templates/site/text_view_frame.html:92
msgid "Which comments?"
msgstr "¿Qué comentarios?"
-#: templates/site/text_view_frame.html:112
+#: templates/site/text_view_frame.html:100
msgid "How should comments' scope be shown in text?"
msgstr "¿Cómo desea mostrar el campo de los comentarios en el texto?"
-#: templates/site/unauthorized.html:5
+#: templates/site/unauthorized.html:14
msgid "Unauthorized"
msgstr "No tiene autorización"
@@ -1568,7 +1675,7 @@
msgid "Change role to %(role_name)s"
msgstr "Cambiar al perfil %(role_name)s"
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:284
msgid "Email"
msgstr "Email"
@@ -1595,11 +1702,6 @@
"Los usuarios recibirán una invitación por correo electrónico para unirse al "
"espacio de trabajo."
-#: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:20
-msgid "back to workspace"
-msgstr "volver al espacio de trabajo"
-
#: templates/site/layout/base_workspace.html:30
#, python-format
msgid "%(nb_texts)s text"
@@ -1614,7 +1716,11 @@
msgstr[0] "%(nb_users)s usuario"
msgstr[1] "%(nb_users)s usuarios"
-#: templates/site/layout/header.html:15
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "Política de confidencialidad"
+
+#: templates/site/layout/header.html:19
msgid "Logout"
msgstr "Desconectarse"
@@ -1678,7 +1784,7 @@
msgid "Share"
msgstr "compartir"
-#: templates/site/macros/text_comments.html:18
+#: templates/site/macros/text_comments.html:16
#, python-format
msgid "by %(name)s on %(date)s"
msgstr "por %(name)s en %(date)s"
@@ -1756,18 +1862,18 @@
msgid "unknown"
msgstr "desconocido"
-#: views/create.py:26
-msgid "Upload file (optional)"
-msgstr "Subir archivo (opcional)"
-
-#: views/create.py:27
+#: views/create.py:30
+msgid "Upload file"
+msgstr "Subir archivo"
+
+#: views/create.py:31
msgid ""
"Upload a file from your computer instead of using the direct input above"
msgstr ""
"Subir un archivo desde su equipo en lugar de usar la entrada directa de la "
"parte superior"
-#: views/create.py:38
+#: views/create.py:42 views/create.py:59
msgid "You should specify a file to upload."
msgstr "Debería especificar un archivo que subir."
@@ -1780,27 +1886,33 @@
msgstr "Subir un archivo XML exportado previamente desde el ordenador"
#: views/create.py:65
-msgid "The imported file should be an XML file generated by co-ment when exporting a text and comments."
-msgstr "El archivo importado debe ser un archivo XML generado por la co-ment cuando se exporta un texto y comentarios."
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
+msgstr ""
+"El archivo importado debe ser un archivo XML generado por la co-ment cuando "
+"se exporta un texto y comentarios."
#: views/create.py:71
msgid "No co_ment_text node found in XML."
msgstr "Ningún nodo co_ment_text se encuentra en XML."
#: views/create.py:76
+#, python-format
msgid "No %(tag)s node found in XML."
msgstr "Ningún nodo %(tag)s se encuentra en XML."
-#: views/create.py:46
+#: views/create.py:85
msgid "The title of your text"
msgstr "El título de su texto"
-#: views/create.py:71 views/create.py:108
+#: views/create.py:109 views/create.py:144
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "El texto \"%(text_title)s\" ha sido creado"
-#: views/create.py:244
+#: views/create.py:247
+#, python-format
msgid "Text \"%(text_title)s\" has been imported"
msgstr "El texto \"%(text_title)s\" ha sido importado"
@@ -1869,51 +1981,51 @@
msgid "Private notifications feed reseted."
msgstr "Respuesta de avisos privados reiniciada"
-#: views/site.py:82 views/texts.py:131 views/user.py:545
+#: views/site.py:84 views/texts.py:136 views/user.py:548
msgid "You're logged in!"
msgstr "¡Se ha conectado!"
-#: views/site.py:100
+#: views/site.py:102
msgid "Your name"
msgstr "Su nombre"
-#: views/site.py:102
+#: views/site.py:104
msgid "Your email address"
msgstr "Su dirección de correo electrónico"
-#: views/site.py:105
+#: views/site.py:107
msgid "Subject of the message"
msgstr "Asunto del mensaje"
-#: views/site.py:106
+#: views/site.py:108
msgid "Body of the message"
msgstr "Cuerpo del mensaje"
-#: views/site.py:108
+#: views/site.py:110
msgid "Send me a copy of the email"
msgstr "Enviarme una copia del correo electrónico"
-#: views/site.py:134
+#: views/site.py:136
msgid "Copy of message:"
msgstr "Copia del mensaje:"
-#: views/site.py:136
+#: views/site.py:138
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:165
+#: views/site.py:167
msgid "Workspace name"
msgstr "Nombre del espacio de trabajo"
-#: views/site.py:170
+#: views/site.py:172
msgid "Workspace tagline"
msgstr "Etiqueta del espacio de trabajo"
-#: views/site.py:175
+#: views/site.py:177
msgid "Workspace registration"
msgstr "Registro del espacio de trabajo"
-#: views/site.py:176
+#: views/site.py:178
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1922,61 +2034,89 @@
"contrario, sólo se podrán usar las invitaciones enviadas por los "
"administradores para crear nuevos usuarios)"
-#: views/site.py:180
+#: views/site.py:182
msgid "Workspace registration moderation"
msgstr "Moderación del registro del espacio de trabajo"
-#: views/site.py:181
+#: views/site.py:183
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"¿Deben moderarse los usuarios nuevos? (el registro requerirá la aprobación "
"del administrador)"
-#: views/site.py:186
+#: views/site.py:188
msgid "Change the roles available in the workspace"
msgstr "Cambiar los perfiles disponibles en el espacio de trabajo"
-#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+"Los párrafos que incluyen al menos un comentario de esta categoría tendrán "
+"una barra vertical, con este color: "
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
msgid "Settings saved"
msgstr "Ajustes guardados"
-#: views/site.py:215
+#: views/site.py:247
msgid "Workspace logo"
msgstr "Logotipo del espacio de trabajo"
-#: views/site.py:217
-
-#, fuzzy
-msgid "Custom css rules"
-msgstr "Custom css normas"
-
-#: views/site.py:218
-#, fuzzy
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
-msgstr "Agregar reglas de hojas de estilo en formato CSS (no incluya <code><style></code> HTML). Advertencia: este código se añadirá a todo el contenido, asegúrese de que sabe lo que está haciendo antes de añadir algo aquí."
-
-#: views/site.py:223
-#, fuzzy
+#: views/site.py:249
+msgid "Custom CSS rules"
+msgstr "Normas CSS personalizado"
+
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+"Agregar reglas de hojas de estilo en formato CSS (no incluya <code><"
+"style></code> HTML). Advertencia: este código se añadirá a todo el "
+"contenido, asegúrese de que sabe lo que está haciendo antes de añadir algo "
+"aquí."
+
+#: views/site.py:255
msgid "Custom font"
-msgstr "fuente personalizada"
-
-#: views/site.py:225
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Familia personalizado fuente alternativa de 'moderno', 'clásico' y 'código' que los visitantes pueden elegir para el cuerpo de co-ción textos. Escriba una lista separada coma de familias de fuentes. Nombres de familias de fuentes, incluyendo espacios en blanco deben encerrarse entre comillas dobles. Por ejemplo "
-
-#: views/site.py:229
-#, fuzzy
+msgstr "Fuente personalizada"
+
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+"Familia personalizado fuente alternativa de 'moderno', 'clásico' y 'código' "
+"que los visitantes pueden elegir para el cuerpo de co-ción textos. Escriba "
+"una lista separada coma de familias de fuentes. Nombres de familias de "
+"fuentes, incluyendo espacios en blanco deben encerrarse entre comillas "
+"dobles. Por ejemplo "
+
+#: views/site.py:261
msgid "Custom font for titles"
msgstr "Fuente personalizada para los títulos"
-#: views/site.py:231
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Familia personalizado fuente alternativa de 'moderno', 'clásico' y 'código' que los visitantes pueden optar por títulos (h1 a h6) de co-ción textos. Escriba una lista separada coma de familias de fuentes. Nombres de familias de fuentes, incluyendo espacios en blanco deben encerrarse entre comillas dobles. Por ejemplo "
-
-#: views/site.py:253
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+"Familia personalizado fuente alternativa de 'moderno', 'clásico' y 'código' "
+"que los visitantes pueden optar por títulos (h1 a h6) de co-ción textos. "
+"Escriba una lista separada coma de familias de fuentes. Nombres de familias "
+"de fuentes, incluyendo espacios en blanco deben encerrarse entre comillas "
+"dobles. Por ejemplo "
+
+#: views/site.py:319
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
@@ -1984,79 +2124,102 @@
"Un enlace para restablecer su contraseña ha sido-a sentir el perfil de "
"correo electrónico. Por favorrevise su correo electrónico."
-#: views/site.py:257 views/user.py:428
+#: views/site.py:323 views/user.py:431
msgid "Password changed"
msgstr "Contraseña cambiada"
-#: views/texts.py:164
+#: views/texts.py:169
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr "%(nb_texts)i texto(s) borrado(s)"
-#: views/texts.py:209
+#: views/texts.py:214
#, python-format
msgid "Text %(text_title)s deleted"
msgstr "El texto %(text_title)s ha sido borrado"
-#: views/texts.py:220
+#: views/texts.py:226
#, python-format
msgid "Text version %(text_version_title)s deleted"
msgstr "La versión %(text_version_title)s ha sido borrado"
-#: views/texts.py:634
+#: views/texts.py:624
msgid "Note (optional)"
msgstr "Nota (opcional)"
-#: views/texts.py:638
+#: views/texts.py:628
msgid "Add a note to explain the modifications made to the text"
msgstr "Añadir una nota para explicar las modificaciones realizadas al texto"
-#: views/texts.py:648
+#: views/texts.py:638
msgid "New version (optional)"
msgstr "Nueva versión (opcional)"
-#: views/texts.py:651
+#: views/texts.py:641
msgid "Create a new version of this text (recommended)"
msgstr "Crear una nueva versión de este texto (recomendado)"
-#: views/texts.py:654
+#: views/texts.py:644
msgid "Keep comments (optional)"
msgstr "Mantener los comentarios (opcional)"
-#: views/texts.py:617
+#: views/texts.py:647
msgid "Keep comments (if not affected by the edit)"
msgstr "Mantener los comentarios (si no son afectados por la edición)"
-#: views/texts.py:614
-#, fuzzy
+#: views/texts.py:650
msgid "Detach comments (optional)"
msgstr "Separe los comentarios (opcional)"
-#: views/texts.py:657
-#, fuzzy
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
-msgstr "Si algunos comentarios se adjunta a un chunck de texto que se modifica, marque esta opción para mantener estos comentarios sin alcance. Deje esta opción sin marcar si desea que esos comentarios serán eliminados. Esta opción se ignora si el anterior 'Mantener los comentarios' opción no está seleccionada."
-
-#: views/texts.py:723
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+"Si algunos comentarios se adjunta a un chunck de texto que se modifica, "
+"marque esta opción para mantener estos comentarios sin alcance. Deje esta "
+"opción sin marcar si desea que esos comentarios serán eliminados. Esta "
+"opción se ignora si el anterior 'Mantener los comentarios' opción no está "
+"seleccionada."
+
+#: views/texts.py:719
msgid "Name (optional)"
msgstr "Nombre (opcional)"
-#: views/texts.py:724
+#: views/texts.py:720
msgid "Email (optional)"
msgstr "Email (opcional)"
-#: views/texts.py:776
+#: views/texts.py:773
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr ""
"Se ha creado una nueva versión (copiada de la versión %(version_title)s)"
-#: views/texts.py:884 views/user.py:79 views/user.py:99
+#: views/texts.py:885 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr "Perfil del/de los usuario(s) %(count)i modificado(s)"
-#: views/texts.py:942
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr ""
+"Déjelo en blanco para utilizar el valor configurado para el espacio de "
+"trabajo."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+"Para desactivar esta categoría para este texto sea cual sea la configuración "
+"del espacio de trabajo, escriba: "
+
+#: views/texts.py:949
msgid "Text settings updated"
msgstr "Ajustes del texto actualizados"
@@ -2114,101 +2277,101 @@
msgid "Optional text to add to invitation email"
msgstr "Texto opcional para añadir al correo de invitación"
-#: views/user.py:259
+#: views/user.py:260
#, python-format
msgid "%(nb_users)d user added"
msgid_plural "%(nb_users)d users added"
msgstr[0] "%(nb_users)d usario añadido"
msgstr[1] "%(nb_users)d usarios añadidos"
-#: views/user.py:277
+#: views/user.py:278
msgid "Add user"
msgid_plural "Add users"
msgstr[0] "Añadir usuario"
msgstr[1] "Añadir usuarios"
-#: views/user.py:299
+#: views/user.py:300
msgid "This username is already in use. Please supply a different username."
msgstr ""
"Este nombre de usuario ya está siendo usado por otra persona. Por favor, "
"introduzca un nombre de usuario diferente."
-#: views/user.py:320 views/user.py:336
+#: views/user.py:321 views/user.py:338
msgid "Your account has been activated. You're now logged-in."
msgstr "Su cuenta ha sido creada. Ahora está contectado/a"
-#: views/user.py:331
+#: views/user.py:333
msgid "activate account"
msgstr "activar cuenta"
-#: views/user.py:361
+#: views/user.py:363
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr "El acceso del usuario %(prof)s ha sido anulado"
-#: views/user.py:367
+#: views/user.py:369
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr "El acceso del usuario %(prof)s ha sido rechazado"
-#: views/user.py:379
+#: views/user.py:382
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr "El acceso del usuario %(prof)s ha sido restaurado"
-#: views/user.py:383
+#: views/user.py:386
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr "El acceso del usuario %(prof)s ha sido aprobado"
-#: views/user.py:393
+#: views/user.py:396
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Se ha enviado una nueva invitación al usuario %(prof)s."
-#: views/user.py:410
+#: views/user.py:413
msgid "Profile updated"
msgstr "Perfil actualizado"
-#: views/user.py:456
+#: views/user.py:459
msgid "Anonymous user role modified."
msgstr "Perfil de usuario anónimo modificado"
-#: views/user.py:478
+#: views/user.py:481
msgid "User modified"
msgstr "Usuario modificado"
-#: views/user.py:493
+#: views/user.py:496
msgid "Subject"
msgstr "Asunto"
-#: views/user.py:494
+#: views/user.py:497
msgid "Subject of the email"
msgstr "Asunto del correo electrónico"
-#: views/user.py:497
+#: views/user.py:500
msgid "Body"
msgstr "Cuerpo"
-#: views/user.py:498
+#: views/user.py:501
msgid "Body of the email"
msgstr "Cuerpo del mensaje"
-#: views/user.py:518
+#: views/user.py:521
msgid "Email sent."
msgstr "Correo electrónico enviado"
-#: views/user.py:539
+#: views/user.py:542
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Esta cuenta está suspendida. Contacte con el administrador del espacio de "
"trabajo"
-#: views/user.py:574
+#: views/user.py:577
msgid "You've been logged out."
msgstr "Se ha desconectado."
-#: views/user.py:590
+#: views/user.py:593
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2216,13 +2379,16 @@
"Se ha registrado. Recibirá una confirmación por correo electrónico una vez "
"que el moderador apruebe su inscripción."
-#: views/user.py:593
+#: views/user.py:596
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Se ha registrado. Por favor, compruebe que ha recibido el mensaje de "
"confirmación en su correo electrónico."
+#~ msgid "Text notifications"
+#~ msgstr "Avisos del texto"
+
#~ msgid "Are you sure you want to delete this version?"
#~ msgstr "¿Está seguro/a de que desea borrar este texto?"
@@ -2273,30 +2439,6 @@
#~ "La versión #%(version_number)s, titulada \"%(title)s\", y creada en "
#~ "%(date)s:"
-#~ msgid "You've been invited to join the workspace %(workspace_name)s."
-#~ msgstr ""
-#~ "Se le ha invitado a unirse al espacio de trabajo %(workspace_name)s."
-
-#~ msgid ""
-#~ "Click the following link to complete your registration and access the "
-#~ "workspace:"
-#~ msgstr ""
-#~ "Haga clic en el siguiente enlace para completar su registro y acceder al "
-#~ "espacio de trabajo:"
-
-#~ msgid ""
-#~ "If you'd like to unsubscribe from this notification, click the following "
-#~ "link: %(SITE_URL)s%(desactivate_notification_url)s."
-#~ msgstr ""
-#~ "Si desea dar de baja este aviso, haga clic en el siguiente enlace: "
-#~ "%(SITE_URL)s%(desactivate_notification_url)s."
-
-#~ msgid "Contact from user: %(name)s / %(email)s"
-#~ msgstr "Contacto del usuario: %(name)s / %(email)s"
-
-#~ msgid "To publish it click on the following link:"
-#~ msgstr "Para publicarlo, haga clic en el siguiente enlace"
-
#~ msgid "%(title)s"
#~ msgstr "%(title)s"
@@ -2334,48 +2476,3 @@
#~ msgid "Local role"
#~ msgstr "Perfil local"
-
-#: models.py:266 views/site.py:191
-#, fuzzy
-msgid "Label for the first category of comments"
-msgstr "Etiqueta para la primera categoría de los comentarios"
-
-#: models.py:267 views/site.py:197
-#, fuzzy
-msgid "Label for the second category of comments"
-msgstr "Etiqueta para la segunda categoría de los comentarios"
-
-#: models.py:268 views/site.py:203
-#, fuzzy
-msgid "Label for the third category of comments"
-msgstr "Etiqueta para la tercera categoría de los comentarios"
-
-#: models.py:269 views/site.py:209
-#, fuzzy
-msgid "Label for the fourth category of comments"
-msgstr "Etiqueta para la cuarta categoría de los comentarios"
-
-#: models.py:270 views/site.py:215
-#, fuzzy
-msgid "Label for the fifth category of comments"
-msgstr "Etiqueta para la quinta categoría de los comentarios"
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-#, fuzzy
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr "Los párrafos que incluyen al menos un comentario de esta categoría tendrán una barra vertical, con este color: "
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "Leave blank to use the value configured for the workspace."
-msgstr "Déjelo en blanco para utilizar el valor configurado para el espacio de trabajo."
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr "Para desactivar esta categoría para este texto sea cual sea la configuración del espacio de trabajo, escriba: "
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr "Política de confidencialidad"
Binary file src/cm/locale/es/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 17:01+0200\n"
+"POT-Creation-Date: 2014-03-21 16:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Simon Descarpentries <sid1@sopinspace.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,76 +16,106 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: media/js/client/c_addcomment_form.js:52
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
msgid "New comment"
msgstr "Comentario nuevo"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
msgid "New comment will be canceled, continue?"
msgstr "El nuevo comentario será cancelado. żDesea continuar?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
msgid "Warning"
msgstr "Aviso"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
msgid "Started reply will be canceled, continue?"
msgstr "La respuesta que ha comenzado será cancelada. żDesea continuar?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
msgid "Started comment edition will be canceled, continue?"
msgstr ""
"La edición de comentario que ha comenzado será cancelada. żDesea continuar?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
+msgstr "Tabla de contenidos"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
msgid "change comment state to pending"
msgstr "Cambiar el estado del comentario a 'pendiente'"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
msgid "change comment state to approved"
msgstr "Cambiar el estado del comentario a 'aprobado'"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
msgid "change comment state to unapproved"
msgstr "Cambiar el estado del comentario a 'no aprobado'"
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "Cancelar el cambio de estado de este comentario"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
msgid "pending"
msgstr "pendiente"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
msgid "approved"
msgstr "aprobado"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "no aprobado"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "cancelar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
msgid "show replies"
msgstr "mostrar respuestas"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "cambiar a:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "respuesta"
+msgstr[1] "respuestas"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "editar comentario"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
msgid "delete comment"
msgstr "borrar comentario"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
msgid "edit"
msgstr "editar"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
msgid "delete"
msgstr "borrar"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
#: media/js/client/c_interface_forms.js:15
msgid "close"
msgstr "Cerrar"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
msgid "show scope"
msgstr "mostrar alcance"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
msgid ""
"Comment is detached: it was created on a previous version and text it "
"applied to has been modified or removed."
@@ -93,33 +123,27 @@
"Comentario se separa: se creó en una versión anterior y el texto queaplicado "
"a ha sido modificado o eliminado."
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
msgid "last modified on %(date)s"
msgstr "última modificación en %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
msgid "Permalink to this comment"
msgstr "Enlace permanente a este comentario"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:305
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
msgid "by %(name)s, created on %(date)s"
msgstr "por %(name)s, creado en %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr "Cancelar el cambio de estado de este comentario"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
-msgid "unapproved"
-msgstr "no aprobado"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "categoría"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr "cancelar"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr "editar comentario"
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] " comentario"
+msgstr[1] " comentarios"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
msgid "No selection yet"
@@ -154,50 +178,24 @@
msgstr "El comentario se aplicará a la siguiente selección:"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
msgid "Save"
msgstr "guardar"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:101
-#: media/js/site/text_edit.js:104
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
msgid "Cancel"
msgstr "Cancelar"
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr "Editar comentario"
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
-msgstr "cambiar a:"
-
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:579
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] "respuesta"
-msgstr[1] "respuestas"
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Categoría:"
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr "Respuesta nueva"
-
-#: media/js/client/c_scopes.js:318
-msgid " comment"
-msgid_plural " comments"
-msgstr[0] " comentario"
-msgstr[1] " comentarios"
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr "error:"
-
-#: media/js/client/c_sync.js:57
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
msgid "no filtered comments left"
msgstr "no hay comentarios flitrados"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid ""
"Do you want to be notified of all replies in all discussions you "
"participated in?"
@@ -205,22 +203,54 @@
"¿Quiere usted ser notificado de todas las respuestas en todas las "
"discusiones que participó en?"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid "Reply notification"
msgstr "Aviso de repuesta"
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
msgid "could not save comment"
msgstr "no se pudo guardar el comentario"
-#: media/js/client/c_sync.js:223
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
msgid "Are you sure you want to delete this comment?"
msgstr "¿Está seguro/a de que desea borrar este comentario?"
-#: media/js/client/c_sync.js:227
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
msgid "could not remove comment"
msgstr "No se pudo eliminar el comentario"
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Editar comentario"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "error:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Respuesta nueva"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "personalizado"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "moderno"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "clásico"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "código"
+
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
msgid "print from the browser"
msgstr "imprimir desde el navegador"
@@ -234,26 +264,30 @@
msgstr "descargar archivo markdown (.mkd)"
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "print in PDF format"
+msgstr "imprimir en formato PDF"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
msgid "download portable object format file (.pdf)"
msgstr "descargar archivo en formato PDF (.pdf)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
msgid "download latex file (.tex)"
msgstr "descargar archivo como fichero latex (.tex)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
msgid "download open document file (.odt)"
msgstr "descargar archivo como documento de openoffice (.odt)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
msgid "download microsoft word file (.doc)"
msgstr "descargar archivo en formato microsoft word (.doc)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
msgid "download microsoft word 2007 file (.docx)"
msgstr "descargar archivo en formato microsoft word 2007 (.docx)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
msgid "download ebook (.epub)"
msgstr "descargar archivo en formato ebook (.epub)"
@@ -261,43 +295,43 @@
msgid "download XML file for re-importing text and comments"
msgstr "descargar archivo XML para la re-importación de texto y comentarios"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "Print text"
msgstr "Imprimir texto"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "How do you want to print?"
msgstr "¿Cómo desea imprimir?"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Export text"
msgstr "Exportar texto"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Choose file format"
msgstr "Elegir el formato de archivo"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
msgid "using markers only, no background colors"
msgstr "Usando sólo los indicadores, no los colores del fondo"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:42
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
msgid "using markers and background colors"
msgstr "usando indicadores y colores del fondo"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
msgid "all (%(nb_comments)s)"
msgstr "Todos (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:55
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
msgid "current filtered ones (%(nb_comments)s)"
msgstr "actualmente filtrados (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:57
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
msgid "none (0)"
msgstr "ninguno (0)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:90
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
msgid "Go !"
msgstr "ĄAdelante!"
@@ -305,328 +339,308 @@
msgid "loading..."
msgstr "cargando..."
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
msgid "click to show options"
msgstr "Haga clic para mostrar las opciones"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
msgid "click to hide options"
msgstr "Haga clic para ocultar las opciones"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
msgid "Text"
msgstr "Texto"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
msgid "Search"
msgstr "Buscar"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
-#: media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
msgid "Reset"
msgstr "Reiniciar"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
msgid "Hide all Comments"
msgstr "Ocultar todos los comentarios"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
msgid "Authors"
msgstr "Autores"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
msgid "States"
msgstr "Estados"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
msgid "Dates"
msgstr "Fechas"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
msgid "Tags"
msgstr "Etiquetas"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Categorías"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
msgid "view previous comment"
msgstr "Visualizar un comentario anterior"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
msgid "view next comment"
msgstr "Ver el siguiente comentario"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
msgid "view first comment"
msgstr "ver el primer comentario"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
msgid "view last next comment"
msgstr "Ver el último comentario"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
msgid "view all comments"
msgstr "Ver todos los comentarios"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr "Ver comentarios desarraigados"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "Activar opciones avanzadas"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "activar la tabla de contenidos"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
msgid "print document with/without comments"
msgstr "imprimir el documento con/sin comentarios"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:185
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
msgid "export document with/without comments"
msgstr "exportar el documento con/sin comentarios"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:186
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
msgid "toggle full screen view"
msgstr "activar la vista de pantalla completa"
-#: media/js/site/f_text_view_frame.js:193
-msgid "toggle table of contents"
-msgstr "activar la tabla de contenidos"
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
+msgstr "respuesta del texto"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
msgid "add a comment"
msgstr "ańadir un comentario"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
msgid "filter:"
msgstr "flitro:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:209
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
msgid "browse by:"
msgstr "Ver por:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
msgid "location"
msgstr "localización"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:212
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
msgid "modification"
msgstr "modificación"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:332
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr "Debates no incluidos en ningún hilo de debate"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
msgid "thread discussions"
msgstr "Hilos de debate"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:366
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
msgid "Text style"
msgstr "Estilo del texto"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:411
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
msgid "Animation duration"
msgstr "Duración de la animación"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:420
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
msgid "(0.001 to 1 second)"
msgstr "de 0.001 a 1 segundo"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:446
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
msgid "preferences reset (will apply on next load)"
msgstr "Preferencias reiniciadas (se aplicará en la siguiente carga)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:452
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
msgid "preferences saved (will apply on next load)"
msgstr "Preferencias guardadas (se aplicará en la siguiente carga)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:556
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
msgid "filter reset"
msgstr "Reiniciar filtro"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:566
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
msgid "filter applied"
msgstr "Filtro aplicado"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:572
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
msgid "discussion"
msgid_plural "discussions"
msgstr[0] "Debate"
msgstr[1] "Debates"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:576
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
msgid "comment"
msgid_plural "comments"
msgstr[0] "Comentario"
msgstr[1] "Comentarios"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:601
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
msgid "all"
msgstr "Todos"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:619
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
msgid "last 24 hours (%(nb_comments)s)"
msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
msgstr[0] "Últimas 24 horas (%(nb_comments)s)"
msgstr[1] "(%(nb_comments)s) de los Últimos %(nb_days)s días"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:733
-#: media/js/site/text_edit.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
msgid "No"
msgstr "No"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:734
-#: media/js/site/text_edit.js:89
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
msgid "Yes"
msgstr "Sí"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
msgid "First Level Heading"
msgstr "Encabezado del primer nivel"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
msgid "Your title here..."
msgstr "Introduzca aquí su título..."
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
msgid "Second Level Heading"
msgstr "Encabezado del segundo nivel"
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
msgid "Heading 3"
msgstr "Encabezado 3"
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
msgid "Heading 4"
msgstr "Encabezado 4"
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
msgid "Heading 5"
msgstr "Encabezado 5"
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
msgid "Heading 6"
msgstr "Encabezado 7"
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
msgid "Bold"
msgstr "Negrita"
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
msgid "Italic"
msgstr "Cursiva"
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
msgid "Bulleted List"
msgstr "Lista no numerada"
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
msgid "Numeric List"
msgstr "Lista numerada"
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
msgid "Picture"
msgstr "Imagen"
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
msgid "Link"
msgstr "Enlace"
-#: media/js/markitup/sets.js:37
+#: media/js/markitup/sets.js:36
msgid "Quotes"
msgstr "Citas"
-#: media/js/markitup/sets.js:38
+#: media/js/markitup/sets.js:37
msgid "Code Block / Code"
msgstr "Codifcar en bloque / Código"
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
msgid "Preview"
msgstr "Previsualizar"
-#: media/js/markitup/sets.js:71
+#: media/js/markitup/sets.js:72
msgid "Paragraph"
msgstr "Párrafo"
-#: media/js/markitup/sets.js:75
+#: media/js/markitup/sets.js:76
msgid "Stroke through"
msgstr "Efectos del texto"
-#: media/js/markitup/sets.js:79
+#: media/js/markitup/sets.js:80
msgid "List element"
msgstr "Listar elemento"
-#: media/js/markitup/sets.js:82
+#: media/js/markitup/sets.js:83
msgid "Your text to link..."
msgstr "Su texto para enlazar..."
-#: media/js/markitup/sets.js:84
+#: media/js/markitup/sets.js:85
msgid "Clean"
msgstr "Limpiar"
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr "moderno"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr "clásico"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr "código"
-
-#: media/js/site/c_text_view_comments.js:21
-#, fuzzy
-msgid "custom"
-msgstr "personalizado"
-
-#: media/js/site/f_text_view_frame.js:182
-msgid "view all detached comments"
-msgstr "Ver comentarios desarraigados"
-
-#: media/js/site/f_text_view_frame.js:183
-msgid "toggle advance interface"
-msgstr "Activar opciones avanzadas"
-
-#: media/js/site/f_text_view_frame.js:187
-msgid "text feed"
-msgstr "respuesta del texto"
-
-#: media/js/site/f_text_view_frame.js:329
-msgid "unthread discussions"
-msgstr "Debates no incluidos en ningún hilo de debate"
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-"¿Si estos comentarios separarse (es decir, mantenerse sin alcance) o "
-"eliminado dela nueva versión?"
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] "%(nb_comments)s comentario se aplica al texto que fue modificado."
-msgstr[1] "%(nb_comments)s comentarios se aplican al texto que fue modificado."
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr "(Le sugerimos que cree una nueva versión)"
-
-#: media/js/site/text_edit.js:67
+#: media/js/site/text_edit.js:10
msgid "You chose not to create a new version all comments will be deleted"
msgstr ""
"Que optó por no crear una nueva versión todos los comentarios serán "
"eliminados"
-#: media/js/site/text_edit.js:69
+#: media/js/site/text_edit.js:12
msgid "Do you want to continue?"
msgstr "¿Desea continuar?"
-#: media/js/site/text_edit.js:102
-msgid "Detach"
-msgstr "Separar"
+#~ msgid ""
+#~ "Should these comments be detached (i.e. kept with no scope) or removed "
+#~ "from new version?"
+#~ msgstr ""
+#~ "¿Si estos comentarios separarse (es decir, mantenerse sin alcance) o "
+#~ "eliminado dela nueva versión?"
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr "Suprimir"
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] ""
+#~ "%(nb_comments)s comentario se aplica al texto que fue modificado."
+#~ msgstr[1] ""
+#~ "%(nb_comments)s comentarios se aplican al texto que fue modificado."
-#: media/js/client/c_toc.js:45
-msgid "Table of contents"
-msgstr "Tabla de contenidos"
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Le sugerimos que cree una nueva versión)"
+
+#~ msgid "Detach"
+#~ msgstr "Separar"
+
+#~ msgid "Remove"
+#~ msgstr "Suprimir"
#~ msgid " reply"
#~ msgid_plural " replies"
@@ -644,18 +658,3 @@
#~ msgid "Use padding to show discussion threads"
#~ msgstr "Usar espacios en blanco para separar los diferentes hilos de debate"
-
-#: media/js/client/c_icomment.js:330
-#, fuzzy
-msgid "category"
-msgstr "categoría"
-
-#: media/js/client/c_interface_form.js:52
-#, fuzzy
-msgid "Category:"
-msgstr "Categoría:"
-
-#: media/js/site/f_text_view_frame.js:123
-#, fuzzy
-msgid "Categories"
-msgstr "Categorías"
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -4,11 +4,13 @@
#
# renaud bernard <renaud.bernard@sopinspace.com>, 2010.
# Simon Descarpentries <sid1@sopinspace.com>, 2011.
+#
+
msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 15:03+0200\n"
+"POT-Creation-Date: 2014-03-18 18:04+0100\n"
"PO-Revision-Date: 2010-10-11 15:31+0100\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: <en@li.org>\n"
@@ -19,154 +21,175 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: client.py:29
+#: client.py:30
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:138
+#: client.py:144
msgid "name is required"
msgstr "le nom est obligatoire"
-#: client.py:141
+#: client.py:147
msgid "email is required"
msgstr "l'email est obligatoire"
-#: client.py:143
+#: client.py:149
msgid "invalid email"
msgstr "l'email est invalide"
-#: client.py:145
+#: client.py:151
msgid "title is required"
msgstr "le titre est obligatoire"
-#: client.py:147
+#: client.py:153
msgid "content is required"
msgstr "le texte est obligatoire"
-#: client.py:162
+#: client.py:168
msgid "comment removed"
msgstr "commentaire supprimé"
-#: client.py:213 client.py:278
+#: client.py:221 client.py:286
msgid "comment saved"
msgstr "commentaire sauvé"
-#: client.py:280
+#: client.py:288
msgid "comment saved, it is being held for moderation"
msgstr "commentaire sauvé, en attente de modération"
-#: client.py:314
+#: client.py:326 client.py:335 client.py:337
msgid "me"
msgstr "moi"
-#: client.py:316
+#: client.py:328 client.py:335 client.py:337
msgid "author"
msgstr "auteur"
-#: client.py:341
+#: client.py:387
msgid "Tags input must be no longer than 250 characters."
msgstr "La longueur des tags est limitée à 250 caractères."
-#: models.py:184 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:630
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
msgid "Title"
msgstr "Titre"
-#: models.py:185
+#: models.py:189
msgid "Format"
msgstr "Format"
-#: models.py:186 views/texts.py:725
+#: models.py:190 views/texts.py:721
msgid "Content"
msgstr "Texte"
-#: models.py:187 models.py:643 templates/site/help.html:47
+#: models.py:191 models.py:625 templates/site/help.html:56
msgid "Tags"
msgstr "Tags"
-#: models.py:189 templates/site/text_history.html:80 views/user.py:223
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
msgid "Note"
msgstr "Note"
-#: models.py:191
+#: models.py:195
msgid "Moderation a posteriori?"
msgstr "Modération a posteriori ?"
-#: models.py:307
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Intitulé pour la première catégorie de commentaires"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Intitulé pour la deuxième catégorie de commentaires"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Intitulé pour la troisième catégorie de commentaires"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Intitulé pour la quatrième catégorie de commentaires"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Intitulé pour la cinquième catégorie de commentaires"
+
+#: models.py:289
msgid "Format:"
msgstr "Format :"
-#: models.py:545
+#: models.py:528
msgid "name"
msgstr "nom"
-#: models.py:546
+#: models.py:529
msgid "description"
msgstr "description"
-#: models.py:637
+#: models.py:619
msgid "Allow contact"
msgstr "Autorise à être contacté"
-#: models.py:637
+#: models.py:619
msgid "Allow email messages from other users"
msgstr ""
"Autoriser les participants de l'espace de travail à vous envoyer un email"
-#: models.py:638
+#: models.py:620
msgid "Preferred language"
msgstr "Langage de préférence"
-#: models.py:641
+#: models.py:623
msgid "Suspended access"
msgstr "Accès désactivé"
-#: models.py:665
+#: models.py:647
msgid "suspended"
msgstr "désactivé"
-#: models.py:667
+#: models.py:649
msgid "waiting approval"
msgstr "en attente d'approbation"
-#: models.py:673
+#: models.py:655
msgid "pending"
msgstr "en attente"
-#: models.py:688
+#: models.py:670
msgid "Invitation"
msgstr "Invitation"
-#: models.py:756
+#: models.py:732
#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Le texte %(link_to_text)s a été édité par %(creator)s"
-#: models.py:757
+#: models.py:733
#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr ""
"Le texte %(link_to_text)s a été édité (nouvelle version créée) par "
"%(creator)s"
-#: models.py:758
+#: models.py:734
#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Le texte %(link_to_text)s a été ajouté par %(creator)s"
-#: models.py:763
+#: models.py:735
+#, python-format
msgid "Text %(link_to_text)s imported by %(creator)s"
msgstr "Le texte %(link_to_text)s a été importé par %(creator)s"
-#: models.py:759
+#: models.py:736
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Le texte %(link_to_text)s a été supprimé"
-#: models.py:760
+#: models.py:737
#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
@@ -174,51 +197,51 @@
"Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s par "
"%(creator)s"
-#: models.py:761
+#: models.py:738
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr "Commentaire %(link_to_comment)s supprimé du texte %(link_to_text)s"
-#: models.py:762
+#: models.py:739
#, python-format
msgid "User %(username)s added"
msgstr "L'utilisateur %(username)s a été ajouté"
-#: models.py:763
+#: models.py:740
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
-#: models.py:764
+#: models.py:741
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
-#: models.py:765
+#: models.py:742
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
-#: models.py:766
+#: models.py:743
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
-#: models.py:767
+#: models.py:744
#, python-format
msgid "User %(username)s has activated his account"
msgstr "L'utilisateur %(username)s a activé son compte"
-#: models.py:816
+#: models.py:793
msgid "anonymous"
msgstr "anonyme"
-#: models.py:823 models.py:831
+#: models.py:800 models.py:808
#, python-format
msgid "by \"%(username)s\""
msgstr "par \"%(username)s\""
-#: models.py:825
+#: models.py:802
#, python-format
msgid "%(time_since)s ago"
msgstr "il y a %(time_since)s"
@@ -231,7 +254,7 @@
msgid "Email:"
msgstr "Email :"
-#: notifications.py:60
+#: notifications.py:61 templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr "Notification:"
@@ -243,30 +266,34 @@
msgid "Class (education)"
msgstr "Classe (éducation)"
-#: settings.py:105
+#: settings.py:110
msgid "French"
msgstr "Français"
-#: settings.py:106
+#: settings.py:111
msgid "English"
msgstr "Anglais"
-#: settings.py:107
+#: settings.py:112
msgid "Norwegian"
msgstr "Norvégien"
-#: settings.py:108
+#: settings.py:113
msgid "Brazilian Portuguese"
msgstr "Portugais brésilien"
-#: settings.py:109
+#: settings.py:114
msgid "Spanish"
msgstr "Espagnol"
-#: settings.py:110
+#: settings.py:115
msgid "Bulgarian"
msgstr "Bulgare"
+#: settings.py:116
+msgid "Italian"
+msgstr "Italien"
+
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
msgstr "Observateur"
@@ -383,12 +410,86 @@
msgid "API Documentation"
msgstr "Documentation de l'API"
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr "Vous avez été invité à rejoindre l'espace %(workspace_name)s."
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr "Cliquez sur le lien suivant pour terminer votre enregistrement et accèder à l'espace : "
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr "Si vous souhaitez vous désabonner de cette notification, cliquez"
+"sur le lien suivant : %(SITE_URL)s%(desactivate_notification_url)s."
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Vous recevez ce courriel car vous avez demandé à réinitialiser votre mot de passe"
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "pour votre compte utilisateur sur %(site_name)s"
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr "Nous vous invitons à votre rendre à la page suivante pour choisir un nouveau mot de passe : "
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr "Votre nom d'utilisateur, pour mémoire : "
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Contact de l'utilisateur %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "Le texte \"%(title)s\" a été créé"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr "Pour le publier, cliquez sur le lien suivant : "
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "retour à l'espace de travail"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
msgid "Activate your account"
msgstr "Activer votre compte"
-#: templates/site/activate.html:23
+#: templates/site/activate.html:32
msgid "Activate"
msgstr "Activer"
@@ -397,15 +498,16 @@
msgid "Contact"
msgstr "Contact"
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
msgid "Send"
msgstr "Envoyer"
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
#: templates/site/settings.html:29 templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:49
-#: templates/site/text_create_upload.html:44 templates/site/user_add.html:34
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
#: templates/site/user_mass_add_text.html:38
@@ -422,8 +524,9 @@
#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
-#: templates/site/layout/header.html:10
+#: templates/site/layout/header.html:13
msgid "Create a text"
msgstr "Créer un texte"
@@ -434,9 +537,10 @@
"presse papier."
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
#: templates/site/text_create_upload.html:4
#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
-#: templates/site/layout/header.html:11
+#: templates/site/layout/header.html:14
msgid "Upload a text"
msgstr "Charger un texte"
@@ -448,58 +552,61 @@
"Charger un document à partir de votre ordinateur (document texte, document "
"Open Format, document Word)"
-#: templates/site/dashboard.html:50
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
#: templates/site/text_create_import.html:4
#: templates/site/text_create_import.html:30
-#: templates/site/text_create_content.html:32
-#: templates/site/text_create_upload.html:30
-#: templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
msgid "Import a co-mented text"
msgstr "Importer un texte co-menté"
#: templates/site/dashboard.html:50
-msgid "Import a text, possibly with comments and attachments, which has been previously exported in XML format from co-ment interface"
-msgstr "Importer un texte, éventuellement avec des commentaires et des pièces jointes, ce qui a été préalablement exportés au format XML à partir de l'interface de co-ment"
-
-#: templates/site/dashboard.html:50
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
+msgstr ""
+"Importer un texte, éventuellement avec des commentaires et des pièces "
+"jointes, ce qui a été préalablement exportés au format XML à partir de "
+"l'interface de co-ment"
+
+#: templates/site/dashboard.html:51
msgid "Invite user"
msgstr "Inviter un utilisateur"
-#: templates/site/dashboard.html:51
-msgid "Edit your profile"
-msgstr "Éditer votre profil"
-
#: templates/site/dashboard.html:52
+msgid "Edit your profile"
+msgstr "Éditer votre profil"
+
+#: templates/site/dashboard.html:53
msgid "View text list"
msgstr "Voir la liste des textes"
-#: templates/site/dashboard.html:53
+#: templates/site/dashboard.html:54
msgid "Configure workspace"
msgstr "Configurer l'espace de travail"
-#: templates/site/dashboard.html:64
+#: templates/site/dashboard.html:65
msgid "Moderation queue"
msgstr "En attente"
-#: templates/site/dashboard.html:76
+#: templates/site/dashboard.html:77
#, python-format
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:81 templates/site/dashboard.html.py:127
msgid "approve"
msgstr "accepter"
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "refuse"
msgstr "refuser"
-#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html:81
msgid "membership"
msgstr "l'utilisateur"
-#: templates/site/dashboard.html:85
+#: templates/site/dashboard.html:86
#: templates/site/macros/user_moderation.html:8
msgid ""
"Are you sure you want to approve this user's membership to the workspace?"
@@ -507,7 +614,7 @@
"Êtes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de "
"travail ?"
-#: templates/site/dashboard.html:94
+#: templates/site/dashboard.html:95
#: templates/site/macros/user_moderation.html:17
msgid ""
"Are you sure you want to refuse this user's membership to the workspace?"
@@ -515,114 +622,115 @@
"Êtes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de "
"travail ?"
-#: templates/site/dashboard.html:106
+#: templates/site/dashboard.html:107
#, 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:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
msgid "comment"
msgstr "commentaire"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
#, python-format
msgid "by %(cuser)s on text"
msgstr "par %(cuser)s sur le texte"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
msgid "awaits approval"
msgstr "est en attente d'approbation"
-#: templates/site/dashboard.html:127
+#: templates/site/dashboard.html:128
msgid "view in context"
msgstr "voir dans son contexte"
-#: templates/site/dashboard.html:132
+#: templates/site/dashboard.html:133
msgid "Are you sure you want to approve this comment?"
msgstr "(Êtes-vous sûr de vouloir valider ce commentaire ?"
-#: templates/site/dashboard.html:149
+#: templates/site/dashboard.html:150
msgid "Are you sure you want to refuse this comment?"
msgstr "Êtes-vous sûr de vouloir refuser ce commentaire ?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
#, python-format
msgid "modified %(duration)s ago"
msgstr "modifié il y a %(duration)s"
-#: templates/site/dashboard.html:186
+#: templates/site/dashboard.html:187
msgid "Recent texts"
msgstr "Textes récents"
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
msgid "all"
msgstr "tous"
-#: templates/site/dashboard.html:201
+#: templates/site/dashboard.html:202
#, python-format
msgid "%(nb_comments)s comment"
msgid_plural "%(nb_comments)s comments"
msgstr[0] "%(nb_comments)s commentaire"
msgstr[1] "%(nb_comments)s commentaires"
-#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
#, python-format
msgid "1 version"
msgid_plural "%(versions_number)s versions"
msgstr[0] "1 version"
msgstr[1] "%(versions_number)s versions"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:223
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
msgid "No texts yet"
msgstr "Aucun texte"
-#: templates/site/dashboard.html:227
-msgid "Workspace activity"
-msgstr "Activités dans l'espace de travail"
-
-#: templates/site/dashboard.html:228
-msgid "month"
-msgstr "mois"
-
#: templates/site/dashboard.html:228
+msgid "Workspace activity"
+msgstr "Activités dans l'espace de travail"
+
+#: templates/site/dashboard.html:229
+msgid "month"
+msgstr "mois"
+
+#: templates/site/dashboard.html:229
msgid "week"
msgstr "semaine"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "24 hours"
msgstr "24 heures"
-#: templates/site/dashboard.html:234
+#: templates/site/dashboard.html:235
msgid "Access"
msgstr "Accès"
-#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:208 templates/site/user_list.html:158
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Chargement ..."
-#: templates/site/dashboard.html:245
+#: templates/site/dashboard.html:246
msgid "Commenting"
msgstr "Commentaires"
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:265
msgid "Activities"
msgstr "Activités"
-#: templates/site/dashboard.html:267
+#: templates/site/dashboard.html:268
msgid "texts"
msgstr "textes"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:269
msgid "comments"
msgstr "commentaires"
-#: templates/site/dashboard.html:270
+#: templates/site/dashboard.html:271
msgid "users"
msgstr "utilisateurs"
-#: templates/site/dashboard.html:310
+#: templates/site/dashboard.html:311
msgid "No activities"
msgstr "Pas d'activités"
@@ -653,7 +761,7 @@
msgid "Followup"
msgstr "Suivi"
-#: templates/site/followup.html:20 templates/site/help.html:66
+#: templates/site/followup.html:20 templates/site/help.html:75
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Flux"
@@ -663,8 +771,8 @@
msgstr "Flux public"
#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/help.html.py:14
-#: templates/site/text_embed.html:27 templates/site/layout/footer.html:11
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
#: templates/site/macros/form_fields.html:20
msgid "Help"
msgstr "Aide"
@@ -722,77 +830,77 @@
"S'abonner aux notifications concernant les commentaires ou réponses dans les "
"discussions auxquelles vous avez participé"
-#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/forgot_pw.html:27
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
msgid "Reset my password"
msgstr "Réinitialiser mon mot de passe"
-#: templates/site/forgot_pw.html:35
+#: templates/site/forgot_pw.html:44
msgid "This link is invalid."
msgstr "Ce lien est invalide."
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
msgid "Forgot password?"
msgstr "Mot de passe oublié ?"
-#: templates/site/help.html:16
+#: templates/site/help.html:25
msgid "General Presentation"
msgstr "Présentation Générale"
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "co-ment is a web based text annotation system."
msgstr "co-ment est un système de commentaire de texte sur le web."
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "COMT is the open source software behind it"
msgstr "COMT est le logiciel libre derrière"
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "See www.co-ment.com for more details"
msgstr "Voir www.co-ment.com pour plus de détails"
-#: templates/site/help.html:20
+#: templates/site/help.html:29
msgid "Glossary"
msgstr "Glossaire"
-#: templates/site/help.html:22
+#: templates/site/help.html:31
msgid "Contents"
msgstr "Contenu"
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
msgid "Collaboration"
msgstr "Collaboration"
-#: templates/site/help.html:25 templates/site/help.html.py:37
+#: templates/site/help.html:34 templates/site/help.html.py:46
msgid "Comments"
msgstr "Commentaires"
-#: templates/site/help.html:26 templates/site/help.html.py:60
+#: templates/site/help.html:35 templates/site/help.html.py:69
msgid "Notification and feeds"
msgstr "Notification et flux."
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
msgid "Roles"
msgstr "Rôles"
-#: templates/site/help.html:28 templates/site/help.html.py:88
+#: templates/site/help.html:37 templates/site/help.html.py:97
#: templates/site/text_list.html:12
msgid "Texts"
msgstr "Textes"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
"La collaboration est basée sur l'assignation de rôles aux utilisateurs dans "
"co-ment 2."
-#: templates/site/help.html:34 templates/site/help.html.py:45
+#: templates/site/help.html:43 templates/site/help.html.py:54
msgid "Click here for more details"
msgstr "Cliquer ici pour plus de détails"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
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 "
@@ -802,11 +910,11 @@
"utilisateurs auront un rôle de gestion, alors que les autres auront un role "
"défini en relation avec les textes."
-#: templates/site/help.html:40
+#: templates/site/help.html:49
msgid "Moderation"
msgstr "Modération"
-#: templates/site/help.html:41
+#: templates/site/help.html:50
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 "
@@ -829,16 +937,16 @@
"seront pas visibles aux utilisateurs dépourvu des droits de modération tant "
"qu'aucun utilisateur doté (au moins) du rôle Moderateur ne les approuve."
-#: templates/site/help.html:44
+#: templates/site/help.html:53
msgid "States"
msgstr "États"
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid "co-ment uses states to implement moderation policies."
msgstr ""
"co-ment utilise les états pour mettre en place les politiques de modération."
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid ""
"Unapproved or pending comments are visible only to Managers, Editors and "
"Moderators. Approved comments are visible to users with any role. The "
@@ -849,7 +957,7 @@
"visible par tous les utilisateurs. L'état « en attente » n'existe que quand "
"la modération a priori est activée dans les paramètres."
-#: templates/site/help.html:48
+#: templates/site/help.html:57
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 "
@@ -862,11 +970,11 @@
"décisions à prendre pour de futures révisions. Vous pouvez aussi les "
"utiliser pour classer les commentaires suivant leur but ou leur sujet. "
-#: templates/site/help.html:50
+#: templates/site/help.html:59
msgid "Linking to a comment"
msgstr "Lien vers un commentaire"
-#: templates/site/help.html:51
+#: templates/site/help.html:60
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 "
@@ -878,11 +986,11 @@
"vous passez la souris sur le symbole de pragraphe (¶) situé à la fin du "
"titre d'un commentaire."
-#: templates/site/help.html:53
+#: templates/site/help.html:62
msgid "Scope"
msgstr "Portée"
-#: templates/site/help.html:54
+#: templates/site/help.html:63
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 "
@@ -892,11 +1000,11 @@
"La portée d'un commentaire peut être modifiée par tout utilisateur ayant un "
"rôle permettant l'édition d'un commentaire."
-#: templates/site/help.html:56
+#: templates/site/help.html:65
msgid "Keeping your comments across versions"
msgstr "Conservation des commentaires entre les versions"
-#: templates/site/help.html:57
+#: templates/site/help.html:66
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 "
@@ -916,11 +1024,11 @@
"connue mais restent visibles, et vous pouvez alors leur donner une nouvelle "
"portée), soit de supprimer ces commentaires dans la nouvelle version."
-#: templates/site/help.html:63
+#: templates/site/help.html:72
msgid "Email notification"
msgstr "Notification par courriel"
-#: templates/site/help.html:64
+#: templates/site/help.html:73
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 "
@@ -931,11 +1039,11 @@
"est ajouté à un texte, ou qu'un texte est édité au point d'en créer une "
"nouvelle version."
-#: templates/site/help.html:67
+#: templates/site/help.html:76
msgid "Web feed definition on Wikipedia"
msgstr "Definition d'un flux sur Wikipedia"
-#: templates/site/help.html:67
+#: templates/site/help.html:76
msgid ""
"You can subscribe to the feed for a specific text or to a global feed for "
"the full workspace."
@@ -943,11 +1051,11 @@
"Vous pouvez vous abonner à un flux pour un texte particulier ou à un flux "
"global pour l'espace de travail tout entier."
-#: templates/site/help.html:69
+#: templates/site/help.html:78
msgid "Public and private feeds"
msgstr "Flux privé et public"
-#: templates/site/help.html:70
+#: templates/site/help.html:79
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 "
@@ -960,11 +1068,11 @@
"espace de travail à moins que vous ne vouliez les informer de ce qui s'y "
"passe à l'intérieur."
-#: templates/site/help.html:72
+#: templates/site/help.html:81
msgid "Text embedding"
msgstr "Encapsulation du texte"
-#: templates/site/help.html:73
+#: templates/site/help.html:82
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' "
@@ -980,11 +1088,11 @@
"des commentaires, assurez-vous de ne pas être logé dans votre espace de "
"travail dans un autre onglet de votre navigateur."
-#: templates/site/help.html:80
+#: templates/site/help.html:89
msgid "Roles are predefined sets of permissions."
msgstr "Les rôles sont des ensembles prédéfinis de permissions."
-#: templates/site/help.html:81
+#: templates/site/help.html:90
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."
@@ -993,11 +1101,11 @@
"utilisateurs anonymes) seulement si les utilisateurs anonymes sont dotés "
"d'un rôle sur le texte en question."
-#: templates/site/help.html:82 templates/site/text_share.html:88
+#: templates/site/help.html:91 templates/site/text_share.html:88
msgid "Text role"
msgstr "Rôle sur le texte"
-#: templates/site/help.html:83
+#: templates/site/help.html:92
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 "
@@ -1009,11 +1117,11 @@
"donner un rôle sur un texte (et non sur tous les textes de l'espace de "
"travail)."
-#: templates/site/help.html:84 views/site.py:185
+#: templates/site/help.html:93 views/site.py:187
msgid "Role model"
msgstr "Modèle des rôles"
-#: templates/site/help.html:85
+#: templates/site/help.html:94
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 "
@@ -1028,11 +1136,11 @@
"particuliers permettant, dans ce cas particulier, que des commentaires "
"soient partagés seulement entre un professeur et un étudiant."
-#: templates/site/help.html:91
+#: templates/site/help.html:100
msgid "Create or upload?"
msgstr "Créer ou charger ?"
-#: templates/site/help.html:92
+#: templates/site/help.html:101
msgid ""
"There are 3 main ways to produce a text in co-ment. If you start from "
"scratch, create your text in markdown format. If you start from an existing "
@@ -1047,11 +1155,11 @@
"HTML, ou encore copier/coller la page dans l'éditeur de documents HTML de co-"
"ment."
-#: templates/site/help.html:96
+#: templates/site/help.html:105
msgid "Text formats"
msgstr "Formats du texte"
-#: templates/site/help.html:97
+#: templates/site/help.html:106
msgid ""
"There are at this date 3 text formats: markdown (default/preferred format), "
"HTML and RST."
@@ -1059,11 +1167,11 @@
"Il y a actuellement 3 formats de texte supportés : Markdown (par défaut), "
"HTML et RST."
-#: templates/site/help.html:101
+#: templates/site/help.html:110
msgid "Markdown"
msgstr "Markdown"
-#: templates/site/help.html:102
+#: templates/site/help.html:111
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 "
@@ -1074,12 +1182,12 @@
"dans co-ment. Notre logiciel utilise la version de Markdown étendue par "
"Pandoc."
-#: templates/site/help.html:102
+#: templates/site/help.html:111
msgid "Read more about this"
msgstr "En savoir plus"
#: templates/site/login.html:8 templates/site/login_form.html:19
-#: templates/site/layout/header.html:17
+#: templates/site/layout/header.html:21
msgid "Login"
msgstr "Se connecter"
@@ -1089,16 +1197,16 @@
msgstr "Se connecter à %(wname)s"
#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:18
+#: templates/site/layout/header.html:22
msgid "Register"
msgstr "S'enregistrer"
#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
+#: templates/site/layout/header.html:11
msgid "Home"
msgstr "Accueil"
-#: templates/site/non_authenticated_index.html:20
+#: templates/site/non_authenticated_index.html:28
#, python-format
msgid "One public text"
msgid_plural "%(counter)s public texts"
@@ -1109,46 +1217,47 @@
msgid "Deactivate notification"
msgstr "Désactiver la notification"
-#: templates/site/notifications_desactivate.html:31
+#: templates/site/notifications_desactivate.html:39
msgid "Deactivate"
msgstr "Désactiver"
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Votre profil (%(username)s)"
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:14
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
msgid "Profile"
msgstr "Profil"
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
msgid "Password"
msgstr "Mot de passe"
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/text_edit.html:37
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
#: 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/user_activate.html:36 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Enregistrer"
-#: templates/site/register.html:19
+#: templates/site/register.html:27
#, python-format
msgid "%(wname)s Registration"
msgstr "S'enregistrer sur %(wname)s"
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
msgid "Reset your password"
msgstr "Réinitialiser votre mot de passe"
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:185 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Paramètres"
@@ -1174,24 +1283,21 @@
msgstr "Supprimer le logo"
#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
msgid "Text list"
msgstr "Textes"
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr "Notifications du texte"
-
-#: templates/site/text_embed.html:25
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
msgid "Embed text"
msgstr "Encapsulation du texte"
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
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."
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid ""
"Users will also be able to add comments from your site depending on "
"anonymous users' roles."
@@ -1265,8 +1371,8 @@
msgstr "Comparer les deux dernières versions"
#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
msgid "Most recent version"
msgstr "Version la plus récente"
@@ -1276,55 +1382,55 @@
msgid "Original version"
msgstr "Version originale"
-#: templates/site/text_history.html:67
+#: templates/site/text_history.html:69
msgid "Compare selected versions"
msgstr "Comparer les versions selectionnées"
-#: templates/site/text_history.html:77
+#: templates/site/text_history.html:79
msgid "Version"
msgstr "Version"
-#: templates/site/text_history.html:78
+#: templates/site/text_history.html:80
msgid "Selection"
msgstr "Sélection"
-#: templates/site/text_history.html:81 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "Author"
msgstr "Auteur"
-#: templates/site/text_history.html:82
+#: templates/site/text_history.html:84
msgid "Created"
msgstr "Crée"
-#: templates/site/text_history.html:83 templates/site/text_list.html:141
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
msgid "# comments"
msgstr "nb. de commentaires"
-#: templates/site/text_history.html:105 templates/site/text_list.html:161
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
msgid "View"
msgstr "Voir"
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr "Comparer avec la version précédente"
-#: templates/site/text_history.html:108
+#: templates/site/text_history.html:110
msgid "Revert to this version"
msgstr "Revenir à cette version"
-#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_compare.html:32
msgid "Previous modification"
msgstr "Modification précédente"
-#: templates/site/text_history_compare.html:31
#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
#, python-format
msgid "Version %(version_number)s"
msgstr "Version n°%(version_number)s"
-#: templates/site/text_history_compare.html:32
+#: templates/site/text_history_compare.html:35
#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
@@ -1332,95 +1438,95 @@
"Différences entre les versions n°%(version_1_number)s et n°"
"%(version_2_number)s"
-#: templates/site/text_history_compare.html:34
+#: templates/site/text_history_compare.html:37
msgid "Next modification"
msgstr "Modification suivante"
-#: templates/site/text_history_compare.html:44
+#: templates/site/text_history_compare.html:46
msgid "No differences"
msgstr "Pas de différences"
-#: templates/site/text_history_version.html:31
+#: templates/site/text_history_version.html:34
msgid "Previous version"
msgstr "Version précédente"
-#: templates/site/text_history_version.html:36
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Version suivante"
+
+#: templates/site/text_history_version.html:42
msgid "Compare with next version"
msgstr "Comparer avec la version suivante"
-#: templates/site/text_history_version.html:37
-msgid "Next version"
-msgstr "Version suivante"
-
-#: templates/site/text_history_version.html:45 views/texts.py:496
-#: views/texts.py:497
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
#, python-format
msgid "by %(author)s"
msgstr "par %(author)s"
-#: templates/site/text_list.html:51 templates/site/text_share.html:40
+#: templates/site/text_list.html:53 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:53 templates/site/text_share.html:42
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Tous"
-#: templates/site/text_list.html:81 templates/site/user_list.html:72
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Actions multiples"
-#: templates/site/text_list.html:82 templates/site/text_list.html.py:163
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
msgid "Delete"
msgstr "Supprimer"
-#: templates/site/text_list.html:85 templates/site/user_list.html:81
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
msgid "Apply"
msgstr "Appliquer"
-#: templates/site/text_list.html:106 templates/site/user_list.html:102
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
-#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texte"
-#: templates/site/text_list.html:140
+#: templates/site/text_list.html:142
msgid "Modified"
msgstr "Modifié"
-#: templates/site/text_list.html:142 templates/site/user_list.html:136
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Activités de la dernière semaine"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "mots-clés :"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr "Filtrer avec le mot-clé : %(tag_name)s"
-#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Éditer"
-#: templates/site/text_list.html:169
+#: templates/site/text_list.html:171
msgid "Are you sure you want to delete this text?"
msgstr "Êtes-vous sûr de vouloir supprimer ce texte ?"
-#: templates/site/text_list.html:182
+#: templates/site/text_list.html:184
msgid "Users"
msgstr "Utilisateurs"
-#: templates/site/text_list.html:200
+#: templates/site/text_list.html:202
msgid "Edit user"
msgstr "Éditer l'utilisateur"
@@ -1495,35 +1601,36 @@
msgid "Anonymous users"
msgstr "Utilisateurs anonymes"
-#: templates/site/text_view_frame.html:64
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
msgid "add a comment"
msgstr "ajouter un commentaire"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:65
msgid "Filter comments"
msgstr "Filtrer les commentaires"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:66
msgid "Preferences"
msgstr "Préférences"
-#: templates/site/text_view_frame.html:76
+#: templates/site/text_view_frame.html:67
msgid "Text preferences"
msgstr "Préférences pour le texte"
-#: templates/site/text_view_frame.html:93
+#: templates/site/text_view_frame.html:74
msgid "Loading text…"
msgstr "Chargement du texte…"
-#: templates/site/text_view_frame.html:104
+#: templates/site/text_view_frame.html:92
msgid "Which comments?"
msgstr "Quels commentaires ?"
-#: templates/site/text_view_frame.html:112
+#: templates/site/text_view_frame.html:100
msgid "How should comments' scope be shown in text?"
msgstr "Rendu de la portée des commentaires ?"
-#: templates/site/unauthorized.html:5
+#: templates/site/unauthorized.html:14
msgid "Unauthorized"
msgstr "Non autorisé"
@@ -1574,7 +1681,7 @@
msgid "Change role to %(role_name)s"
msgstr "Modifier le rôle en %(role_name)s"
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:284
msgid "Email"
msgstr "Email"
@@ -1601,11 +1708,6 @@
"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
-msgid "back to workspace"
-msgstr "retour à l'espace de travail"
-
#: templates/site/layout/base_workspace.html:30
#, python-format
msgid "%(nb_texts)s text"
@@ -1620,7 +1722,11 @@
msgstr[0] "%(nb_users)s utilisateurs"
msgstr[1] "%(nb_users)s utilisateurs"
-#: templates/site/layout/header.html:15
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "Vie privée"
+
+#: templates/site/layout/header.html:19
msgid "Logout"
msgstr "Se déconnecter"
@@ -1685,7 +1791,7 @@
msgid "Share"
msgstr "Partager"
-#: templates/site/macros/text_comments.html:18
+#: templates/site/macros/text_comments.html:16
#, python-format
msgid "by %(name)s on %(date)s"
msgstr "par %(name)s le %(date)s"
@@ -1763,18 +1869,18 @@
msgid "unknown"
msgstr "inconnu"
-#: views/create.py:26
-msgid "Upload file (optional)"
-msgstr "Charger un fichier (optionnel)"
-
-#: views/create.py:27
+#: views/create.py:30
+msgid "Upload file"
+msgstr "Charger un fichier"
+
+#: views/create.py:31
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
+#: views/create.py:42 views/create.py:59
msgid "You should specify a file to upload."
msgstr "Vous devez fournir un fichier à charger sur le site."
@@ -1784,30 +1890,37 @@
#: views/create.py:50
msgid "Upload a previously exported XML file from your computer"
-msgstr "Télécharger un fichier précédemment exporté XML à partir de votre ordinateur"
+msgstr ""
+"Télécharger un fichier précédemment exporté XML à partir de votre ordinateur"
#: views/create.py:65
-msgid "The imported file should be an XML file generated by co-ment when exporting a text and comments."
-msgstr "Le fichier importé doit être un fichier XML généré par co-ment lors de l'exportation d'un texte et des commentaires."
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
+msgstr ""
+"Le fichier importé doit être un fichier XML généré par co-ment lors de "
+"l'exportation d'un texte et des commentaires."
#: views/create.py:71
msgid "No co_ment_text node found in XML."
msgstr "Impossible de trouver un noeud co_ment_text dans le XML."
#: views/create.py:76
+#, python-format
msgid "No %(tag)s node found in XML."
msgstr "Impossible de trouver un noeud %(tag)s dans le XML."
-#: views/create.py:46
+#: views/create.py:85
msgid "The title of your text"
msgstr "Le titre de votre texte"
-#: views/create.py:71 views/create.py:108
+#: views/create.py:109 views/create.py:144
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "Le texte \"%(text_title)s\" a été créé"
-#: views/create.py:244
+#: views/create.py:247
+#, python-format
msgid "Text \"%(text_title)s\" has been imported"
msgstr "Le texte \"%(text_title)s\" a été importé"
@@ -1875,51 +1988,51 @@
msgid "Private notifications feed reseted."
msgstr "Flux privé réinitialisé."
-#: views/site.py:82 views/texts.py:131 views/user.py:545
+#: views/site.py:84 views/texts.py:136 views/user.py:548
msgid "You're logged in!"
msgstr "Vous êtes connecté !"
-#: views/site.py:100
+#: views/site.py:102
msgid "Your name"
msgstr "Votre nom"
-#: views/site.py:102
+#: views/site.py:104
msgid "Your email address"
msgstr "Votre Email"
-#: views/site.py:105
+#: views/site.py:107
msgid "Subject of the message"
msgstr "Sujet du message"
-#: views/site.py:106
+#: views/site.py:108
msgid "Body of the message"
msgstr "Corps du message"
-#: views/site.py:108
+#: views/site.py:110
msgid "Send me a copy of the email"
msgstr "M'envoyer une copie du message"
-#: views/site.py:134
+#: views/site.py:136
msgid "Copy of message:"
msgstr "Copie du message :"
-#: views/site.py:136
+#: views/site.py:138
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:165
+#: views/site.py:167
msgid "Workspace name"
msgstr "Nom de l'espace de travail"
-#: views/site.py:170
+#: views/site.py:172
msgid "Workspace tagline"
msgstr "Slogan de l'espace de travail"
-#: views/site.py:175
+#: views/site.py:177
msgid "Workspace registration"
msgstr "S'enregistrer sur l'espace de travail"
-#: views/site.py:176
+#: views/site.py:178
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1928,131 +2041,190 @@
"le cas contraire l'ajout d'utilisateurs à l'espace de travail peut seulement "
"se faire par l'envoi d'invitations par les gestionnaires)"
-#: views/site.py:180
+#: views/site.py:182
msgid "Workspace registration moderation"
msgstr "Modération de l'enregistrement sur l'espace de travail"
-#: views/site.py:181
+#: views/site.py:183
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"Les nouveaux utilisateurs doivent-ils être modérés (l'enregistrement exigera "
"alors l'approbation par un gestionnaire) ?"
-#: views/site.py:186
+#: views/site.py:188
msgid "Change the roles available in the workspace"
msgstr "Modifie les rôles disponibles dans l'espace de travail"
-#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+"Les paragraphes comprenant au moins un commentaire de cette catégorie auront "
+"une barre verticale avec cette couleur : "
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
msgid "Settings saved"
msgstr "Paramètres sauvegardés"
-#: views/site.py:215
+#: views/site.py:247
msgid "Workspace logo"
msgstr "Logo de l'espace de travail"
-#: views/site.py:217
-msgid "Custom css rules"
+#: views/site.py:249
+msgid "Custom CSS rules"
msgstr "Règles CSS personalisées"
-#: views/site.py:218
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
-msgstr "Ajouter des règles de feuilles de style au format CSS (ne pas include de balises HTML <code><style></code). Attention : ce code sera ajouté à tous les contents, à manipuler avec prudence."
-
-#: views/site.py:223
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+"Ajouter des règles de feuilles de style au format CSS (ne pas include de "
+"balises HTML <code><style></code). Attention : ce code sera ajouté à "
+"tous les contents, à manipuler avec prudence."
+
+#: views/site.py:255
msgid "Custom font"
msgstr "Police de caractères personalisée"
-#: views/site.py:225
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Une police de caractères personalisée alternative à 'moderne', 'classique' et 'code', que les visiteurs peuvent sélectionner pour le corps des textes co-ment. Saisissez une liste de familles de polices de caractères séparées par des virgules. Les noms de famille de police de caractères contenant des espaces doivent être entre guillemets. Ex. "
-
-#: views/site.py:229
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+"Une police de caractères personalisée alternative à 'moderne', 'classique' "
+"et 'code', que les visiteurs peuvent sélectionner pour le corps des textes "
+"co-ment. Saisissez une liste de familles de polices de caractères séparées "
+"par des virgules. Les noms de famille de police de caractères contenant des "
+"espaces doivent être entre guillemets. Ex. "
+
+#: views/site.py:261
msgid "Custom font for titles"
msgstr "Police de caractères personalisée pour les titres"
-#: views/site.py:231
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Une police de caractères personalisée alternative à 'moderne', 'classique' et 'code', que les visiteurs peuvent sélectionner pour les titres (h1 à h6) des textes co-ment. Saisissez une liste de familles de polices de caractères séparées par des virgules. Les noms de famille de police de caractères contenant des espaces doivent être entre guillemets. Ex. "
-
-#: views/site.py:253
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+"Une police de caractères personalisée alternative à 'moderne', 'classique' "
+"et 'code', que les visiteurs peuvent sélectionner pour les titres (h1 à h6) "
+"des textes co-ment. Saisissez une liste de familles de polices de caractères "
+"séparées par des virgules. Les noms de famille de police de caractères "
+"contenant des espaces doivent être entre guillemets. Ex. "
+
+#: views/site.py:319
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
msgstr ""
"Un lien pour réinitialiser votre mot de passe a été envoyé à votre email."
-#: views/site.py:257 views/user.py:428
+#: views/site.py:323 views/user.py:431
msgid "Password changed"
msgstr "Votre mot de passe a été modifié"
-#: views/texts.py:164
+#: views/texts.py:169
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr "%(nb_texts)i texte(s) supprimés"
-#: views/texts.py:209
+#: views/texts.py:214
#, python-format
msgid "Text %(text_title)s deleted"
msgstr "texte %(text_title)s supprimé"
-#: views/texts.py:220
+#: views/texts.py:226
#, python-format
msgid "Text version %(text_version_title)s deleted"
msgstr "Version %(text_version_title)s supprimée"
-#: views/texts.py:634
+#: views/texts.py:624
msgid "Note (optional)"
msgstr "Note (facultative)"
-#: views/texts.py:638
+#: views/texts.py:628
msgid "Add a note to explain the modifications made to the text"
msgstr "Ajouter une note pour expliquer les modifications apportées au texte"
-#: views/texts.py:648
+#: views/texts.py:638
msgid "New version (optional)"
msgstr "Nouvelle version (facultative)"
-#: views/texts.py:651
+#: views/texts.py:641
msgid "Create a new version of this text (recommended)"
msgstr "créér une nouvelle version de ce texte (recommandé)"
-#: views/texts.py:654
+#: views/texts.py:644
msgid "Keep comments (optional)"
msgstr "Conserver les commentaires (facultatif)"
-#: views/texts.py:657
+#: views/texts.py:647
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"
-
-#: views/texts.py:614
+msgstr ""
+"Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
+
+#: views/texts.py:650
msgid "Detach comments (optional)"
msgstr "Détacher les commentaires (facultatif)"
-#: views/texts.py:617
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
-msgstr "Si certains commentaires étaient attachés à une portion de texte qui a été modifiée, cochez cette option pour conserver ces commentaires sans portée. Laissez cette option décochée si vous souhaitez que ces commentaires soient supprimés. Cette option est ignorée si la précédente option 'Conserver les commentaires' n'est pas cochée."
-
-#: views/texts.py:723
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+"Si certains commentaires étaient attachés à une portion de texte qui a été "
+"modifiée, cochez cette option pour conserver ces commentaires sans portée. "
+"Laissez cette option décochée si vous souhaitez que ces commentaires soient "
+"supprimés. Cette option est ignorée si la précédente option 'Conserver les "
+"commentaires' n'est pas cochée."
+
+#: views/texts.py:719
msgid "Name (optional)"
msgstr "Nom (facultatif)"
-#: views/texts.py:724
+#: views/texts.py:720
msgid "Email (optional)"
msgstr "Email (facultatif)"
-#: views/texts.py:776
+#: views/texts.py:773
#, 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"
-#: views/texts.py:884 views/user.py:79 views/user.py:99
+#: views/texts.py:885 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)"
-#: views/texts.py:942
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr ""
+"Laissez vide pour utiliser la valeur configurée pour l'espace de travail."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+"Pour désactiver cette catégorie pour ce texte quelle que soit la "
+"configuration de l'espace de travail, entrez : "
+
+#: views/texts.py:949
msgid "Text settings updated"
msgstr "Paramètres mis à jour"
@@ -2110,99 +2282,99 @@
msgid "Optional text to add to invitation email"
msgstr "Texte additionnel à ajouter à l'email d'invitation."
-#: views/user.py:259
+#: views/user.py:260
#, python-format
msgid "%(nb_users)d user added"
msgid_plural "%(nb_users)d users added"
msgstr[0] "%(nb_users)d utilisateur ajouté"
msgstr[1] "%(nb_users)d utilisateurs ajoutés"
-#: views/user.py:277
+#: views/user.py:278
msgid "Add user"
msgid_plural "Add users"
msgstr[0] "Ajouter l'utilisateur"
msgstr[1] "Ajouter les utilisateurs"
-#: views/user.py:299
+#: views/user.py:300
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:321 views/user.py:338
msgid "Your account has been activated. You're now logged-in."
msgstr "Votre compte a été activé. Vous êtes maintenant connecté."
-#: views/user.py:331
+#: views/user.py:333
msgid "activate account"
msgstr "activation du compte"
-#: views/user.py:361
+#: views/user.py:363
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr "L'accès de l'utilisateur %(prof)s a été desactivé."
-#: views/user.py:367
+#: views/user.py:369
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr "L'accès de l'utilisateur %(prof)s a été refusé."
-#: views/user.py:379
+#: views/user.py:382
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr "L'accès de l'utilisateur %(prof)s a été restauré."
-#: views/user.py:383
+#: views/user.py:386
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr "L'accès de l'utilisateur %(prof)s a été activé."
-#: views/user.py:393
+#: views/user.py:396
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Une nouvelle invitation a été envoyée à l'utilisateur %(prof)s."
-#: views/user.py:410
+#: views/user.py:413
msgid "Profile updated"
msgstr "Profil mis à jour"
-#: views/user.py:456
+#: views/user.py:459
msgid "Anonymous user role modified."
msgstr "Role de l'utilisateur anonyme modifié."
-#: views/user.py:478
+#: views/user.py:481
msgid "User modified"
msgstr "Utilisateur modifié"
-#: views/user.py:493
+#: views/user.py:496
msgid "Subject"
msgstr "Sujet"
-#: views/user.py:494
+#: views/user.py:497
msgid "Subject of the email"
msgstr "Sujet du message"
-#: views/user.py:497
+#: views/user.py:500
msgid "Body"
msgstr "Corps"
-#: views/user.py:498
+#: views/user.py:501
msgid "Body of the email"
msgstr "Corps du message"
-#: views/user.py:518
+#: views/user.py:521
msgid "Email sent."
msgstr "Email envoyé."
-#: views/user.py:539
+#: views/user.py:542
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de "
"travail."
-#: views/user.py:574
+#: views/user.py:577
msgid "You've been logged out."
msgstr "Vous êtes déconnecté."
-#: views/user.py:590
+#: views/user.py:593
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2210,11 +2382,14 @@
"Enregistrement réussi, vous recevrez un message de confirmation quand un "
"gestionnaire de l'espace de travail aura activé votre compte."
-#: views/user.py:593
+#: views/user.py:596
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 "Text notifications"
+#~ msgstr "Notifications du texte"
+
#~ msgid "Are you sure you want to delete this version?"
#~ msgstr "Êtes-vous sûr de vouloir supprimer cette version ?"
@@ -2262,45 +2437,5 @@
#~ msgid "Version #%(version_number)s created on %(date)s"
#~ msgstr "Version n°%(version_number)s créée le %(date)s :"
-#~ msgid "Contact from user: %(name)s / %(email)s"
-#~ msgstr "Contact de l'utilisateur %(name)s / %(email)s"
-
#~ msgid "%(title)s"
#~ msgstr "%(title)s"
-
-#: models.py:266 views/site.py:191
-msgid "Label for the first category of comments"
-msgstr "Intitulé pour la première catégorie de commentaires"
-
-#: models.py:267 views/site.py:197
-msgid "Label for the second category of comments"
-msgstr "Intitulé pour la deuxième catégorie de commentaires"
-
-#: models.py:268 views/site.py:203
-msgid "Label for the third category of comments"
-msgstr "Intitulé pour la troisième catégorie de commentaires"
-
-#: models.py:269 views/site.py:209
-msgid "Label for the fourth category of comments"
-msgstr "Intitulé pour la quatrième catégorie de commentaires"
-
-#: models.py:270 views/site.py:215
-msgid "Label for the fifth category of comments"
-msgstr "Intitulé pour la cinquième catégorie de commentaires"
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr "Les paragraphes comprenant au moins un commentaire de cette catégorie auront une barre verticale avec cette couleur : "
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-msgid "Leave blank to use the value configured for the workspace."
-msgstr "Laissez vide pour utiliser la valeur configurée pour l'espace de travail."
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr "Pour désactiver cette catégorie pour ce texte quelle que soit la configuration de l'espace de travail, entrez : "
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr "Vie privée"
Binary file src/cm/locale/fr/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: djangojs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 17:01+0200\n"
+"POT-Creation-Date: 2014-03-21 16:23+0100\n"
"PO-Revision-Date: 2010-01-20 21:59+0100\n"
"Last-Translator: renaud bernard <renaud.bernard@sopinspace.com>\n"
"Language-Team: <en@li.org>\n"
@@ -19,75 +19,105 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: media/js/client/c_addcomment_form.js:52
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
msgid "New comment"
msgstr "Nouveau commentaire"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
msgid "New comment will be canceled, continue?"
msgstr "L'ajout d'un nouveau commentaire va être annulé, continuer ?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
msgid "Warning"
msgstr "Avertissement"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
msgid "Started reply will be canceled, continue?"
msgstr "L'ajout d'une nouvelle réponse va être annulé, continuer ?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
msgid "Started comment edition will be canceled, continue?"
msgstr "L'édition du commentaire va être annulé, continuer ?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
+msgstr "Table des matières"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
msgid "change comment state to pending"
msgstr "changer l'état du commentaire à 'en attente'"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
msgid "change comment state to approved"
msgstr "changer l'état du commentaire à 'validé'"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
msgid "change comment state to unapproved"
msgstr "changer l'état du commentaire à 'modéré'"
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "annuler le changement d'état du commentaire"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
msgid "pending"
msgstr "en attente"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
msgid "approved"
msgstr "validé"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "modéré"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "annuler"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
msgid "show replies"
msgstr "voir les réponses"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "changer en :"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "réponse"
+msgstr[1] "réponses"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "éditer le commentaire"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
msgid "delete comment"
msgstr "supprimer le commentaire"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
msgid "edit"
msgstr "éditer"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
msgid "delete"
msgstr "supprimer"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
#: media/js/client/c_interface_forms.js:15
msgid "close"
msgstr "fermer"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
msgid "show scope"
msgstr "afficher la portée"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
msgid ""
"Comment is detached: it was created on a previous version and text it "
"applied to has been modified or removed."
@@ -95,33 +125,27 @@
"Ce commentaire est détaché : il a été créé sur une version précédente et le "
"texte auquel il s'appliquait a été modifié ou supprimé."
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
msgid "last modified on %(date)s"
msgstr "dernière modification le %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
msgid "Permalink to this comment"
msgstr "Lien permanent vers ce commentaire"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:305
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
msgid "by %(name)s, created on %(date)s"
msgstr "par %(name)s, crée le %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr "annuler le changement d'état du commentaire"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
-msgid "unapproved"
-msgstr "modéré"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "catégorie"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr "annuler"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr "éditer le commentaire"
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] " commentaire"
+msgstr[1] " commentaires"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
msgid "No selection yet"
@@ -156,50 +180,24 @@
msgstr "Le commentaire s'appliquera à cet extrait sélectionné dans le texte :"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
msgid "Save"
msgstr "Sauver"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:101
-#: media/js/site/text_edit.js:104
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
msgid "Cancel"
msgstr "Annuler"
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr "Edition du commentaire"
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
-msgstr "changer en :"
-
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:579
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] "réponse"
-msgstr[1] "réponses"
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Catégorie :"
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr "Nouvelle réponse"
-
-#: media/js/client/c_scopes.js:318
-msgid " comment"
-msgid_plural " comments"
-msgstr[0] " commentaire"
-msgstr[1] " commentaires"
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr "erreur :"
-
-#: media/js/client/c_sync.js:57
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
msgid "no filtered comments left"
msgstr "plus aucun commentaire filtré"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid ""
"Do you want to be notified of all replies in all discussions you "
"participated in?"
@@ -207,22 +205,54 @@
"Voulez-vous vous abonner aux notifications portant sur toutes les "
"discussions auxquelles vous avez participé ?"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid "Reply notification"
msgstr "Notification des réponses"
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
msgid "could not save comment"
msgstr "impossible de sauver le commentaire"
-#: media/js/client/c_sync.js:223
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
msgid "Are you sure you want to delete this comment?"
msgstr "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
-#: media/js/client/c_sync.js:227
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
msgid "could not remove comment"
msgstr "impossible de supprimer le commentaire"
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Edition du commentaire"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "erreur :"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Nouvelle réponse"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "personnalisé"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "moderne"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "classique"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "code"
+
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
msgid "print from the browser"
msgstr "imprimer depuis le navigateur"
@@ -236,70 +266,75 @@
msgstr "télécharger un fichier markdown (.mkd)"
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "print in PDF format"
+msgstr "imprimer en format PDF"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
msgid "download portable object format file (.pdf)"
msgstr "télécharger un fichier pdf (.pdf)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
msgid "download latex file (.tex)"
msgstr "télécharger un fichier latex (.tex)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
msgid "download open document file (.odt)"
msgstr "télécharger un fichier open document (.odt)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
msgid "download microsoft word file (.doc)"
msgstr "télécharger un fichier microsoft word (.doc)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
msgid "download microsoft word 2007 file (.docx)"
msgstr "télécharger un fichier microsoft word 2007 (.docx)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
msgid "download ebook (.epub)"
msgstr "télécharger un ebook (.epub)"
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:21
msgid "download XML file for re-importing text and comments"
-msgstr "télécharger le fichier XML pour re-importer le texte et les commentaires"
+msgstr ""
+"télécharger le fichier XML pour re-importer le texte et les commentaires"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "Print text"
msgstr "Impression du texte"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "How do you want to print?"
msgstr "Comment voulez-vous imprimer ?"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Export text"
msgstr "Export du texte"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Choose file format"
msgstr "Choisissez le format du fichier"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
msgid "using markers only, no background colors"
msgstr "en utilisant des marqueurs, pas de couleur de fond"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:42
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
msgid "using markers and background colors"
msgstr "en utilisant des marqueurs et la couleur de fond"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
msgid "all (%(nb_comments)s)"
msgstr "tous (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:55
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
msgid "current filtered ones (%(nb_comments)s)"
msgstr "ceux actuellement filtrés (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:57
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
msgid "none (0)"
msgstr "aucun (0)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:90
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
msgid "Go !"
msgstr "Go !"
@@ -307,347 +342,314 @@
msgid "loading..."
msgstr "chargement..."
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
msgid "click to show options"
msgstr "cliquer pour voir les options"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
msgid "click to hide options"
msgstr "cliquer pour cacher les options"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
msgid "Text"
msgstr "Texte"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
msgid "Search"
msgstr "Rechercher"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
-#: media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
msgid "Reset"
msgstr "Réinitialiser"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
msgid "Hide all Comments"
msgstr "Cacher tous les commentaires"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
msgid "Authors"
msgstr "Auteurs"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
msgid "States"
msgstr "Etats"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
msgid "Dates"
msgstr "Dates"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
msgid "Tags"
msgstr "Tags"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Catégories"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
msgid "view previous comment"
msgstr "voir le commentaire précédent"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
msgid "view next comment"
msgstr "voir le commentaire suivant"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
msgid "view first comment"
msgstr "voir le premier commentaire"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
msgid "view last next comment"
msgstr "voir le dernier commentaire"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
msgid "view all comments"
msgstr "voir tous les commentaires"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr "voir tous les commentaires détachés"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "voir/cacher l'interface avancée"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "afficher la table des matières"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
msgid "print document with/without comments"
msgstr "imprimer le document (avec ou sans les commentaires)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:185
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
msgid "export document with/without comments"
msgstr "exporter le document (avec ou sans les commentaires)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:186
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
msgid "toggle full screen view"
msgstr "passer en mode plein écran"
-#: media/js/site/f_text_view_frame.js:193
-msgid "toggle table of contents"
-msgstr "afficher la table des matières"
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
+msgstr "fil du texte"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
msgid "add a comment"
msgstr "ajouter un commentaire"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
msgid "filter:"
msgstr "filtre :"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:209
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
msgid "browse by:"
msgstr "parcourir par :"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
msgid "location"
msgstr "emplacement"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:212
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
msgid "modification"
msgstr "modification"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:332
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr ""
+"aligner les réponses aux commentaires sur la gauche pour rendre possible la "
+"lecture du texte"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
msgid "thread discussions"
msgstr ""
"décaler les réponses aux commentaires pour mettre en évidence le fil de la "
"discussion"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:366
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
msgid "Text style"
msgstr "Style du texte"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:411
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
msgid "Animation duration"
msgstr "Durée des animations"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:420
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
msgid "(0.001 to 1 second)"
msgstr "(0.001 à 1 seconde)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:446
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
msgid "preferences reset (will apply on next load)"
msgstr "préférences réinitialisées (s'appliqueront au prochain chargement)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:452
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
msgid "preferences saved (will apply on next load)"
msgstr "préférences sauvées (s'appliqueront au prochain chargement)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:556
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
msgid "filter reset"
msgstr "filtre réinitialisé"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:566
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
msgid "filter applied"
msgstr "filtre activé"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:572
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
msgid "discussion"
msgid_plural "discussions"
msgstr[0] "discussion"
msgstr[1] "discussions"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:576
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
msgid "comment"
msgid_plural "comments"
msgstr[0] "commentaire"
msgstr[1] "commentaires"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:601
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
msgid "all"
msgstr "tous"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:619
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
msgid "last 24 hours (%(nb_comments)s)"
msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
msgstr[0] "dernières 24 heures (%(nb_comments)s)"
msgstr[1] "derniers %(nb_days)s jours (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:733
-#: media/js/site/text_edit.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
msgid "No"
msgstr "Non"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:734
-#: media/js/site/text_edit.js:89
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
msgid "Yes"
msgstr "Oui"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
msgid "First Level Heading"
msgstr "Titre de premier niveau"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
msgid "Your title here..."
msgstr "Votre titre ici ..."
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
msgid "Second Level Heading"
msgstr "Titre de second niveau"
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
msgid "Heading 3"
msgstr "Titre 3"
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
msgid "Heading 4"
msgstr "Titre 4"
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
msgid "Heading 5"
msgstr "Titre 5"
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
msgid "Heading 6"
msgstr "Titre 6"
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
msgid "Bold"
msgstr "Gras"
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
msgid "Italic"
msgstr "Italique"
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
msgid "Bulleted List"
msgstr "Liste à puce"
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
msgid "Numeric List"
msgstr "Liste numérotée"
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
msgid "Picture"
msgstr "Image"
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
msgid "Link"
msgstr "Lien"
-#: media/js/markitup/sets.js:37
+#: media/js/markitup/sets.js:36
msgid "Quotes"
msgstr "Citation"
-#: media/js/markitup/sets.js:38
+#: media/js/markitup/sets.js:37
msgid "Code Block / Code"
msgstr "Bloc de Code / Code"
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
msgid "Preview"
msgstr "Prévisualiser"
-#: media/js/markitup/sets.js:71
+#: media/js/markitup/sets.js:72
msgid "Paragraph"
msgstr "Paragraphe"
-#: media/js/markitup/sets.js:75
+#: media/js/markitup/sets.js:76
msgid "Stroke through"
msgstr "Barré"
-#: media/js/markitup/sets.js:79
+#: media/js/markitup/sets.js:80
msgid "List element"
msgstr "Elément d'une liste"
-#: media/js/markitup/sets.js:82
+#: media/js/markitup/sets.js:83
msgid "Your text to link..."
msgstr "Votre texte du lien ..."
-#: media/js/markitup/sets.js:84
+#: media/js/markitup/sets.js:85
msgid "Clean"
msgstr "Nettoyer"
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr "moderne"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr "classique"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr "code"
-
-#: media/js/site/c_text_view_comments.js:21
-msgid "custom"
-msgstr "personnalisé"
-
-#: media/js/site/f_text_view_frame.js:182
-msgid "view all detached comments"
-msgstr "voir tous les commentaires détachés"
-
-#: media/js/site/f_text_view_frame.js:183
-msgid "toggle advance interface"
-msgstr "voir/cacher l'interface avancée"
-
-#: media/js/site/f_text_view_frame.js:187
-msgid "text feed"
-msgstr "fil du texte"
-
-#: media/js/site/f_text_view_frame.js:329
-msgid "unthread discussions"
-msgstr ""
-"aligner les réponses aux commentaires sur la gauche pour rendre possible la "
-"lecture du texte"
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-"Ces commentaires doivent ils être détachés (i.e. conservés sans portée) ou "
-"supprimés de la nouvelle version ?"
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] ""
-"%(nb_comments)s commentaire s'applique à du texte qui a été modifié."
-msgstr[1] ""
-"%(nb_comments)s commentaires s'appliquent à du texte qui a été modifié."
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr "(Nous vous suggérons de créer une nouvelle version)"
-
-#: media/js/site/text_edit.js:67
+#: media/js/site/text_edit.js:10
msgid "You chose not to create a new version all comments will be deleted"
msgstr ""
"Comme vous avez choisi de ne pas créer de nouvelle version, tous les "
"commentaires seront supprimés"
-#: media/js/site/text_edit.js:69
+#: media/js/site/text_edit.js:12
msgid "Do you want to continue?"
msgstr "Voulez vous continuer ?"
-#: media/js/site/text_edit.js:102
-msgid "Detach"
-msgstr "Détacher"
+#~ msgid ""
+#~ "Should these comments be detached (i.e. kept with no scope) or removed "
+#~ "from new version?"
+#~ msgstr ""
+#~ "Ces commentaires doivent ils être détachés (i.e. conservés sans portée) "
+#~ "ou supprimés de la nouvelle version ?"
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr "Supprimer"
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] ""
+#~ "%(nb_comments)s commentaire s'applique à du texte qui a été modifié."
+#~ msgstr[1] ""
+#~ "%(nb_comments)s commentaires s'appliquent à du texte qui a été modifié."
-#: media/js/client/c_toc.js:45
-msgid "Table of contents"
-msgstr "Table des matières"
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Nous vous suggérons de créer une nouvelle version)"
+
+#~ msgid "Detach"
+#~ msgstr "Détacher"
+
+#~ msgid "Remove"
+#~ msgstr "Supprimer"
#~ msgid " reply"
#~ msgid_plural " replies"
#~ msgstr[0] " réponse"
#~ msgstr[1] " réponses"
-
-#: media/js/client/c_icomment.js:330
-msgid "category"
-msgstr "catégorie"
-
-#: media/js/client/c_interface_form.js:52
-msgid "Category:"
-msgstr "Catégorie :"
-
-#: media/js/site/f_text_view_frame.js:123
-msgid "Categories"
-msgstr "Catégories"
Binary file src/cm/locale/it/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/it/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/it/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-10 22:52+0200\n"
+"POT-Creation-Date: 2014-03-18 18:03+0100\n"
"PO-Revision-Date: 2012-09-10 22:49+0200\n"
"Last-Translator: Daniele Pizzolli <dan@toel.it>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,153 +16,173 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: client.py:29
+#: client.py:30
msgid ""
"A selection is required. Select in the text the part your comment applies to."
msgstr ""
"È richiesta una selezione. Seleziona la parte di testo che vuoi commentare."
-#: client.py:140
+#: client.py:144
msgid "name is required"
msgstr "Il nome è obbligatorio"
-#: client.py:143
-msgid "email is required"
-msgstr "L’email è obbligatoria"
-
-#: client.py:145
-msgid "invalid email"
-msgstr "L’email non è valida"
-
#: client.py:147
+msgid "email is required"
+msgstr "L’email è obbligatoria"
+
+#: client.py:149
+msgid "invalid email"
+msgstr "L’email non è valida"
+
+#: client.py:151
msgid "title is required"
msgstr "Il titolo è obbligatorio"
-#: client.py:149
+#: client.py:153
msgid "content is required"
msgstr "Il commento è obbligatorio"
-#: client.py:164
+#: client.py:168
msgid "comment removed"
msgstr "Il commento è stato cancellato"
-#: client.py:215 client.py:280
+#: client.py:221 client.py:286
msgid "comment saved"
msgstr "Il commento è stato salvato"
-#: client.py:282
+#: client.py:288
msgid "comment saved, it is being held for moderation"
msgstr "Il commento è stato salvato e sarà vagliato dal moderatore"
-#: client.py:319 client.py:328 client.py:330
+#: client.py:326 client.py:335 client.py:337
msgid "me"
msgstr "me"
-#: client.py:321 client.py:328 client.py:330
+#: client.py:328 client.py:335 client.py:337
msgid "author"
msgstr "autore"
-#: client.py:375
+#: client.py:387
msgid "Tags input must be no longer than 250 characters."
msgstr "Il tag non può essere più lungo di 250 caratteri."
-#: models.py:187 templates/site/text_history.html:79 views/create.py:34
-#: views/create.py:84 views/texts.py:584
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
msgid "Title"
msgstr "Titolo"
-#: models.py:188
+#: models.py:189
msgid "Format"
msgstr "Formato"
-#: models.py:189 views/texts.py:679
+#: models.py:190 views/texts.py:721
msgid "Content"
msgstr "Contenuto"
-#: models.py:190 models.py:646 templates/site/help.html:47
+#: models.py:191 models.py:625 templates/site/help.html:56
msgid "Tags"
msgstr "Tag"
-#: models.py:192 templates/site/text_history.html:80 views/user.py:223
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
msgid "Note"
msgstr "Note"
-#: models.py:194
+#: models.py:195
msgid "Moderation a posteriori?"
msgstr "Abilita moderazione a posteriori?"
-#: models.py:310
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Etichetta per la prima categoria di commenti"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Etichetta per la seconda categoria di commenti"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Etichetta per la terza categoria di commenti"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Etichetta per la quarta categoria di commenti"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Etichetta per la quinta categoria di commenti"
+
+#: models.py:289
msgid "Format:"
msgstr "Formato:"
-#: models.py:548
+#: models.py:528
msgid "name"
msgstr "nome"
-#: models.py:549
+#: models.py:529
msgid "description"
msgstr "descrizione"
-#: models.py:640
+#: models.py:619
msgid "Allow contact"
msgstr "Permetti di essere contattato"
-#: models.py:640
+#: models.py:619
msgid "Allow email messages from other users"
msgstr "Permetti messaggi email da altri utenti"
-#: models.py:641
+#: models.py:620
msgid "Preferred language"
msgstr "Lingua preferita"
-#: models.py:644
+#: models.py:623
msgid "Suspended access"
msgstr "Accesso sospeso"
-#: models.py:668
+#: models.py:647
msgid "suspended"
msgstr "sospeso"
-#: models.py:670
+#: models.py:649
msgid "waiting approval"
msgstr "In attesa di approvazione"
-#: models.py:676
+#: models.py:655
msgid "pending"
msgstr "in attesa"
-#: models.py:691
+#: models.py:670
msgid "Invitation"
msgstr "Invito"
-#: models.py:760
+#: models.py:732
#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Testo %(link_to_text)s modificato da %(creator)s"
-#: models.py:761
+#: models.py:733
#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr ""
"Testo %(link_to_text)s modificato (con creazione di nuova versione) da "
"%(creator)s"
-#: models.py:762
+#: models.py:734
#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Testo %(link_to_text)s aggiunto da %(creator)s"
-#: models.py:763
+#: models.py:735
#, python-format
msgid "Text %(link_to_text)s imported by %(creator)s"
msgstr "Testo %(link_to_text)s importato da %(creator)s"
-#: models.py:764
+#: models.py:736
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Testo %(link_to_text)s cancellato"
-#: models.py:765
+#: models.py:737
#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
@@ -170,54 +190,54 @@
"Commento %(link_to_comment)s aggiunto al testo %(link_to_text)s da "
"%(creator)s"
-#: models.py:766
+#: models.py:738
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr "Commento %(link_to_comment)s cancellato dal testo %(link_to_text)s"
-#: models.py:767
+#: models.py:739
#, python-format
msgid "User %(username)s added"
msgstr "Aggiunto utente %(username)s"
-#: models.py:768
+#: models.py:740
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Abilitato l’accesso allo spazio di lavoro per l’utente %(username)s"
-#: models.py:769
+#: models.py:741
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr ""
"L’accesso allo spazio di lavoro per l’utente %(username)s è stato rifiutato"
-#: models.py:770
+#: models.py:742
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr ""
"L’accesso allo spazio di lavoro per l’utente %(username)s è stato sospeso"
-#: models.py:771
+#: models.py:743
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr ""
"L’accesso allo spazio di lavoro per l’utente %(username)s è stato attivato"
-#: models.py:772
+#: models.py:744
#, python-format
msgid "User %(username)s has activated his account"
msgstr "L’utente %(username)s ha attivato il suo account"
-#: models.py:821
+#: models.py:793
msgid "anonymous"
msgstr "anonimo"
-#: models.py:828 models.py:836
+#: models.py:800 models.py:808
#, python-format
msgid "by \"%(username)s\""
msgstr "da \"%(username)s\""
-#: models.py:830
+#: models.py:802
#, python-format
msgid "%(time_since)s ago"
msgstr "da %(time_since)s"
@@ -230,7 +250,7 @@
msgid "Email:"
msgstr "Email:"
-#: notifications.py:60 templates/email/activity_notification.txt:1
+#: notifications.py:61 templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr "Notifica:"
@@ -242,31 +262,31 @@
msgid "Class (education)"
msgstr "Classe (scolastico)"
-#: settings.py:105
+#: settings.py:110
msgid "French"
msgstr "Francese"
-#: settings.py:106
+#: settings.py:111
msgid "English"
msgstr "Inglese"
-#: settings.py:107
+#: settings.py:112
msgid "Norwegian"
msgstr "Norvegese"
-#: settings.py:108
+#: settings.py:113
msgid "Brazilian Portuguese"
msgstr "Portoghese brasiliano"
-#: settings.py:109
+#: settings.py:114
msgid "Spanish"
msgstr "Spagnolo"
-#: settings.py:110
+#: settings.py:115
msgid "Bulgarian"
msgstr "Bulgaro"
-#: settings.py:111
+#: settings.py:116
msgid "Italian"
msgstr "Italiano"
@@ -443,12 +463,35 @@
msgid "To publish it click on the following link:"
msgstr "Per pubblicarlo clicca sul seguente link:"
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "torna allo spazio di lavoro"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
msgid "Activate your account"
msgstr "Attiva il tuo account"
-#: templates/site/activate.html:23
+#: templates/site/activate.html:32
msgid "Activate"
msgstr "Attiva"
@@ -457,12 +500,12 @@
msgid "Contact"
msgstr "Contatto"
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
msgid "Send"
msgstr "Spedisci"
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
#: templates/site/settings.html:29 templates/site/settings_design.html:29
#: templates/site/text_create_content.html:51
#: templates/site/text_create_import.html:46
@@ -485,7 +528,7 @@
#: templates/site/text_create_content.html:28
#: templates/site/text_create_import.html:26
#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
-#: templates/site/layout/header.html:10
+#: templates/site/layout/header.html:13
msgid "Create a text"
msgstr "Crea un testo"
@@ -499,7 +542,7 @@
#: templates/site/text_create_import.html:28
#: templates/site/text_create_upload.html:4
#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
-#: templates/site/layout/header.html:11
+#: templates/site/layout/header.html:14
msgid "Upload a text"
msgstr "Carica un testo"
@@ -515,7 +558,7 @@
#: templates/site/text_create_import.html:4
#: templates/site/text_create_import.html:30
#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
+#: templates/site/layout/header.html:15
msgid "Import a co-mented text"
msgstr "Importa un testo elaborato con co-ment"
@@ -586,7 +629,7 @@
msgstr "registrato da %(duration)s"
#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
-#: templates/site/text_view_frame.html:72
+#: templates/site/text_view_frame.html:55
msgid "comment"
msgstr "commento"
@@ -719,7 +762,7 @@
msgid "Followup"
msgstr "Proseguimento"
-#: templates/site/followup.html:20 templates/site/help.html:66
+#: templates/site/followup.html:20 templates/site/help.html:75
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Feed"
@@ -729,8 +772,8 @@
msgstr "Feed pubblico"
#: 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:11
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
#: templates/site/macros/form_fields.html:20
msgid "Help"
msgstr "Aiuto"
@@ -789,69 +832,77 @@
"Ricevi tutte le notifiche delle risposte a tutte le discussioni alle quali "
"hai partecipato"
-#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:14
-#: templates/site/forgot_pw.html:27
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
msgid "Reset my password"
msgstr "Reimposta la password"
-#: templates/site/forgot_pw.html:35
+#: templates/site/forgot_pw.html:44
msgid "This link is invalid."
msgstr "Questo link non è valido"
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
msgid "Forgot password?"
msgstr "Dimenticato la password?"
-#: templates/site/help.html:16
+#: templates/site/help.html:25
msgid "General Presentation"
msgstr "Presentazione generale"
-#: templates/site/help.html:18
+#: templates/site/help.html:27
msgid "co-ment is a web based text annotation system."
msgstr "co-ment è un sistema di annotazione di testi basato sul web"
-#: templates/site/help.html:20
+#: templates/site/help.html:27
+msgid "COMT is the open source software behind it"
+msgstr ""
+
+#: templates/site/help.html:27
+msgid "See www.co-ment.com for more details"
+msgstr "Clicca qui per maggiori dettagli"
+
+#: templates/site/help.html:29
msgid "Glossary"
msgstr "Glossario"
-#: templates/site/help.html:22
+#: templates/site/help.html:31
msgid "Contents"
msgstr "Contenuti"
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
msgid "Collaboration"
msgstr "Collaborazione"
-#: templates/site/help.html:25 templates/site/help.html.py:37
+#: templates/site/help.html:34 templates/site/help.html.py:46
msgid "Comments"
msgstr "Commenti"
-#: templates/site/help.html:26 templates/site/help.html.py:60
+#: templates/site/help.html:35 templates/site/help.html.py:69
msgid "Notification and feeds"
msgstr "Notifiche e feed"
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
msgid "Roles"
msgstr "Ruoli"
-#: templates/site/help.html:28 templates/site/help.html.py:88
+#: templates/site/help.html:37 templates/site/help.html.py:97
#: templates/site/text_list.html:12
msgid "Texts"
msgstr "Testi"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
"la collaborazione usando co-ment si basa sull’assegnazione di ruoli agli "
"utenti"
-#: templates/site/help.html:34 templates/site/help.html.py:45
+#: templates/site/help.html:43 templates/site/help.html.py:54
msgid "Click here for more details"
msgstr "Clicca qui per maggiori dettagli"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
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 "
@@ -861,11 +912,11 @@
"avranno soprattutto un ruolo di gestione, mentre altri avranno ruoli "
"definiti nella relazione con i testi o con un testo dato."
-#: templates/site/help.html:40
+#: templates/site/help.html:49
msgid "Moderation"
msgstr "Moderazione"
-#: templates/site/help.html:41
+#: templates/site/help.html:50
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 "
@@ -889,15 +940,15 @@
"moderatore) non lo approvi, non sarà visibile agli utenti che non hanno i "
"permessi di moderazione. "
-#: templates/site/help.html:44
+#: templates/site/help.html:53
msgid "States"
msgstr "Stati"
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid "co-ment uses states to implement moderation policies."
msgstr "co-ment usa degli stati per implementare le regole di moderazione"
-#: templates/site/help.html:45
+#: templates/site/help.html:54
msgid ""
"Unapproved or pending comments are visible only to Managers, Editors and "
"Moderators. Approved comments are visible to users with any role. The "
@@ -908,7 +959,7 @@
"stato in attesa esiste sono quando nelle impostazioni è selezionata la "
"moderazione a priori."
-#: templates/site/help.html:48
+#: templates/site/help.html:57
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 "
@@ -921,11 +972,11 @@
"per classificare commenti, in accordo con i problemi o gli argomenti che "
"toccano."
-#: templates/site/help.html:50
+#: templates/site/help.html:59
msgid "Linking to a comment"
msgstr "Collegamenti ai commenti"
-#: templates/site/help.html:51
+#: templates/site/help.html:60
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 "
@@ -937,11 +988,11 @@
"mentre con il mouse passi sopra al segno di paragrafo (¶) alla fine del "
"titolo del commento."
-#: templates/site/help.html:53
+#: templates/site/help.html:62
msgid "Scope"
msgstr "Portata"
-#: templates/site/help.html:54
+#: templates/site/help.html:63
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 "
@@ -951,11 +1002,11 @@
"testo al quale è applicato può essere modificata da chiunque abbia un ruolo "
"che permetta di modificare il commento."
-#: templates/site/help.html:56
+#: templates/site/help.html:65
msgid "Keeping your comments across versions"
msgstr "Mantieni i commenti fra le versioni"
-#: templates/site/help.html:57
+#: templates/site/help.html:66
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 "
@@ -974,11 +1025,11 @@
"portata nel nuovo testo ma rimarrà visibile e potrai dargli una nuova "
"portata) o semplicemente se rimuoverlo."
-#: templates/site/help.html:63
+#: templates/site/help.html:72
msgid "Email notification"
msgstr "Notifiche via email"
-#: templates/site/help.html:64
+#: templates/site/help.html:73
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 "
@@ -988,11 +1039,11 @@
"quando un nuovo commento è stato aggiunto al testo o un testo è stato "
"modificato e ne viene creata una nuova versione."
-#: templates/site/help.html:67
+#: templates/site/help.html:76
msgid "Web feed definition on Wikipedia"
msgstr "Definizione di web feed su Wikipedia"
-#: templates/site/help.html:67
+#: templates/site/help.html:76
msgid ""
"You can subscribe to the feed for a specific text or to a global feed for "
"the full workspace."
@@ -1000,11 +1051,11 @@
"Puoi iscriverti al feed di un testo specifico o al feed globale di tutto lo "
"spazio di lavoro"
-#: templates/site/help.html:69
+#: templates/site/help.html:78
msgid "Public and private feeds"
msgstr "Feed pubblici e privati"
-#: templates/site/help.html:70
+#: templates/site/help.html:79
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 "
@@ -1017,11 +1068,11 @@
"privato del feed, a meno che tu non vuoi far realmente sapere a loro quello "
"che sta accadendo."
-#: templates/site/help.html:72
+#: templates/site/help.html:81
msgid "Text embedding"
msgstr "Incastona il testo (embedding)"
-#: templates/site/help.html:73
+#: templates/site/help.html:82
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' "
@@ -1036,11 +1087,11 @@
"incastonato, fai attenzione a non essere collegato in uno spazio di lavoro "
"in un altro tab del browser."
-#: templates/site/help.html:80
+#: templates/site/help.html:89
msgid "Roles are predefined sets of permissions."
msgstr "I ruoli sono un insieme predefinito di permessi"
-#: templates/site/help.html:81
+#: templates/site/help.html:90
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."
@@ -1049,11 +1100,11 @@
"collegati o anonimi) solo se gli utenti anonimi hanno un ruolo rispetto al "
"testo."
-#: templates/site/help.html:82 templates/site/text_share.html:88
+#: templates/site/help.html:91 templates/site/text_share.html:88
msgid "Text role"
msgstr "Ruolo applicato al testo"
-#: templates/site/help.html:83
+#: templates/site/help.html:92
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 "
@@ -1064,11 +1115,11 @@
"esistente a livello di spazio di lavoro o per dare ad un utente un ruolo su "
"un testo (e non su ogni testo presente nello spazio di lavoro)."
-#: templates/site/help.html:84 views/site.py:185
+#: templates/site/help.html:93 views/site.py:187
msgid "Role model"
msgstr "Modello del ruolo"
-#: templates/site/help.html:85
+#: templates/site/help.html:94
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 "
@@ -1083,11 +1134,11 @@
"questo caso particolare è possibile che i commenti siano condivisi "
"privatamente fra un insegnate e ogni studente."
-#: templates/site/help.html:91
+#: templates/site/help.html:100
msgid "Create or upload?"
msgstr "Crea o carica?"
-#: templates/site/help.html:92
+#: templates/site/help.html:101
msgid ""
"There are 3 main ways to produce a text in co-ment. If you start from "
"scratch, create your text in markdown format. If you start from an existing "
@@ -1100,11 +1151,11 @@
"formato markdown. Se inizi da una pagina web, crea un testo con fomato HTML "
"e copia e incolla il testo della pagina web nell’editor."
-#: templates/site/help.html:96
+#: templates/site/help.html:105
msgid "Text formats"
msgstr "Formati del testo"
-#: templates/site/help.html:97
+#: templates/site/help.html:106
msgid ""
"There are at this date 3 text formats: markdown (default/preferred format), "
"HTML and RST."
@@ -1112,11 +1163,11 @@
"Attualmente sono supportati 3 formati di testo: markdown (formato "
"predefinito e preferito), HTML e RST."
-#: templates/site/help.html:101
+#: templates/site/help.html:110
msgid "Markdown"
msgstr "Markdown"
-#: templates/site/help.html:102
+#: templates/site/help.html:111
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 "
@@ -1126,12 +1177,12 @@
"formato markdown per importare testi. Il nostro software e altri servizi "
"usano la versione di markdown estesa da pandoc."
-#: templates/site/help.html:102
+#: templates/site/help.html:111
msgid "Read more about this"
msgstr "Maggiori informazioni"
#: templates/site/login.html:8 templates/site/login_form.html:19
-#: templates/site/layout/header.html:18
+#: templates/site/layout/header.html:21
msgid "Login"
msgstr "Login"
@@ -1141,16 +1192,16 @@
msgstr "%(wname)s Login"
#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:19
+#: templates/site/layout/header.html:22
msgid "Register"
msgstr "Registrati"
#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
+#: templates/site/layout/header.html:11
msgid "Home"
msgstr "Home"
-#: templates/site/non_authenticated_index.html:20
+#: templates/site/non_authenticated_index.html:28
#, python-format
msgid "One public text"
msgid_plural "%(counter)s public texts"
@@ -1161,42 +1212,42 @@
msgid "Deactivate notification"
msgstr "Disattiva le notifiche"
-#: templates/site/notifications_desactivate.html:31
+#: templates/site/notifications_desactivate.html:39
msgid "Deactivate"
msgstr "Disattiva"
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Il tuo profilo (%(username)s)"
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:15
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
msgid "Profile"
msgstr "Profilo"
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
msgid "Password"
msgstr "Password"
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
#: templates/site/text_create_content.html:49
#: templates/site/text_create_import.html:44
#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
#: 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/user_activate.html:36 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Salva"
-#: templates/site/register.html:19
+#: templates/site/register.html:27
#, python-format
msgid "%(wname)s Registration"
msgstr "%(wname)s Registrazione"
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
msgid "Reset your password"
msgstr "Reimposta la tua password"
@@ -1232,20 +1283,16 @@
msgid "Text list"
msgstr "Lista del testo"
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr "Notifiche del testo"
-
-#: templates/site/text_embed.html:25
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
msgid "Embed text"
msgstr "Testo incastonato (embed)"
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid "Copy this code into your site to display text with comments."
msgstr ""
"Copia questo codice dentro il tuo sito per mostrare il testo con i commenti."
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid ""
"Users will also be able to add comments from your site depending on "
"anonymous users' roles."
@@ -1318,76 +1365,66 @@
msgstr "Compara le ultime due versioni"
#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
msgid "Most recent version"
msgstr "Versioni più recenti"
#: templates/site/text_history.html:63
#: templates/site/text_history_compare.html:30
#: templates/site/text_history_version.html:31
-#, fuzzy
-msgid "Last version"
+msgid "Original version"
msgstr "Versione originale"
-#: templates/site/text_history.html:67
+#: templates/site/text_history.html:69
msgid "Compare selected versions"
msgstr "Compara le versioni selezionate"
-#: templates/site/text_history.html:77
+#: templates/site/text_history.html:79
msgid "Version"
msgstr "Versione"
-#: templates/site/text_history.html:78
+#: templates/site/text_history.html:80
msgid "Selection"
msgstr "Selezione"
-#: templates/site/text_history.html:81 templates/site/text_list.html:141
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "Author"
msgstr "Autore"
-#: templates/site/text_history.html:82
+#: templates/site/text_history.html:84
msgid "Created"
msgstr "Creato"
-#: templates/site/text_history.html:83 templates/site/text_list.html:143
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
msgid "# comments"
msgstr "# commenti"
-#: templates/site/text_history.html:105 templates/site/text_list.html:163
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
msgid "View"
msgstr "Vedi"
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr "Compara con la versione precedente"
-#: templates/site/text_history.html:108
+#: templates/site/text_history.html:110
msgid "Revert to this version"
msgstr "Riporta a questa versione"
-#: templates/site/text_history.html:122 templates/site/text_list.html:84
-#: templates/site/text_list.html.py:165
-msgid "Delete"
-msgstr "Cancella"
-
-#: templates/site/text_history.html:128
-msgid "Are you sure you want to delete this version?"
-msgstr "Sei sicuro di voler cancellare questa versione del testo?"
-
-#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_compare.html:32
msgid "Previous modification"
msgstr "Modifiche precedenti"
-#: templates/site/text_history_compare.html:31
#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
#, python-format
msgid "Version %(version_number)s"
msgstr "Versione %(version_number)s"
-#: templates/site/text_history_compare.html:32
+#: templates/site/text_history_compare.html:35
#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
@@ -1395,28 +1432,28 @@
"Comparazione fra la versione #%(version_1_number)s e la versione #"
"%(version_2_number)s"
-#: templates/site/text_history_compare.html:34
+#: templates/site/text_history_compare.html:37
msgid "Next modification"
msgstr "Prossima modifica"
-#: templates/site/text_history_compare.html:44
+#: templates/site/text_history_compare.html:46
msgid "No differences"
msgstr "Nessuna differenza"
-#: templates/site/text_history_version.html:31
+#: templates/site/text_history_version.html:34
msgid "Previous version"
msgstr "Versione precedente"
-#: templates/site/text_history_version.html:36
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Versione successiva"
+
+#: templates/site/text_history_version.html:42
msgid "Compare with next version"
msgstr "Compara con la versione successiva"
-#: templates/site/text_history_version.html:37
-msgid "Next version"
-msgstr "Versione successiva"
-
-#: templates/site/text_history_version.html:45 views/texts.py:450
-#: views/texts.py:451
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
#, python-format
msgid "by %(author)s"
msgstr "da %(author)s"
@@ -1435,6 +1472,10 @@
msgid "Bulk Actions"
msgstr "Azioni massive"
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
+msgid "Delete"
+msgstr "Cancella"
+
#: templates/site/text_list.html:87 templates/site/user_list.html:81
msgid "Apply"
msgstr "Applica"
@@ -1555,36 +1596,36 @@
msgid "Anonymous users"
msgstr "Utenti anonimi"
-#: templates/site/text_view_frame.html:70
-#: templates/site/text_view_frame.html:71
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
msgid "add a comment"
msgstr "aggiungi un commento"
-#: templates/site/text_view_frame.html:82
+#: templates/site/text_view_frame.html:65
msgid "Filter comments"
msgstr "Filtra commenti"
-#: templates/site/text_view_frame.html:83
+#: templates/site/text_view_frame.html:66
msgid "Preferences"
msgstr "Preferenze"
-#: templates/site/text_view_frame.html:84
+#: templates/site/text_view_frame.html:67
msgid "Text preferences"
msgstr "Preferenze sul testo"
-#: templates/site/text_view_frame.html:94
+#: templates/site/text_view_frame.html:74
msgid "Loading text…"
msgstr "Caricamento testo…"
-#: templates/site/text_view_frame.html:115
+#: templates/site/text_view_frame.html:92
msgid "Which comments?"
msgstr "Quali commenti?"
-#: templates/site/text_view_frame.html:123
+#: templates/site/text_view_frame.html:100
msgid "How should comments' scope be shown in text?"
msgstr "Come dovrebbe essere mostrata l’estensione del commento nel testo?"
-#: templates/site/unauthorized.html:5
+#: templates/site/unauthorized.html:14
msgid "Unauthorized"
msgstr "Non autorizzato"
@@ -1634,7 +1675,7 @@
msgid "Change role to %(role_name)s"
msgstr "Cambia ruolo in %(role_name)s"
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:284
msgid "Email"
msgstr "Email"
@@ -1661,11 +1702,6 @@
"Gli utenti riceveranno un invito via email per collegarsi allo spazio di "
"lavoro."
-#: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:20
-msgid "back to workspace"
-msgstr "torna allo spazio di lavoro"
-
#: templates/site/layout/base_workspace.html:30
#, python-format
msgid "%(nb_texts)s text"
@@ -1680,7 +1716,11 @@
msgstr[0] "%(nb_users)s utente"
msgstr[1] "%(nb_users)s utenti"
-#: templates/site/layout/header.html:16
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "Politica della privacy"
+
+#: templates/site/layout/header.html:19
msgid "Logout"
msgstr "Logout"
@@ -1824,8 +1864,8 @@
msgstr "sconosciuto"
#: views/create.py:30
-msgid "Upload file (optional)"
-msgstr "Carica file (opzionale)"
+msgid "Upload file"
+msgstr "Carica file"
#: views/create.py:31
msgid ""
@@ -1871,7 +1911,7 @@
msgid "Text \"%(text_title)s\" has been created"
msgstr "È stato creato il testo \"%(text_title)s\""
-#: views/create.py:244
+#: views/create.py:247
#, python-format
msgid "Text \"%(text_title)s\" has been imported"
msgstr "Testo \"%(text_title)s\" è stato importato"
@@ -1940,51 +1980,51 @@
msgid "Private notifications feed reseted."
msgstr "Reimpostato feed privato di notifica."
-#: views/site.py:82 views/texts.py:134 views/user.py:545
+#: views/site.py:84 views/texts.py:136 views/user.py:548
msgid "You're logged in!"
msgstr "Ti sei collegato!"
-#: views/site.py:100
+#: views/site.py:102
msgid "Your name"
msgstr "Il tuo nome"
-#: views/site.py:102
+#: views/site.py:104
msgid "Your email address"
msgstr "Il tuo indirizzo email"
-#: views/site.py:105
+#: views/site.py:107
msgid "Subject of the message"
msgstr "Oggetto del messaggio"
-#: views/site.py:106
+#: views/site.py:108
msgid "Body of the message"
msgstr "Corpo del messaggio"
-#: views/site.py:108
+#: views/site.py:110
msgid "Send me a copy of the email"
msgstr "Spedisci anche a me una copia dell’email"
-#: views/site.py:134
+#: views/site.py:136
msgid "Copy of message:"
msgstr "Copia del messaggio:"
-#: views/site.py:136
+#: views/site.py:138
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Email spedita. Ci faremmo sentire il più velocemente possibile."
-#: views/site.py:165
+#: views/site.py:167
msgid "Workspace name"
msgstr "Nome dello spazio di lavoro"
-#: views/site.py:170
+#: views/site.py:172
msgid "Workspace tagline"
msgstr "Tag dello spazio di lavoro"
-#: views/site.py:175
+#: views/site.py:177
msgid "Workspace registration"
msgstr "Registrazione allo spazio di lavoro"
-#: views/site.py:176
+#: views/site.py:178
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1992,60 +2032,87 @@
"Gli utenti da soli possono registrarsi allo spazio di lavoro? (se no, solo i "
"gestori potranno creare nuovi utente attraverso gli inviti)"
-#: views/site.py:180
+#: views/site.py:182
msgid "Workspace registration moderation"
msgstr "Approvazione delle registrazioni allo spazio di lavoro"
-#: views/site.py:181
+#: views/site.py:183
msgid ""
"Should new users be moderated (registration will require manager's approval)?"
msgstr ""
"I nuovi utenti devono essere soggetti al processo di approvazione (la "
"registrazione richiederà il processo di approvazione)?"
-#: views/site.py:186
+#: views/site.py:188
msgid "Change the roles available in the workspace"
msgstr "Cambia i ruoli disponibili nello spazio di lavoro"
-#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+"I paragrafi tra cui almeno un commento di questa categoria avranno una barra "
+"verticale con questo colore: "
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
msgid "Settings saved"
msgstr "Impostazioni salvate"
-#: views/site.py:215
+#: views/site.py:247
msgid "Workspace logo"
msgstr "Logo dello spazio di lavoro"
-#: views/site.py:217
-#, fuzzy
-msgid "Custom css rules"
+#: views/site.py:249
+msgid "Custom CSS rules"
msgstr "CSS personalizzato regole"
-#: views/site.py:218
-#, fuzzy
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
-msgstr "Aggiungere regole di stile in formato CSS (non includono <code><style></code> tag HTML). Attenzione: questo codice viene aggiunto a tutti i contenuti, assicuratevi di sapere cosa si sta facendo prima di aggiungere qualcosa qui."
-
-#: views/site.py:223
-#, fuzzy
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+"Aggiungere regole di stile in formato CSS (non includono <code><style>"
+"</code> tag HTML). Attenzione: questo codice viene aggiunto a tutti i "
+"contenuti, assicuratevi di sapere cosa si sta facendo prima di aggiungere "
+"qualcosa qui."
+
+#: views/site.py:255
msgid "Custom font"
msgstr "Tipo di carattere personalizzato"
-#: views/site.py:225
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Misura alternativa alla famiglia di font 'moderno', 'classico' e 'codice' che i visitatori possono scegliere per il corpo di co-mento testi. Inserire un elenco separato di coma famiglie di font. I cognomi font inclusi i caratteri di spazio deve essere racchiuso tra virgolette. Eg. "
-
-#: views/site.py:229
-#, fuzzy
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+"Misura alternativa alla famiglia di font 'moderno', 'classico' e 'codice' "
+"che i visitatori possono scegliere per il corpo di co-mento testi. Inserire "
+"un elenco separato di coma famiglie di font. I cognomi font inclusi i "
+"caratteri di spazio deve essere racchiuso tra virgolette. Eg. "
+
+#: views/site.py:261
msgid "Custom font for titles"
msgstr "Tipo di carattere personalizzato per i titoli"
-#: views/site.py:231
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Misura alternativa alla famiglia di font 'moderno', 'codice' 'classico' e che i visitatori possono scegliere per i titoli (h1 a h6) di co-mento testi. Inserire un elenco separato di coma famiglie di font. I cognomi font inclusi i caratteri di spazio deve essere racchiuso tra virgolette. Eg. "
-
-#: views/site.py:253
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+"Misura alternativa alla famiglia di font 'moderno', 'codice' 'classico' e "
+"che i visitatori possono scegliere per i titoli (h1 a h6) di co-mento testi. "
+"Inserire un elenco separato di coma famiglie di font. I cognomi font inclusi "
+"i caratteri di spazio deve essere racchiuso tra virgolette. Eg. "
+
+#: views/site.py:319
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
@@ -2053,79 +2120,101 @@
"Un link per la reimpostazione della password è stato inviato all’indirizzo "
"email del profilo. Per cortesia controlla la tua email."
-#: views/site.py:257 views/user.py:428
+#: views/site.py:323 views/user.py:431
msgid "Password changed"
msgstr "Password cambiata"
-#: views/texts.py:167
+#: views/texts.py:169
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr "%(nb_texts)i testo/i cancellato/i"
-#: views/texts.py:212
+#: views/texts.py:214
#, python-format
msgid "Text %(text_title)s deleted"
msgstr "Testo %(text_title)s cancellato"
-#: views/texts.py:223
+#: views/texts.py:226
#, python-format
msgid "Text version %(text_version_title)s deleted"
msgstr "Versione del testo %(text_version_title)s cancellata"
-#: views/texts.py:588
+#: views/texts.py:624
msgid "Note (optional)"
msgstr "Nota (opzionale)"
-#: views/texts.py:592
+#: views/texts.py:628
msgid "Add a note to explain the modifications made to the text"
msgstr "Aggiungi una nota per spiegare le modifiche fatte al testo"
-#: views/texts.py:602
+#: views/texts.py:638
msgid "New version (optional)"
msgstr "Nuova versione (opzionale)"
-#: views/texts.py:605
+#: views/texts.py:641
msgid "Create a new version of this text (recommended)"
msgstr "Crea una nuova versione di questo testo (raccomandato)"
-#: views/texts.py:608
+#: views/texts.py:644
msgid "Keep comments (optional)"
msgstr "Tieni i commenti (opzionale)"
-#: views/texts.py:611
+#: views/texts.py:647
msgid "Keep comments (if not affected by the edit)"
msgstr "Tieni i commenti (se non interessati dalle modifiche)"
-#: views/texts.py:614
-#, fuzzy
+#: views/texts.py:650
msgid "Detach comments (optional)"
msgstr "Staccare i commenti (opzionale)"
-#: views/texts.py:617
-#, fuzzy
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
-msgstr "Se alcuni commenti sono stati attaccati ad un chunck di testo che viene modificato, selezionare questa opzione per mantenere questi commenti senza ambito. Lasciate questa opzione deselezionata se si vuole che tali osservazioni è soppresso. Questa opzione viene ignorata se il precedente 'Tieni i commenti' opzione non è selezionata."
-
-#: views/texts.py:677
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+"Se alcuni commenti sono stati attaccati ad un chunck di testo che viene "
+"modificato, selezionare questa opzione per mantenere questi commenti senza "
+"ambito. Lasciate questa opzione deselezionata se si vuole che tali "
+"osservazioni è soppresso. Questa opzione viene ignorata se il precedente "
+"'Tieni i commenti' opzione non è selezionata."
+
+#: views/texts.py:719
msgid "Name (optional)"
msgstr "Nome (opzionale)"
-#: views/texts.py:678
+#: views/texts.py:720
msgid "Email (optional)"
msgstr "Email (opzionale)"
-#: views/texts.py:730
+#: views/texts.py:773
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr ""
"Una nuova versione (copiata dalla versione %(version_title)s) è stata creata"
-#: views/texts.py:842 views/user.py:79 views/user.py:99
+#: views/texts.py:885 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr "modificati %(count)i ruoli utenti"
-#: views/texts.py:900
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr ""
+"Lasciare vuoto per utilizzare il valore configurato per l'area di lavoro."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+"Per disabilitare questa categoria per questo testo qualunque sia la "
+"configurazione per l'area di lavoro, digitare: "
+
+#: views/texts.py:949
msgid "Text settings updated"
msgstr "Aggiornato impostazioni del testo"
@@ -2181,99 +2270,99 @@
msgid "Optional text to add to invitation email"
msgstr "Testo opzionale da aggiungere all’invito via email"
-#: views/user.py:259
+#: views/user.py:260
#, python-format
msgid "%(nb_users)d user added"
msgid_plural "%(nb_users)d users added"
msgstr[0] "aggiunto %(nb_users)d utente "
msgstr[1] "aggiunto %(nb_users)d utenti"
-#: views/user.py:277
+#: views/user.py:278
msgid "Add user"
msgid_plural "Add users"
msgstr[0] "Aggiungi utente"
msgstr[1] "Aggiungi utenti"
-#: views/user.py:299
+#: views/user.py:300
msgid "This username is already in use. Please supply a different username."
msgstr ""
"Questo nome utente è già usato. Per cortesia introduci un nome differente."
-#: views/user.py:320 views/user.py:336
+#: views/user.py:321 views/user.py:338
msgid "Your account has been activated. You're now logged-in."
msgstr "Il tuo account è stato attivato. Ora sei collegato."
-#: views/user.py:331
+#: views/user.py:333
msgid "activate account"
msgstr "Attiva account"
-#: views/user.py:361
+#: views/user.py:363
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr "L‘accesso all’utente %(prof)s è stato sospeso."
-#: views/user.py:367
+#: views/user.py:369
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr "L’accesso all’utente %(prof)s è stato rifiutato."
-#: views/user.py:379
+#: views/user.py:382
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr "L‘accesso all’utente %(prof)s è stato riabilitato."
-#: views/user.py:383
+#: views/user.py:386
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr "L’accesso per utente %(prof)s è stato approvato."
-#: views/user.py:393
+#: views/user.py:396
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr "È stato inviato un nuovo invito all’utente %(prof)s."
-#: views/user.py:410
+#: views/user.py:413
msgid "Profile updated"
msgstr "Profilo aggiornato"
-#: views/user.py:456
+#: views/user.py:459
msgid "Anonymous user role modified."
msgstr "Modificato ruolo utente anonimo"
-#: views/user.py:478
+#: views/user.py:481
msgid "User modified"
msgstr "Modificato utente"
-#: views/user.py:493
+#: views/user.py:496
msgid "Subject"
msgstr "Oggetto"
-#: views/user.py:494
+#: views/user.py:497
msgid "Subject of the email"
msgstr "Oggetto dell’email"
-#: views/user.py:497
+#: views/user.py:500
msgid "Body"
msgstr "Corpo"
-#: views/user.py:498
+#: views/user.py:501
msgid "Body of the email"
msgstr "Corpo dell’email"
-#: views/user.py:518
+#: views/user.py:521
msgid "Email sent."
msgstr "Email spedita."
-#: views/user.py:539
+#: views/user.py:542
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Questo account è sospeso, contatta l’amministratore dello spazio di lavoro."
-#: views/user.py:574
+#: views/user.py:577
msgid "You've been logged out."
msgstr "Sei stato scollegato."
-#: views/user.py:590
+#: views/user.py:593
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2281,54 +2370,15 @@
"Sei registrato, riceverai un messaggio email di conferma una volta che il "
"moderatore avrà approvato la tua ammissione."
-#: views/user.py:593
+#: views/user.py:596
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Sei registrato, per cortesia controlla la tua casella di posta elettronica "
"per il messaggio di conferma."
-#: models.py:266 views/site.py:191
-#, fuzzy
-msgid "Label for the first category of comments"
-msgstr "Etichetta per la prima categoria di commenti"
-
-#: models.py:267 views/site.py:197
-#, fuzzy
-msgid "Label for the second category of comments"
-msgstr "Etichetta per la seconda categoria di commenti"
-
-#: models.py:268 views/site.py:203
-#, fuzzy
-msgid "Label for the third category of comments"
-msgstr "Etichetta per la terza categoria di commenti"
-
-#: models.py:269 views/site.py:209
-#, fuzzy
-msgid "Label for the fourth category of comments"
-msgstr "Etichetta per la quarta categoria di commenti"
-
-#: models.py:270 views/site.py:215
-#, fuzzy
-msgid "Label for the fifth category of comments"
-msgstr "Etichetta per la quinta categoria di commenti"
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-#, fuzzy
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr "I paragrafi tra cui almeno un commento di questa categoria avranno una barra verticale con questo colore: "
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "Leave blank to use the value configured for the workspace."
-msgstr "Lasciare vuoto per utilizzare il valore configurato per l'area di lavoro."
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr "Per disabilitare questa categoria per questo testo qualunque sia la configurazione per l'area di lavoro, digitare: "
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr "Politica della privacy"
+#~ msgid "Text notifications"
+#~ msgstr "Notifiche del testo"
+
+#~ msgid "Are you sure you want to delete this version?"
+#~ msgstr "Sei sicuro di voler cancellare questa versione del testo?"
Binary file src/cm/locale/it/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/it/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/it/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 21:19+0200\n"
+"POT-Creation-Date: 2014-03-21 16:22+0100\n"
"PO-Revision-Date: 2012-09-04 21:21+0200\n"
"Last-Translator: Daniele Pizzolli <dan@toel.it>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,79 +16,105 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: media/js/client/c_addcomment_form.js:52
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
msgid "New comment"
msgstr "Nuovo commento"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
msgid "New comment will be canceled, continue?"
msgstr "Il nuovo commento verrà cancellato, continuare?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
msgid "Warning"
msgstr "Attenzione"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
msgid "Started reply will be canceled, continue?"
msgstr "La replica verrà cancellata, continuare?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
msgid "Started comment edition will be canceled, continue?"
msgstr "La modifica al commento verrà cancellata, continuare?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
msgid "Table of contents"
msgstr "Tavola dei contenuti"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
msgid "change comment state to pending"
msgstr "cambia lo stato in pendente"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
msgid "change comment state to approved"
msgstr "cambia lo stato in approvato"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
msgid "change comment state to unapproved"
msgstr "cambia lo stato in non approvato"
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "cancella i cambiamenti allo stato di questo commento"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
msgid "pending"
msgstr "pendente"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
msgid "approved"
msgstr "approvato"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "non approvato"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "annulla"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
msgid "show replies"
msgstr "mostra repliche"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "cambia in:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "replica"
+msgstr[1] "repliche"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "modifica commento"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
msgid "delete comment"
msgstr "cancella commento"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
msgid "edit"
msgstr "modifica"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
msgid "delete"
msgstr "cancella"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
#: media/js/client/c_interface_forms.js:15
msgid "close"
msgstr "chiudi"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
msgid "show scope"
msgstr "mostra portata"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
msgid ""
"Comment is detached: it was created on a previous version and text it "
"applied to has been modified or removed."
@@ -96,19 +122,23 @@
"Il commento è staccato: è stato creato in una versione precedente e il testo "
"al quale era collegato è stato modificato o cancellato."
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
msgid "last modified on %(date)s"
msgstr "ultima modifica il %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
msgid "Permalink to this comment"
msgstr "Link permanente a questo commento"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:302
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
msgid "by %(name)s, created on %(date)s"
msgstr "da %(name)s, creato il %(date)s\""
-#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:318
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "categoria"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
msgid " comment"
msgid_plural " comments"
msgstr[0] " commento"
@@ -147,60 +177,24 @@
msgstr "Il commento sarà collegato a questa selezione:"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:429
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
msgid "Save"
msgstr "Salva"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
-#: media/js/site/text_edit.js:104
msgid "Cancel"
msgstr "Annulla"
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr "Modifica commento"
-
-#: media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr "cancella i cambiamenti allo stato di questo commento"
-
-#: media/js/client/c_icomment.js:17
-msgid "unapproved"
-msgstr "non approvato"
-
-#: media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr "annulla"
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
-msgstr "cambia in:"
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Categoria:"
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:601
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] "replica"
-msgstr[1] "repliche"
-
-#: media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr "modifica commento"
-
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr "Nuova replica"
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr "errore:"
-
-#: media/js/client/c_sync.js:57
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
msgid "no filtered comments left"
msgstr "non è rimasto nessun commento filtrato"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid ""
"Do you want to be notified of all replies in all discussions you "
"participated in?"
@@ -208,22 +202,54 @@
"Vuoi ricevere notifica di tutte le repliche in tutte le discussioni alle "
"quali hai partecipato?"
-#: media/js/client/c_sync.js:129
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid "Reply notification"
msgstr "Notifica delle repliche"
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
msgid "could not save comment"
msgstr "non posso salvare il commento"
-#: media/js/client/c_sync.js:223
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
msgid "Are you sure you want to delete this comment?"
msgstr "Sei sicuro di voler cancellare questo commento?"
-#: media/js/client/c_sync.js:227
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
msgid "could not remove comment"
msgstr "non posso rimuovere il commento"
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Modifica commento"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "errore:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Nuova replica"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "su misura"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "moderno"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "classico"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "codice"
+
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
msgid "print from the browser"
msgstr "stampa con il browser"
@@ -320,330 +346,297 @@
msgid "click to hide options"
msgstr "clicca per nascondere le opzioni"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:87
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
msgid "Text"
msgstr "Testo"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:91
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
msgid "Search"
msgstr "Ricerca"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:96
-#: media/js/site/f_text_view_frame.js:429
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
msgid "Reset"
msgstr "Reimposta"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:97
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
msgid "Hide all Comments"
msgstr "Nascondi tutti i commenti"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:105
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
msgid "Authors"
msgstr "Autori"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:113
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
msgid "States"
msgstr "Stati"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:122
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
msgid "Dates"
msgstr "Date"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:130
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
msgid "Tags"
msgstr "Tag"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Categorie"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
msgid "view previous comment"
msgstr "mostra commenti precedente"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:189
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
msgid "view next comment"
msgstr "mostra commento successivo"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:190
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
msgid "view first comment"
msgstr "mostra il primo commento"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:191
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
msgid "view last next comment"
msgstr "mostra l’ultimo commento"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:192
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
msgid "view all comments"
msgstr "mostra tutti i commenti"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
msgid "view all detached comments"
msgstr "mostra tutti i commenti staccati"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "abilita/disabilita interfaccia avanzata"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "abilita/disabilita tavola dei contenuti"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
msgid "print document with/without comments"
msgstr "stampa il documento con o senza commenti"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
+msgid "export document with/without comments"
+msgstr "esporta documenti con o senza commenti"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
msgid "toggle full screen view"
msgstr "abilita/disabilita schermo pieno"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
msgid "text feed"
msgstr "feed di testo"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
msgid "add a comment"
msgstr "aggiungi un commento"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:216
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
msgid "filter:"
msgstr "filtro:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:221
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
msgid "browse by:"
msgstr "naviga per:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:223
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
msgid "location"
msgstr "posizione"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
msgid "modification"
msgstr "modifica"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:388
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr "discussioni non ramificate"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
+msgid "thread discussions"
+msgstr "discussioni ramificate"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
msgid "Text style"
msgstr "Stile del testo"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:433
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
msgid "Animation duration"
msgstr "Durata animazione"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:442
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
msgid "(0.001 to 1 second)"
msgstr "(da 0.001 a 1 secondo)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:468
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
msgid "preferences reset (will apply on next load)"
msgstr "reimposta preferenze (si applicherà solo al prossimo caricamento)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:474
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
msgid "preferences saved (will apply on next load)"
msgstr "preferenze salvate (si applicherà dal prossimo caricamento)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:578
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
msgid "filter reset"
msgstr "reimposta filtro"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:588
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
msgid "filter applied"
msgstr "filtro applicato"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:594
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
msgid "discussion"
msgid_plural "discussions"
msgstr[0] "discussione"
msgstr[1] "discussioni"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:598
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
msgid "comment"
msgid_plural "comments"
msgstr[0] "commento"
msgstr[1] "commenti"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:623
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
msgid "all"
msgstr "tutti"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:641
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
msgid "last 24 hours (%(nb_comments)s)"
msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
msgstr[0] "ultime 24 ore ($(nb_comments)s)"
msgstr[1] "ultimi %(nb_days)s giorni (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:755
-#: media/js/site/text_edit.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
msgid "No"
msgstr "No"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:756
-#: media/js/site/text_edit.js:89
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
msgid "Yes"
msgstr "Sì"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
msgid "First Level Heading"
msgstr "Intestazione di primo livello"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
msgid "Your title here..."
msgstr "Qui va il titolo..."
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
msgid "Second Level Heading"
msgstr "Intestazione di secondo livello"
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
msgid "Heading 3"
msgstr "Intestazione 3"
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
msgid "Heading 4"
msgstr "Intestazione 4"
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
msgid "Heading 5"
msgstr "Intestazione 5"
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
msgid "Heading 6"
msgstr "Intestazione 6"
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
msgid "Bold"
msgstr "Grassetto"
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
msgid "Italic"
msgstr "Inclinato"
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
msgid "Bulleted List"
msgstr "Lista a pallini"
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
msgid "Numeric List"
msgstr "Lista numerica"
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
msgid "Picture"
msgstr "Immagine"
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
msgid "Link"
msgstr "Collegamento"
-#: media/js/markitup/sets.js:37
+#: media/js/markitup/sets.js:36
msgid "Quotes"
msgstr "Citazione"
-#: media/js/markitup/sets.js:38
+#: media/js/markitup/sets.js:37
msgid "Code Block / Code"
msgstr "Blocco di codice / Codice"
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
msgid "Preview"
msgstr "Anteprima"
-#: media/js/markitup/sets.js:71
+#: media/js/markitup/sets.js:72
msgid "Paragraph"
msgstr "Paragrafo"
-#: media/js/markitup/sets.js:75
+#: media/js/markitup/sets.js:76
msgid "Stroke through"
msgstr "Testo sbarrato"
-#: media/js/markitup/sets.js:79
+#: media/js/markitup/sets.js:80
msgid "List element"
msgstr "Elemento di una lista"
-#: media/js/markitup/sets.js:82
+#: media/js/markitup/sets.js:83
msgid "Your text to link..."
msgstr "Il testo del link..."
-#: media/js/markitup/sets.js:84
+#: media/js/markitup/sets.js:85
msgid "Clean"
msgstr "Pulisci"
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr "moderno"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr "classico"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr "codice"
-
-#: media/js/site/c_text_view_comments.js:21
-#, fuzzy
-msgid "custom"
-msgstr "su misura"
-
-#: media/js/site/f_text_view_frame.js:194
-msgid "toggle advance interface"
-msgstr "abilita/disabilita interfaccia avanzata"
-
-#: media/js/site/f_text_view_frame.js:195
-msgid "toggle table of contents"
-msgstr "abilita/disabilita tavola dei contenuti"
-
-#: media/js/site/f_text_view_frame.js:197
-msgid "export document with/without comments"
-msgstr "esporta documenti con o senza commenti"
-
-#: media/js/site/f_text_view_frame.js:344
-msgid "unthread discussions"
-msgstr "discussioni non ramificate"
-
-#: media/js/site/f_text_view_frame.js:347
-msgid "thread discussions"
-msgstr "discussioni ramificate"
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-"Questi commenti dovrebbero essere staccati (rimanere senza portata) o essere "
-"rimossi dalla nuova versione?"
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] ""
-"%(nb_comments)s commento si applica al testo che è stato modificato."
-msgstr[1] ""
-"%(nb_comments)s commenti si applicano al testo che è stato modificato.<"
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr "(Suggeriamo di creare una nuova versione)"
-
-#: media/js/site/text_edit.js:67
+#: media/js/site/text_edit.js:10
msgid "You chose not to create a new version all comments will be deleted"
msgstr ""
"Hai scelto di non creare una nuova versione e tutti i commenti saranno "
"cancellati"
-#: media/js/site/text_edit.js:69
+#: media/js/site/text_edit.js:12
msgid "Do you want to continue?"
msgstr "Vuoi continuare?"
-#: media/js/site/text_edit.js:102
-msgid "Detach"
-msgstr "Stacca"
-
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr "Cancella"
+#~ msgid ""
+#~ "Should these comments be detached (i.e. kept with no scope) or removed "
+#~ "from new version?"
+#~ msgstr ""
+#~ "Questi commenti dovrebbero essere staccati (rimanere senza portata) o "
+#~ "essere rimossi dalla nuova versione?"
-#: media/js/client/c_icomment.js:330
-#, fuzzy
-msgid "category"
-msgstr "categoria"
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] ""
+#~ "%(nb_comments)s commento si applica al testo che è stato modificato."
+#~ msgstr[1] ""
+#~ "%(nb_comments)s commenti si applicano al testo che è stato modificato.<"
-#: media/js/client/c_interface_form.js:52
-#, fuzzy
-msgid "Category:"
-msgstr "Categoria:"
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Suggeriamo di creare una nuova versione)"
-#: media/js/site/f_text_view_frame.js:123
-#, fuzzy
-msgid "Categories"
-msgstr "Categorie"
+#~ msgid "Detach"
+#~ msgstr "Stacca"
+
+#~ msgid "Remove"
+#~ msgstr "Cancella"
Binary file src/cm/locale/nb/LC_MESSAGES/django.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/nb/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,2308 @@
+# COMT Norwegian translation
+# Copyright (C) Sopinspace
+# This file is distributed under the same license as the COMT package.
+# Kirill Miazine (km@krot.org), 2010-2012
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: COMT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-18 18:04+0100\n"
+"PO-Revision-Date: 2012-23-10 08:00+0100\n"
+"Last-Translator: Kirill Miazine <km@krot.org>\n"
+"Language-Team: <no@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: hand-crafted with vim.\n"
+
+#: client.py:30
+msgid ""
+"A selection is required. Select in the text the part your comment applies to."
+msgstr ""
+"Et område i teksten må merkes. Merk et område i teksten som din merknad skal "
+"gjelde."
+
+#: client.py:144
+msgid "name is required"
+msgstr "navn må angis"
+
+#: client.py:147
+msgid "email is required"
+msgstr "epost må angis"
+
+#: client.py:149
+msgid "invalid email"
+msgstr "ugyldig epost"
+
+#: client.py:151
+msgid "title is required"
+msgstr "overskrift må angis"
+
+#: client.py:153
+msgid "content is required"
+msgstr "tekstens innhold må fylles ut"
+
+#: client.py:168
+msgid "comment removed"
+msgstr "merknad slettet"
+
+#: client.py:221 client.py:286
+msgid "comment saved"
+msgstr "merknad lagret"
+
+#: client.py:288
+msgid "comment saved, it is being held for moderation"
+msgstr "merknad lagret og holdes tilbake for godkjenning"
+
+#: client.py:326 client.py:335 client.py:337
+msgid "me"
+msgstr "meg"
+
+#: client.py:328 client.py:335 client.py:337
+msgid "author"
+msgstr "forfatter"
+
+#: client.py:387
+msgid "Tags input must be no longer than 250 characters."
+msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn."
+
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
+msgid "Title"
+msgstr "Overskrift"
+
+#: models.py:189
+msgid "Format"
+msgstr "Format"
+
+#: models.py:190 views/texts.py:721
+msgid "Content"
+msgstr "Innhold"
+
+#: models.py:191 models.py:625 templates/site/help.html:56
+msgid "Tags"
+msgstr "Etiketter"
+
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
+msgid "Note"
+msgstr "Kommentar"
+
+#: models.py:195
+msgid "Moderation a posteriori?"
+msgstr "Godkjenning i ettertid?"
+
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Etiketten for den første kategorien av kommentarer"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Etiketten for den andre kategorien av kommentarer"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Etiketten for tredje kategorien av kommentarer"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Etiketten for fjerde kategori av kommentarer"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Etiketten for femte kategorien av kommentarer"
+
+#: models.py:289
+msgid "Format:"
+msgstr "Format:"
+
+#: models.py:528
+msgid "name"
+msgstr "navn"
+
+#: models.py:529
+msgid "description"
+msgstr "beskrivelse"
+
+#: models.py:619
+msgid "Allow contact"
+msgstr "Tillatt kontakt"
+
+#: models.py:619
+msgid "Allow email messages from other users"
+msgstr "Motta epost fra andre brukere"
+
+#: models.py:620
+msgid "Preferred language"
+msgstr "Foretrukket språk"
+
+#: models.py:623
+msgid "Suspended access"
+msgstr "Sperret tilgang"
+
+#: models.py:647
+msgid "suspended"
+msgstr "sperret"
+
+#: models.py:649
+msgid "waiting approval"
+msgstr "venter på godkjenning"
+
+#: models.py:655
+msgid "pending"
+msgstr "pågående"
+
+#: models.py:670
+msgid "Invitation"
+msgstr "Invitasjon"
+
+#: models.py:732
+#, python-format
+msgid "Text %(link_to_text)s edited by %(creator)s"
+msgstr "Tekst %(link_to_text)s endret av %(creator)s"
+
+#: models.py:733
+#, python-format
+msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
+msgstr "Tekst %(link_to_text)s endret (ny versjon opprettet) av %(creator)s"
+
+#: models.py:734
+#, python-format
+msgid "Text %(link_to_text)s added by %(creator)s"
+msgstr "Tekst %(link_to_text)s lagt til av %(creator)s"
+
+#: models.py:735
+#, python-format
+msgid "Text %(link_to_text)s imported by %(creator)s"
+msgstr "Tekst %(link_to_text)s importert av %(creator)s"
+
+#: models.py:736
+#, python-format
+msgid "Text %(link_to_text)s removed"
+msgstr "Tekst %(link_to_text)s slettet"
+
+#: models.py:737
+#, python-format
+msgid ""
+"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
+msgstr ""
+"Merknad %(link_to_comment)s lagt til teksten %(link_to_text)s av %(creator)s"
+
+#: models.py:738
+#, python-format
+msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
+msgstr "Merknad %(link_to_comment)s slettet fra teksten %(link_to_text)s"
+
+#: models.py:739
+#, python-format
+msgid "User %(username)s added"
+msgstr "Bruker %(username)s opprettet"
+
+#: models.py:740
+#, python-format
+msgid "User %(username)s access to workspace enabled"
+msgstr "Aktivert tilgang for brukeren %(username)s"
+
+#: models.py:741
+#, python-format
+msgid "User %(username)s access to workspace refused"
+msgstr "Nektet tilgang for brukeren %(username)s"
+
+#: models.py:742
+#, python-format
+msgid "User %(username)s access to workspace suspended"
+msgstr "Sperret tilgang for brukeren %(username)s"
+
+#: models.py:743
+#, python-format
+msgid "User %(username)s access to workspace activated"
+msgstr "Aktivert tilgang for brukeren %(username)s"
+
+#: models.py:744
+#, python-format
+msgid "User %(username)s has activated his account"
+msgstr "Bruker %(username)s har aktivert kontoen"
+
+#: models.py:793
+msgid "anonymous"
+msgstr "anonym bruker"
+
+#: models.py:800 models.py:808
+#, python-format
+msgid "by \"%(username)s\""
+msgstr "av %(username)s"
+
+#: models.py:802
+#, python-format
+msgid "%(time_since)s ago"
+msgstr "for %(time_since)s siden"
+
+#: models_base.py:53
+msgid "Name:"
+msgstr "Navn:"
+
+#: models_base.py:54
+msgid "Email:"
+msgstr "Epost:"
+
+#: notifications.py:61 templates/email/activity_notification.txt:1
+msgid "Notification:"
+msgstr "Varsler:"
+
+#: role_models.py:7
+msgid "Generic"
+msgstr "Generell"
+
+#: role_models.py:7
+msgid "Class (education)"
+msgstr "Klasse (i skole osv.)"
+
+#: settings.py:110
+msgid "French"
+msgstr "Fransk"
+
+#: settings.py:111
+msgid "English"
+msgstr "Engelsk"
+
+#: settings.py:112
+msgid "Norwegian"
+msgstr "Norsk"
+
+#: settings.py:113
+msgid "Brazilian Portuguese"
+msgstr "Brasiliansk portugisisk"
+
+#: settings.py:114
+msgid "Spanish"
+msgstr "Spansk"
+
+#: settings.py:115
+msgid "Bulgarian"
+msgstr "Bulgarsk"
+
+#: settings.py:116
+msgid "Italian"
+msgstr ""
+
+#: static_i18n.py:6 static_i18n.py:11
+msgid "Observer"
+msgstr "Observatør"
+
+#: static_i18n.py:7
+msgid "Manager"
+msgstr "Administrator"
+
+#: static_i18n.py:8
+msgid "Editor"
+msgstr "Redaktør"
+
+#: static_i18n.py:9
+msgid "Moderator"
+msgstr "Moderator"
+
+#: static_i18n.py:10
+msgid "Commentator"
+msgstr "Kommentator"
+
+#: static_i18n.py:12
+msgid "Participant"
+msgstr "Deltaker"
+
+#: static_i18n.py:15
+msgid "Can view text"
+msgstr "Kan se tekster"
+
+#: static_i18n.py:16
+msgid "Can edit text"
+msgstr "Kan endre tekster"
+
+#: static_i18n.py:17
+msgid "Can create text"
+msgstr "Kan opprette tekster"
+
+#: static_i18n.py:18
+msgid "Can delete text"
+msgstr "Kan slette tekster"
+
+#: static_i18n.py:19
+msgid "Can manage text"
+msgstr "Kan administrere tekster"
+
+#: static_i18n.py:20
+msgid "Can create comment"
+msgstr "Kan opprette merknader"
+
+#: static_i18n.py:21
+msgid "Can delete comment"
+msgstr "Kan slette merknader"
+
+#: static_i18n.py:22
+msgid "Can delete own comment"
+msgstr "Kan slette egne merknader"
+
+#: static_i18n.py:23
+msgid "Can view approved comment"
+msgstr "Kan se godkjente merknader"
+
+#: static_i18n.py:24
+msgid "Can view own comment"
+msgstr "Kan se egne merknader"
+
+#: static_i18n.py:25
+msgid "Can view unapproved comment"
+msgstr "Kan se ikke-godkjente merknader"
+
+#: static_i18n.py:26
+msgid "Can edit comment"
+msgstr "Kan endre merknader"
+
+#: static_i18n.py:27
+msgid "Can edit own comment"
+msgstr "Kan endre egne merknader"
+
+#: static_i18n.py:28
+msgid "Can manage workspace"
+msgstr "Kan administrere arbeidsområde"
+
+#: static_i18n.py:29
+msgid "Can view workspace"
+msgstr "Kan se arbeidsområde"
+
+#: static_i18n.py:32
+msgid "Teacher"
+msgstr "Lærer"
+
+#: static_i18n.py:33
+msgid "Student"
+msgstr "Student"
+
+#: static_i18n.py:34
+msgid "Individual student"
+msgstr "Individuell student"
+
+#: templates/404.html:4
+msgid "Page not found"
+msgstr "Ukjent side"
+
+#: templates/404.html:6
+msgid "The requested page could not be found."
+msgstr "Siden ble ikke funnet."
+
+#: templates/500.html:4
+msgid "Server Error"
+msgstr "Serverfeil"
+
+#: templates/500.html:6
+msgid "An error has occurred."
+msgstr "En feil har oppstått."
+
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr "API dokumentasjon"
+
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr ""
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr ""
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr ""
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Kontakt bruker %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "Teksten %(title)s har blitt opprettet"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr ""
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "tilbake til arbeidsområde"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
+msgid "Activate your account"
+msgstr "Aktiver din konto"
+
+#: templates/site/activate.html:32
+msgid "Activate"
+msgstr "Aktiver"
+
+#: templates/site/contact.html:6 templates/site/layout/footer.html:7
+#: templates/site/macros/user_actions.html:20
+msgid "Contact"
+msgstr "Kontakt"
+
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
+msgid "Send"
+msgstr "Send"
+
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
+#: templates/site/settings.html:29 templates/site/settings_design.html:29
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
+#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
+#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/user_mass_add_text.html:38
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+msgid "Dashboard"
+msgstr "Kontrollpanell"
+
+#: templates/site/dashboard.html:43
+msgid "Actions"
+msgstr "Handlinger"
+
+#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
+#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/layout/header.html:13
+msgid "Create a text"
+msgstr "Opprett en tekst"
+
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr ""
+"Skriv tekst direkte i din nettleser eller lim teksten inn fra din "
+"utklippstavle"
+
+#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
+#: templates/site/text_create_upload.html:4
+#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/layout/header.html:14
+msgid "Upload a text"
+msgstr "Last opp tekst"
+
+#: templates/site/dashboard.html:49
+msgid ""
+"Upload a document from your computer (Text document, Open Format document, "
+"Word document)"
+msgstr ""
+"Last opp et dokument fra din datamaskin (ren tekst eller i Open Document- "
+"eller Microsoft Word-format)"
+
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
+#: templates/site/text_create_import.html:4
+#: templates/site/text_create_import.html:30
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
+msgid "Import a co-mented text"
+msgstr "Importer en \"co-mentert\" tekst"
+
+#: templates/site/dashboard.html:50
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
+msgstr ""
+"Importere en tekst, eventuelt med kommentarer og vedlegg, som tidligere har "
+"vært eksportert i XML-format fra co-ment"
+
+#: templates/site/dashboard.html:51
+msgid "Invite user"
+msgstr "Inviter bruker"
+
+#: templates/site/dashboard.html:52
+msgid "Edit your profile"
+msgstr "Rediger din profil"
+
+#: templates/site/dashboard.html:53
+msgid "View text list"
+msgstr "Se tekster"
+
+#: templates/site/dashboard.html:54
+msgid "Configure workspace"
+msgstr "Tilpass arbeidsområde"
+
+#: templates/site/dashboard.html:65
+msgid "Moderation queue"
+msgstr "Godkjenningskø"
+
+#: templates/site/dashboard.html:77
+#, python-format
+msgid "user %(user)s awaits approval"
+msgstr "bruker %(user)s venter på godkjenning"
+
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
+msgid "approve"
+msgstr "godkjenne"
+
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
+msgid "refuse"
+msgstr "nekte godkjenning"
+
+#: templates/site/dashboard.html:81
+msgid "membership"
+msgstr "medlemskap"
+
+#: templates/site/dashboard.html:86
+#: templates/site/macros/user_moderation.html:8
+msgid ""
+"Are you sure you want to approve this user's membership to the workspace?"
+msgstr "Ønsker du å godkjenne brukerens medlemskap i arbeidsområdet?"
+
+#: templates/site/dashboard.html:95
+#: templates/site/macros/user_moderation.html:17
+msgid ""
+"Are you sure you want to refuse this user's membership to the workspace?"
+msgstr "Ønsker du å nekte å godkjenne brukerens medlemskap i arbeidsområdet?"
+
+#: templates/site/dashboard.html:107
+#, python-format
+msgid "registered %(duration)s ago"
+msgstr "registrert for %(duration)s siden"
+
+#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
+msgid "comment"
+msgstr "merknad"
+
+#: templates/site/dashboard.html:122
+#, python-format
+msgid "by %(cuser)s on text"
+msgstr "av %(cuser)s til teksten"
+
+#: templates/site/dashboard.html:122
+msgid "awaits approval"
+msgstr "venter på godkjenning"
+
+#: templates/site/dashboard.html:128
+msgid "view in context"
+msgstr "se i kontekst"
+
+#: templates/site/dashboard.html:133
+msgid "Are you sure you want to approve this comment?"
+msgstr "Ønsker du å godkjenne denne merknaden?"
+
+#: templates/site/dashboard.html:150
+msgid "Are you sure you want to refuse this comment?"
+msgstr "Ønsker du å nekte å godkjenne denne merknaden?"
+
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
+#, python-format
+msgid "modified %(duration)s ago"
+msgstr "endret for %(duration)s siden"
+
+#: templates/site/dashboard.html:187
+msgid "Recent texts"
+msgstr "Nye tekster"
+
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
+msgid "all"
+msgstr "alle"
+
+#: templates/site/dashboard.html:202
+#, python-format
+msgid "%(nb_comments)s comment"
+msgid_plural "%(nb_comments)s comments"
+msgstr[0] "%(nb_comments)s merknad"
+msgstr[1] "%(nb_comments)s merknader"
+
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
+#, python-format
+msgid "1 version"
+msgid_plural "%(versions_number)s versions"
+msgstr[0] "Versjoner"
+msgstr[1] "Versjoner"
+
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
+msgid "No texts yet"
+msgstr "Ingen tekster ennå"
+
+#: templates/site/dashboard.html:228
+msgid "Workspace activity"
+msgstr "Aktivitet i arbeidsområde"
+
+#: templates/site/dashboard.html:229
+msgid "month"
+msgstr "måned"
+
+#: templates/site/dashboard.html:229
+msgid "week"
+msgstr "uke"
+
+#: templates/site/dashboard.html:229
+msgid "24 hours"
+msgstr "24 timer"
+
+#: templates/site/dashboard.html:235
+msgid "Access"
+msgstr "Tilgang"
+
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
+#: templates/site/user_list.html.py:188
+msgid "Loading..."
+msgstr "Laster..."
+
+#: templates/site/dashboard.html:246
+msgid "Commenting"
+msgstr "Kommentering"
+
+#: templates/site/dashboard.html:265
+msgid "Activities"
+msgstr "Aktiviteter"
+
+#: templates/site/dashboard.html:268
+msgid "texts"
+msgstr "tekster"
+
+#: templates/site/dashboard.html:269
+msgid "comments"
+msgstr "merknader"
+
+#: templates/site/dashboard.html:271
+msgid "users"
+msgstr "brukere"
+
+#: templates/site/dashboard.html:311
+msgid "No activities"
+msgstr "Ingen aktiviteter"
+
+#: templates/site/dashboard_bloc_recent_comments.html:9
+msgid "Recent comments"
+msgstr "Nye merknader"
+
+#: templates/site/dashboard_bloc_recent_comments.html:20
+msgid "on text"
+msgstr "til teksten"
+
+#: templates/site/dashboard_bloc_recent_comments.html:23
+#, python-format
+msgid "created %(duration)s ago"
+msgstr "opprettet for %(duration)s siden"
+
+#: templates/site/dashboard_bloc_recent_comments.html:24
+#, python-format
+msgid "by %(username)s"
+msgstr "av %(username)s"
+
+#: templates/site/dashboard_bloc_recent_comments.html:29
+msgid "No comments yet"
+msgstr "Ingen merknader ennå"
+
+#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/macros/text_tabs.html:22
+msgid "Followup"
+msgstr "Oppfølgning"
+
+#: templates/site/followup.html:20 templates/site/help.html:75
+#: templates/site/text_followup.html:22
+msgid "Feeds"
+msgstr "Strømmer"
+
+#: templates/site/followup.html:22 templates/site/text_followup.html:24
+msgid "Public feed"
+msgstr "Offentlig strøm"
+
+#: templates/site/followup.html:22 templates/site/followup.html.py:35
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
+#: templates/site/macros/form_fields.html:20
+msgid "Help"
+msgstr "Hjelp"
+
+#: templates/site/followup.html:25
+msgid "Public feed for workspace"
+msgstr "Offentlig strøm for arbeidsområde"
+
+#: templates/site/followup.html:29
+msgid "This is the public feed for the workspace."
+msgstr "Dette er den offentlige strømmen for arbeidsområdet."
+
+#: templates/site/followup.html:35 templates/site/text_followup.html:37
+msgid "Private feed"
+msgstr "Privat strøm"
+
+#: templates/site/followup.html:39
+msgid "Private feed for workspace"
+msgstr "Privat strøm for arbeidsområde"
+
+#: 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 ""
+"Dette er den private strømmen for arbeidsområdet. Ikke del adressen for "
+"strømmen med andre, men mindre du ønsker at de skal kunne se alt som skjer "
+"på arbeidsområdet."
+
+#: templates/site/followup.html:45 templates/site/text_followup.html:47
+msgid "Reset private feed url"
+msgstr "Nullstill adresse for den private strømmen"
+
+#: templates/site/followup.html:49 templates/site/text_followup.html:51
+msgid "Activate private feed"
+msgstr "Aktiver privat strøm"
+
+#: templates/site/followup.html:51
+msgid "The private feed for this workspace is not yet activated."
+msgstr "Privat strøm for arbeidsområdet er ikke aktivert ennå."
+
+#: templates/site/followup.html:55 templates/site/text_followup.html:58
+msgid "Email notifications"
+msgstr "Epostvarsler"
+
+#: templates/site/followup.html:58
+msgid "Subscribe to workspace notifications"
+msgstr "Abonner på varsler for arbeidsområdet"
+
+#: templates/site/followup.html:62
+msgid ""
+"Subscribe to all replies notifications in discussions where you have "
+"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:23
+#: templates/site/forgot_pw.html:36
+msgid "Reset my password"
+msgstr "Nullstill mitt passord"
+
+#: templates/site/forgot_pw.html:44
+msgid "This link is invalid."
+msgstr "Denne adressen er ugyldig."
+
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
+msgid "Forgot password?"
+msgstr "Glemt passord?"
+
+#: templates/site/help.html:25
+msgid "General Presentation"
+msgstr "Presentasjon"
+
+#: templates/site/help.html:27
+msgid "co-ment is a web based text annotation system."
+msgstr "co-ment er et nettbasert system for å kommentere tekster."
+
+#: templates/site/help.html:27
+msgid "COMT is the open source software behind it"
+msgstr ""
+
+#: templates/site/help.html:27
+msgid "See www.co-ment.com for more details"
+msgstr ""
+
+#: templates/site/help.html:29
+msgid "Glossary"
+msgstr "Ord og begreper"
+
+#: templates/site/help.html:31
+msgid "Contents"
+msgstr "Innhold"
+
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
+msgid "Collaboration"
+msgstr "Samarbeid"
+
+#: templates/site/help.html:34 templates/site/help.html.py:46
+msgid "Comments"
+msgstr "Merknader"
+
+#: templates/site/help.html:35 templates/site/help.html.py:69
+msgid "Notification and feeds"
+msgstr "Varsler og strømmer"
+
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
+msgid "Roles"
+msgstr "Roller"
+
+#: templates/site/help.html:37 templates/site/help.html.py:97
+#: templates/site/text_list.html:12
+msgid "Texts"
+msgstr "Tekster"
+
+#: templates/site/help.html:43
+msgid "co-ment 2 collaboration is based on assigning roles for users."
+msgstr ""
+
+#: templates/site/help.html:43 templates/site/help.html.py:54
+msgid "Click here for more details"
+msgstr ""
+
+#: templates/site/help.html:43
+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:49
+msgid "Moderation"
+msgstr "Godkjenning"
+
+#: templates/site/help.html:50
+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:53
+msgid "States"
+msgstr "Tilstander"
+
+#: templates/site/help.html:54
+msgid "co-ment uses states to implement moderation policies."
+msgstr ""
+
+#: templates/site/help.html:54
+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:57
+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:59
+msgid "Linking to a comment"
+msgstr ""
+
+#: templates/site/help.html:60
+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:62
+msgid "Scope"
+msgstr "Kontekst"
+
+#: templates/site/help.html:63
+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:65
+msgid "Keeping your comments across versions"
+msgstr ""
+
+#: templates/site/help.html:66
+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:72
+msgid "Email notification"
+msgstr "Epostvarsler"
+
+#: templates/site/help.html:73
+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:76
+msgid "Web feed definition on Wikipedia"
+msgstr ""
+
+#: templates/site/help.html:76
+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:78
+msgid "Public and private feeds"
+msgstr "Offentlige og private strømmer"
+
+#: templates/site/help.html:79
+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:81
+msgid "Text embedding"
+msgstr "Tekstintegrering"
+
+#: templates/site/help.html:82
+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 you are not logged into your workspace "
+"in another tab of your browser."
+msgstr ""
+
+#: templates/site/help.html:89
+msgid "Roles are predefined sets of permissions."
+msgstr ""
+
+#: templates/site/help.html:90
+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:91 templates/site/text_share.html:88
+msgid "Text role"
+msgstr "Tekstrolle"
+
+#: templates/site/help.html:92
+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:93 views/site.py:187
+msgid "Role model"
+msgstr "Rollemodell"
+
+#: templates/site/help.html:94
+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:100
+msgid "Create or upload?"
+msgstr ""
+
+#: templates/site/help.html:101
+msgid ""
+"There are 3 main ways to produce a text in co-ment. If you start from "
+"scratch, create your text in markdown format. If you start from an existing "
+"file upload it to a markdown format. If you start from a Web page, create a "
+"text with HTML as format, and copy and paste the full Web page into the "
+"editor."
+msgstr ""
+
+#: templates/site/help.html:105
+msgid "Text formats"
+msgstr ""
+
+#: templates/site/help.html:106
+msgid ""
+"There are at this date 3 text formats: markdown (default/preferred format), "
+"HTML and RST."
+msgstr ""
+
+#: templates/site/help.html:110
+msgid "Markdown"
+msgstr ""
+
+#: templates/site/help.html:111
+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:111
+msgid "Read more about this"
+msgstr ""
+
+#: templates/site/login.html:8 templates/site/login_form.html:19
+#: templates/site/layout/header.html:21
+msgid "Login"
+msgstr "Logg inn"
+
+#: templates/site/login_form.html:7
+#, python-format
+msgid "%(wname)s Login"
+msgstr "Innlogging til %(wname)s"
+
+#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/layout/header.html:22
+msgid "Register"
+msgstr "Registrer"
+
+#: templates/site/non_authenticated_index.html:10
+#: templates/site/layout/header.html:11
+msgid "Home"
+msgstr "Startside"
+
+#: templates/site/non_authenticated_index.html:28
+#, python-format
+msgid "One public text"
+msgid_plural "%(counter)s public texts"
+msgstr[0] "Én offentlig tekst"
+msgstr[1] "%(counter)s offentlige tekster"
+
+#: templates/site/notifications_desactivate.html:8
+msgid "Deactivate notification"
+msgstr "Stopp varsler"
+
+#: templates/site/notifications_desactivate.html:39
+msgid "Deactivate"
+msgstr "Stopp"
+
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
+#, python-format
+msgid "Your profile (%(username)s)"
+msgstr "Din profil (%(username)s)"
+
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
+msgid "Password"
+msgstr "Passord"
+
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
+#: templates/site/text_settings.html:23 templates/site/text_share.html:153
+#: templates/site/user_activate.html:36 templates/site/user_list.html:210
+#: templates/site/layout/base_workspace_form.html:32
+msgid "Save"
+msgstr "Lagre"
+
+#: templates/site/register.html:27
+#, python-format
+msgid "%(wname)s Registration"
+msgstr "Registrering på %(wname)s"
+
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
+msgid "Reset your password"
+msgstr "Nullstill ditt passord"
+
+#: templates/site/settings.html:5 templates/site/settings_design.html:5
+#: templates/site/text_list.html:185 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
+msgid "General"
+msgstr "Generell"
+
+#: templates/site/settings.html:23 templates/site/settings_design.html:23
+msgid "Appearance"
+msgstr "Utseende"
+
+#: templates/site/settings.html:38 templates/site/settings_design.html:40
+msgid ""
+"Are you sure you want to change the role model? All roles (except managers) "
+"will be resetted!"
+msgstr ""
+"Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli "
+"nullstilt!"
+
+#: templates/site/settings_design.html:31
+msgid "Delete logo"
+msgstr "Slett logo"
+
+#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
+#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+msgid "Text list"
+msgstr "Tekster"
+
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
+msgid "Embed text"
+msgstr "Integrer tekst"
+
+#: templates/site/text_embed.html:30
+msgid "Copy this code into your site to display text with comments."
+msgstr "Kopier denne koden til din side for å vise tekst med merknader."
+
+#: templates/site/text_embed.html:30
+msgid ""
+"Users will also be able to add comments from your site depending on "
+"anonymous users' roles."
+msgstr ""
+"Avhengig av rettighetene til anonyme brukere, vil andre muligens også kunne "
+"kommentere teksten direkte fra din side."
+
+#: templates/site/text_embed.html:36
+msgid "Warning:"
+msgstr "Advarsel:"
+
+#: 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 ""
+"Du vil ikke kunne integrere teksten før du har gitt anonyme brukere en "
+"rolle, som tillater dem å se teksten."
+
+#: templates/site/text_followup.html:7
+msgid "Text followup"
+msgstr "Oppfølgning av tekst"
+
+#: templates/site/text_followup.html:27
+#, python-format
+msgid "Public feed for text %(title)s"
+msgstr "Offentlig strøm for teksten %(title)s"
+
+#: templates/site/text_followup.html:31
+msgid "This is the public feed for the text."
+msgstr "Dette er den offentlige strømmen for teksten."
+
+#: templates/site/text_followup.html:41
+msgid "Private feed for text "
+msgstr "Privat strøm for teksten "
+
+#: 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 ""
+"Dette er den private strømmen for teksten. Ikke del denne adressen med "
+"andre, men mindre du ønsker at de skal kunne se alt som skjer med teksten."
+
+#: templates/site/text_followup.html:53
+msgid "The private feed for this text is not yet activated."
+msgstr "Den private strømmen for denne teksten er ikke aktivert ennå."
+
+#: templates/site/text_followup.html:61
+msgid ""
+"You will receive text notifications because you subscribed to notifications "
+"at the workspace level"
+msgstr ""
+"Du vil motta varsler for denne teksten, fordi du har abonnert på varsler for "
+"arbeidsområdet"
+
+#: templates/site/text_followup.html:64
+msgid "Subscribe to all text notifications"
+msgstr "Abonner på alle varsler for teksten"
+
+#: templates/site/text_history.html:56
+#: templates/site/text_history_compare.html:28
+#: templates/site/text_history_version.html:28
+msgid "Version list"
+msgstr "Versjoner"
+
+#: templates/site/text_history.html:59
+msgid "Compare last two versions"
+msgstr "Sammenlikn siste to versjoner"
+
+#: templates/site/text_history.html:61
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
+msgid "Most recent version"
+msgstr "Nyeste versjon"
+
+#: templates/site/text_history.html:63
+#: templates/site/text_history_compare.html:30
+#: templates/site/text_history_version.html:31
+msgid "Original version"
+msgstr "Original versjon"
+
+#: templates/site/text_history.html:69
+msgid "Compare selected versions"
+msgstr "Sammenlikn valgte versjoner"
+
+#: templates/site/text_history.html:79
+msgid "Version"
+msgstr "Versjon"
+
+#: templates/site/text_history.html:80
+msgid "Selection"
+msgstr "Tekstområde"
+
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
+msgid "Author"
+msgstr "Forfatter"
+
+#: templates/site/text_history.html:84
+msgid "Created"
+msgstr "Opprettet"
+
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
+msgid "# comments"
+msgstr "# merknader"
+
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
+msgid "View"
+msgstr "Se"
+
+#: templates/site/text_history.html:108
+#: templates/site/text_history_version.html:32
+msgid "Compare with previous version"
+msgstr "Sammenlikn med forrige versjon"
+
+#: templates/site/text_history.html:110
+msgid "Revert to this version"
+msgstr "Still tilbake til denne versjonen"
+
+#: templates/site/text_history_compare.html:32
+msgid "Previous modification"
+msgstr "Forrige endring"
+
+#: templates/site/text_history_compare.html:33
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
+#, python-format
+msgid "Version %(version_number)s"
+msgstr "Versjon %(version_number)s"
+
+#: templates/site/text_history_compare.html:35
+#, python-format
+msgid ""
+"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgstr ""
+"Sammenlikning mellom versjoner #%(version_1_number)s og #%(version_2_number)s"
+
+#: templates/site/text_history_compare.html:37
+msgid "Next modification"
+msgstr "Neste endring"
+
+#: templates/site/text_history_compare.html:46
+msgid "No differences"
+msgstr "Ingen forskjeller"
+
+#: templates/site/text_history_version.html:34
+msgid "Previous version"
+msgstr "Forrige versjon"
+
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Neste versjon"
+
+#: templates/site/text_history_version.html:42
+msgid "Compare with next version"
+msgstr "Sammenlikn med neste versjon"
+
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
+#, python-format
+msgid "by %(author)s"
+msgstr "av %(author)s"
+
+#: templates/site/text_list.html:53 templates/site/text_share.html:40
+#: templates/site/user_list.html:45
+msgid "Filter by tag:"
+msgstr "Filtrer etter etikett:"
+
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
+#: templates/site/user_list.html:47
+msgid "All"
+msgstr "Alle"
+
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
+msgid "Bulk Actions"
+msgstr "Handlinger"
+
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
+msgid "Apply"
+msgstr "Utfør"
+
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
+msgid "Text"
+msgstr "Tekst"
+
+#: templates/site/text_list.html:142
+msgid "Modified"
+msgstr "Endret"
+
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
+msgid "Last week activity"
+msgstr "Aktivitet siste uke"
+
+#: templates/site/text_list.html:160
+#: templates/site/macros/user_actions.html:13
+msgid "tags:"
+msgstr "etiketter:"
+
+#: templates/site/text_list.html:160
+#: templates/site/macros/user_actions.html:13
+#, python-format
+msgid "Filter by tag: %(tag_name)s"
+msgstr "Filtrer etter etikett: %(tag_name)s"
+
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
+#: templates/site/macros/user_actions.html:19
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/site/text_list.html:171
+msgid "Are you sure you want to delete this text?"
+msgstr "Ønsker du å slette denne teksten?"
+
+#: templates/site/text_list.html:184
+msgid "Users"
+msgstr "Brukere"
+
+#: templates/site/text_list.html:202
+msgid "Edit user"
+msgstr "Endre bruker"
+
+#: templates/site/text_share.html:27 templates/site/user_add.html:20
+#: templates/site/user_add_text.html:23 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 "Brukere"
+
+#: 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:22
+#: 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 "Opprett ny bruker"
+
+#: templates/site/text_share.html:31 templates/site/user_add.html:24
+#: templates/site/user_add_text.html:27 templates/site/user_contact.html:24
+#: 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 "Opprett flere brukere"
+
+#: templates/site/text_share.html:35 templates/site/user_contact.html:20
+#: 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 "Personer"
+
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
+msgid "Hide suspended users"
+msgstr "Skjul sperrede brukere"
+
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
+msgid "Display suspended users"
+msgstr "Vis sperrede brukere"
+
+#: templates/site/text_share.html:86 templates/site/user_list.html:132
+msgid "User"
+msgstr "Bruker"
+
+#: 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 ""
+"Rollen 'Rolle for arbeidsområde' er en global rolle, som vil anvendes på "
+"alle tekster. Du kan gi en bruker en særskilt rolle for denne teksten ved å "
+"velge en passende rolle i kolonnen Tekstrolle til høyre."
+
+#: templates/site/text_share.html:87
+msgid "Workspace role"
+msgstr "Rolle for arbeidsområde"
+
+#: templates/site/text_share.html:101
+#, python-format
+msgid "This role has been overriden on this text by a text role: %(rolename)s"
+msgstr "Denne rollen viker for en lokal rolle for teksten: %(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
+msgid "Edit anonymous users"
+msgstr "Endre anonyme brukere"
+
+#: templates/site/text_share.html:128 templates/site/user_list.html:177
+msgid "Anonymous users"
+msgstr "Anonyme brukere"
+
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
+msgid "add a comment"
+msgstr "opprett merknad"
+
+#: templates/site/text_view_frame.html:65
+msgid "Filter comments"
+msgstr "Filtrer merknader"
+
+#: templates/site/text_view_frame.html:66
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: templates/site/text_view_frame.html:67
+msgid "Text preferences"
+msgstr "Tekstinnstillinger"
+
+#: templates/site/text_view_frame.html:74
+msgid "Loading text…"
+msgstr "Laster tekst…"
+
+#: templates/site/text_view_frame.html:92
+msgid "Which comments?"
+msgstr "Hvilke merknader?"
+
+#: templates/site/text_view_frame.html:100
+msgid "How should comments' scope be shown in text?"
+msgstr "Hvordan skal rekkevidden for merknadene i teksten vises?"
+
+#: templates/site/unauthorized.html:14
+msgid "Unauthorized"
+msgstr "Ingen rettigheter"
+
+#: templates/site/user_add.html:26
+msgid ""
+"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 ""
+"Brukeren vil motta en invitasjon til å slutte seg til arbeidsområdet.\n"
+"Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' "
+"nedenfor."
+
+#: templates/site/user_add_text.html:29
+msgid "The user will receive an email invitation to join the workspace."
+msgstr "Brukeren vil motta en invitasjon til å slutte seg til arbeidsområdet."
+
+#: 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 ""
+"Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' "
+"nedenfor."
+
+#: templates/site/user_contact.html:6
+msgid "Contact user"
+msgstr "Kontakt bruker"
+
+#: templates/site/user_contact.html:26
+#, python-format
+msgid "Contact user %(username)s"
+msgstr "Kontakt bruker %(username)s"
+
+#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#, python-format
+msgid "Edit user %(username)s"
+msgstr "Endre bruker %(username)s"
+
+#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+msgid "Suspend access"
+msgstr "Sperr tilgang"
+
+#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+msgid "Enable access"
+msgstr "Åpne tilgang"
+
+#: templates/site/user_list.html:76
+#, python-format
+msgid "Change role to %(role_name)s"
+msgstr "Endre rollen til %(role_name)s"
+
+#: templates/site/user_list.html:133 views/user.py:284
+msgid "Email"
+msgstr "Epostadresse"
+
+#: templates/site/user_list.html:134
+msgid "Date joined"
+msgstr "Dato for tilslutning"
+
+#: templates/site/user_list.html:135
+msgid "Role"
+msgstr "Rolle"
+
+#: templates/site/user_list.html:177
+msgid ""
+"Those are non-registered users. Assign them a role to open your texts to "
+"simple visitors."
+msgstr ""
+"Dette er ikke-registrerte brukere. Tildel dem en rolle for å åpne dine "
+"tekster for vanlige besøkende."
+
+#: 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 "Brukere vil bli invitert til å slutte seg til arbeidsområdet."
+
+#: templates/site/layout/base_workspace.html:30
+#, python-format
+msgid "%(nb_texts)s text"
+msgid_plural "%(nb_texts)s texts"
+msgstr[0] "%(nb_texts)s tekst"
+msgstr[1] "%(nb_texts)s tekster"
+
+#: templates/site/layout/base_workspace.html:30
+#, python-format
+msgid "%(nb_users)s user"
+msgid_plural "%(nb_users)s users"
+msgstr[0] "%(nb_users)s bruker"
+msgstr[1] "%(nb_users)s brukere"
+
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "Personvern"
+
+#: templates/site/layout/header.html:19
+msgid "Logout"
+msgstr "Logg ut"
+
+#: templates/site/macros/form_fields.html:11
+msgid ""
+"Markdown (or rst) is a structured format which permit simple formatting with "
+"simple textual syntax. We recommend you use the 'markown' format unless you "
+"want to paste HTML (in which case you should use the 'html' format)."
+msgstr ""
+
+#: templates/site/macros/form_fields.html:14
+msgid ""
+"Markdown (or rst) is a structured format which permit simple formatting with "
+"simple textual syntax. We recommend you use the 'markdown' format if your "
+"text is mostly text and/or if you will create many revisions of your text. "
+"You can use the 'html' format if your text will not be edited or if you want "
+"to preserve complex formatting (tables, images, etc.)."
+msgstr ""
+
+#: templates/site/macros/main_tabs.html:11
+#, python-format
+msgid "Texts (%(nb_texts)s)"
+msgstr "Tekster (%(nb_texts)s)"
+
+#: templates/site/macros/main_tabs.html:13
+#, python-format
+msgid "People (%(nb_users)s)"
+msgstr "Personer (%(nb_users)s)"
+
+#: templates/site/macros/paginator.html:5
+msgid "Previous page"
+msgstr "Forrige side"
+
+#: templates/site/macros/paginator.html:6
+#, python-format
+msgid "%(sindex)s-%(eindex)s of %(pcount)s"
+msgstr "%(sindex)s-%(eindex)s av %(pcount)s"
+
+#: templates/site/macros/paginator.html:7
+msgid "Next page"
+msgstr "Neste side"
+
+#: templates/site/macros/paginator.html:9
+msgid "View all"
+msgstr "Vis alle"
+
+#: templates/site/macros/paginator.html:11
+msgid "paginate"
+msgstr "paginer"
+
+#: templates/site/macros/text_actions.html:12
+msgid "Share"
+msgstr "Deling"
+
+#: templates/site/macros/text_comments.html:16
+#, python-format
+msgid "by %(name)s on %(date)s"
+msgstr "av %(name)s %(date)s"
+
+#: templates/site/macros/text_editor.html:66
+msgid ""
+"You have attempted to leave this page. Unsaved changes will be lost. Are you "
+"sure you want to exit this page?"
+msgstr ""
+"Du har forsøkt å forlate denne siden. Endringer som ikke er lagret vil bli "
+"tapt. Ønsker du å forlate denne siden?"
+
+#: templates/site/macros/text_meta.html:6
+#, python-format
+msgid "last modified %(duration)s ago"
+msgstr "endret for %(duration)s siden"
+
+#: templates/site/macros/text_tabs.html:15
+msgid "People"
+msgstr "Personer"
+
+#: templates/site/macros/text_tabs.html:17
+msgid "Versions"
+msgstr "Versjoner"
+
+#: templates/site/macros/text_tabs.html:24
+msgid "Embed"
+msgstr "Integrer"
+
+#: templates/site/macros/user_actions.html:6
+#: templates/site/macros/user_actions.html:17
+msgid "Your profile"
+msgstr "Din profil"
+
+#: templates/site/macros/user_actions.html:8
+#, python-format
+msgid "Edit user %(userprint)s"
+msgstr "Endre bruker %(userprint)s"
+
+#: templates/site/macros/user_actions.html:29
+msgid "(Re-)send invitation"
+msgstr "Send invitasjon"
+
+#: templates/site/macros/user_actions.html:38
+msgid "Are you sure you want to suspend this user's access to the workspace?"
+msgstr "Ønsker du å sperre brukerens tilgang til arbeidsområdet?"
+
+#: templates/site/macros/user_actions.html:47
+msgid "Are you sure you want to enable this user's access to the workspace?"
+msgstr "Ønsker du å åpne brukerens tilgang til arbeidsområdet?"
+
+#: templates/site/macros/user_actions.html:56
+msgid "Are you sure you want to send this user an invitation to the workspace?"
+msgstr "Ønsker du å invitere brukeren til arbeidsområdet?"
+
+#: templates/site/macros/user_moderation.html:3
+msgid "Approve"
+msgstr "Godkjenn"
+
+#: templatetags/com.py:146
+msgid "F j, Y \\a\\t g:i a"
+msgstr "j.n.Y \\k\\l. G:i"
+
+#: utils/date.py:6
+msgid "%Y-%m-%d %H:%M"
+msgstr "%Y-%m-%d %H:%M"
+
+#: utils/diff.py:53
+msgid "unknown"
+msgstr "ukjent"
+
+#: views/create.py:30
+msgid "Upload file"
+msgstr "Last opp fil"
+
+#: views/create.py:31
+msgid ""
+"Upload a file from your computer instead of using the direct input above"
+msgstr "Last opp en fil fra din datamaskin"
+
+#: views/create.py:42 views/create.py:59
+msgid "You should specify a file to upload."
+msgstr "Du må angi en fil til å laste opp"
+
+#: views/create.py:49
+msgid "Upload XML file"
+msgstr "Last opp XML-fil"
+
+#: views/create.py:50
+msgid "Upload a previously exported XML file from your computer"
+msgstr "Last opp en tidligere eksportert XML-fil"
+
+#: views/create.py:65
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
+msgstr "Den importerte filen bør være en XML-fil generert av co-ment."
+
+#: views/create.py:71
+msgid "No co_ment_text node found in XML."
+msgstr "Ingen co_ment_text node funnet i XML."
+
+#: views/create.py:76
+#, python-format
+msgid "No %(tag)s node found in XML."
+msgstr "Ingen %(tag)s node funnet i XML."
+
+#: views/create.py:85
+msgid "The title of your text"
+msgstr "Overskrift for din tekst"
+
+#: views/create.py:109 views/create.py:144
+#, python-format
+msgid "Text \"%(text_title)s\" has been created"
+msgstr "Teksten %(text_title)s har blitt opprettet"
+
+#: views/create.py:247
+#, python-format
+msgid "Text \"%(text_title)s\" has been imported"
+msgstr "Teksten %(text_title)s har blitt importert"
+
+#: views/feeds.py:25
+#, python-format
+msgid "%(workspace_name)s's public feed"
+msgstr "Offentlig strøm for %(workspace_name)s"
+
+#: views/feeds.py:26
+#, python-format
+msgid "Workspace %(workspace_name)s public activity feed"
+msgstr "Offentlig strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
+
+#: views/feeds.py:36
+#, python-format
+msgid "%(workspace_name)s's private feed"
+msgstr "Privat strøm for %(workspace_name)s"
+
+#: views/feeds.py:37
+#, python-format
+msgid "Workspace %(workspace_name)s private feed"
+msgstr "Privat strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
+
+#: views/feeds.py:72
+#, python-format
+msgid "Text %(text_title)s's public feed"
+msgstr "Offentlig strøm for teksten %(text_title)s"
+
+#: views/feeds.py:73
+#, python-format
+msgid "Public activity feed for text %(text_title)s"
+msgstr "Offentlig strøm for aktiviteter på teksten %(text_title)s"
+
+#: views/feeds.py:84
+#, python-format
+msgid "Text %(text_title)s's private feed"
+msgstr "Privat strøm for teksten %(text_title)s"
+
+#: views/feeds.py:85
+#, python-format
+msgid "Private activity feed for text %(text_title)s"
+msgstr "Privat strøm for aktiviteter på teksten %(text_title)s"
+
+#: views/followup.py:31 views/followup.py:80
+msgid "Private feed activated."
+msgstr "Privat strøm aktivert."
+
+#: views/followup.py:34
+msgid "Private feed reseted."
+msgstr "Privat strøm nullstilt."
+
+#: views/followup.py:52
+msgid "This notification has already been deactivated."
+msgstr "Dette varselet har allerede blitt stoppet."
+
+#: views/followup.py:58
+msgid "Notification deactivated."
+msgstr "Varsel stoppet."
+
+#: views/followup.py:62
+msgid "Deactivate notification?"
+msgstr "Stope varsel?"
+
+#: views/followup.py:84
+msgid "Private notifications feed reseted."
+msgstr "Strøm for private varsler nullstilt."
+
+#: views/site.py:84 views/texts.py:136 views/user.py:548
+msgid "You're logged in!"
+msgstr "Du er logget inn!"
+
+#: views/site.py:102
+msgid "Your name"
+msgstr "Ditt navn"
+
+#: views/site.py:104
+msgid "Your email address"
+msgstr "Din epostadresse"
+
+#: views/site.py:107
+msgid "Subject of the message"
+msgstr "Emne"
+
+#: views/site.py:108
+msgid "Body of the message"
+msgstr "Tekst"
+
+#: views/site.py:110
+msgid "Send me a copy of the email"
+msgstr "Send meg en kopi av eposten"
+
+#: views/site.py:136
+msgid "Copy of message:"
+msgstr "Kopi av meldingen:"
+
+#: views/site.py:138
+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:167
+msgid "Workspace name"
+msgstr "Navn for arbeidsområde"
+
+#: views/site.py:172
+msgid "Workspace tagline"
+msgstr "Beskrivelse av arbeidsområde"
+
+#: views/site.py:177
+msgid "Workspace registration"
+msgstr "Registering på arbeidsområde"
+
+#: views/site.py:178
+msgid ""
+"Can users register themselves into the workspace? (if not, only invitations "
+"by managers can create new users)"
+msgstr ""
+"Skal brukere kunne registrere seg på arbeidsområdet? (Hvis ikke, må brukere "
+"inviteres av en administrator.)"
+
+#: views/site.py:182
+msgid "Workspace registration moderation"
+msgstr "Godkjenning av registreringer på arbeidsområde"
+
+#: views/site.py:183
+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:188
+msgid "Change the roles available in the workspace"
+msgstr "Endre roller i arbeidsområdet"
+
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+"Avsnitt inkludert minst én kommentar av denne kategorien vil ha en loddrett "
+"strek med denne fargen: "
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
+msgid "Settings saved"
+msgstr "Innstillinger lagret"
+
+#: views/site.py:247
+msgid "Workspace logo"
+msgstr "Logo for arbeidsområde"
+
+#: views/site.py:249
+msgid "Custom CSS rules"
+msgstr "Custom CSS-regler"
+
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+"Legg stilarksreglene i CSS-format (inkluderer ikke <code><style></"
+"code> HTML-koder). Advarsel: Denne koden vil bli lagt til alt innhold, sørg "
+"for at du vet hva du gjør før du legger noe her."
+
+#: views/site.py:255
+msgid "Custom font"
+msgstr "Tilpasset skrifttype"
+
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+"Tilpasset alternativ font familien til 'moderne', 'klassiske' og 'kode' at "
+"besøkende kan velge for kroppen av co-ter tekster. Angi en koma separert "
+"liste over fontfamilier. Font slektsnavn inkludert mellomrom bør stå i doble "
+"anførselstegn. F.eks. "
+
+#: views/site.py:261
+msgid "Custom font for titles"
+msgstr "Tilpasset skrifttype for titler"
+
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+"Tilpasset alternativ font familien til 'moderne', 'klassiske' og 'kode' at "
+"besøkende kan velge for titler (h1 til h6) av co-ter tekster. Angi en koma "
+"separert liste over fontfamilier. Font slektsnavn inkludert mellomrom bør "
+"stå i doble anførselstegn. F.eks. "
+
+#: views/site.py:319
+msgid ""
+"A link to reset your password has been sent to the profile email. Please "
+"check your email."
+msgstr ""
+"Adresse for å nullstille ditt passord er blitt sendt til din epostadresse. "
+"Sjekk din epost."
+
+#: views/site.py:323 views/user.py:431
+msgid "Password changed"
+msgstr "Passord har blitt endret"
+
+#: views/texts.py:169
+#, python-format
+msgid "%(nb_texts)i text(s) deleted"
+msgstr "%(nb_texts)i tekst(er) slettet"
+
+#: views/texts.py:214
+#, python-format
+msgid "Text %(text_title)s deleted"
+msgstr "Tekstet %(text_title)s slettet"
+
+#: views/texts.py:226
+#, python-format
+msgid "Text version %(text_version_title)s deleted"
+msgstr "Tekstversjon %(text_version_title)s slettet"
+
+#: views/texts.py:624
+msgid "Note (optional)"
+msgstr "Kommentar (valgfritt)"
+
+#: views/texts.py:628
+msgid "Add a note to explain the modifications made to the text"
+msgstr "Legg til en kommentar for å beskrive foretatte endringer i teksten"
+
+#: views/texts.py:638
+msgid "New version (optional)"
+msgstr "Ny versjon (valgfritt)"
+
+#: views/texts.py:641
+msgid "Create a new version of this text (recommended)"
+msgstr "Opprett ny versjon av teksten (anbefales)"
+
+#: views/texts.py:644
+msgid "Keep comments (optional)"
+msgstr "Behold merknader (valgfritt)"
+
+#: views/texts.py:647
+msgid "Keep comments (if not affected by the edit)"
+msgstr "Behold merknadene (dersom de ikke er påvirket av endringene i teksten)"
+
+#: views/texts.py:650
+msgid "Detach comments (optional)"
+msgstr "Løsne merknader (valgfritt)"
+
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+"Hvis noen kommentarer var knyttet til en chunck av tekst som er endret, "
+"sjekk dette alternativet for å holde disse kommentarene uten omfang. La "
+"dette alternativet hvis du vil at slike kommentarer blir slettet. Dette "
+"alternativet blir ignorert hvis den forrige 'Behold merknader' alternativet "
+"er avmerket."
+
+#: views/texts.py:719
+msgid "Name (optional)"
+msgstr "Navn (valgfritt)"
+
+#: views/texts.py:720
+msgid "Email (optional)"
+msgstr "Epost (valgfritt)"
+
+#: views/texts.py:773
+#, python-format
+msgid "A new version (copied from version %(version_title)s) has been created"
+msgstr "Ny versjon (kopiert fra versjon %(version_title)s) har blitt opprettet"
+
+#: views/texts.py:885 views/user.py:79 views/user.py:99
+#, python-format
+msgid "%(count)i user(s) role modified"
+msgstr "Roller for %(count)i bruker(e) endret"
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr "La stå tomt for å bruke verdien konfigurert for arbeidsområdet."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+"For å deaktivere denne kategorien for denne teksten uansett konfigurasjon "
+"for arbeidsområdet, skriver du: "
+
+#: views/texts.py:949
+msgid "Text settings updated"
+msgstr "Tekstinnstillinger oppdatert"
+
+#: views/user.py:61
+#, python-format
+msgid "%(count)i User's access suspended"
+msgstr "Tilgang for %(count)i bruker(e) sperret"
+
+#: views/user.py:68
+#, python-format
+msgid "%(count)i User's access enabled"
+msgstr "Tilgang for %(count)i bruker(e) åpnet"
+
+#: views/user.py:140
+msgid "E-mail address"
+msgstr "Epostadresse"
+
+#: views/user.py:160
+msgid "This user is already a member."
+msgstr "Denne brukeren er allerede et medlem."
+
+#: views/user.py:163
+msgid "Emails"
+msgstr "Epostadresser"
+
+#: views/user.py:164
+msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
+msgstr ""
+"Oppgi flere epostadresser (en per linje eller atskilt med ',' eller ';')"
+
+#: views/user.py:181
+msgid "Workspace level role"
+msgstr "Rolle for arbeidsområde"
+
+#: 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 ""
+"Denne rollen vil anvendes på alle tekster i arbeidsområdet. For å dele bare "
+"visse tekster med denne brukeren, kan du la dette feltet stå tomt og "
+"tilordne brukeren tekstroller etter at brukeren er opprettet."
+
+#: views/user.py:198
+msgid "Text level role"
+msgstr "Tekstrolle"
+
+#: views/user.py:199
+msgid "This role will apply only to this text."
+msgstr "Denne roller vil anvendes på denne teksten."
+
+#: views/user.py:224
+msgid "Optional text to add to invitation email"
+msgstr "Valgfri melding som skal sendes sammen med invitasjonen"
+
+#: views/user.py:260
+#, python-format
+msgid "%(nb_users)d user added"
+msgid_plural "%(nb_users)d users added"
+msgstr[0] "%(nb_users)d bruker opprettet"
+msgstr[1] "%(nb_users)d brukere opprettet"
+
+#: views/user.py:278
+msgid "Add user"
+msgid_plural "Add users"
+msgstr[0] "Opprett ny bruker"
+msgstr[1] "Opprett nye brukere"
+
+#: views/user.py:300
+msgid "This username is already in use. Please supply a different username."
+msgstr ""
+"Dette brukernavnet er allerde registrert. Vennligst velg et annet brukernavn."
+
+#: views/user.py:321 views/user.py:338
+msgid "Your account has been activated. You're now logged-in."
+msgstr "Din brukerkonto er blitt aktivert. Du er nå logged inn."
+
+#: views/user.py:333
+msgid "activate account"
+msgstr "aktiver konto"
+
+#: views/user.py:363
+#, python-format
+msgid "User's access %(prof)s has been suspended."
+msgstr "Tilgang for brukeren %(prof)s har blitt sperret."
+
+#: views/user.py:369
+#, python-format
+msgid "User's access %(prof)s has been refused."
+msgstr "Tilgang for brukeren %(prof)s har blitt nektet."
+
+#: views/user.py:382
+#, python-format
+msgid "User's access %(prof)s has been restored."
+msgstr "Tilgang for brukeren %(prof)s har blitt åpnet."
+
+#: views/user.py:386
+#, python-format
+msgid "User's access %(prof)s has been approved."
+msgstr "Tilgang for brukeren %(prof)s har blitt godkjent."
+
+#: views/user.py:396
+#, python-format
+msgid "A new invitation has been sent to user %(prof)s."
+msgstr "Ny invitasjon har blitt sendt til brukeren %(prof)s."
+
+#: views/user.py:413
+msgid "Profile updated"
+msgstr "Profil oppdatert"
+
+#: views/user.py:459
+msgid "Anonymous user role modified."
+msgstr "Rollen for anonyme brukere har blitt endret."
+
+#: views/user.py:481
+msgid "User modified"
+msgstr "Bruker endret."
+
+#: views/user.py:496
+msgid "Subject"
+msgstr "Emne"
+
+#: views/user.py:497
+msgid "Subject of the email"
+msgstr "Emne for eposten"
+
+#: views/user.py:500
+msgid "Body"
+msgstr "Tekst"
+
+#: views/user.py:501
+msgid "Body of the email"
+msgstr "Epostteksten"
+
+#: views/user.py:521
+msgid "Email sent."
+msgstr "Eposten er blitt sendt."
+
+#: views/user.py:542
+msgid "This account is suspended, contact the workspace administrator."
+msgstr ""
+"Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
+
+#: views/user.py:577
+msgid "You've been logged out."
+msgstr "Du er logget ut."
+
+#: views/user.py:593
+msgid ""
+"You've been registered, you will receive a confirmation mail once a "
+"moderator has approved your membership."
+msgstr ""
+"Du er blitt registert. Du vil motta en epost med bekreftelse når en "
+"administrator godkjenner ditt medlemskap."
+
+#: views/user.py:596
+msgid ""
+"You've been registered, please check your email for the confirm message."
+msgstr "Du er blitt registert. Se din epost for en melding med bekreftelsen."
+
+#~ msgid "Text notifications"
+#~ msgstr "Tekstvarsler"
+
+#~ msgid "Are you sure you want to delete this version?"
+#~ msgstr "Ønsker du å slette denne versjonen?"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Save user"
+#~ msgid_plural "Save users"
+#~ msgstr[0] "Lagre bruker"
+#~ msgstr[1] "Lagre brukere"
+
+#, fuzzy
+#~ msgid "Text edition"
+#~ msgstr "Neste endring"
+
+#, fuzzy
+#~ msgid "Your password has been reset."
+#~ msgstr "Teksten %(text_title)s har blitt opprettet"
+
+#~ msgid "How do you want to print?"
+#~ msgstr "Hvordan ønsker du å skrive ut?"
+
+#, fuzzy
+#~ msgid "Design"
+#~ msgstr "Versjon"
+
+#~ msgid "%(workspace_name)s's workspace"
+#~ msgstr "Arbeidsområde til %(workspace_name)s"
+
+#~ msgid "Versions:"
+#~ msgstr "Versjoner:"
+
+#~ msgid "created %(v1created)s"
+#~ msgstr "opprettet %(v1created)s"
+
+#~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
+#~ msgstr "Forskjeller mellom versjon #%(v1_nid)s og versjon #%(v2_nid)s:"
+
+#~ msgid "Version #%(version_number)s created on %(date)s"
+#~ msgstr "Versjon #%(version_number)s opprettet %(date)s"
+
+#~ msgid "%(title)s"
+#~ msgstr "%(title)s"
+
+#~ msgid "Local role"
+#~ msgstr "Tekstrolle"
Binary file src/cm/locale/nb/LC_MESSAGES/djangojs.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/nb/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,662 @@
+# COMT Norwegian translation
+# Copyright (C) Sopinspace
+# This file is distributed under the same license as the COMT package.
+# Kirill Miazine (km@krot.org), 2010-2012
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: COMT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-21 16:17+0100\n"
+"PO-Revision-Date: 2012-23-10 08:00+0100\n"
+"Last-Translator: Kirill Miazine <km@krot.org>\n"
+"Language-Team: <no@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: hand-crafted with vim.\n"
+
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
+msgid "New comment"
+msgstr "Ny merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+msgid "New comment will be canceled, continue?"
+msgstr "Ønsker du å avbryte opprettelsen av en ny merknad?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
+msgid "Warning"
+msgstr "Advarsel"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
+msgid "Started reply will be canceled, continue?"
+msgstr "Ønsker du å avbryte påbegynt svar?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
+msgid "Started comment edition will be canceled, continue?"
+msgstr "Ønsker du å avbryte påbegynte endringer i merknaden?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
+msgstr "Innholdsfortegnelsen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+msgid "change comment state to pending"
+msgstr "endre tilstand til pågående"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+msgid "change comment state to approved"
+msgstr "endre tilstand til godkjent"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
+msgid "change comment state to unapproved"
+msgstr "endre tilstand til ikke-godkjent"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "avbryt endring av merknadens tilstand"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+msgid "pending"
+msgstr "pågående"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
+msgid "approved"
+msgstr "godkjent"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "ikke-godkjent"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "avbryt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
+msgid "show replies"
+msgstr "vis svar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "endre til:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "svar"
+msgstr[1] "svar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "endre merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+msgid "delete comment"
+msgstr "slett merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+msgid "edit"
+msgstr "endre"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+msgid "delete"
+msgstr "slett"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_interface_forms.js:15
+msgid "close"
+msgstr "lukk"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+msgid "show scope"
+msgstr "vis kontekst"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
+msgid ""
+"Comment is detached: it was created on a previous version and text it "
+"applied to has been modified or removed."
+msgstr ""
+"Merknad er frakoblet: den var opprettet i en tidligere versjon, og teksten, "
+"som merknaden er knyttet til, er blitt endret eller slettet."
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
+msgid "last modified on %(date)s"
+msgstr "sist endret %(date)s"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
+msgid "Permalink to this comment"
+msgstr "Fast adresse til denne merknaden"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
+msgid "by %(name)s, created on %(date)s"
+msgstr "av %(name)s, opprettet %(date)s"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "kategori"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] " merknad"
+msgstr[1] " merknader"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
+msgid "No selection yet"
+msgstr "Intet merket ennå"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:4
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:5
+msgid "E-mail address:"
+msgstr "Epostadresse:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:6
+msgid "Title:"
+msgstr "Overskrift:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:7
+msgid "Content:"
+msgstr "Innhold:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:8
+msgid "Tag:"
+msgstr "Etikett:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:11
+msgid "Modify comment's scope:"
+msgstr "Endre merknadens kontekst:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:13
+msgid "Comment will apply to this selection:"
+msgstr "Merknaden vil gjelde følgende tekstområde:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
+msgid "Save"
+msgstr "Lagre"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Kategori:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
+msgid "no filtered comments left"
+msgstr "ingen filtrerte merknader igjen"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
+msgid ""
+"Do you want to be notified of all replies in all discussions you "
+"participated in?"
+msgstr ""
+"Ønsker du å abonnere på varsler for alle svar i diskusjoner hvor du har "
+"deltatt?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
+msgid "Reply notification"
+msgstr "Varsel om svar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
+msgid "could not save comment"
+msgstr "kunne ikke lagre merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
+msgid "Are you sure you want to delete this comment?"
+msgstr "Ønsker du å slette denne merknaden?"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
+msgid "could not remove comment"
+msgstr "kunne ikke slette merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Endre merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "feil:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Nytt svar"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "tilpasset"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "moderne"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "klassisk"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "kode"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
+msgid "print from the browser"
+msgstr "skriv ut fra nettleser"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:6
+msgid "download html file (.html)"
+msgstr "last ned fil i HTML-format (.html)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:7
+msgid "download markdown file (.mkd)"
+msgstr "last ned fil i Markdown-format (.mkd)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "print in PDF format"
+msgstr "skrive ut i PDF-format"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+msgid "download portable object format file (.pdf)"
+msgstr "last ned fil i PDF-format (.pdf)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
+msgid "download latex file (.tex)"
+msgstr "last ned fil i LaTeX-format (.tex)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
+msgid "download open document file (.odt)"
+msgstr "lest ned fil i OpenDocument-format (.odt)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+msgid "download microsoft word file (.doc)"
+msgstr "last ned fil i Microsoft Word-format (.doc)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+msgid "download microsoft word 2007 file (.docx)"
+msgstr "last ned fil i Microsoft Word-format 2007 (.docx)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
+msgid "download ebook (.epub)"
+msgstr "last ned fil i ebok-format (.epub)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:21
+msgid "download XML file for re-importing text and comments"
+msgstr "last ned XML-fil for å kunne re-importere tekst og kommentarer"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
+msgid "Print text"
+msgstr "Skriv ut tekst"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
+msgid "How do you want to print?"
+msgstr "Hvordan ønsker du å skrive ut?"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
+msgid "Export text"
+msgstr "Eksporter tekst"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
+msgid "Choose file format"
+msgstr "Velg filformat"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
+msgid "using markers only, no background colors"
+msgstr "bruker bare markører, ingen bakgrunnsfarger"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
+msgid "using markers and background colors"
+msgstr "bruker markører og bakgrunnsfarger"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
+msgid "all (%(nb_comments)s)"
+msgstr "alle (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
+msgid "current filtered ones (%(nb_comments)s)"
+msgstr "filtrert (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
+msgid "none (0)"
+msgstr "ingen (0)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
+msgid "Go !"
+msgstr "Kjør!"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_message.js:18
+msgid "loading..."
+msgstr "laster..."
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
+msgid "click to show options"
+msgstr "klikk for å vise valg"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
+msgid "click to hide options"
+msgstr "klikk for å skjule valg"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
+msgid "Text"
+msgstr "Tekst"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
+msgid "Search"
+msgstr "Søk"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
+msgid "Reset"
+msgstr "Nullstill"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+msgid "Hide all Comments"
+msgstr "Skjul alle merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+msgid "Authors"
+msgstr "Forfattere"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
+msgid "States"
+msgstr "Tilstander"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+msgid "Dates"
+msgstr "Datoer"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
+msgid "Tags"
+msgstr "Etiketter"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Kategorier"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
+msgid "view previous comment"
+msgstr "se forrige merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
+msgid "view next comment"
+msgstr "se neste merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
+msgid "view first comment"
+msgstr "se første merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
+msgid "view last next comment"
+msgstr "se siste merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
+msgid "view all comments"
+msgstr "se alle merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr "se alle frakoblede merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "slå på/av avansert grensesnitt"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "slå på/av innholdsfortegnelsen"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
+msgid "print document with/without comments"
+msgstr "skriv ut dokument med/uten merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
+msgid "export document with/without comments"
+msgstr "eksporter dokument med/uten merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
+msgid "toggle full screen view"
+msgstr "slå på/av visning på full side"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
+msgstr "textstrøm"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
+msgid "add a comment"
+msgstr "opprett merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
+msgid "filter:"
+msgstr "filter:"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
+msgid "browse by:"
+msgstr "navigasjon etter:"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
+msgid "location"
+msgstr "plassering"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
+msgid "modification"
+msgstr "endring"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr "skjul diskusjonstråder"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
+msgid "thread discussions"
+msgstr "vis diskusjonstråder"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
+msgid "Text style"
+msgstr "Stil"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
+msgid "Animation duration"
+msgstr "Varighet for animasjon"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
+msgid "(0.001 to 1 second)"
+msgstr "(fra 0.001 til 1 sekund)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
+msgid "preferences reset (will apply on next load)"
+msgstr "innstillinger nullstilt (aktiveres ved neste innlasting)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
+msgid "preferences saved (will apply on next load)"
+msgstr "innstillinger lagret (aktiveres ved neste innlasting)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
+msgid "filter reset"
+msgstr "filter nullstilt"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
+msgid "filter applied"
+msgstr "filtrert"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
+msgid "discussion"
+msgid_plural "discussions"
+msgstr[0] "diskusjon"
+msgstr[1] "diskusjoner"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "merknad"
+msgstr[1] "merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
+msgid "all"
+msgstr "alle"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
+msgid "last 24 hours (%(nb_comments)s)"
+msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
+msgstr[0] "siste 24 timer (%(nb_comments)s)"
+msgstr[1] "siste %(nb_days)s dager (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
+msgid "No"
+msgstr "Nei"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
+msgid "Yes"
+msgstr "Ja"
+
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
+msgid "First Level Heading"
+msgstr "Overskrift - nivå 1"
+
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
+msgid "Your title here..."
+msgstr "Din overskrift kommer her..."
+
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
+msgid "Second Level Heading"
+msgstr "Overskrift - nivå 2"
+
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
+msgid "Heading 3"
+msgstr "Overskrift - nivå 3"
+
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
+msgid "Heading 4"
+msgstr "Overskrift - nivå 4"
+
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
+msgid "Heading 5"
+msgstr "Overskrift - nivå 5"
+
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
+msgid "Heading 6"
+msgstr "Overskrift - nivå 6"
+
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
+msgid "Bold"
+msgstr "Fett"
+
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
+msgid "Italic"
+msgstr "Kursiv"
+
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
+msgid "Bulleted List"
+msgstr "Punktliste"
+
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
+msgid "Numeric List"
+msgstr "Nummerert liste"
+
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
+msgid "Picture"
+msgstr "Bilde"
+
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
+msgid "Link"
+msgstr "Kobling"
+
+#: media/js/markitup/sets.js:36
+msgid "Quotes"
+msgstr "Sitat"
+
+#: media/js/markitup/sets.js:37
+msgid "Code Block / Code"
+msgstr "Kode"
+
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: media/js/markitup/sets.js:72
+msgid "Paragraph"
+msgstr "Avsnitt"
+
+#: media/js/markitup/sets.js:76
+msgid "Stroke through"
+msgstr "Strøket"
+
+#: media/js/markitup/sets.js:80
+msgid "List element"
+msgstr "Listeelement"
+
+#: media/js/markitup/sets.js:83
+msgid "Your text to link..."
+msgstr "Koblingstekst..."
+
+#: media/js/markitup/sets.js:85
+msgid "Clean"
+msgstr "Ren"
+
+#: media/js/site/text_edit.js:10
+msgid "You chose not to create a new version all comments will be deleted"
+msgstr ""
+"Siden du ikke ønsket å opprette en ny versjon, vil alle merknader bli slettet"
+
+#: media/js/site/text_edit.js:12
+msgid "Do you want to continue?"
+msgstr "Ønsker du å fortsette?"
+
+#~ msgid ""
+#~ "Should these comments be detached (i.e. kept with no scope) or removed "
+#~ "from new version?"
+#~ msgstr ""
+#~ "Skal disse merknadene frakobles (dvs. tape kontekst) eller slettes i den "
+#~ "nye versjonen?"
+
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] "%(nb_comments)s kommentar gjelder den endrede teksten."
+#~ msgstr[1] "%(nb_comments)s kommentarer gjelder den endrede teksten."
+
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Vi anbefaler at du oppretter en ny versjon)"
+
+#~ msgid "Detach"
+#~ msgstr "Koble fra"
+
+#~ msgid "Remove"
+#~ msgstr "Fjern"
+
+#~ msgid " reply"
+#~ msgid_plural " replies"
+#~ msgstr[0] " svar"
+#~ msgstr[1] " svar"
+
+#~ msgid "Follow up"
+#~ msgstr "Følg opp"
+
+#~ msgid ""
+#~ "%(nb_comments)s comment will be removed because the text it applies to "
+#~ "has been changed."
+#~ msgid_plural ""
+#~ "%(nb_comments)s comments will be removed because the text they apply to "
+#~ "has been changed."
+#~ msgstr[0] ""
+#~ "%(nb_comments)s merknad vil bli slettet, fordi teksten som den er knyttet "
+#~ "til har blitt endret."
+#~ msgstr[1] ""
+#~ "%(nb_comments)s merknader vil bli slettet, fordi teksten som de er "
+#~ "knyttet til har blitt endret."
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2195 +0,0 @@
-# COMT Norwegian translation
-# Copyright (C) Sopinspace
-# This file is distributed under the same license as the COMT package.
-# Kirill Miazine (km@krot.org), 2010-2012
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: COMT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 12:58+0200\n"
-"PO-Revision-Date: 2012-23-10 08:00+0100\n"
-"Last-Translator: Kirill Miazine <km@krot.org>\n"
-"Language-Team: <no@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: hand-crafted with vim.\n"
-
-#: client.py:29
-msgid ""
-"A selection is required. Select in the text the part your comment applies to."
-msgstr ""
-"Et område i teksten må merkes. Merk et område i teksten som din merknad skal "
-"gjelde."
-
-#: client.py:138
-msgid "name is required"
-msgstr "navn må angis"
-
-#: client.py:141
-msgid "email is required"
-msgstr "epost må angis"
-
-#: client.py:143
-msgid "invalid email"
-msgstr "ugyldig epost"
-
-#: client.py:145
-msgid "title is required"
-msgstr "overskrift må angis"
-
-#: client.py:147
-msgid "content is required"
-msgstr "tekstens innhold må fylles ut"
-
-#: client.py:162
-msgid "comment removed"
-msgstr "merknad slettet"
-
-#: client.py:213 client.py:278
-msgid "comment saved"
-msgstr "merknad lagret"
-
-#: client.py:280
-msgid "comment saved, it is being held for moderation"
-msgstr "merknad lagret og holdes tilbake for godkjenning"
-
-#: client.py:314
-msgid "me"
-msgstr "meg"
-
-#: client.py:316
-msgid "author"
-msgstr "forfatter"
-
-#: client.py:341
-msgid "Tags input must be no longer than 250 characters."
-msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn."
-
-#: models.py:184 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:630
-msgid "Title"
-msgstr "Overskrift"
-
-#: models.py:185
-msgid "Format"
-msgstr "Format"
-
-#: models.py:186 views/texts.py:725
-msgid "Content"
-msgstr "Innhold"
-
-#: models.py:187 models.py:643 templates/site/help.html:47
-msgid "Tags"
-msgstr "Etiketter"
-
-#: models.py:189 templates/site/text_history.html:80 views/user.py:223
-msgid "Note"
-msgstr "Kommentar"
-
-#: models.py:191
-msgid "Moderation a posteriori?"
-msgstr "Godkjenning i ettertid?"
-
-#: models.py:307
-msgid "Format:"
-msgstr "Format:"
-
-#: models.py:545
-msgid "name"
-msgstr "navn"
-
-#: models.py:546
-msgid "description"
-msgstr "beskrivelse"
-
-#: models.py:637
-msgid "Allow contact"
-msgstr "Tillatt kontakt"
-
-#: models.py:637
-msgid "Allow email messages from other users"
-msgstr "Motta epost fra andre brukere"
-
-#: models.py:638
-msgid "Preferred language"
-msgstr "Foretrukket språk"
-
-#: models.py:641
-msgid "Suspended access"
-msgstr "Sperret tilgang"
-
-#: models.py:665
-msgid "suspended"
-msgstr "sperret"
-
-#: models.py:667
-msgid "waiting approval"
-msgstr "venter på godkjenning"
-
-#: models.py:673
-msgid "pending"
-msgstr "pågående"
-
-#: models.py:688
-msgid "Invitation"
-msgstr "Invitasjon"
-
-#: models.py:756
-#, python-format
-msgid "Text %(link_to_text)s edited by %(creator)s"
-msgstr "Tekst %(link_to_text)s endret av %(creator)s"
-
-#: models.py:757
-#, python-format
-msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
-msgstr "Tekst %(link_to_text)s endret (ny versjon opprettet) av %(creator)s"
-
-#: models.py:758
-#, python-format
-msgid "Text %(link_to_text)s added by %(creator)s"
-msgstr "Tekst %(link_to_text)s lagt til av %(creator)s"
-
-#: models.py:763
-msgid "Text %(link_to_text)s imported by %(creator)s"
-msgstr "Tekst %(link_to_text)s importert av %(creator)s"
-
-#: models.py:759
-#, python-format
-msgid "Text %(link_to_text)s removed"
-msgstr "Tekst %(link_to_text)s slettet"
-
-#: models.py:760
-#, python-format
-msgid ""
-"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
-msgstr ""
-"Merknad %(link_to_comment)s lagt til teksten %(link_to_text)s av %(creator)s"
-
-#: models.py:761
-#, python-format
-msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
-msgstr "Merknad %(link_to_comment)s slettet fra teksten %(link_to_text)s"
-
-#: models.py:762
-#, python-format
-msgid "User %(username)s added"
-msgstr "Bruker %(username)s opprettet"
-
-#: models.py:763
-#, python-format
-msgid "User %(username)s access to workspace enabled"
-msgstr "Aktivert tilgang for brukeren %(username)s"
-
-#: models.py:764
-#, python-format
-msgid "User %(username)s access to workspace refused"
-msgstr "Nektet tilgang for brukeren %(username)s"
-
-#: models.py:765
-#, python-format
-msgid "User %(username)s access to workspace suspended"
-msgstr "Sperret tilgang for brukeren %(username)s"
-
-#: models.py:766
-#, python-format
-msgid "User %(username)s access to workspace activated"
-msgstr "Aktivert tilgang for brukeren %(username)s"
-
-#: models.py:767
-#, python-format
-msgid "User %(username)s has activated his account"
-msgstr "Bruker %(username)s har aktivert kontoen"
-
-#: models.py:816
-msgid "anonymous"
-msgstr "anonym bruker"
-
-#: models.py:823 models.py:831
-#, python-format
-msgid "by \"%(username)s\""
-msgstr "av %(username)s"
-
-#: models.py:825
-#, python-format
-msgid "%(time_since)s ago"
-msgstr "for %(time_since)s siden"
-
-#: models_base.py:53
-msgid "Name:"
-msgstr "Navn:"
-
-#: models_base.py:54
-msgid "Email:"
-msgstr "Epost:"
-
-#: notifications.py:60
-msgid "Notification:"
-msgstr "Varsler:"
-
-#: role_models.py:7
-msgid "Generic"
-msgstr "Generell"
-
-#: role_models.py:7
-msgid "Class (education)"
-msgstr "Klasse (i skole osv.)"
-
-#: settings.py:105
-msgid "French"
-msgstr "Fransk"
-
-#: settings.py:106
-msgid "English"
-msgstr "Engelsk"
-
-#: settings.py:107
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: settings.py:108
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk portugisisk"
-
-#: settings.py:109
-msgid "Spanish"
-msgstr "Spansk"
-
-#: settings.py:110
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: static_i18n.py:6 static_i18n.py:11
-msgid "Observer"
-msgstr "Observatør"
-
-#: static_i18n.py:7
-msgid "Manager"
-msgstr "Administrator"
-
-#: static_i18n.py:8
-msgid "Editor"
-msgstr "Redaktør"
-
-#: static_i18n.py:9
-msgid "Moderator"
-msgstr "Moderator"
-
-#: static_i18n.py:10
-msgid "Commentator"
-msgstr "Kommentator"
-
-#: static_i18n.py:12
-msgid "Participant"
-msgstr "Deltaker"
-
-#: static_i18n.py:15
-msgid "Can view text"
-msgstr "Kan se tekster"
-
-#: static_i18n.py:16
-msgid "Can edit text"
-msgstr "Kan endre tekster"
-
-#: static_i18n.py:17
-msgid "Can create text"
-msgstr "Kan opprette tekster"
-
-#: static_i18n.py:18
-msgid "Can delete text"
-msgstr "Kan slette tekster"
-
-#: static_i18n.py:19
-msgid "Can manage text"
-msgstr "Kan administrere tekster"
-
-#: static_i18n.py:20
-msgid "Can create comment"
-msgstr "Kan opprette merknader"
-
-#: static_i18n.py:21
-msgid "Can delete comment"
-msgstr "Kan slette merknader"
-
-#: static_i18n.py:22
-msgid "Can delete own comment"
-msgstr "Kan slette egne merknader"
-
-#: static_i18n.py:23
-msgid "Can view approved comment"
-msgstr "Kan se godkjente merknader"
-
-#: static_i18n.py:24
-msgid "Can view own comment"
-msgstr "Kan se egne merknader"
-
-#: static_i18n.py:25
-msgid "Can view unapproved comment"
-msgstr "Kan se ikke-godkjente merknader"
-
-#: static_i18n.py:26
-msgid "Can edit comment"
-msgstr "Kan endre merknader"
-
-#: static_i18n.py:27
-msgid "Can edit own comment"
-msgstr "Kan endre egne merknader"
-
-#: static_i18n.py:28
-msgid "Can manage workspace"
-msgstr "Kan administrere arbeidsområde"
-
-#: static_i18n.py:29
-msgid "Can view workspace"
-msgstr "Kan se arbeidsområde"
-
-#: static_i18n.py:32
-msgid "Teacher"
-msgstr "Lærer"
-
-#: static_i18n.py:33
-msgid "Student"
-msgstr "Student"
-
-#: static_i18n.py:34
-msgid "Individual student"
-msgstr "Individuell student"
-
-#: templates/404.html:4
-msgid "Page not found"
-msgstr "Ukjent side"
-
-#: templates/404.html:6
-msgid "The requested page could not be found."
-msgstr "Siden ble ikke funnet."
-
-#: templates/500.html:4
-msgid "Server Error"
-msgstr "Serverfeil"
-
-#: templates/500.html:6
-msgid "An error has occurred."
-msgstr "En feil har oppstått."
-
-#: templates/api_doc.html:6
-msgid "API Documentation"
-msgstr "API dokumentasjon"
-
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
-msgid "Activate your account"
-msgstr "Aktiver din konto"
-
-#: templates/site/activate.html:23
-msgid "Activate"
-msgstr "Aktiver"
-
-#: templates/site/contact.html:6 templates/site/layout/footer.html:7
-#: templates/site/macros/user_actions.html:20
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
-msgid "Send"
-msgstr "Send"
-
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:49
-#: templates/site/text_create_upload.html:44 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
-#: templates/site/user_mass_add_text.html:38
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
-msgid "Dashboard"
-msgstr "Kontrollpanell"
-
-#: templates/site/dashboard.html:43
-msgid "Actions"
-msgstr "Handlinger"
-
-#: 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/layout/header.html:10
-msgid "Create a text"
-msgstr "Opprett en tekst"
-
-#: templates/site/dashboard.html:48
-msgid "Write a text inside your browser or paste a content from your clipboard"
-msgstr ""
-"Skriv tekst direkte i din nettleser eller lim teksten inn fra din "
-"utklippstavle"
-
-#: 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/layout/header.html:11
-msgid "Upload a text"
-msgstr "Last opp tekst"
-
-#: templates/site/dashboard.html:49
-msgid ""
-"Upload a document from your computer (Text document, Open Format document, "
-"Word document)"
-msgstr ""
-"Last opp et dokument fra din datamaskin (ren tekst eller i Open Document- eller "
-"Microsoft Word-format)"
-
-#: templates/site/dashboard.html:50
-#: templates/site/text_create_import.html:4
-#: templates/site/text_create_import.html:30
-#: templates/site/text_create_content.html:32
-#: templates/site/text_create_upload.html:30
-#: templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
-msgid "Import a co-mented text"
-msgstr "Importer en \"co-mentert\" tekst"
-
-#: templates/site/dashboard.html:50
-msgid "Import a text, possibly with comments and attachments, which has been previously exported in XML format from co-ment interface"
-msgstr "Importere en tekst, eventuelt med kommentarer og vedlegg, som tidligere har vært "
-"eksportert i XML-format fra co-ment"
-
-#: templates/site/dashboard.html:50
-msgid "Invite user"
-msgstr "Inviter bruker"
-
-#: templates/site/dashboard.html:51
-msgid "Edit your profile"
-msgstr "Rediger din profil"
-
-#: templates/site/dashboard.html:52
-msgid "View text list"
-msgstr "Se tekster"
-
-#: templates/site/dashboard.html:53
-msgid "Configure workspace"
-msgstr "Tilpass arbeidsområde"
-
-#: templates/site/dashboard.html:64
-msgid "Moderation queue"
-msgstr "Godkjenningskø"
-
-#: templates/site/dashboard.html:76
-#, python-format
-msgid "user %(user)s awaits approval"
-msgstr "bruker %(user)s venter på godkjenning"
-
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
-msgid "approve"
-msgstr "godkjenne"
-
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
-msgid "refuse"
-msgstr "nekte godkjenning"
-
-#: templates/site/dashboard.html:80
-msgid "membership"
-msgstr "medlemskap"
-
-#: 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 "Ønsker du å godkjenne brukerens medlemskap i arbeidsområdet?"
-
-#: 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 "Ønsker du å nekte å godkjenne brukerens medlemskap i arbeidsområdet?"
-
-#: templates/site/dashboard.html:106
-#, python-format
-msgid "registered %(duration)s ago"
-msgstr "registrert for %(duration)s siden"
-
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
-msgid "comment"
-msgstr "merknad"
-
-#: templates/site/dashboard.html:121
-#, python-format
-msgid "by %(cuser)s on text"
-msgstr "av %(cuser)s til teksten"
-
-#: templates/site/dashboard.html:121
-msgid "awaits approval"
-msgstr "venter på godkjenning"
-
-#: templates/site/dashboard.html:127
-msgid "view in context"
-msgstr "se i kontekst"
-
-#: templates/site/dashboard.html:132
-msgid "Are you sure you want to approve this comment?"
-msgstr "Ønsker du å godkjenne denne merknaden?"
-
-#: templates/site/dashboard.html:149
-msgid "Are you sure you want to refuse this comment?"
-msgstr "Ønsker du å nekte å godkjenne denne merknaden?"
-
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
-#, python-format
-msgid "modified %(duration)s ago"
-msgstr "endret for %(duration)s siden"
-
-#: templates/site/dashboard.html:186
-msgid "Recent texts"
-msgstr "Nye tekster"
-
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
-msgid "all"
-msgstr "alle"
-
-#: templates/site/dashboard.html:201
-#, python-format
-msgid "%(nb_comments)s comment"
-msgid_plural "%(nb_comments)s comments"
-msgstr[0] "%(nb_comments)s merknad"
-msgstr[1] "%(nb_comments)s merknader"
-
-#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
-#, python-format
-msgid "1 version"
-msgid_plural "%(versions_number)s versions"
-msgstr[0] "Versjoner"
-msgstr[1] "Versjoner"
-
-#: templates/site/dashboard.html:208 templates/site/text_list.html:223
-msgid "No texts yet"
-msgstr "Ingen tekster ennå"
-
-#: templates/site/dashboard.html:227
-msgid "Workspace activity"
-msgstr "Aktivitet i arbeidsområde"
-
-#: templates/site/dashboard.html:228
-msgid "month"
-msgstr "måned"
-
-#: templates/site/dashboard.html:228
-msgid "week"
-msgstr "uke"
-
-#: templates/site/dashboard.html:228
-msgid "24 hours"
-msgstr "24 timer"
-
-#: templates/site/dashboard.html:234
-msgid "Access"
-msgstr "Tilgang"
-
-#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:208 templates/site/user_list.html:158
-#: templates/site/user_list.html.py:188
-msgid "Loading..."
-msgstr "Laster..."
-
-#: templates/site/dashboard.html:245
-msgid "Commenting"
-msgstr "Kommentering"
-
-#: templates/site/dashboard.html:264
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#: templates/site/dashboard.html:267
-msgid "texts"
-msgstr "tekster"
-
-#: templates/site/dashboard.html:268
-msgid "comments"
-msgstr "merknader"
-
-#: templates/site/dashboard.html:270
-msgid "users"
-msgstr "brukere"
-
-#: templates/site/dashboard.html:310
-msgid "No activities"
-msgstr "Ingen aktiviteter"
-
-#: templates/site/dashboard_bloc_recent_comments.html:9
-msgid "Recent comments"
-msgstr "Nye merknader"
-
-#: templates/site/dashboard_bloc_recent_comments.html:20
-msgid "on text"
-msgstr "til teksten"
-
-#: templates/site/dashboard_bloc_recent_comments.html:23
-#, python-format
-msgid "created %(duration)s ago"
-msgstr "opprettet for %(duration)s siden"
-
-#: templates/site/dashboard_bloc_recent_comments.html:24
-#, python-format
-msgid "by %(username)s"
-msgstr "av %(username)s"
-
-#: templates/site/dashboard_bloc_recent_comments.html:29
-msgid "No comments yet"
-msgstr "Ingen merknader ennå"
-
-#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
-#: templates/site/macros/text_tabs.html:22
-msgid "Followup"
-msgstr "Oppfølgning"
-
-#: templates/site/followup.html:20 templates/site/help.html:66
-#: templates/site/text_followup.html:22
-msgid "Feeds"
-msgstr "Strømmer"
-
-#: templates/site/followup.html:22 templates/site/text_followup.html:24
-msgid "Public feed"
-msgstr "Offentlig strøm"
-
-#: 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:11
-#: templates/site/macros/form_fields.html:20
-msgid "Help"
-msgstr "Hjelp"
-
-#: templates/site/followup.html:25
-msgid "Public feed for workspace"
-msgstr "Offentlig strøm for arbeidsområde"
-
-#: templates/site/followup.html:29
-msgid "This is the public feed for the workspace."
-msgstr "Dette er den offentlige strømmen for arbeidsområdet."
-
-#: templates/site/followup.html:35 templates/site/text_followup.html:37
-msgid "Private feed"
-msgstr "Privat strøm"
-
-#: templates/site/followup.html:39
-msgid "Private feed for workspace"
-msgstr "Privat strøm for arbeidsområde"
-
-#: 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 ""
-"Dette er den private strømmen for arbeidsområdet. Ikke del adressen for "
-"strømmen med andre, men mindre du ønsker at de skal kunne se alt som "
-"skjer på arbeidsområdet."
-
-#: templates/site/followup.html:45 templates/site/text_followup.html:47
-msgid "Reset private feed url"
-msgstr "Nullstill adresse for den private strømmen"
-
-#: templates/site/followup.html:49 templates/site/text_followup.html:51
-msgid "Activate private feed"
-msgstr "Aktiver privat strøm"
-
-#: templates/site/followup.html:51
-msgid "The private feed for this workspace is not yet activated."
-msgstr "Privat strøm for arbeidsområdet er ikke aktivert ennå."
-
-#: templates/site/followup.html:55 templates/site/text_followup.html:58
-msgid "Email notifications"
-msgstr "Epostvarsler"
-
-#: templates/site/followup.html:58
-msgid "Subscribe to workspace notifications"
-msgstr "Abonner på varsler for arbeidsområdet"
-
-#: templates/site/followup.html:62
-msgid ""
-"Subscribe to all replies notifications in discussions where you have "
-"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/forgot_pw.html:27
-msgid "Reset my password"
-msgstr "Nullstill mitt passord"
-
-#: templates/site/forgot_pw.html:35
-msgid "This link is invalid."
-msgstr "Denne adressen er ugyldig."
-
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
-msgid "Forgot password?"
-msgstr "Glemt passord?"
-
-#: templates/site/help.html:16
-msgid "General Presentation"
-msgstr "Presentasjon"
-
-#: templates/site/help.html:18
-msgid "co-ment is a web based text annotation system."
-msgstr "co-ment er et nettbasert system for å kommentere tekster."
-
-#: templates/site/help.html:20
-msgid "Glossary"
-msgstr "Ord og begreper"
-
-#: templates/site/help.html:22
-msgid "Contents"
-msgstr "Innhold"
-
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
-msgid "Collaboration"
-msgstr "Samarbeid"
-
-#: templates/site/help.html:25 templates/site/help.html.py:37
-msgid "Comments"
-msgstr "Merknader"
-
-#: templates/site/help.html:26 templates/site/help.html.py:60
-msgid "Notification and feeds"
-msgstr "Varsler og strømmer"
-
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
-msgid "Roles"
-msgstr "Roller"
-
-#: templates/site/help.html:28 templates/site/help.html.py:88
-#: templates/site/text_list.html:12
-msgid "Texts"
-msgstr "Tekster"
-
-#: templates/site/help.html:34
-msgid "co-ment 2 collaboration is based on assigning roles for users."
-msgstr ""
-
-#: templates/site/help.html:34 templates/site/help.html.py:45
-msgid "Click here for more details"
-msgstr ""
-
-#: templates/site/help.html:34
-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:40
-msgid "Moderation"
-msgstr "Godkjenning"
-
-#: templates/site/help.html:41
-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:44
-msgid "States"
-msgstr "Tilstander"
-
-#: templates/site/help.html:45
-msgid "co-ment uses states to implement moderation policies."
-msgstr ""
-
-#: templates/site/help.html:45
-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:48
-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:50
-msgid "Linking to a comment"
-msgstr ""
-
-#: templates/site/help.html:51
-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:53
-msgid "Scope"
-msgstr "Kontekst"
-
-#: templates/site/help.html:54
-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:56
-msgid "Keeping your comments across versions"
-msgstr ""
-
-#: templates/site/help.html:57
-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:63
-msgid "Email notification"
-msgstr "Epostvarsler"
-
-#: templates/site/help.html:64
-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:67
-msgid "Web feed definition on Wikipedia"
-msgstr ""
-
-#: templates/site/help.html:67
-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:69
-msgid "Public and private feeds"
-msgstr "Offentlige og private strømmer"
-
-#: templates/site/help.html:70
-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:72
-msgid "Text embedding"
-msgstr "Tekstintegrering"
-
-#: templates/site/help.html:73
-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 you are not logged into your workspace "
-"in another tab of your browser."
-msgstr ""
-
-#: templates/site/help.html:80
-msgid "Roles are predefined sets of permissions."
-msgstr ""
-
-#: templates/site/help.html:81
-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:82 templates/site/text_share.html:88
-msgid "Text role"
-msgstr "Tekstrolle"
-
-#: templates/site/help.html:83
-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:84 views/site.py:185
-msgid "Role model"
-msgstr "Rollemodell"
-
-#: templates/site/help.html:85
-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:91
-msgid "Create or upload?"
-msgstr ""
-
-#: templates/site/help.html:92
-msgid ""
-"There are 3 main ways to produce a text in co-ment. If you start from "
-"scratch, create your text in markdown format. If you start from an existing "
-"file upload it to a markdown format. If you start from a Web page, create a "
-"text with HTML as format, and copy and paste the full Web page into the "
-"editor."
-msgstr ""
-
-#: templates/site/help.html:96
-msgid "Text formats"
-msgstr ""
-
-#: templates/site/help.html:97
-msgid ""
-"There are at this date 3 text formats: markdown (default/preferred format), "
-"HTML and RST."
-msgstr ""
-
-#: templates/site/help.html:101
-msgid "Markdown"
-msgstr ""
-
-#: templates/site/help.html:102
-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:102
-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 "Logg inn"
-
-#: templates/site/login_form.html:7
-#, python-format
-msgid "%(wname)s Login"
-msgstr "Innlogging til %(wname)s"
-
-#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:18
-msgid "Register"
-msgstr "Registrer"
-
-#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
-msgid "Home"
-msgstr "Startside"
-
-#: templates/site/non_authenticated_index.html:20
-#, python-format
-msgid "One public text"
-msgid_plural "%(counter)s public texts"
-msgstr[0] "Én offentlig tekst"
-msgstr[1] "%(counter)s offentlige tekster"
-
-#: templates/site/notifications_desactivate.html:8
-msgid "Deactivate notification"
-msgstr "Stopp varsler"
-
-#: templates/site/notifications_desactivate.html:31
-msgid "Deactivate"
-msgstr "Stopp"
-
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
-#, python-format
-msgid "Your profile (%(username)s)"
-msgstr "Din profil (%(username)s)"
-
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:14
-msgid "Profile"
-msgstr "Profil"
-
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
-msgid "Password"
-msgstr "Passord"
-
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/text_edit.html:37
-#: 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 "Lagre"
-
-#: templates/site/register.html:19
-#, python-format
-msgid "%(wname)s Registration"
-msgstr "Registrering på %(wname)s"
-
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
-msgid "Reset your password"
-msgstr "Nullstill ditt passord"
-
-#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:183 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
-msgid "General"
-msgstr "Generell"
-
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
-msgid "Appearance"
-msgstr "Utseende"
-
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
-msgid ""
-"Are you sure you want to change the role model? All roles (except managers) "
-"will be resetted!"
-msgstr ""
-"Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli "
-"nullstilt!"
-
-#: templates/site/settings_design.html:31
-msgid "Delete logo"
-msgstr "Slett logo"
-
-#: templates/site/text_create_content.html:26
-#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
-msgid "Text list"
-msgstr "Tekster"
-
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr "Tekstvarsler"
-
-#: templates/site/text_embed.html:25
-msgid "Embed text"
-msgstr "Integrer tekst"
-
-#: templates/site/text_embed.html:26
-msgid "Copy this code into your site to display text with comments."
-msgstr "Kopier denne koden til din side for å vise tekst med merknader."
-
-#: templates/site/text_embed.html:26
-msgid ""
-"Users will also be able to add comments from your site depending on "
-"anonymous users' roles."
-msgstr ""
-"Avhengig av rettighetene til anonyme brukere, vil andre muligens også kunne "
-"kommentere teksten direkte fra din side."
-
-#: templates/site/text_embed.html:36
-msgid "Warning:"
-msgstr "Advarsel:"
-
-#: 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 ""
-"Du vil ikke kunne integrere teksten før du har gitt anonyme brukere en "
-"rolle, som tillater dem å se teksten."
-
-#: templates/site/text_followup.html:7
-msgid "Text followup"
-msgstr "Oppfølgning av tekst"
-
-#: templates/site/text_followup.html:27
-#, python-format
-msgid "Public feed for text %(title)s"
-msgstr "Offentlig strøm for teksten %(title)s"
-
-#: templates/site/text_followup.html:31
-msgid "This is the public feed for the text."
-msgstr "Dette er den offentlige strømmen for teksten."
-
-#: templates/site/text_followup.html:41
-msgid "Private feed for text "
-msgstr "Privat strøm for teksten "
-
-#: 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 ""
-"Dette er den private strømmen for teksten. Ikke del denne adressen med "
-"andre, men mindre du ønsker at de skal kunne se alt som skjer med teksten."
-
-#: templates/site/text_followup.html:53
-msgid "The private feed for this text is not yet activated."
-msgstr "Den private strømmen for denne teksten er ikke aktivert ennå."
-
-#: templates/site/text_followup.html:61
-msgid ""
-"You will receive text notifications because you subscribed to notifications "
-"at the workspace level"
-msgstr ""
-"Du vil motta varsler for denne teksten, fordi du har abonnert på varsler for "
-"arbeidsområdet"
-
-#: templates/site/text_followup.html:64
-msgid "Subscribe to all text notifications"
-msgstr "Abonner på alle varsler for teksten"
-
-#: templates/site/text_history.html:56
-#: templates/site/text_history_compare.html:28
-#: templates/site/text_history_version.html:28
-msgid "Version list"
-msgstr "Versjoner"
-
-#: templates/site/text_history.html:59
-msgid "Compare last two versions"
-msgstr "Sammenlikn siste to versjoner"
-
-#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
-msgid "Most recent version"
-msgstr "Nyeste versjon"
-
-#: templates/site/text_history.html:63
-#: templates/site/text_history_compare.html:30
-#: templates/site/text_history_version.html:31
-#, fuzzy
-msgid "Last version"
-msgstr "Original versjon"
-
-#: templates/site/text_history.html:67
-msgid "Compare selected versions"
-msgstr "Sammenlikn valgte versjoner"
-
-#: templates/site/text_history.html:77
-msgid "Version"
-msgstr "Versjon"
-
-#: templates/site/text_history.html:78
-msgid "Selection"
-msgstr "Tekstområde"
-
-#: templates/site/text_history.html:81 templates/site/text_list.html:139
-msgid "Author"
-msgstr "Forfatter"
-
-#: templates/site/text_history.html:82
-msgid "Created"
-msgstr "Opprettet"
-
-#: templates/site/text_history.html:83 templates/site/text_list.html:141
-msgid "# comments"
-msgstr "# merknader"
-
-#: templates/site/text_history.html:105 templates/site/text_list.html:161
-msgid "View"
-msgstr "Se"
-
-#: templates/site/text_history.html:106
-#: templates/site/text_history_version.html:32
-msgid "Compare with previous version"
-msgstr "Sammenlikn med forrige versjon"
-
-#: templates/site/text_history.html:108
-msgid "Revert to this version"
-msgstr "Still tilbake til denne versjonen"
-
-#: templates/site/text_history_compare.html:30
-msgid "Previous modification"
-msgstr "Forrige endring"
-
-#: templates/site/text_history_compare.html:31
-#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
-#, python-format
-msgid "Version %(version_number)s"
-msgstr "Versjon %(version_number)s"
-
-#: templates/site/text_history_compare.html:32
-#, python-format
-msgid ""
-"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
-msgstr ""
-"Sammenlikning mellom versjoner #%(version_1_number)s og #%(version_2_number)s"
-
-#: templates/site/text_history_compare.html:34
-msgid "Next modification"
-msgstr "Neste endring"
-
-#: templates/site/text_history_compare.html:44
-msgid "No differences"
-msgstr "Ingen forskjeller"
-
-#: templates/site/text_history_version.html:31
-msgid "Previous version"
-msgstr "Forrige versjon"
-
-#: templates/site/text_history_version.html:36
-msgid "Compare with next version"
-msgstr "Sammenlikn med neste versjon"
-
-#: templates/site/text_history_version.html:37
-msgid "Next version"
-msgstr "Neste versjon"
-
-#: templates/site/text_history_version.html:45 views/texts.py:496
-#: views/texts.py:497
-#, python-format
-msgid "by %(author)s"
-msgstr "av %(author)s"
-
-#: templates/site/text_list.html:51 templates/site/text_share.html:40
-#: templates/site/user_list.html:45
-msgid "Filter by tag:"
-msgstr "Filtrer etter etikett:"
-
-#: templates/site/text_list.html:53 templates/site/text_share.html:42
-#: templates/site/user_list.html:47
-msgid "All"
-msgstr "Alle"
-
-#: templates/site/text_list.html:81 templates/site/user_list.html:72
-msgid "Bulk Actions"
-msgstr "Handlinger"
-
-#: templates/site/text_list.html:82 templates/site/text_list.html.py:163
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/site/text_list.html:85 templates/site/user_list.html:81
-msgid "Apply"
-msgstr "Utfør"
-
-#: templates/site/text_list.html:106 templates/site/user_list.html:102
-msgid "Are you sure?"
-msgstr "Er du sikker?"
-
-#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
-msgid "Text"
-msgstr "Tekst"
-
-#: templates/site/text_list.html:140
-msgid "Modified"
-msgstr "Endret"
-
-#: templates/site/text_list.html:142 templates/site/user_list.html:136
-msgid "Last week activity"
-msgstr "Aktivitet siste uke"
-
-#: templates/site/text_list.html:158
-#: templates/site/macros/user_actions.html:13
-msgid "tags:"
-msgstr "etiketter:"
-
-#: templates/site/text_list.html:158
-#: templates/site/macros/user_actions.html:13
-#, python-format
-msgid "Filter by tag: %(tag_name)s"
-msgstr "Filtrer etter etikett: %(tag_name)s"
-
-#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
-#: templates/site/macros/user_actions.html:19
-msgid "Edit"
-msgstr "Rediger"
-
-#: templates/site/text_list.html:169
-msgid "Are you sure you want to delete this text?"
-msgstr "Ønsker du å slette denne teksten?"
-
-#: templates/site/text_list.html:182
-msgid "Users"
-msgstr "Brukere"
-
-#: templates/site/text_list.html:200
-msgid "Edit user"
-msgstr "Endre bruker"
-
-#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 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 "Brukere"
-
-#: 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:22
-#: 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 "Opprett ny bruker"
-
-#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_contact.html:24
-#: 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 "Opprett flere brukere"
-
-#: templates/site/text_share.html:35 templates/site/user_contact.html:20
-#: 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 "Personer"
-
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
-msgid "Hide suspended users"
-msgstr "Skjul sperrede brukere"
-
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
-msgid "Display suspended users"
-msgstr "Vis sperrede brukere"
-
-#: templates/site/text_share.html:86 templates/site/user_list.html:132
-msgid "User"
-msgstr "Bruker"
-
-#: 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 ""
-"Rollen 'Rolle for arbeidsområde' er en global rolle, som vil anvendes på "
-"alle tekster. Du kan gi en bruker en særskilt rolle for denne teksten ved å "
-"velge en passende rolle i kolonnen Tekstrolle til høyre."
-
-#: templates/site/text_share.html:87
-msgid "Workspace role"
-msgstr "Rolle for arbeidsområde"
-
-#: templates/site/text_share.html:101
-#, python-format
-msgid "This role has been overriden on this text by a text role: %(rolename)s"
-msgstr "Denne rollen viker for en lokal rolle for teksten: %(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
-msgid "Edit anonymous users"
-msgstr "Endre anonyme brukere"
-
-#: templates/site/text_share.html:128 templates/site/user_list.html:177
-msgid "Anonymous users"
-msgstr "Anonyme brukere"
-
-#: templates/site/text_view_frame.html:64
-msgid "add a comment"
-msgstr "opprett merknad"
-
-#: templates/site/text_view_frame.html:74
-msgid "Filter comments"
-msgstr "Filtrer merknader"
-
-#: templates/site/text_view_frame.html:75
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#: templates/site/text_view_frame.html:76
-msgid "Text preferences"
-msgstr "Tekstinnstillinger"
-
-#: templates/site/text_view_frame.html:93
-msgid "Loading text…"
-msgstr "Laster tekst…"
-
-#: templates/site/text_view_frame.html:104
-msgid "Which comments?"
-msgstr "Hvilke merknader?"
-
-#: templates/site/text_view_frame.html:112
-msgid "How should comments' scope be shown in text?"
-msgstr "Hvordan skal rekkevidden for merknadene i teksten vises?"
-
-#: templates/site/unauthorized.html:5
-msgid "Unauthorized"
-msgstr "Ingen rettigheter"
-
-#: templates/site/user_add.html:26
-msgid ""
-"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 ""
-"Brukeren vil motta en invitasjon til å slutte seg til arbeidsområdet.\n"
-"Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' "
-"nedenfor."
-
-#: templates/site/user_add_text.html:29
-msgid "The user will receive an email invitation to join the workspace."
-msgstr "Brukeren vil motta en invitasjon til å slutte seg til arbeidsområdet."
-
-#: 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 ""
-"Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' "
-"nedenfor."
-
-#: templates/site/user_contact.html:6
-msgid "Contact user"
-msgstr "Kontakt bruker"
-
-#: templates/site/user_contact.html:26
-#, python-format
-msgid "Contact user %(username)s"
-msgstr "Kontakt bruker %(username)s"
-
-#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
-#, python-format
-msgid "Edit user %(username)s"
-msgstr "Endre bruker %(username)s"
-
-#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
-msgid "Suspend access"
-msgstr "Sperr tilgang"
-
-#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
-msgid "Enable access"
-msgstr "Åpne tilgang"
-
-#: templates/site/user_list.html:76
-#, python-format
-msgid "Change role to %(role_name)s"
-msgstr "Endre rollen til %(role_name)s"
-
-#: templates/site/user_list.html:133 views/user.py:283
-msgid "Email"
-msgstr "Epostadresse"
-
-#: templates/site/user_list.html:134
-msgid "Date joined"
-msgstr "Dato for tilslutning"
-
-#: templates/site/user_list.html:135
-msgid "Role"
-msgstr "Rolle"
-
-#: templates/site/user_list.html:177
-msgid ""
-"Those are non-registered users. Assign them a role to open your texts to "
-"simple visitors."
-msgstr ""
-"Dette er ikke-registrerte brukere. Tildel dem en rolle for å åpne dine tekster for "
-"vanlige besøkende."
-
-#: 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 "Brukere vil bli invitert til å slutte seg til arbeidsområdet."
-
-#: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:20
-msgid "back to workspace"
-msgstr "tilbake til arbeidsområde"
-
-#: templates/site/layout/base_workspace.html:30
-#, python-format
-msgid "%(nb_texts)s text"
-msgid_plural "%(nb_texts)s texts"
-msgstr[0] "%(nb_texts)s tekst"
-msgstr[1] "%(nb_texts)s tekster"
-
-#: templates/site/layout/base_workspace.html:30
-#, python-format
-msgid "%(nb_users)s user"
-msgid_plural "%(nb_users)s users"
-msgstr[0] "%(nb_users)s bruker"
-msgstr[1] "%(nb_users)s brukere"
-
-#: templates/site/layout/header.html:15
-msgid "Logout"
-msgstr "Logg ut"
-
-#: templates/site/macros/form_fields.html:11
-msgid ""
-"Markdown (or rst) is a structured format which permit simple formatting with "
-"simple textual syntax. We recommend you use the 'markown' format unless you "
-"want to paste HTML (in which case you should use the 'html' format)."
-msgstr ""
-
-#: templates/site/macros/form_fields.html:14
-msgid ""
-"Markdown (or rst) is a structured format which permit simple formatting with "
-"simple textual syntax. We recommend you use the 'markdown' format if your "
-"text is mostly text and/or if you will create many revisions of your text. "
-"You can use the 'html' format if your text will not be edited or if you want "
-"to preserve complex formatting (tables, images, etc.)."
-msgstr ""
-
-#: templates/site/macros/main_tabs.html:11
-#, python-format
-msgid "Texts (%(nb_texts)s)"
-msgstr "Tekster (%(nb_texts)s)"
-
-#: templates/site/macros/main_tabs.html:13
-#, python-format
-msgid "People (%(nb_users)s)"
-msgstr "Personer (%(nb_users)s)"
-
-#: templates/site/macros/paginator.html:5
-msgid "Previous page"
-msgstr "Forrige side"
-
-#: templates/site/macros/paginator.html:6
-#, python-format
-msgid "%(sindex)s-%(eindex)s of %(pcount)s"
-msgstr "%(sindex)s-%(eindex)s av %(pcount)s"
-
-#: templates/site/macros/paginator.html:7
-msgid "Next page"
-msgstr "Neste side"
-
-#: templates/site/macros/paginator.html:9
-msgid "View all"
-msgstr "Vis alle"
-
-#: templates/site/macros/paginator.html:11
-msgid "paginate"
-msgstr "paginer"
-
-#: templates/site/macros/text_actions.html:12
-msgid "Share"
-msgstr "Deling"
-
-#: templates/site/macros/text_comments.html:18
-#, python-format
-msgid "by %(name)s on %(date)s"
-msgstr "av %(name)s %(date)s"
-
-#: templates/site/macros/text_editor.html:66
-msgid ""
-"You have attempted to leave this page. Unsaved changes will be lost. Are you "
-"sure you want to exit this page?"
-msgstr ""
-"Du har forsøkt å forlate denne siden. Endringer som ikke er lagret vil bli "
-"tapt. Ønsker du å forlate denne siden?"
-
-#: templates/site/macros/text_meta.html:6
-#, python-format
-msgid "last modified %(duration)s ago"
-msgstr "endret for %(duration)s siden"
-
-#: templates/site/macros/text_tabs.html:15
-msgid "People"
-msgstr "Personer"
-
-#: templates/site/macros/text_tabs.html:17
-msgid "Versions"
-msgstr "Versjoner"
-
-#: templates/site/macros/text_tabs.html:24
-msgid "Embed"
-msgstr "Integrer"
-
-#: templates/site/macros/user_actions.html:6
-#: templates/site/macros/user_actions.html:17
-msgid "Your profile"
-msgstr "Din profil"
-
-#: templates/site/macros/user_actions.html:8
-#, python-format
-msgid "Edit user %(userprint)s"
-msgstr "Endre bruker %(userprint)s"
-
-#: templates/site/macros/user_actions.html:29
-msgid "(Re-)send invitation"
-msgstr "Send invitasjon"
-
-#: templates/site/macros/user_actions.html:38
-msgid "Are you sure you want to suspend this user's access to the workspace?"
-msgstr "Ønsker du å sperre brukerens tilgang til arbeidsområdet?"
-
-#: templates/site/macros/user_actions.html:47
-msgid "Are you sure you want to enable this user's access to the workspace?"
-msgstr "Ønsker du å åpne brukerens tilgang til arbeidsområdet?"
-
-#: templates/site/macros/user_actions.html:56
-msgid "Are you sure you want to send this user an invitation to the workspace?"
-msgstr "Ønsker du å invitere brukeren til arbeidsområdet?"
-
-#: templates/site/macros/user_moderation.html:3
-msgid "Approve"
-msgstr "Godkjenn"
-
-#: templatetags/com.py:146
-msgid "F j, Y \\a\\t g:i a"
-msgstr "j.n.Y \\k\\l. G:i"
-
-#: utils/date.py:6
-msgid "%Y-%m-%d %H:%M"
-msgstr "%Y-%m-%d %H:%M"
-
-#: utils/diff.py:53
-msgid "unknown"
-msgstr "ukjent"
-
-#: views/create.py:26
-msgid "Upload file (optional)"
-msgstr "Last opp fil"
-
-#: views/create.py:27
-msgid ""
-"Upload a file from your computer instead of using the direct input above"
-msgstr "Last opp en fil fra din datamaskin"
-
-#: views/create.py:38
-msgid "You should specify a file to upload."
-msgstr "Du må angi en fil til å laste opp"
-
-#: views/create.py:49
-msgid "Upload XML file"
-msgstr "Last opp XML-fil"
-
-#: views/create.py:50
-msgid "Upload a previously exported XML file from your computer"
-msgstr "Last opp en tidligere eksportert XML-fil"
-
-#: views/create.py:65
-msgid "The imported file should be an XML file generated by co-ment when exporting a text and comments."
-msgstr "Den importerte filen bør være en XML-fil generert av co-ment."
-
-#: views/create.py:71
-msgid "No co_ment_text node found in XML."
-msgstr "Ingen co_ment_text node funnet i XML."
-
-#: views/create.py:76
-msgid "No %(tag)s node found in XML."
-msgstr "Ingen %(tag)s node funnet i XML."
-
-#: views/create.py:46
-msgid "The title of your text"
-msgstr "Overskrift for din tekst"
-
-#: 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"
-
-#: views/create.py:244
-msgid "Text \"%(text_title)s\" has been imported"
-msgstr "Teksten %(text_title)s har blitt importert"
-
-#: views/feeds.py:25
-#, python-format
-msgid "%(workspace_name)s's public feed"
-msgstr "Offentlig strøm for %(workspace_name)s"
-
-#: views/feeds.py:26
-#, python-format
-msgid "Workspace %(workspace_name)s public activity feed"
-msgstr "Offentlig strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
-
-#: views/feeds.py:36
-#, python-format
-msgid "%(workspace_name)s's private feed"
-msgstr "Privat strøm for %(workspace_name)s"
-
-#: views/feeds.py:37
-#, python-format
-msgid "Workspace %(workspace_name)s private feed"
-msgstr "Privat strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
-
-#: views/feeds.py:72
-#, python-format
-msgid "Text %(text_title)s's public feed"
-msgstr "Offentlig strøm for teksten %(text_title)s"
-
-#: views/feeds.py:73
-#, python-format
-msgid "Public activity feed for text %(text_title)s"
-msgstr "Offentlig strøm for aktiviteter på teksten %(text_title)s"
-
-#: views/feeds.py:84
-#, python-format
-msgid "Text %(text_title)s's private feed"
-msgstr "Privat strøm for teksten %(text_title)s"
-
-#: views/feeds.py:85
-#, python-format
-msgid "Private activity feed for text %(text_title)s"
-msgstr "Privat strøm for aktiviteter på teksten %(text_title)s"
-
-#: views/followup.py:31 views/followup.py:80
-msgid "Private feed activated."
-msgstr "Privat strøm aktivert."
-
-#: views/followup.py:34
-msgid "Private feed reseted."
-msgstr "Privat strøm nullstilt."
-
-#: views/followup.py:52
-msgid "This notification has already been deactivated."
-msgstr "Dette varselet har allerede blitt stoppet."
-
-#: views/followup.py:58
-msgid "Notification deactivated."
-msgstr "Varsel stoppet."
-
-#: views/followup.py:62
-msgid "Deactivate notification?"
-msgstr "Stope varsel?"
-
-#: views/followup.py:84
-msgid "Private notifications feed reseted."
-msgstr "Strøm for private varsler nullstilt."
-
-#: views/site.py:82 views/texts.py:131 views/user.py:545
-msgid "You're logged in!"
-msgstr "Du er logget inn!"
-
-#: views/site.py:100
-msgid "Your name"
-msgstr "Ditt navn"
-
-#: views/site.py:102
-msgid "Your email address"
-msgstr "Din epostadresse"
-
-#: views/site.py:105
-msgid "Subject of the message"
-msgstr "Emne"
-
-#: views/site.py:106
-msgid "Body of the message"
-msgstr "Tekst"
-
-#: views/site.py:108
-msgid "Send me a copy of the email"
-msgstr "Send meg en kopi av eposten"
-
-#: views/site.py:134
-msgid "Copy of message:"
-msgstr "Kopi av meldingen:"
-
-#: 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:165
-msgid "Workspace name"
-msgstr "Navn for arbeidsområde"
-
-#: views/site.py:170
-msgid "Workspace tagline"
-msgstr "Beskrivelse av arbeidsområde"
-
-#: views/site.py:175
-msgid "Workspace registration"
-msgstr "Registering på arbeidsområde"
-
-#: views/site.py:176
-msgid ""
-"Can users register themselves into the workspace? (if not, only invitations "
-"by managers can create new users)"
-msgstr ""
-"Skal brukere kunne registrere seg på arbeidsområdet? (Hvis ikke, må brukere "
-"inviteres av en administrator.)"
-
-#: views/site.py:180
-msgid "Workspace registration moderation"
-msgstr "Godkjenning av registreringer på arbeidsområde"
-
-#: 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:186
-msgid "Change the roles available in the workspace"
-msgstr "Endre roller i arbeidsområdet"
-
-#: 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:215
-msgid "Workspace logo"
-msgstr "Logo for arbeidsområde"
-
-#: views/site.py:217
-#, fuzzy
-msgid "Custom css rules"
-msgstr "Custom CSS-regler"
-
-#: views/site.py:218
-#, fuzzy
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
-msgstr "Legg stilarksreglene i CSS-format (inkluderer ikke <code><style></code> HTML-koder). Advarsel: Denne koden vil bli lagt til alt innhold, sørg for at du vet hva du gjør før du legger noe her."
-
-#: views/site.py:223
-#, fuzzy
-msgid "Custom font"
-msgstr "Tilpasset skrifttype"
-
-#: views/site.py:225
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Tilpasset alternativ font familien til 'moderne', 'klassiske' og 'kode' at besøkende kan velge for kroppen av co-ter tekster. Angi en koma separert liste over fontfamilier. Font slektsnavn inkludert mellomrom bør stå i doble anførselstegn. F.eks. "
-
-#: views/site.py:229
-#, fuzzy
-msgid "Custom font for titles"
-msgstr "Tilpasset skrifttype for titler"
-
-#: views/site.py:231
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Tilpasset alternativ font familien til 'moderne', 'klassiske' og 'kode' at besøkende kan velge for titler (h1 til h6) av co-ter tekster. Angi en koma separert liste over fontfamilier. Font slektsnavn inkludert mellomrom bør stå i doble anførselstegn. F.eks. "
-
-#: views/site.py:253
-msgid ""
-"A link to reset your password has been sent to the profile email. Please "
-"check your email."
-msgstr ""
-"Adresse for å nullstille ditt passord er blitt sendt til din epostadresse. "
-"Sjekk din epost."
-
-#: views/site.py:257 views/user.py:428
-msgid "Password changed"
-msgstr "Passord har blitt endret"
-
-#: views/texts.py:164
-#, python-format
-msgid "%(nb_texts)i text(s) deleted"
-msgstr "%(nb_texts)i tekst(er) slettet"
-
-#: views/texts.py:209
-#, python-format
-msgid "Text %(text_title)s deleted"
-msgstr "Tekstet %(text_title)s slettet"
-
-#: views/texts.py:220
-#, python-format
-msgid "Text version %(text_version_title)s deleted"
-msgstr "Tekstversjon %(text_version_title)s slettet"
-
-#: views/texts.py:634
-msgid "Note (optional)"
-msgstr "Kommentar (valgfritt)"
-
-#: views/texts.py:638
-msgid "Add a note to explain the modifications made to the text"
-msgstr "Legg til en kommentar for å beskrive foretatte endringer i teksten"
-
-#: views/texts.py:648
-msgid "New version (optional)"
-msgstr "Ny versjon (valgfritt)"
-
-#: views/texts.py:651
-msgid "Create a new version of this text (recommended)"
-msgstr "Opprett ny versjon av teksten (anbefales)"
-
-#: views/texts.py:654
-msgid "Keep comments (optional)"
-msgstr "Behold merknader (valgfritt)"
-
-#: views/texts.py:657
-msgid "Keep comments (if not affected by the edit)"
-msgstr "Behold merknadene (dersom de ikke er påvirket av endringene i teksten)"
-
-#: views/texts.py:614
-#, fuzzy
-msgid "Detach comments (optional)"
-msgstr "Løsne merknader (valgfritt)"
-
-#: views/texts.py:617
-#, fuzzy
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
-msgstr "Hvis noen kommentarer var knyttet til en chunck av tekst som er endret, sjekk dette alternativet for å holde disse kommentarene uten omfang. La dette alternativet hvis du vil at slike kommentarer blir slettet. Dette alternativet blir ignorert hvis den forrige 'Behold merknader' alternativet er avmerket."
-
-#: views/texts.py:723
-msgid "Name (optional)"
-msgstr "Navn (valgfritt)"
-
-#: views/texts.py:724
-msgid "Email (optional)"
-msgstr "Epost (valgfritt)"
-
-#: views/texts.py:776
-#, python-format
-msgid "A new version (copied from version %(version_title)s) has been created"
-msgstr "Ny versjon (kopiert fra versjon %(version_title)s) har blitt opprettet"
-
-#: views/texts.py:884 views/user.py:79 views/user.py:99
-#, python-format
-msgid "%(count)i user(s) role modified"
-msgstr "Roller for %(count)i bruker(e) endret"
-
-#: views/texts.py:942
-msgid "Text settings updated"
-msgstr "Tekstinnstillinger oppdatert"
-
-#: views/user.py:61
-#, python-format
-msgid "%(count)i User's access suspended"
-msgstr "Tilgang for %(count)i bruker(e) sperret"
-
-#: views/user.py:68
-#, python-format
-msgid "%(count)i User's access enabled"
-msgstr "Tilgang for %(count)i bruker(e) åpnet"
-
-#: views/user.py:140
-msgid "E-mail address"
-msgstr "Epostadresse"
-
-#: views/user.py:160
-msgid "This user is already a member."
-msgstr "Denne brukeren er allerede et medlem."
-
-#: views/user.py:163
-msgid "Emails"
-msgstr "Epostadresser"
-
-#: views/user.py:164
-msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
-msgstr ""
-"Oppgi flere epostadresser (en per linje eller atskilt med ',' eller ';')"
-
-#: views/user.py:181
-msgid "Workspace level role"
-msgstr "Rolle for arbeidsområde"
-
-#: 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 ""
-"Denne rollen vil anvendes på alle tekster i arbeidsområdet. For å dele bare "
-"visse tekster med denne brukeren, kan du la dette feltet stå tomt og "
-"tilordne brukeren tekstroller etter at brukeren er opprettet."
-
-#: views/user.py:198
-msgid "Text level role"
-msgstr "Tekstrolle"
-
-#: views/user.py:199
-msgid "This role will apply only to this text."
-msgstr "Denne roller vil anvendes på denne teksten."
-
-#: views/user.py:224
-msgid "Optional text to add to invitation email"
-msgstr "Valgfri melding som skal sendes sammen med invitasjonen"
-
-#: views/user.py:259
-#, python-format
-msgid "%(nb_users)d user added"
-msgid_plural "%(nb_users)d users added"
-msgstr[0] "%(nb_users)d bruker opprettet"
-msgstr[1] "%(nb_users)d brukere opprettet"
-
-#: views/user.py:277
-msgid "Add user"
-msgid_plural "Add users"
-msgstr[0] "Opprett ny bruker"
-msgstr[1] "Opprett nye brukere"
-
-#: views/user.py:299
-msgid "This username is already in use. Please supply a different username."
-msgstr ""
-"Dette brukernavnet er allerde registrert. Vennligst velg et annet brukernavn."
-
-#: views/user.py:320 views/user.py:336
-msgid "Your account has been activated. You're now logged-in."
-msgstr "Din brukerkonto er blitt aktivert. Du er nå logged inn."
-
-#: views/user.py:331
-msgid "activate account"
-msgstr "aktiver konto"
-
-#: views/user.py:361
-#, python-format
-msgid "User's access %(prof)s has been suspended."
-msgstr "Tilgang for brukeren %(prof)s har blitt sperret."
-
-#: views/user.py:367
-#, python-format
-msgid "User's access %(prof)s has been refused."
-msgstr "Tilgang for brukeren %(prof)s har blitt nektet."
-
-#: views/user.py:379
-#, python-format
-msgid "User's access %(prof)s has been restored."
-msgstr "Tilgang for brukeren %(prof)s har blitt åpnet."
-
-#: views/user.py:383
-#, python-format
-msgid "User's access %(prof)s has been approved."
-msgstr "Tilgang for brukeren %(prof)s har blitt godkjent."
-
-#: views/user.py:393
-#, python-format
-msgid "A new invitation has been sent to user %(prof)s."
-msgstr "Ny invitasjon har blitt sendt til brukeren %(prof)s."
-
-#: views/user.py:410
-msgid "Profile updated"
-msgstr "Profil oppdatert"
-
-#: views/user.py:456
-msgid "Anonymous user role modified."
-msgstr "Rollen for anonyme brukere har blitt endret."
-
-#: views/user.py:478
-msgid "User modified"
-msgstr "Bruker endret."
-
-#: views/user.py:493
-msgid "Subject"
-msgstr "Emne"
-
-#: views/user.py:494
-msgid "Subject of the email"
-msgstr "Emne for eposten"
-
-#: views/user.py:497
-msgid "Body"
-msgstr "Tekst"
-
-#: views/user.py:498
-msgid "Body of the email"
-msgstr "Epostteksten"
-
-#: views/user.py:518
-msgid "Email sent."
-msgstr "Eposten er blitt sendt."
-
-#: views/user.py:539
-msgid "This account is suspended, contact the workspace administrator."
-msgstr ""
-"Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
-
-#: views/user.py:574
-msgid "You've been logged out."
-msgstr "Du er logget ut."
-
-#: views/user.py:590
-msgid ""
-"You've been registered, you will receive a confirmation mail once a "
-"moderator has approved your membership."
-msgstr ""
-"Du er blitt registert. Du vil motta en epost med bekreftelse når en "
-"administrator godkjenner ditt medlemskap."
-
-#: views/user.py:593
-msgid ""
-"You've been registered, please check your email for the confirm message."
-msgstr "Du er blitt registert. Se din epost for en melding med bekreftelsen."
-
-#~ msgid "Are you sure you want to delete this version?"
-#~ msgstr "Ønsker du å slette denne versjonen?"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "Save user"
-#~ msgid_plural "Save users"
-#~ msgstr[0] "Lagre bruker"
-#~ msgstr[1] "Lagre brukere"
-
-#, fuzzy
-#~ msgid "Text edition"
-#~ msgstr "Neste endring"
-
-#, fuzzy
-#~ msgid "Your password has been reset."
-#~ msgstr "Teksten %(text_title)s har blitt opprettet"
-
-#~ msgid "How do you want to print?"
-#~ msgstr "Hvordan ønsker du å skrive ut?"
-
-#, fuzzy
-#~ msgid "Design"
-#~ msgstr "Versjon"
-
-#~ msgid "%(workspace_name)s's workspace"
-#~ msgstr "Arbeidsområde til %(workspace_name)s"
-
-#~ msgid "Versions:"
-#~ msgstr "Versjoner:"
-
-#~ msgid "created %(v1created)s"
-#~ msgstr "opprettet %(v1created)s"
-
-#~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
-#~ msgstr "Forskjeller mellom versjon #%(v1_nid)s og versjon #%(v2_nid)s:"
-
-#~ msgid "Version #%(version_number)s created on %(date)s"
-#~ msgstr "Versjon #%(version_number)s opprettet %(date)s"
-
-#, fuzzy
-#~ msgid "Contact from user: %(name)s / %(email)s"
-#~ msgstr "Kontakt bruker %(username)s"
-
-#~ msgid "%(title)s"
-#~ msgstr "%(title)s"
-
-#~ msgid "Local role"
-#~ msgstr "Tekstrolle"
-
-#: models.py:266 views/site.py:191
-#, fuzzy
-msgid "Label for the first category of comments"
-msgstr "Etiketten for den første kategorien av kommentarer"
-
-#: models.py:267 views/site.py:197
-#, fuzzy
-msgid "Label for the second category of comments"
-msgstr "Etiketten for den andre kategorien av kommentarer"
-
-#: models.py:268 views/site.py:203
-#, fuzzy
-msgid "Label for the third category of comments"
-msgstr "Etiketten for tredje kategorien av kommentarer"
-
-#: models.py:269 views/site.py:209
-#, fuzzy
-msgid "Label for the fourth category of comments"
-msgstr "Etiketten for fjerde kategori av kommentarer"
-
-#: models.py:270 views/site.py:215
-#, fuzzy
-msgid "Label for the fifth category of comments"
-msgstr "Etiketten for femte kategorien av kommentarer"
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-#, fuzzy
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr "Avsnitt inkludert minst én kommentar av denne kategorien vil ha en loddrett strek med denne fargen: "
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "Leave blank to use the value configured for the workspace."
-msgstr "La stå tomt for å bruke verdien konfigurert for arbeidsområdet."
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr "For å deaktivere denne kategorien for denne teksten uansett konfigurasjon for arbeidsområdet, skriver du: "
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr "Personvern"
Binary file src/cm/locale/no/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,665 +0,0 @@
-# COMT Norwegian translation
-# Copyright (C) Sopinspace
-# This file is distributed under the same license as the COMT package.
-# Kirill Miazine (km@krot.org), 2010-2012
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: COMT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 17:01+0200\n"
-"PO-Revision-Date: 2012-23-10 08:00+0100\n"
-"Last-Translator: Kirill Miazine <km@krot.org>\n"
-"Language-Team: <no@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: hand-crafted with vim.\n"
-
-#: media/js/client/c_addcomment_form.js:52
-msgid "New comment"
-msgstr "Ny merknad"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-msgid "New comment will be canceled, continue?"
-msgstr "Ønsker du å avbryte opprettelsen av en ny merknad?"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
-msgid "Warning"
-msgstr "Advarsel"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
-msgid "Started reply will be canceled, continue?"
-msgstr "Ønsker du å avbryte påbegynt svar?"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
-msgid "Started comment edition will be canceled, continue?"
-msgstr "Ønsker du å avbryte påbegynte endringer i merknaden?"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
-msgid "change comment state to pending"
-msgstr "endre tilstand til pågående"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
-msgid "change comment state to approved"
-msgstr "endre tilstand til godkjent"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
-msgid "change comment state to unapproved"
-msgstr "endre tilstand til ikke-godkjent"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
-msgid "pending"
-msgstr "pågående"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
-msgid "approved"
-msgstr "godkjent"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
-msgid "show replies"
-msgstr "vis svar"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
-msgid "delete comment"
-msgstr "slett merknad"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
-msgid "edit"
-msgstr "endre"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
-msgid "delete"
-msgstr "slett"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
-#: media/js/client/c_interface_forms.js:15
-msgid "close"
-msgstr "lukk"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
-msgid "show scope"
-msgstr "vis kontekst"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
-msgid ""
-"Comment is detached: it was created on a previous version and text it "
-"applied to has been modified or removed."
-msgstr ""
-"Merknad er frakoblet: den var opprettet i en tidligere versjon, og teksten, "
-"som merknaden er knyttet til, er blitt endret eller slettet."
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
-msgid "last modified on %(date)s"
-msgstr "sist endret %(date)s"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
-msgid "Permalink to this comment"
-msgstr "Fast adresse til denne merknaden"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:305
-msgid "by %(name)s, created on %(date)s"
-msgstr "av %(name)s, opprettet %(date)s"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr "avbryt endring av merknadens tilstand"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
-msgid "unapproved"
-msgstr "ikke-godkjent"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr "avbryt"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr "endre merknad"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
-msgid "No selection yet"
-msgstr "Intet merket ennå"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:4
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:5
-msgid "E-mail address:"
-msgstr "Epostadresse:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:6
-msgid "Title:"
-msgstr "Overskrift:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:7
-msgid "Content:"
-msgstr "Innhold:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:8
-msgid "Tag:"
-msgstr "Etikett:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:11
-msgid "Modify comment's scope:"
-msgstr "Endre merknadens kontekst:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:13
-msgid "Comment will apply to this selection:"
-msgstr "Merknaden vil gjelde følgende tekstområde:"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:407
-msgid "Save"
-msgstr "Lagre"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:101
-#: media/js/site/text_edit.js:104
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr "Endre merknad"
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
-msgstr "endre til:"
-
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:579
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] "svar"
-msgstr[1] "svar"
-
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr "Nytt svar"
-
-#: media/js/client/c_scopes.js:318
-msgid " comment"
-msgid_plural " comments"
-msgstr[0] " merknad"
-msgstr[1] " merknader"
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr "feil:"
-
-#: media/js/client/c_sync.js:57
-msgid "no filtered comments left"
-msgstr "ingen filtrerte merknader igjen"
-
-#: media/js/client/c_sync.js:129
-msgid ""
-"Do you want to be notified of all replies in all discussions you "
-"participated in?"
-msgstr ""
-"Ønsker du å abonnere på varsler for alle svar i diskusjoner hvor du har "
-"deltatt?"
-
-#: media/js/client/c_sync.js:129
-msgid "Reply notification"
-msgstr "Varsel om svar"
-
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
-msgid "could not save comment"
-msgstr "kunne ikke lagre merknad"
-
-#: media/js/client/c_sync.js:223
-msgid "Are you sure you want to delete this comment?"
-msgstr "Ønsker du å slette denne merknaden?"
-
-#: media/js/client/c_sync.js:227
-msgid "could not remove comment"
-msgstr "kunne ikke slette merknad"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
-msgid "print from the browser"
-msgstr "skriv ut fra nettleser"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:6
-msgid "download html file (.html)"
-msgstr "last ned fil i HTML-format (.html)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:7
-msgid "download markdown file (.mkd)"
-msgstr "last ned fil i Markdown-format (.mkd)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
-msgid "download portable object format file (.pdf)"
-msgstr "last ned fil i PDF-format (.pdf)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
-msgid "download latex file (.tex)"
-msgstr "last ned fil i LaTeX-format (.tex)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
-msgid "download open document file (.odt)"
-msgstr "lest ned fil i OpenDocument-format (.odt)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
-msgid "download microsoft word file (.doc)"
-msgstr "last ned fil i Microsoft Word-format (.doc)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
-msgid "download microsoft word 2007 file (.docx)"
-msgstr "last ned fil i Microsoft Word-format 2007 (.docx)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
-msgid "download ebook (.epub)"
-msgstr "last ned fil i ebok-format (.epub)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:21
-msgid "download XML file for re-importing text and comments"
-msgstr "last ned XML-fil for å kunne re-importere tekst og kommentarer"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
-msgid "Print text"
-msgstr "Skriv ut tekst"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
-msgid "How do you want to print?"
-msgstr "Hvordan ønsker du å skrive ut?"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
-msgid "Export text"
-msgstr "Eksporter tekst"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
-msgid "Choose file format"
-msgstr "Velg filformat"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
-msgid "using markers only, no background colors"
-msgstr "bruker bare markører, ingen bakgrunnsfarger"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:42
-msgid "using markers and background colors"
-msgstr "bruker markører og bakgrunnsfarger"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
-msgid "all (%(nb_comments)s)"
-msgstr "alle (%(nb_comments)s)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:55
-msgid "current filtered ones (%(nb_comments)s)"
-msgstr "filtrert (%(nb_comments)s)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:57
-msgid "none (0)"
-msgstr "ingen (0)"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:90
-msgid "Go !"
-msgstr "Kjør!"
-
-#: media/js/client/f_client-min.js:1 media/js/client/f_message.js:18
-msgid "loading..."
-msgstr "laster..."
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
-msgid "click to show options"
-msgstr "klikk for å vise valg"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
-msgid "click to hide options"
-msgstr "klikk for å skjule valg"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
-msgid "Text"
-msgstr "Tekst"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
-msgid "Search"
-msgstr "Søk"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
-#: media/js/site/f_text_view_frame.js:407
-msgid "Reset"
-msgstr "Nullstill"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
-msgid "Hide all Comments"
-msgstr "Skjul alle merknader"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
-msgid "Authors"
-msgstr "Forfattere"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
-msgid "States"
-msgstr "Tilstander"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
-msgid "Dates"
-msgstr "Datoer"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
-msgid "Tags"
-msgstr "Etiketter"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
-msgid "view previous comment"
-msgstr "se forrige merknad"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
-msgid "view next comment"
-msgstr "se neste merknad"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
-msgid "view first comment"
-msgstr "se første merknad"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
-msgid "view last next comment"
-msgstr "se siste merknad"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
-msgid "view all comments"
-msgstr "se alle merknader"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
-msgid "print document with/without comments"
-msgstr "skriv ut dokument med/uten merknader"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:185
-msgid "export document with/without comments"
-msgstr "eksporter dokument med/uten merknader"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:186
-msgid "toggle full screen view"
-msgstr "slå på/av visning på full side"
-
-#: media/js/site/f_text_view_frame.js:193
-msgid "toggle table of contents"
-msgstr "slå på/av innholdsfortegnelsen"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
-msgid "add a comment"
-msgstr "opprett merknad"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
-msgid "filter:"
-msgstr "filter:"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:209
-msgid "browse by:"
-msgstr "navigasjon etter:"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
-msgid "location"
-msgstr "plassering"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:212
-msgid "modification"
-msgstr "endring"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:332
-msgid "thread discussions"
-msgstr "vis diskusjonstråder"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:366
-msgid "Text style"
-msgstr "Stil"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:411
-msgid "Animation duration"
-msgstr "Varighet for animasjon"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:420
-msgid "(0.001 to 1 second)"
-msgstr "(fra 0.001 til 1 sekund)"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:446
-msgid "preferences reset (will apply on next load)"
-msgstr "innstillinger nullstilt (aktiveres ved neste innlasting)"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:452
-msgid "preferences saved (will apply on next load)"
-msgstr "innstillinger lagret (aktiveres ved neste innlasting)"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:556
-msgid "filter reset"
-msgstr "filter nullstilt"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:566
-msgid "filter applied"
-msgstr "filtrert"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:572
-msgid "discussion"
-msgid_plural "discussions"
-msgstr[0] "diskusjon"
-msgstr[1] "diskusjoner"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:576
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "merknad"
-msgstr[1] "merknader"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:601
-msgid "all"
-msgstr "alle"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:619
-msgid "last 24 hours (%(nb_comments)s)"
-msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
-msgstr[0] "siste 24 timer (%(nb_comments)s)"
-msgstr[1] "siste %(nb_days)s dager (%(nb_comments)s)"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:733
-#: media/js/site/text_edit.js:86
-msgid "No"
-msgstr "Nei"
-
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:734
-#: media/js/site/text_edit.js:89
-msgid "Yes"
-msgstr "Ja"
-
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
-msgid "First Level Heading"
-msgstr "Overskrift - nivå 1"
-
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
-msgid "Your title here..."
-msgstr "Din overskrift kommer her..."
-
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
-msgid "Second Level Heading"
-msgstr "Overskrift - nivå 2"
-
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
-msgid "Heading 3"
-msgstr "Overskrift - nivå 3"
-
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
-msgid "Heading 4"
-msgstr "Overskrift - nivå 4"
-
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
-msgid "Heading 5"
-msgstr "Overskrift - nivå 5"
-
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
-msgid "Heading 6"
-msgstr "Overskrift - nivå 6"
-
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
-msgid "Bold"
-msgstr "Fett"
-
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
-msgid "Italic"
-msgstr "Kursiv"
-
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
-msgid "Bulleted List"
-msgstr "Punktliste"
-
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
-msgid "Numeric List"
-msgstr "Nummerert liste"
-
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
-msgid "Picture"
-msgstr "Bilde"
-
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
-msgid "Link"
-msgstr "Kobling"
-
-#: media/js/markitup/sets.js:37
-msgid "Quotes"
-msgstr "Sitat"
-
-#: media/js/markitup/sets.js:38
-msgid "Code Block / Code"
-msgstr "Kode"
-
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
-msgid "Preview"
-msgstr "Forhåndsvisning"
-
-#: media/js/markitup/sets.js:71
-msgid "Paragraph"
-msgstr "Avsnitt"
-
-#: media/js/markitup/sets.js:75
-msgid "Stroke through"
-msgstr "Strøket"
-
-#: media/js/markitup/sets.js:79
-msgid "List element"
-msgstr "Listeelement"
-
-#: media/js/markitup/sets.js:82
-msgid "Your text to link..."
-msgstr "Koblingstekst..."
-
-#: media/js/markitup/sets.js:84
-msgid "Clean"
-msgstr "Ren"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr "moderne"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr "klassisk"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr "kode"
-
-#: media/js/site/c_text_view_comments.js:21
-#, fuzzy
-msgid "custom"
-msgstr "tilpasset"
-
-#: media/js/site/f_text_view_frame.js:182
-msgid "view all detached comments"
-msgstr "se alle frakoblede merknader"
-
-#: media/js/site/f_text_view_frame.js:183
-msgid "toggle advance interface"
-msgstr "slå på/av avansert grensesnitt"
-
-#: media/js/site/f_text_view_frame.js:187
-msgid "text feed"
-msgstr "textstrøm"
-
-#: media/js/site/f_text_view_frame.js:329
-msgid "unthread discussions"
-msgstr "skjul diskusjonstråder"
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-"Skal disse merknadene frakobles (dvs. tape kontekst) eller slettes i den nye "
-"versjonen?"
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] "%(nb_comments)s kommentar gjelder den endrede teksten."
-msgstr[1] "%(nb_comments)s kommentarer gjelder den endrede teksten."
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr "(Vi anbefaler at du oppretter en ny versjon)"
-
-#: media/js/site/text_edit.js:67
-msgid "You chose not to create a new version all comments will be deleted"
-msgstr ""
-"Siden du ikke ønsket å opprette en ny versjon, vil alle merknader bli slettet"
-
-#: media/js/site/text_edit.js:69
-msgid "Do you want to continue?"
-msgstr "Ønsker du å fortsette?"
-
-#: media/js/site/text_edit.js:102
-msgid "Detach"
-msgstr "Koble fra"
-
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr "Fjern"
-
-#: media/js/client/c_toc.js:45
-msgid "Table of contents"
-msgstr "Innholdsfortegnelsen"
-
-#~ msgid " reply"
-#~ msgid_plural " replies"
-#~ msgstr[0] " svar"
-#~ msgstr[1] " svar"
-
-#~ msgid "Follow up"
-#~ msgstr "Følg opp"
-
-#~ msgid ""
-#~ "%(nb_comments)s comment will be removed because the text it applies to "
-#~ "has been changed."
-#~ msgid_plural ""
-#~ "%(nb_comments)s comments will be removed because the text they apply to "
-#~ "has been changed."
-#~ msgstr[0] ""
-#~ "%(nb_comments)s merknad vil bli slettet, fordi teksten som den er knyttet "
-#~ "til har blitt endret."
-#~ msgstr[1] ""
-#~ "%(nb_comments)s merknader vil bli slettet, fordi teksten som de er "
-#~ "knyttet til har blitt endret."
-
-#: media/js/client/c_icomment.js:330
-#, fuzzy
-msgid "category"
-msgstr "kategori"
-
-#: media/js/client/c_interface_form.js:52
-#, fuzzy
-msgid "Category:"
-msgstr "Kategori:"
-
-#: media/js/site/f_text_view_frame.js:123
-#, fuzzy
-msgid "Categories"
-msgstr "Kategorier"
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Apr 07 17:41:35 2014 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-08 15:02+0200\n"
+"POT-Creation-Date: 2014-03-18 18:02+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"
@@ -14,200 +14,220 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: client.py:29
+#: client.py:30
msgid ""
"A selection is required. Select in the text the part your comment applies to."
msgstr "Favor selecionar no texto o trecho ao qual se refere o seu comentário."
-#: client.py:138
+#: client.py:144
msgid "name is required"
msgstr "Favor preencher o nome"
-#: client.py:141
+#: client.py:147
msgid "email is required"
msgstr "Favor preencher email"
-#: client.py:143
+#: client.py:149
msgid "invalid email"
msgstr "Email inválido"
-#: client.py:145
+#: client.py:151
msgid "title is required"
msgstr "Favor preencher título"
-#: client.py:147
+#: client.py:153
msgid "content is required"
msgstr "Favor preencher conteúdo"
-#: client.py:162
+#: client.py:168
msgid "comment removed"
msgstr "Conteúdo removido"
-#: client.py:213 client.py:278
+#: client.py:221 client.py:286
msgid "comment saved"
msgstr "comentário salvo"
-#: client.py:280
+#: client.py:288
msgid "comment saved, it is being held for moderation"
msgstr "comentário salvo, aguarda moderação"
-#: client.py:314
+#: client.py:326 client.py:335 client.py:337
msgid "me"
msgstr "me"
-#: client.py:316
+#: client.py:328 client.py:335 client.py:337
msgid "author"
msgstr "autor"
-#: client.py:341
+#: client.py:387
msgid "Tags input must be no longer than 250 characters."
msgstr "Palavras-chave não pode exceder 250 caracteres."
-#: models.py:184 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:630
+#: models.py:188 templates/site/text_history.html:81 views/create.py:34
+#: views/create.py:84 views/texts.py:620
msgid "Title"
msgstr "Título"
-#: models.py:185
+#: models.py:189
msgid "Format"
msgstr "Formatar"
-#: models.py:186 views/texts.py:725
+#: models.py:190 views/texts.py:721
msgid "Content"
msgstr "Conteúdo"
-#: models.py:187 models.py:643 templates/site/help.html:47
+#: models.py:191 models.py:625 templates/site/help.html:56
msgid "Tags"
msgstr "Palavras-chave"
-#: models.py:189 templates/site/text_history.html:80 views/user.py:223
+#: models.py:193 templates/site/text_history.html:82 views/user.py:223
msgid "Note"
msgstr "Observação"
-#: models.py:191
+#: models.py:195
msgid "Moderation a posteriori?"
msgstr "Moderação a posteriori?"
-#: models.py:307
+#: models.py:199 views/site.py:193 views/texts.py:928
+msgid "Label for the first category of comments"
+msgstr "Rótulo para a primeira categoria dos comentários"
+
+#: models.py:200 views/site.py:199 views/texts.py:929
+msgid "Label for the second category of comments"
+msgstr "Rótulo para a segunda categoria dos comentários"
+
+#: models.py:201 views/site.py:205 views/texts.py:930
+msgid "Label for the third category of comments"
+msgstr "Rótulo para a terceira categoria dos comentários"
+
+#: models.py:202 views/site.py:211 views/texts.py:931
+msgid "Label for the fourth category of comments"
+msgstr "Rótulo para a quarta categoria de comentários"
+
+#: models.py:203 views/site.py:217 views/texts.py:932
+msgid "Label for the fifth category of comments"
+msgstr "Rótulo para a quinta categoria dos comentários"
+
+#: models.py:289
msgid "Format:"
msgstr "Formatar:"
-#: models.py:545
+#: models.py:528
msgid "name"
msgstr "nome"
-#: models.py:546
+#: models.py:529
msgid "description"
msgstr "descrição"
-#: models.py:637
+#: models.py:619
msgid "Allow contact"
msgstr "Permitir contato"
-#: models.py:637
+#: models.py:619
msgid "Allow email messages from other users"
msgstr "Permitir mensagens de email de outros usuários"
-#: models.py:638
+#: models.py:620
msgid "Preferred language"
msgstr "Idioma preferido"
-#: models.py:641
+#: models.py:623
msgid "Suspended access"
msgstr "Suspender acesso"
-#: models.py:665
+#: models.py:647
msgid "suspended"
msgstr "suspenso"
-#: models.py:667
+#: models.py:649
msgid "waiting approval"
msgstr "aguardando aprovação"
-#: models.py:673
+#: models.py:655
msgid "pending"
msgstr "pendente"
-#: models.py:688
+#: models.py:670
msgid "Invitation"
msgstr "Convite"
-#: models.py:756
-#, fuzzy, python-format
+#: models.py:732
+#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
-msgstr "Texto %(link_to_text)s editado"
-
-#: models.py:757
-#, fuzzy, python-format
+msgstr "Texto %(link_to_text)s editado por %(creator)s"
+
+#: models.py:733
+#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
-msgstr "Texto %(link_to_text)s editado (criada nova versão)"
-
-#: models.py:758
-#, fuzzy, python-format
+msgstr "Texto %(link_to_text)s editado (criada nova versão) por %(creator)s"
+
+#: models.py:734
+#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
-msgstr "Texto %(link_to_text)s adicionado"
-
-#: models.py:763
+msgstr "Texto %(link_to_text)s adicionado por %(creator)s"
+
+#: models.py:735
+#, python-format
msgid "Text %(link_to_text)s imported by %(creator)s"
msgstr "Texto %(link_to_text)s importados por %(creator)s"
-#: models.py:759
+#: models.py:736
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Texto %(link_to_text)s removido"
-#: models.py:760
-#, fuzzy, python-format
+#: models.py:737
+#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
-msgstr "Comentário %(link_to_comment)s adicionado ao texto %(link_to_text)s "
-
-#: models.py:761
+msgstr "Comentário %(link_to_comment)s adicionado ao texto %(link_to_text)s por %(creator)s"
+
+#: models.py:738
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr "Comentário %(link_to_comment)s removido do texto %(link_to_text)s"
-#: models.py:762
+#: models.py:739
#, python-format
msgid "User %(username)s added"
msgstr "Usuário %(username)s adicionado"
-#: models.py:763
+#: models.py:740
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Acesso do usuário %(username)s à área de trabalho permitido"
-#: models.py:764
+#: models.py:741
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Acesso do usuário %(username)s à área de trabalho recusado"
-#: models.py:765
+#: models.py:742
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Acesso do usuário %(username)s à área de trabalho suspenso"
-#: models.py:766
+#: models.py:743
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Acesso do usuário %(username)s à área de trabalho ativado"
-#: models.py:767
+#: models.py:744
#, python-format
msgid "User %(username)s has activated his account"
msgstr "O usuário %(username)s ativou sua conta"
-#: models.py:816
-#, fuzzy
+#: models.py:793
msgid "anonymous"
msgstr "Usuários anônimos"
-#: models.py:823 models.py:831
+#: models.py:800 models.py:808
#, python-format
msgid "by \"%(username)s\""
msgstr "por \"%(username)s\""
-#: models.py:825
+#: models.py:802
#, python-format
msgid "%(time_since)s ago"
msgstr "há %(time_since)s"
@@ -220,7 +240,7 @@
msgid "Email:"
msgstr "Email:"
-#: notifications.py:60
+#: notifications.py:61 templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr "Aviso:"
@@ -232,29 +252,33 @@
msgid "Class (education)"
msgstr "Classe (educação)"
-#: settings.py:105
+#: settings.py:110
msgid "French"
msgstr "Francês"
-#: settings.py:106
+#: settings.py:111
msgid "English"
msgstr "Inglês"
-#: settings.py:107
+#: settings.py:112
msgid "Norwegian"
msgstr "Norueguês"
-#: settings.py:108
+#: settings.py:113
msgid "Brazilian Portuguese"
-msgstr ""
-
-#: settings.py:109
+msgstr "Português Brasileiro"
+
+#: settings.py:114
msgid "Spanish"
-msgstr ""
-
-#: settings.py:110
+msgstr "Espanhol"
+
+#: settings.py:115
msgid "Bulgarian"
-msgstr ""
+msgstr "Búlgaro"
+
+#: settings.py:116
+msgid "Italian"
+msgstr "Italiano"
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
@@ -370,14 +394,89 @@
#: templates/api_doc.html:6
msgid "API Documentation"
-msgstr ""
-
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
-#: views/user.py:330
+msgstr "Documentação da API"
+
+#: templates/email/activation_email.txt:2
+#, python-format
+msgid "You've been invited to join the workspace %(workspace_name)s."
+msgstr "Você foi convidado para participar do espaço de trabalho %(workspace_name)s."
+
+#: templates/email/activation_email.txt:3
+#: templates/email/invitation_email.txt:3
+msgid ""
+"Click the following link to complete your registration and access the "
+"workspace:"
+msgstr "Clique no link abaixo para completar a sua inscrição e acessar o"
+"espaço de trabalho"
+
+#: templates/email/base_email_notification.txt:2
+#, python-format
+msgid ""
+"If you'd like to unsubscribe from this notification, click the following "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+msgstr "Se você quiser cancelar a inscrição a partir desta notificação, clique no seguinte "
+"link: %(SITE_URL)s%(desactivate_notification_url)s."
+
+#: templates/email/forgot_pw.txt:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Você está recebendo este e-mail porque você pediu uma redefinição de senha"
+
+#: templates/email/forgot_pw.txt:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "para sua conta de usuário no %(site_name)s"
+
+#: templates/email/forgot_pw.txt:5
+msgid "Please go to the following page and choose a new password:"
+msgstr "Por favor, vá para a seguinte página e escolher uma nova senha:"
+
+#: templates/email/forgot_pw.txt:9
+msgid "Your username, in case you've forgotten:"
+msgstr "O seu nome de usuário, caso você tenha esquecido:"
+
+#: templates/email/site_contact_email.txt:4
+#, python-format
+msgid "Contact from user: %(name)s / %(email)s"
+msgstr "Fale de usuário: %(name)s / %(email)s"
+
+#: templates/email/text_created.txt:4
+#, python-format
+msgid "Your text \"%(title)s\" has been created."
+msgstr "O texto \"%(title)s\" foi criado"
+
+#: templates/email/text_created.txt:6
+msgid "To publish it click on the following link:"
+msgstr "Para publicá-lo, clique no link a seguir:"
+
+#: templates/site/activate.html:12 templates/site/activate.html.py:16
+#: templates/site/contact.html:16 templates/site/contact.html.py:20
+#: templates/site/forgot_pw.html:16 templates/site/forgot_pw.html.py:20
+#: templates/site/help.html:16 templates/site/help.html.py:20
+#: templates/site/login.html:14 templates/site/login.html.py:18
+#: templates/site/non_authenticated_index.html:16
+#: templates/site/non_authenticated_index.html:20
+#: templates/site/notifications_desactivate.html:14
+#: templates/site/notifications_desactivate.html:18
+#: templates/site/profile.html:16 templates/site/profile.html.py:20
+#: templates/site/profile_pw.html:16 templates/site/profile_pw.html.py:20
+#: templates/site/register.html:14 templates/site/register.html.py:18
+#: templates/site/reset_pw.html:16 templates/site/reset_pw.html.py:20
+#: templates/site/text_pending.html:6 templates/site/text_pending.html:10
+#: templates/site/unauthorized.html:7 templates/site/unauthorized.html:11
+#: templates/site/user_activate.html:12 templates/site/user_activate.html:16
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_text.html:24
+#: templates/site/layout/base_workspace.html:16
+#: templates/site/layout/base_workspace.html:20
+msgid "back to workspace"
+msgstr "voltar para área de trabalho"
+
+#: templates/site/activate.html:19 templates/site/user_activate.html:19
+#: views/user.py:332
msgid "Activate your account"
msgstr "Ativar sua conta"
-#: templates/site/activate.html:23
+#: templates/site/activate.html:32
msgid "Activate"
msgstr "Ativar"
@@ -386,15 +485,16 @@
msgid "Contact"
msgstr "Contato"
-#: templates/site/contact.html:24 templates/site/user_contact.html:50
+#: templates/site/contact.html:33 templates/site/user_contact.html:50
msgid "Send"
msgstr "Enviar"
-#: templates/site/contact.html:26
-#: templates/site/notifications_desactivate.html:32
+#: templates/site/contact.html:35
+#: templates/site/notifications_desactivate.html:40
#: templates/site/settings.html:29 templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:49
-#: templates/site/text_create_upload.html:44 templates/site/user_add.html:34
+#: templates/site/text_create_content.html:51
+#: templates/site/text_create_import.html:46
+#: templates/site/text_create_upload.html:46 templates/site/user_add.html:34
#: templates/site/user_add_text.html:37 templates/site/user_contact.html:52
#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
#: templates/site/user_mass_add_text.html:38
@@ -411,200 +511,204 @@
#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
#: templates/site/text_create_content.html:28
+#: templates/site/text_create_import.html:26
#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
-#: templates/site/layout/header.html:10
-#, fuzzy
+#: templates/site/layout/header.html:13
msgid "Create a text"
msgstr "Escrever um texto"
#: templates/site/dashboard.html:48
msgid "Write a text inside your browser or paste a content from your clipboard"
-msgstr ""
+msgstr "Escreva um texto dentro do seu navegador ou colar conteúdo da área de transferência"
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_import.html:28
#: templates/site/text_create_upload.html:4
#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
-#: templates/site/layout/header.html:11
+#: templates/site/layout/header.html:14
msgid "Upload a text"
msgstr "Carregar um texto"
-#: templates/site/dashboard.html:50
-#: templates/site/text_create_import.html:4
-#: templates/site/text_create_import.html:30
-#: templates/site/text_create_content.html:32
-#: templates/site/text_create_upload.html:30
-#: templates/site/text_list.html:44
-#: templates/site/layout/header.html:12
-msgid "Import a co-mented text"
-msgstr "Importar um texto co-mentado"
-
-#: templates/site/dashboard.html:50
-msgid "Import a text, possibly with comments and attachments, which has been previously exported in XML format from co-ment interface"
-msgstr "Importar um texto, possivelmente com comentários e anexos, que tenha sido previamente exportados em formato XML a partir da interface de co-ment"
-
#: templates/site/dashboard.html:49
msgid ""
"Upload a document from your computer (Text document, Open Format document, "
"Word document)"
-msgstr ""
+msgstr "Carregar um documento a partir do computador (documento de texto, Open Document Format, documento do Word)"
+
+#: templates/site/dashboard.html:50 templates/site/text_create_content.html:32
+#: templates/site/text_create_import.html:4
+#: templates/site/text_create_import.html:30
+#: templates/site/text_create_upload.html:30 templates/site/text_list.html:44
+#: templates/site/layout/header.html:15
+msgid "Import a co-mented text"
+msgstr "Importar um texto co-mentado"
#: templates/site/dashboard.html:50
+msgid ""
+"Import a text, possibly with comments and attachments, which has been "
+"previously exported in XML format from co-ment interface"
+msgstr ""
+"Importar um texto, possivelmente com comentários e anexos, que tenha sido "
+"previamente exportados em formato XML a partir da interface de co-ment"
+
+#: templates/site/dashboard.html:51
msgid "Invite user"
msgstr "Convidar usuários"
-#: templates/site/dashboard.html:51
-msgid "Edit your profile"
-msgstr "Editar seu perfil"
-
#: templates/site/dashboard.html:52
+msgid "Edit your profile"
+msgstr "Editar seu perfil"
+
+#: templates/site/dashboard.html:53
msgid "View text list"
msgstr "Ver lista de textos"
-#: templates/site/dashboard.html:53
+#: templates/site/dashboard.html:54
msgid "Configure workspace"
msgstr "Configurar área de trabalho"
-#: templates/site/dashboard.html:64
+#: templates/site/dashboard.html:65
msgid "Moderation queue"
msgstr "Fila de moderação"
-#: templates/site/dashboard.html:76
+#: templates/site/dashboard.html:77
#, python-format
msgid "user %(user)s awaits approval"
msgstr "usuário %(user)s aguarda aprovação"
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "approve"
msgstr "aprovar"
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:81 templates/site/dashboard.html.py:127
msgid "refuse"
msgstr "rejeitar"
-#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html:81
msgid "membership"
msgstr "participação"
-#: templates/site/dashboard.html:85
+#: templates/site/dashboard.html:86
#: templates/site/macros/user_moderation.html:8
msgid ""
"Are you sure you want to approve this user's membership to the workspace?"
msgstr "Confirmar aprovação da participação do usuário na área de trabalho?"
-#: templates/site/dashboard.html:94
+#: templates/site/dashboard.html:95
#: templates/site/macros/user_moderation.html:17
msgid ""
"Are you sure you want to refuse this user's membership to the workspace?"
msgstr "Confirmar rejeição da participação do usuário na área de trabalho?"
-#: templates/site/dashboard.html:106
+#: templates/site/dashboard.html:107
#, python-format
msgid "registered %(duration)s ago"
msgstr "inscrito há %(duration)s"
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:121 templates/site/dashboard.html.py:127
+#: templates/site/text_view_frame.html:55
msgid "comment"
msgstr "comentar"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
#, python-format
msgid "by %(cuser)s on text"
msgstr "por %(cuser)s on text"
-#: templates/site/dashboard.html:121
+#: templates/site/dashboard.html:122
msgid "awaits approval"
msgstr "aguarda aprovação"
-#: templates/site/dashboard.html:127
+#: templates/site/dashboard.html:128
msgid "view in context"
msgstr "ver no contexto"
-#: templates/site/dashboard.html:132
+#: templates/site/dashboard.html:133
msgid "Are you sure you want to approve this comment?"
msgstr "Confirmar aprovação desse comentário?"
-#: templates/site/dashboard.html:149
+#: templates/site/dashboard.html:150
msgid "Are you sure you want to refuse this comment?"
msgstr "Confirmar rejeição desse comentário?"
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:203
+#: templates/site/dashboard.html:169 templates/site/dashboard.html.py:204
#, python-format
msgid "modified %(duration)s ago"
msgstr "modificado há %(duration)s"
-#: templates/site/dashboard.html:186
+#: templates/site/dashboard.html:187
msgid "Recent texts"
msgstr "Textos recentes"
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:187 templates/site/macros/paginator.html:9
msgid "all"
msgstr "todos"
-#: templates/site/dashboard.html:201
+#: templates/site/dashboard.html:202
#, python-format
msgid "%(nb_comments)s comment"
msgid_plural "%(nb_comments)s comments"
msgstr[0] "%(nb_comments)s commentário"
-msgstr[1] "%(nb_comments)s commentárioss"
-
-#: templates/site/dashboard.html:202 templates/site/macros/text_meta.html:8
-#, fuzzy, python-format
+msgstr[1] "%(nb_comments)s commentários"
+
+#: templates/site/dashboard.html:203 templates/site/macros/text_meta.html:8
+#, python-format
msgid "1 version"
msgid_plural "%(versions_number)s versions"
-msgstr[0] "Versões"
+msgstr[0] "Versõe"
msgstr[1] "Versões"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:223
+#: templates/site/dashboard.html:209 templates/site/text_list.html:225
msgid "No texts yet"
msgstr "Sem textos ainda"
-#: templates/site/dashboard.html:227
-msgid "Workspace activity"
-msgstr "Atividade na área de trabalho"
-
#: templates/site/dashboard.html:228
+msgid "Workspace activity"
+msgstr "Atividade na área de trabalho"
+
+#: templates/site/dashboard.html:229
msgid "month"
msgstr "mês"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "week"
msgstr "semana"
-#: templates/site/dashboard.html:228
+#: templates/site/dashboard.html:229
msgid "24 hours"
msgstr "24 horas"
-#: templates/site/dashboard.html:234
+#: templates/site/dashboard.html:235
msgid "Access"
msgstr "Acessar"
-#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:208 templates/site/user_list.html:158
+#: templates/site/dashboard.html:236 templates/site/dashboard.html.py:247
+#: templates/site/text_list.html:210 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Carregando"
-#: templates/site/dashboard.html:245
+#: templates/site/dashboard.html:246
msgid "Commenting"
msgstr "Comentando"
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:265
msgid "Activities"
msgstr "Atividades"
-#: templates/site/dashboard.html:267
+#: templates/site/dashboard.html:268
msgid "texts"
msgstr "textos"
-#: templates/site/dashboard.html:268
+#: templates/site/dashboard.html:269
msgid "comments"
msgstr "comentários"
-#: templates/site/dashboard.html:270
+#: templates/site/dashboard.html:271
msgid "users"
msgstr "usuário"
-#: templates/site/dashboard.html:310
+#: templates/site/dashboard.html:311
msgid "No activities"
msgstr "Sem atividades"
@@ -622,7 +726,7 @@
msgstr "criado há %(duration)s"
#: templates/site/dashboard_bloc_recent_comments.html:24
-#, fuzzy, python-format
+#, python-format
msgid "by %(username)s"
msgstr "por \"%(username)s\""
@@ -635,7 +739,7 @@
msgid "Followup"
msgstr "Acompanhamento"
-#: templates/site/followup.html:20 templates/site/help.html:66
+#: templates/site/followup.html:20 templates/site/help.html:75
#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Feeds"
@@ -645,8 +749,8 @@
msgstr "Feed público"
#: 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:11
+#: templates/site/help.html:6 templates/site/help.html.py:23
+#: templates/site/text_embed.html:31 templates/site/layout/footer.html:11
#: templates/site/macros/form_fields.html:20
msgid "Help"
msgstr "Ajuda"
@@ -703,91 +807,86 @@
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/forgot_pw.html:27
+#: templates/site/forgot_pw.html:6 templates/site/forgot_pw.html.py:23
+#: templates/site/forgot_pw.html:36
msgid "Reset my password"
-msgstr ""
-
-#: templates/site/forgot_pw.html:35
+msgstr "Repor a minha senha"
+
+#: templates/site/forgot_pw.html:44
msgid "This link is invalid."
-msgstr ""
-
-#: templates/site/forgot_pw.html:40 templates/site/login_form.html:21
+msgstr "Este link é inválido."
+
+#: templates/site/forgot_pw.html:49 templates/site/login_form.html:21
msgid "Forgot password?"
-msgstr ""
-
-#: templates/site/help.html:16
+msgstr "Esqueceu sua senha?"
+
+#: templates/site/help.html:25
msgid "General Presentation"
-msgstr ""
-
-#: templates/site/help.html:18
+msgstr "Apresentação Geral"
+
+#: templates/site/help.html:27
msgid "co-ment is a web based text annotation system."
-msgstr ""
-
-#: templates/site/help.html:18
+msgstr "co-ment é um sistema de anotação de texto baseado na web."
+
+#: templates/site/help.html:27
msgid "COMT is the open source software behind it"
-msgstr ""
-
-#: templates/site/help.html:18
+msgstr "COMT é o software de código aberto por trás dele"
+
+#: templates/site/help.html:27
msgid "See www.co-ment.com for more details"
msgstr ""
-#: templates/site/help.html:20
+#: templates/site/help.html:29
msgid "Glossary"
-msgstr ""
-
-#: templates/site/help.html:22
-#, fuzzy
+msgstr "Glossário"
+
+#: templates/site/help.html:31
msgid "Contents"
msgstr "Conteúdo"
-#: templates/site/help.html:24 templates/site/help.html.py:30
-#: templates/site/help.html:33
+#: templates/site/help.html:33 templates/site/help.html.py:39
+#: templates/site/help.html:42
msgid "Collaboration"
-msgstr ""
-
-#: templates/site/help.html:25 templates/site/help.html.py:37
-#, fuzzy
+msgstr "Colaboração"
+
+#: templates/site/help.html:34 templates/site/help.html.py:46
msgid "Comments"
-msgstr "comentários"
-
-#: templates/site/help.html:26 templates/site/help.html.py:60
-#, fuzzy
+msgstr "Comentários"
+
+#: templates/site/help.html:35 templates/site/help.html.py:69
msgid "Notification and feeds"
msgstr "Aviso desativado."
-#: templates/site/help.html:27 templates/site/help.html.py:77
-#: templates/site/help.html:79
-#, fuzzy
+#: templates/site/help.html:36 templates/site/help.html.py:86
+#: templates/site/help.html:88
msgid "Roles"
msgstr "Função"
-#: templates/site/help.html:28 templates/site/help.html.py:88
+#: templates/site/help.html:37 templates/site/help.html.py:97
#: templates/site/text_list.html:12
msgid "Texts"
msgstr "Textos"
-#: templates/site/help.html:34
+#: templates/site/help.html:43
msgid "co-ment 2 collaboration is based on assigning roles for users."
msgstr ""
-#: templates/site/help.html:34 templates/site/help.html.py:45
+#: templates/site/help.html:43 templates/site/help.html.py:54
msgid "Click here for more details"
-msgstr ""
-
-#: templates/site/help.html:34
+msgstr "Clique aqui para mais detalhes"
+
+#: templates/site/help.html:43
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:40
-#, fuzzy
+#: templates/site/help.html:49
msgid "Moderation"
msgstr "Moderador"
-#: templates/site/help.html:41
+#: templates/site/help.html:50
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 "
@@ -800,23 +899,22 @@
"them."
msgstr ""
-#: templates/site/help.html:44
-#, fuzzy
+#: templates/site/help.html:53
msgid "States"
-msgstr "Salvar"
-
-#: templates/site/help.html:45
+msgstr ""
+
+#: templates/site/help.html:54
msgid "co-ment uses states to implement moderation policies."
-msgstr ""
-
-#: templates/site/help.html:45
+msgstr "co-ment usa estados para implementar políticas de moderação."
+
+#: templates/site/help.html:54
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:48
+#: templates/site/help.html:57
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 "
@@ -824,12 +922,11 @@
"according to the issues or topics they address."
msgstr ""
-#: templates/site/help.html:50
-#, fuzzy
+#: templates/site/help.html:59
msgid "Linking to a comment"
-msgstr "Pode editar comentário"
-
-#: templates/site/help.html:51
+msgstr ""
+
+#: templates/site/help.html:60
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 "
@@ -837,22 +934,22 @@
"title."
msgstr ""
-#: templates/site/help.html:53
+#: templates/site/help.html:62
msgid "Scope"
-msgstr ""
-
-#: templates/site/help.html:54
+msgstr "Escopo"
+
+#: templates/site/help.html:63
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:56
+#: templates/site/help.html:65
msgid "Keeping your comments across versions"
msgstr ""
-#: templates/site/help.html:57
+#: templates/site/help.html:66
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 "
@@ -864,34 +961,32 @@
"simply removed from the new version."
msgstr ""
-#: templates/site/help.html:63
-#, fuzzy
+#: templates/site/help.html:72
msgid "Email notification"
msgstr "Aviso de email"
-#: templates/site/help.html:64
+#: templates/site/help.html:73
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:67
+#: templates/site/help.html:76
msgid "Web feed definition on Wikipedia"
msgstr ""
-#: templates/site/help.html:67
+#: templates/site/help.html:76
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:69
-#, fuzzy
+#: templates/site/help.html:78
msgid "Public and private feeds"
msgstr "Feed privado"
-#: templates/site/help.html:70
+#: templates/site/help.html:79
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 "
@@ -899,11 +994,11 @@
"really want them to know what's happening in it."
msgstr ""
-#: templates/site/help.html:72
+#: templates/site/help.html:81
msgid "Text embedding"
msgstr ""
-#: templates/site/help.html:73
+#: templates/site/help.html:82
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' "
@@ -913,32 +1008,32 @@
"in another tab of your browser."
msgstr ""
-#: templates/site/help.html:80
+#: templates/site/help.html:89
msgid "Roles are predefined sets of permissions."
msgstr ""
-#: templates/site/help.html:81
+#: templates/site/help.html:90
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:82 templates/site/text_share.html:88
+#: templates/site/help.html:91 templates/site/text_share.html:88
msgid "Text role"
msgstr "Função do texto"
-#: templates/site/help.html:83
+#: templates/site/help.html:92
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:84 views/site.py:185
+#: templates/site/help.html:93 views/site.py:187
msgid "Role model"
msgstr "Função modelo"
-#: templates/site/help.html:85
+#: templates/site/help.html:94
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 "
@@ -947,11 +1042,11 @@
"privately shared between a teacher and each student."
msgstr ""
-#: templates/site/help.html:91
+#: templates/site/help.html:100
msgid "Create or upload?"
msgstr ""
-#: templates/site/help.html:92
+#: templates/site/help.html:101
msgid ""
"There are 3 main ways to produce a text in co-ment. If you start from "
"scratch, create your text in markdown format. If you start from an existing "
@@ -960,34 +1055,33 @@
"editor."
msgstr ""
-#: templates/site/help.html:96
-#, fuzzy
+#: templates/site/help.html:105
msgid "Text formats"
msgstr "Aviso de texto"
-#: templates/site/help.html:97
+#: templates/site/help.html:106
msgid ""
"There are at this date 3 text formats: markdown (default/preferred format), "
"HTML and RST."
msgstr ""
-#: templates/site/help.html:101
+#: templates/site/help.html:110
msgid "Markdown"
msgstr ""
-#: templates/site/help.html:102
+#: templates/site/help.html:111
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:102
+#: templates/site/help.html:111
msgid "Read more about this"
msgstr ""
#: templates/site/login.html:8 templates/site/login_form.html:19
-#: templates/site/layout/header.html:17
+#: templates/site/layout/header.html:21
msgid "Login"
msgstr "Entrar"
@@ -997,16 +1091,16 @@
msgstr "%(wname)s Entrar"
#: templates/site/login_form.html:20 templates/site/register.html:8
-#: templates/site/layout/header.html:18
+#: templates/site/layout/header.html:22
msgid "Register"
msgstr "Inscrever-se"
#: templates/site/non_authenticated_index.html:10
-#: templates/site/layout/header.html:8
+#: templates/site/layout/header.html:11
msgid "Home"
msgstr "Página inicial"
-#: templates/site/non_authenticated_index.html:20
+#: templates/site/non_authenticated_index.html:28
#, python-format
msgid "One public text"
msgid_plural "%(counter)s public texts"
@@ -1017,58 +1111,58 @@
msgid "Deactivate notification"
msgstr "Desativar notificação"
-#: templates/site/notifications_desactivate.html:31
+#: templates/site/notifications_desactivate.html:39
msgid "Deactivate"
msgstr "Desativar"
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
-#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:23
+#: templates/site/profile_pw.html:6 templates/site/profile_pw.html.py:23
#, python-format
msgid "Your profile (%(username)s)"
msgstr "Seu perfil (%(username)s)"
-#: templates/site/profile.html:17 templates/site/profile_pw.html:17
-#: templates/site/layout/header.html:14
+#: templates/site/profile.html:26 templates/site/profile_pw.html:26
+#: templates/site/layout/header.html:18
msgid "Profile"
msgstr "Perfil"
-#: templates/site/profile.html:19 templates/site/profile_pw.html:19
+#: templates/site/profile.html:28 templates/site/profile_pw.html:28
msgid "Password"
-msgstr ""
-
-#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/text_edit.html:37
+msgstr "Senha"
+
+#: templates/site/profile.html:42 templates/site/profile_pw.html:42
+#: templates/site/text_create_content.html:49
+#: templates/site/text_create_import.html:44
+#: templates/site/text_create_upload.html:44 templates/site/text_edit.html:37
#: 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/user_activate.html:36 templates/site/user_list.html:210
#: templates/site/layout/base_workspace_form.html:32
msgid "Save"
msgstr "Salvar"
-#: templates/site/register.html:19
+#: templates/site/register.html:27
#, python-format
msgid "%(wname)s Registration"
msgstr "%(wname)s Inscrição"
-#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:14
-#: templates/site/reset_pw.html:24
+#: templates/site/reset_pw.html:6 templates/site/reset_pw.html.py:23
+#: templates/site/reset_pw.html:33
msgid "Reset your password"
-msgstr ""
+msgstr "Restabeleça a sua senha"
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:185 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
-#, fuzzy
msgid "General"
msgstr "Genérico"
#: templates/site/settings.html:23 templates/site/settings_design.html:23
msgid "Appearance"
-msgstr ""
+msgstr "Aparência"
#: templates/site/settings.html:38 templates/site/settings_design.html:40
msgid ""
@@ -1077,29 +1171,24 @@
msgstr "Confirmar alteração de "
#: templates/site/settings_design.html:31
-#, fuzzy
msgid "Delete logo"
-msgstr "Apagar"
+msgstr "Excluir logotipo"
#: templates/site/text_create_content.html:26
+#: templates/site/text_create_import.html:24
#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
msgid "Text list"
msgstr "Lista de textos"
-#: templates/site/text_embed.html:7
-msgid "Text notifications"
-msgstr "Aviso de texto"
-
-#: templates/site/text_embed.html:25
+#: templates/site/text_embed.html:7 templates/site/text_embed.html.py:29
msgid "Embed text"
msgstr "Embutir texto"
-#: templates/site/text_embed.html:26
+#: templates/site/text_embed.html:30
msgid "Copy this code into your site to display text with comments."
-msgstr ""
-
-#: templates/site/text_embed.html:26
-#, fuzzy
+msgstr "Copie este código em seu site para exibir o texto com comentários."
+
+#: templates/site/text_embed.html:30
msgid ""
"Users will also be able to add comments from your site depending on "
"anonymous users' roles."
@@ -1164,183 +1253,168 @@
#: templates/site/text_history.html:56
#: templates/site/text_history_compare.html:28
#: templates/site/text_history_version.html:28
-#, fuzzy
msgid "Version list"
msgstr "Versões"
#: templates/site/text_history.html:59
-#, fuzzy
msgid "Compare last two versions"
msgstr "Comparar duas últimas versões"
#: templates/site/text_history.html:61
-#: templates/site/text_history_compare.html:37
-#: templates/site/text_history_version.html:38
-#, fuzzy
+#: templates/site/text_history_compare.html:39
+#: templates/site/text_history_version.html:43
msgid "Most recent version"
msgstr "Versão mais recente"
#: templates/site/text_history.html:63
#: templates/site/text_history_compare.html:30
#: templates/site/text_history_version.html:31
-#, fuzzy
-msgid "Last version"
+msgid "Original version"
msgstr "Versão original"
-#: templates/site/text_history.html:67
-#, fuzzy
+#: templates/site/text_history.html:69
msgid "Compare selected versions"
msgstr "Compare as versões seleccionadas"
-#: templates/site/text_history.html:77
-#, fuzzy
+#: templates/site/text_history.html:79
msgid "Version"
msgstr "Versões"
-#: templates/site/text_history.html:78
-#, fuzzy
+#: templates/site/text_history.html:80
msgid "Selection"
msgstr "Ações"
-#: templates/site/text_history.html:81 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "Author"
msgstr "Autor"
-#: templates/site/text_history.html:82
-#, fuzzy
+#: templates/site/text_history.html:84
msgid "Created"
msgstr "Criado"
-#: templates/site/text_history.html:83 templates/site/text_list.html:141
-#, fuzzy
+#: templates/site/text_history.html:85 templates/site/text_list.html:143
msgid "# comments"
msgstr "comentários"
-#: templates/site/text_history.html:105 templates/site/text_list.html:161
+#: templates/site/text_history.html:107 templates/site/text_list.html:163
msgid "View"
msgstr "Ver"
-#: templates/site/text_history.html:106
-#: templates/site/text_history_version.html:32
-#, fuzzy
-msgid "Compare with previous version"
-msgstr "Comparar com versão anterior"
-
#: templates/site/text_history.html:108
-#, fuzzy
+#: templates/site/text_history_version.html:32
+msgid "Compare with previous version"
+msgstr "Comparar com versão anterior"
+
+#: templates/site/text_history.html:110
msgid "Revert to this version"
-msgstr "Reverter para a versão #%(v1_nid)s"
-
-#: templates/site/text_history_compare.html:30
-#, fuzzy
-msgid "Previous modification"
-msgstr "Aviso de texto"
-
-#: templates/site/text_history_compare.html:31
-#: templates/site/text_history_compare.html:33
-#: templates/site/text_history_version.html:34
-#, fuzzy, python-format
-msgid "Version %(version_number)s"
-msgstr "versão #%(v1number)s"
+msgstr "Reverter para esta versão"
#: templates/site/text_history_compare.html:32
-#, fuzzy, python-format
+msgid "Previous modification"
+msgstr "Modificação anterior"
+
+#: templates/site/text_history_compare.html:33
+#: templates/site/text_history_compare.html:36
+#: templates/site/text_history_version.html:37
+#, python-format
+msgid "Version %(version_number)s"
+msgstr "versão #%(version_number)s"
+
+#: templates/site/text_history_compare.html:35
+#, python-format
msgid ""
"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
-msgstr "diferenças entre a versão #%(v1number)s e a versão #%(v2number)s"
-
-#: templates/site/text_history_compare.html:34
-#, fuzzy
+msgstr "diferenças entre a versão #%(version_1_number)s e a versão #%(version_2_number)s"
+
+#: templates/site/text_history_compare.html:37
msgid "Next modification"
msgstr "Aviso de texto"
-#: templates/site/text_history_compare.html:44
+#: templates/site/text_history_compare.html:46
msgid "No differences"
msgstr "Sem diferenças"
-#: templates/site/text_history_version.html:31
-#, fuzzy
+#: templates/site/text_history_version.html:34
msgid "Previous version"
-msgstr "Versões"
-
-#: templates/site/text_history_version.html:36
+msgstr "Versõe anterior"
+
+#: templates/site/text_history_version.html:40
+msgid "Next version"
+msgstr "Próxima versõe"
+
+#: templates/site/text_history_version.html:42
msgid "Compare with next version"
-msgstr ""
-
-#: templates/site/text_history_version.html:37
-#, fuzzy
-msgid "Next version"
-msgstr "Versões"
-
-#: templates/site/text_history_version.html:45 views/texts.py:496
-#: views/texts.py:497
-#, fuzzy, python-format
+msgstr "Comparar com a próxima versão"
+
+#: templates/site/text_history_version.html:50 views/texts.py:482
+#: views/texts.py:483
+#, python-format
msgid "by %(author)s"
-msgstr "por %(v1name)s"
-
-#: templates/site/text_list.html:51 templates/site/text_share.html:40
+msgstr "por %(author)s"
+
+#: templates/site/text_list.html:53 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr "Filtrar por palavra-chave:"
-#: templates/site/text_list.html:53 templates/site/text_share.html:42
+#: templates/site/text_list.html:55 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Todas"
-#: templates/site/text_list.html:81 templates/site/user_list.html:72
+#: templates/site/text_list.html:83 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Ações em massa"
-#: templates/site/text_list.html:82 templates/site/text_list.html.py:163
+#: templates/site/text_list.html:84 templates/site/text_list.html.py:165
msgid "Delete"
msgstr "Apagar"
-#: templates/site/text_list.html:85 templates/site/user_list.html:81
+#: templates/site/text_list.html:87 templates/site/user_list.html:81
msgid "Apply"
msgstr "Aplicar"
-#: templates/site/text_list.html:106 templates/site/user_list.html:102
+#: templates/site/text_list.html:108 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Confirma?"
-#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:140 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texto"
-#: templates/site/text_list.html:140
+#: templates/site/text_list.html:142
msgid "Modified"
msgstr "Modificar"
-#: templates/site/text_list.html:142 templates/site/user_list.html:136
+#: templates/site/text_list.html:144 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Atividade da última semana"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "palavras-chave:"
-#: templates/site/text_list.html:158
+#: templates/site/text_list.html:160
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr "Filtrar por palavra chave: %(tag_name)s"
-#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:164 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Editar"
-#: templates/site/text_list.html:169
+#: templates/site/text_list.html:171
msgid "Are you sure you want to delete this text?"
msgstr "Confirmar a exclusão desse texto?"
-#: templates/site/text_list.html:182
+#: templates/site/text_list.html:184
msgid "Users"
msgstr "Usuários"
-#: templates/site/text_list.html:200
+#: templates/site/text_list.html:202
msgid "Edit user"
msgstr "Editar usuários"
@@ -1415,35 +1489,36 @@
msgid "Anonymous users"
msgstr "Usuários anônimos"
-#: templates/site/text_view_frame.html:64
+#: templates/site/text_view_frame.html:53
+#: templates/site/text_view_frame.html:54
msgid "add a comment"
msgstr "comentar"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:65
msgid "Filter comments"
msgstr "Filtrar comentários"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:66
msgid "Preferences"
msgstr "Preferências"
-#: templates/site/text_view_frame.html:76
+#: templates/site/text_view_frame.html:67
msgid "Text preferences"
msgstr "Preferências de texto"
-#: templates/site/text_view_frame.html:93
+#: templates/site/text_view_frame.html:74
msgid "Loading text…"
msgstr "Carregar o texto…"
-#: templates/site/text_view_frame.html:104
+#: templates/site/text_view_frame.html:92
msgid "Which comments?"
msgstr "Quais comentários"
-#: templates/site/text_view_frame.html:112
+#: templates/site/text_view_frame.html:100
msgid "How should comments' scope be shown in text?"
msgstr "Como os assuntos dos comentários deve aparecer no texto?"
-#: templates/site/unauthorized.html:5
+#: templates/site/unauthorized.html:14
msgid "Unauthorized"
msgstr "Desautorizado"
@@ -1493,7 +1568,7 @@
msgid "Change role to %(role_name)s"
msgstr "Alterar a função para %(role_name)s"
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:284
msgid "Email"
msgstr "Email"
@@ -1509,7 +1584,7 @@
msgid ""
"Those are non-registered users. Assign them a role to open your texts to "
"simple visitors."
-msgstr ""
+msgstr "Esses são os usuários não-registrados. Atribuir-lhes um papel de abrir os textos para os visitantes simples."
#: templates/site/user_mass_add.html:26
#: templates/site/user_mass_add_text.html:29
@@ -1517,11 +1592,6 @@
msgstr ""
"Os usuários receberão um convite por email para entrar na área de trabalho."
-#: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:20
-msgid "back to workspace"
-msgstr "voltar para área de trabalho"
-
#: templates/site/layout/base_workspace.html:30
#, python-format
msgid "%(nb_texts)s text"
@@ -1536,7 +1606,11 @@
msgstr[0] "%(nb_users)s usuário"
msgstr[1] "%(nb_users)s usuários"
-#: templates/site/layout/header.html:15
+#: templates/site/layout/header.html:8
+msgid "Privacy policy"
+msgstr "Política de privacidade"
+
+#: templates/site/layout/header.html:19
msgid "Logout"
msgstr "Sair"
@@ -1568,7 +1642,7 @@
#: templates/site/macros/paginator.html:5
msgid "Previous page"
-msgstr ""
+msgstr "Página anterior"
#: templates/site/macros/paginator.html:6
#, python-format
@@ -1577,12 +1651,11 @@
#: templates/site/macros/paginator.html:7
msgid "Next page"
-msgstr ""
+msgstr "Próxima página"
#: templates/site/macros/paginator.html:9
-#, fuzzy
msgid "View all"
-msgstr "Ver"
+msgstr "Ver todo"
#: templates/site/macros/paginator.html:11
msgid "paginate"
@@ -1592,7 +1665,7 @@
msgid "Share"
msgstr "Compartilhar"
-#: templates/site/macros/text_comments.html:18
+#: templates/site/macros/text_comments.html:16
#, python-format
msgid "by %(name)s on %(date)s"
msgstr "por %(name)s em %(date)s"
@@ -1606,9 +1679,9 @@
"Confirmar?"
#: templates/site/macros/text_meta.html:6
-#, fuzzy, python-format
+#, python-format
msgid "last modified %(duration)s ago"
-msgstr "modificado há %(duration)s"
+msgstr "modificado pela ultima vez %(duration)s atrás"
#: templates/site/macros/text_tabs.html:15
msgid "People"
@@ -1634,7 +1707,7 @@
#: templates/site/macros/user_actions.html:29
msgid "(Re-)send invitation"
-msgstr "(Re-_enviar convite"
+msgstr "(Re-)enviar convite"
#: templates/site/macros/user_actions.html:38
msgid "Are you sure you want to suspend this user's access to the workspace?"
@@ -1653,7 +1726,6 @@
msgstr "Aprovar"
#: templatetags/com.py:146
-#, fuzzy
msgid "F j, Y \\a\\t g:i a"
msgstr "F j, Y \\a\\t g:i a"
@@ -1665,17 +1737,17 @@
msgid "unknown"
msgstr "desconhecido"
-#: views/create.py:26
-msgid "Upload file (optional)"
-msgstr "Carregar arquivo (opcional)"
-
-#: views/create.py:27
+#: views/create.py:30
+msgid "Upload file"
+msgstr "Carregar arquivo"
+
+#: views/create.py:31
msgid ""
"Upload a file from your computer instead of using the direct input above"
msgstr ""
"Carregar arquivo do seu computador em vez de usar a inclusão direta acima"
-#: views/create.py:38
+#: views/create.py:42 views/create.py:59
msgid "You should specify a file to upload."
msgstr "Favor especificar o arquivo a ser carregado."
@@ -1688,27 +1760,33 @@
msgstr "Carregar um arquivo XML exportado anteriormente de seu computador"
#: views/create.py:65
-msgid "The imported file should be an XML file generated by co-ment when exporting a text and comments."
-msgstr "O arquivo importado deve ser um arquivo XML gerado pelo co-ment ao exportar um texto e comentários."
+msgid ""
+"The imported file should be an XML file generated by co-ment when exporting "
+"a text and comments."
+msgstr ""
+"O arquivo importado deve ser um arquivo XML gerado pelo co-ment ao exportar "
+"um texto e comentários."
#: views/create.py:71
msgid "No co_ment_text node found in XML."
msgstr "Nenhum nó co_ment_text encontrada no XML."
#: views/create.py:76
+#, python-format
msgid "No %(tag)s node found in XML."
msgstr "Nenhum nó %(tag)s encontrada no XML."
-#: views/create.py:46
+#: views/create.py:85
msgid "The title of your text"
msgstr "O título do seu texto"
-#: views/create.py:71 views/create.py:108
+#: views/create.py:109 views/create.py:144
#, python-format
msgid "Text \"%(text_title)s\" has been created"
msgstr "O texto \"%(text_title)s\" foi criado"
-#: views/create.py:244
+#: views/create.py:247
+#, python-format
msgid "Text \"%(text_title)s\" has been imported"
msgstr "O texto \"%(text_title)s\" foi importado"
@@ -1776,51 +1854,51 @@
msgid "Private notifications feed reseted."
msgstr "Feed privado de avisos restabelecido."
-#: views/site.py:82 views/texts.py:131 views/user.py:545
+#: views/site.py:84 views/texts.py:136 views/user.py:548
msgid "You're logged in!"
msgstr "Você entrou!"
-#: views/site.py:100
+#: views/site.py:102
msgid "Your name"
msgstr "Seu nome"
-#: views/site.py:102
+#: views/site.py:104
msgid "Your email address"
msgstr "Seu endereço de email"
-#: views/site.py:105
+#: views/site.py:107
msgid "Subject of the message"
msgstr "Assunto da mensagem"
-#: views/site.py:106
+#: views/site.py:108
msgid "Body of the message"
msgstr "Corpo da mensagem"
-#: views/site.py:108
+#: views/site.py:110
msgid "Send me a copy of the email"
msgstr "Envie-me uma cópia do email"
-#: views/site.py:134
+#: views/site.py:136
msgid "Copy of message:"
msgstr "Cópia da mensagem:"
-#: views/site.py:136
+#: views/site.py:138
msgid "Email sent. We will get back to you as quickly as possible."
msgstr "Email enviado. Retornaremos assim que possível."
-#: views/site.py:165
+#: views/site.py:167
msgid "Workspace name"
msgstr "Nome da área de trabalho"
-#: views/site.py:170
+#: views/site.py:172
msgid "Workspace tagline"
msgstr "Slogan da área de trabalho"
-#: views/site.py:175
+#: views/site.py:177
msgid "Workspace registration"
msgstr "Registro da área de trabalho"
-#: views/site.py:176
+#: views/site.py:178
msgid ""
"Can users register themselves into the workspace? (if not, only invitations "
"by managers can create new users)"
@@ -1828,138 +1906,185 @@
"Usuários podem se inscrever na área de trabalho? (se não, apenas convites "
"por gerentes podem criar novos usuários)"
-#: views/site.py:180
+#: views/site.py:182
msgid "Workspace registration moderation"
msgstr "Moderação de registro da área de trabalho"
-#: views/site.py:181
-#, fuzzy
+#: views/site.py:183
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:186
+#: views/site.py:188
msgid "Change the roles available in the workspace"
msgstr "Alterar as funções disponível na área de trabalho"
-#: views/site.py:201 views/site.py:207 views/site.py:235 views/site.py:244
+#: views/site.py:194 views/site.py:200 views/site.py:206 views/site.py:212
+#: views/site.py:218 views/texts.py:928 views/texts.py:929 views/texts.py:930
+#: views/texts.py:931 views/texts.py:932
+msgid ""
+"Paragraphs including at least one comment of this category will have a "
+"vertical bar with this color: "
+msgstr ""
+"Números, incluindo pelo menos um comentário desta categoria terão uma barra "
+"vertical com esta cor: "
+
+#: views/site.py:233 views/site.py:239 views/site.py:278 views/site.py:287
msgid "Settings saved"
msgstr "Configurações salvas"
-#: views/site.py:215
-#, fuzzy
+#: views/site.py:247
msgid "Workspace logo"
msgstr "Função da área de trabalho"
-#: views/site.py:217
-#, fuzzy
-msgid "Custom css rules"
+#: views/site.py:249
+msgid "Custom CSS rules"
msgstr "Personalizado css regras"
-#: views/site.py:218
-#, fuzzy
-msgid "Add stylesheet rules in CSS format (do not include <code><style></code> HTML tags). Warning: this code will be added to all content, make sure you know what you're doing before adding something here."
-msgstr "Adicionar regras de estilo em formato de CSS (não incluem <code><style></code> tags HTML). Aviso: este código será adicionado a todo o conteúdo, verifique se você sabe o que está fazendo antes de adicionar algo aqui."
-
-#: views/site.py:223
-#, fuzzy
+#: views/site.py:250
+msgid ""
+"Add stylesheet rules in CSS format (do not include <code><style></"
+"code> HTML tags). Warning: this code will be added to all content, make sure "
+"you know what you're doing before adding something here."
+msgstr ""
+"Adicionar regras de estilo em formato de CSS (não incluem <code><style>"
+"</code> tags HTML). Aviso: este código será adicionado a todo o conteúdo, "
+"verifique se você sabe o que está fazendo antes de adicionar algo aqui."
+
+#: views/site.py:255
msgid "Custom font"
msgstr "Fonte personalizada"
-#: views/site.py:225
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for the body of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Família de fonte personalizado alternativa ao 'moderno', 'clássico' e 'código' que os visitantes podem escolher para o corpo do co-mento textos. Insira uma lista separada coma de famílias de fontes. Nomes de fontes da família, incluindo os caracteres de espaço deve ser colocada entre aspas duplas. Por exemplo "
-
-#: views/site.py:229
-#, fuzzy
+#: views/site.py:257
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for the body of co-ment texts. Enter a coma separated "
+"list of font families. Font family names including space characters should "
+"be enclosed in double quotes. Eg. "
+msgstr ""
+"Família de fonte personalizado alternativa ao 'moderno', 'clássico' e "
+"'código' que os visitantes podem escolher para o corpo do co-mento textos. "
+"Insira uma lista separada coma de famílias de fontes. Nomes de fontes da "
+"família, incluindo os caracteres de espaço deve ser colocada entre aspas "
+"duplas. Por exemplo "
+
+#: views/site.py:261
msgid "Custom font for titles"
msgstr "Fonte personalizada para títulos"
-#: views/site.py:231
-#, fuzzy
-msgid "Custom alternative font family to 'modern', 'classic' and 'code' that visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma separated list of font families. Font family names including space characters should be enclosed in double quotes. Eg. "
-msgstr "Família de fonte personalizado alternativa ao 'moderno', 'clássico' e 'código' que os visitantes podem escolher por títulos (H1 a H6) de co-mento textos. Insira uma lista separada coma de famílias de fontes. Nomes de fontes da família, incluindo os caracteres de espaço deve ser colocada entre aspas duplas. Por exemplo "
-
-#: views/site.py:253
+#: views/site.py:263
+msgid ""
+"Custom alternative font family to 'modern', 'classic' and 'code' that "
+"visitors can chose for titles (h1 to h6) of co-ment texts. Enter a coma "
+"separated list of font families. Font family names including space "
+"characters should be enclosed in double quotes. Eg. "
+msgstr ""
+"Família de fonte personalizado alternativa ao 'moderno', 'clássico' e "
+"'código' que os visitantes podem escolher por títulos (H1 a H6) de co-mento "
+"textos. Insira uma lista separada coma de famílias de fontes. Nomes de "
+"fontes da família, incluindo os caracteres de espaço deve ser colocada entre "
+"aspas duplas. Por exemplo "
+
+#: views/site.py:319
msgid ""
"A link to reset your password has been sent to the profile email. Please "
"check your email."
-msgstr ""
-
-#: views/site.py:257 views/user.py:428
+msgstr "Um link para redefinir sua senha foi enviada para o e-mail do perfil. Por favor, verifique seu e-mail."
+
+#: views/site.py:323 views/user.py:431
msgid "Password changed"
-msgstr ""
-
-#: views/texts.py:164
+msgstr "Senha alterada"
+
+#: views/texts.py:169
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr "%(nb_texts)i texto(s) apagado(s)"
-#: views/texts.py:209
+#: views/texts.py:214
#, python-format
msgid "Text %(text_title)s deleted"
msgstr "Texto %(text_title)s apagado"
-#: views/texts.py:220
-#, fuzzy, python-format
+#: views/texts.py:226
+#, python-format
msgid "Text version %(text_version_title)s deleted"
-msgstr "Texto %(text_title)s apagado"
-
-#: views/texts.py:634
+msgstr "Texto versão %(text_version_title)s apagado"
+
+#: views/texts.py:624
msgid "Note (optional)"
msgstr "Observação (opcional)"
+#: views/texts.py:628
+msgid "Add a note to explain the modifications made to the text"
+msgstr "Adicionar uma observação para explicar as mudanças feitas no texto"
+
#: views/texts.py:638
-msgid "Add a note to explain the modifications made to the text"
-msgstr "Adicionar uma observação para explicar as mudanças feitas no texto"
-
-#: views/texts.py:648
msgid "New version (optional)"
msgstr "Nova versão (opcional)"
-#: views/texts.py:651
+#: views/texts.py:641
msgid "Create a new version of this text (recommended)"
msgstr "Criar uma nova versão desse texto (recomendado)"
-#: views/texts.py:654
+#: views/texts.py:644
msgid "Keep comments (optional)"
msgstr "Manter comentários (opcional)"
-#: views/texts.py:657
+#: views/texts.py:647
msgid "Keep comments (if not affected by the edit)"
msgstr "Manter comentários (se não afetados pela edição)"
-#: views/texts.py:614
-#, fuzzy
+#: views/texts.py:650
msgid "Detach comments (optional)"
msgstr "Retire comentários (opcional)"
-#: views/texts.py:617
-#, fuzzy
-msgid "If some comments were attached to a chunck of text that is modified, check this option to keep these comments with no scope. Leave this option unchecked if you want that such comments be deleted. This option is ignored if the previous 'Keep comment' option is unchecked."
-msgstr "Se alguns comentários foram anexados a um chunck de texto que é modificado, marque esta opção para manter esses comentários sem escopo. Deixe essa opção desmarcada se desejar que esses comentários sejam excluídos. Esta opção é ignorada se o anterior 'Manter comentários' opção está desmarcada."
-
-#: views/texts.py:723
+#: views/texts.py:653
+msgid ""
+"If some comments were attached to a chunck of text that is modified, check "
+"this option to keep these comments with no scope. Leave this option "
+"unchecked if you want that such comments be deleted. This option is ignored "
+"if the previous 'Keep comment' option is unchecked."
+msgstr ""
+"Se alguns comentários foram anexados a um chunck de texto que é modificado, "
+"marque esta opção para manter esses comentários sem escopo. Deixe essa opção "
+"desmarcada se desejar que esses comentários sejam excluídos. Esta opção é "
+"ignorada se o anterior 'Manter comentários' opção está desmarcada."
+
+#: views/texts.py:719
msgid "Name (optional)"
msgstr "Nome (opcional)"
-#: views/texts.py:724
+#: views/texts.py:720
msgid "Email (optional)"
msgstr "Email (opcional)"
-#: views/texts.py:776
-#, fuzzy, python-format
+#: views/texts.py:773
+#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
-msgstr "Uma mova versão (copiada da versão %(version_id)s) foi criada"
-
-#: views/texts.py:884 views/user.py:79 views/user.py:99
+msgstr "Uma mova versão (copiada da versão %(version_title)s) foi criada"
+
+#: views/texts.py:885 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr "%(count)i função do(s) usuário(s) modificada"
-#: views/texts.py:942
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid "Leave blank to use the value configured for the workspace."
+msgstr ""
+"Deixe em branco para usar o valor configurado para o espaço de trabalho."
+
+#: views/texts.py:928 views/texts.py:929 views/texts.py:930 views/texts.py:931
+#: views/texts.py:932
+msgid ""
+"To disable this category for this text whatever the configuration for the "
+"workspace, enter: "
+msgstr ""
+"Para desativar esta categoria para este texto seja qual for a configuração "
+"do espaço de trabalho, digite: "
+
+#: views/texts.py:949
msgid "Text settings updated"
msgstr "Configurações do texto atualizadas"
@@ -2016,102 +2141,101 @@
msgid "Optional text to add to invitation email"
msgstr "Texto opcional para adicionar ao email convite"
-#: views/user.py:259
+#: views/user.py:260
#, python-format
msgid "%(nb_users)d user added"
msgid_plural "%(nb_users)d users added"
msgstr[0] "%(nb_users)d usuário adicionado"
msgstr[1] "%(nb_users)d usuários adicionados"
-#: views/user.py:277
-#, fuzzy
+#: views/user.py:278
msgid "Add user"
msgid_plural "Add users"
-msgstr[0] "Ajouter un utilisateur"
-msgstr[1] "Ajouter un utilisateur"
-
-#: views/user.py:299
+msgstr[0] "Adicionar usuário"
+msgstr[1] "Adicionar usuários"
+
+#: views/user.py:300
msgid "This username is already in use. Please supply a different username."
msgstr ""
"Esse nome de usuário já está em uso. Por favor tente um nome de usuário "
"diferente."
-#: views/user.py:320 views/user.py:336
+#: views/user.py:321 views/user.py:338
msgid "Your account has been activated. You're now logged-in."
msgstr "Sua conta foi ativada. Você entrou."
-#: views/user.py:331
+#: views/user.py:333
msgid "activate account"
msgstr "ativar conta"
-#: views/user.py:361
+#: views/user.py:363
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr "O acesso do usuário %(prof)s foi suspenso"
-#: views/user.py:367
+#: views/user.py:369
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr "O acesso do usuário %(prof)s foi rejeitado."
-#: views/user.py:379
+#: views/user.py:382
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr "O acesso do usuário %(prof)s foi restaurado."
-#: views/user.py:383
+#: views/user.py:386
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr "O acesso do usuário %(prof)s foi aprovado."
-#: views/user.py:393
+#: views/user.py:396
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Um novo convite foi enviado ao usuário %(prof)s."
-#: views/user.py:410
+#: views/user.py:413
msgid "Profile updated"
msgstr "Perfil atualizado"
-#: views/user.py:456
+#: views/user.py:459
msgid "Anonymous user role modified."
msgstr "Função de usuário anônimo alterada."
-#: views/user.py:478
+#: views/user.py:481
msgid "User modified"
msgstr "Usuário alterado"
-#: views/user.py:493
+#: views/user.py:496
msgid "Subject"
msgstr "Assunto"
-#: views/user.py:494
+#: views/user.py:497
msgid "Subject of the email"
msgstr "Assunto do email"
-#: views/user.py:497
+#: views/user.py:500
msgid "Body"
msgstr "Corpo"
-#: views/user.py:498
+#: views/user.py:501
msgid "Body of the email"
msgstr "Corpo do email"
-#: views/user.py:518
+#: views/user.py:521
msgid "Email sent."
msgstr "Email enviado."
-#: views/user.py:539
+#: views/user.py:542
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
"Essa conta estpa suspensa, entre em contato com o administrador da área de "
"trabalho."
-#: views/user.py:574
+#: views/user.py:577
msgid "You've been logged out."
msgstr "Você saiu."
-#: views/user.py:590
+#: views/user.py:593
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2119,12 +2243,15 @@
"Você se inscreveu. Você receberá um email de confirmação quando o moderador "
"aprovar sua participação."
-#: views/user.py:593
+#: views/user.py:596
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Você se inscreveu. Favor verifique em seu email a mensagem de confirmação."
+#~ msgid "Text notifications"
+#~ msgstr "Aviso de texto"
+
#, fuzzy
#~ msgid "Are you sure you want to delete this version?"
#~ msgstr "Confirmar a exclusão desse texto?"
@@ -2169,52 +2296,3 @@
#~ msgid "%(title)s"
#~ msgstr "%(title)s"
-
-#, fuzzy
-#~ msgid "Contact from user: %(name)s / %(email)s"
-#~ msgstr "Ajouter un utilisateur"
-
-#: models.py:266 views/site.py:191
-#, fuzzy
-msgid "Label for the first category of comments"
-msgstr "Rótulo para a primeira categoria dos comentários"
-
-#: models.py:267 views/site.py:197
-#, fuzzy
-msgid "Label for the second category of comments"
-msgstr "Rótulo para a segunda categoria dos comentários"
-
-#: models.py:268 views/site.py:203
-#, fuzzy
-msgid "Label for the third category of comments"
-msgstr "Rótulo para a terceira categoria dos comentários"
-
-#: models.py:269 views/site.py:209
-#, fuzzy
-msgid "Label for the fourth category of comments"
-msgstr "Rótulo para a quarta categoria de comentários"
-
-#: models.py:270 views/site.py:215
-#, fuzzy
-msgid "Label for the fifth category of comments"
-msgstr "Rótulo para a quinta categoria dos comentários"
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270 views/site.py:192 views/site.py:198 views/site.py:204 views/site.py:210 views/site.py:216
-#, fuzzy
-msgid "Paragraphs including at least one comment of this category will have a vertical bar with this color: "
-msgstr "Números, incluindo pelo menos um comentário desta categoria terão uma barra vertical com esta cor: "
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "Leave blank to use the value configured for the workspace."
-msgstr "Deixe em branco para usar o valor configurado para o espaço de trabalho."
-
-#: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
-#, fuzzy
-msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
-msgstr "Para desativar esta categoria para este texto seja qual for a configuração do espaço de trabalho, digite: "
-
-#: /header.html:8
-#, fuzzy
-msgid "Privacy policy"
-msgstr "Política de privacidade"
Binary file src/cm/locale/pt_BR/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/djangojs.po Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/djangojs.po Mon Apr 07 17:41:35 2014 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 17:01+0200\n"
+"POT-Creation-Date: 2014-03-21 16:19+0100\n"
"PO-Revision-Date: 2010-01-24 21:40-0300\n"
"Last-Translator: Paulo Rená da Silva Santarém <pbrss@yahoo.com.br>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,107 +15,131 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: media/js/client/c_addcomment_form.js:52
+#: media/js/client/c_addcomment_form.js:55 media/js/client/c_client-min.js:1
msgid "New comment"
msgstr "Novo comentário"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
msgid "New comment will be canceled, continue?"
msgstr "O novo comentário será cancelado. Continuar?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:48
-#: media/js/client/c_dlg_intercept.js:50 media/js/client/c_dlg_intercept.js:52
-#: media/js/client/c_sync.js:223 media/js/site/text_edit.js:96
-#: media/js/site/text_edit.js.py:109
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:49
+#: media/js/client/c_dlg_intercept.js:51 media/js/client/c_dlg_intercept.js:53
+#: media/js/client/c_sync.js:245 media/js/site/text_edit.js:39
msgid "Warning"
msgstr "Aviso"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:51
msgid "Started reply will be canceled, continue?"
msgstr "A resposta iniciada será cancelada. Continuar?"
-#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:52
+#: media/js/client/c_client-min.js:1 media/js/client/c_dlg_intercept.js:53
msgid "Started comment edition will be canceled, continue?"
msgstr "A edição do comentário iniciada será cancelada. Continuar? "
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:11
+#: media/js/client/c_client-min.js:1 media/js/client/c_toc.js:52
+msgid "Table of contents"
+msgstr "Tabela de conteúdos"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
msgid "change comment state to pending"
msgstr "alterar estado do comentário para pendente"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:12
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
msgid "change comment state to approved"
msgstr "alterar estado do comentário para aprovado"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:13
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
msgid "change comment state to unapproved"
msgstr "alterar estado do comentário para rejeitado"
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:15
+msgid "cancel changing the state of this comment"
+msgstr "cancelar a alteração do estado desse comentário"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
msgid "pending"
msgstr "pendente"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:16
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
msgid "approved"
msgstr "aprovado"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
+msgid "unapproved"
+msgstr "rejeitado"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:19
+msgid "cancel"
+msgstr "cancelar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:20
msgid "show replies"
msgstr "mostrar respostas"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:21
+msgid "change to:"
+msgstr "mudar para:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:603
+msgid "reply"
+msgid_plural "replies"
+msgstr[0] "resposta"
+msgstr[1] "respostas"
+
#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:23
+msgid "edit comment"
+msgstr "editar comentário"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
msgid "delete comment"
msgstr "deletar comentário"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:24
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
msgid "edit"
msgstr "editar"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
msgid "delete"
msgstr "apagar"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:26
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
#: media/js/client/c_interface_forms.js:15
msgid "close"
msgstr "fechar"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:27
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
msgid "show scope"
msgstr "mostrar escopo"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:28
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:29
msgid ""
"Comment is detached: it was created on a previous version and text it "
"applied to has been modified or removed."
-msgstr ""
+msgstr "Comentário é destacado: ele foi criado em uma versão anterior e texto se aplicava a foi modificado ou removido."
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:296
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:301
msgid "last modified on %(date)s"
msgstr "última alteração em %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:299
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:304
msgid "Permalink to this comment"
msgstr "Link permanente para esse comentário"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:305
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:307
msgid "by %(name)s, created on %(date)s"
msgstr "por %(name)s, criado em %(date)s"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:14
-msgid "cancel changing the state of this comment"
-msgstr "cancelar a alteração do estado desse comentário"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:17
-msgid "unapproved"
-msgstr "rejeitado"
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:330
+msgid "category"
+msgstr "categoria"
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:18
-msgid "cancel"
-msgstr "cancelar"
-
-#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:22
-msgid "edit comment"
-msgstr "editar comentário"
+#: media/js/client/c_client-min.js:1 media/js/client/c_scopes.js:386
+msgid " comment"
+msgid_plural " comments"
+msgstr[0] " comentário"
+msgstr[1] " comentários"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:1
msgid "No selection yet"
@@ -150,51 +174,24 @@
msgstr "O comentário se aplicará a essa seleção:"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:428
msgid "Save"
msgstr "Salvar"
#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:101
-#: media/js/site/text_edit.js:104
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:119
msgid "Cancel"
msgstr "Cancelar"
-#: media/js/client/c_edit_form.js:47
-msgid "Edit comment"
-msgstr "Editar comentário"
-
-#: media/js/client/c_icomment.js:20
-msgid "change to:"
-msgstr "mudar para:"
-
-#: media/js/client/c_icomment.js:21 media/js/client/f_client-min.js:1
-#: media/js/site/f_text_view_frame.js:579
-msgid "reply"
-msgid_plural "replies"
-msgstr[0] "resposta"
-msgstr[1] "respostas"
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:52
+msgid "Category:"
+msgstr "Categoria:"
-#: media/js/client/c_reply_form.js:37
-msgid "New reply"
-msgstr "Nova resposta"
-
-#: media/js/client/c_scopes.js:318
-msgid " comment"
-msgid_plural " comments"
-msgstr[0] " comentário"
-msgstr[1] " comentários"
-
-#: media/js/client/c_server_exchange.js:49
-msgid "error:"
-msgstr "erro:"
-
-#: media/js/client/c_sync.js:57
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:76
msgid "no filtered comments left"
msgstr "Nenhum comentário filtrado sobrou"
-#: media/js/client/c_sync.js:129
-#, fuzzy
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid ""
"Do you want to be notified of all replies in all discussions you "
"participated in?"
@@ -202,23 +199,54 @@
"Você deseja receber todas as notificações de respostas nas discussões em que "
"você participar?"
-#: media/js/client/c_sync.js:129
-#, fuzzy
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:149
msgid "Reply notification"
-msgstr "alteração"
+msgstr "Responder notificação"
-#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:222
+#: media/js/client/c_sync.js.c:229
msgid "could not save comment"
msgstr "o comentário não pôde ser salvo"
-#: media/js/client/c_sync.js:223
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:245
msgid "Are you sure you want to delete this comment?"
msgstr "Tem certeza de que deseja deletar esse comentário?"
-#: media/js/client/c_sync.js:227
+#: media/js/client/c_client-min.js:1 media/js/client/c_sync.js:249
msgid "could not remove comment"
msgstr "o comentário não pôde ser removido"
+#: media/js/client/c_client-min.js:1 media/js/client/c_edit_form.js:51
+msgid "Edit comment"
+msgstr "Editar comentário"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_server_exchange.js:50
+msgid "error:"
+msgstr "erro:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Nova resposta"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+msgid "custom"
+msgstr "personalizado"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "modern"
+msgstr "moderno"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "classic"
+msgstr "clássico"
+
+#: media/js/client/c_client-min.js:1 media/js/site/c_text_view_comments.js:21
+#: media/js/site/c_text_view_comments.js:24
+msgid "code"
+msgstr "código"
+
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
msgid "print from the browser"
msgstr "imprimir do navegador"
@@ -232,26 +260,30 @@
msgstr "baixar arquivo markdown (.mkd)"
#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "print in PDF format"
+msgstr "imprimir em formato PDF"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
msgid "download portable object format file (.pdf)"
msgstr "baixar arquivo PDF (.pdf)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
msgid "download latex file (.tex)"
msgstr "baixar arquivo LaTex (.tex)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:10
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
msgid "download open document file (.odt)"
msgstr "baixar aquivo ODT (.odt)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:11
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
msgid "download microsoft word file (.doc)"
msgstr "baixar arquivo microsoft word (.doc)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
msgid "download microsoft word 2007 file (.docx)"
msgstr "baixar arquivo microsoft word 2007 (.docx)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:18
msgid "download ebook (.epub)"
msgstr "baixar arquivo ebook (.epub)"
@@ -259,44 +291,43 @@
msgid "download XML file for re-importing text and comments"
msgstr "baixar arquivo XML para a re-importação o texto e comentários"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "Print text"
msgstr "Imprimir texto"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
-#, fuzzy
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:23
msgid "How do you want to print?"
-msgstr "Deseja continuar?"
+msgstr "Como você quer uma cópia?"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Export text"
msgstr "Exportar texto"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:24
msgid "Choose file format"
-msgstr ""
+msgstr "escolher o formato de arquivo"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:51
msgid "using markers only, no background colors"
msgstr "usar apenas marcadores, sem cores de fundo"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:42
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:52
msgid "using markers and background colors"
msgstr "usar marcadores e cores de fundo"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:64
msgid "all (%(nb_comments)s)"
msgstr "todos (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:55
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:65
msgid "current filtered ones (%(nb_comments)s)"
msgstr "atualmente filtrados (%(nb_comments)s)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:57
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:67
msgid "none (0)"
msgstr "nenhum (0)"
-#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:90
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:108
msgid "Go !"
msgstr "Vá !"
@@ -304,334 +335,302 @@
msgid "loading..."
msgstr "carregando"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:48
msgid "click to show options"
msgstr "clique para mostrar opções"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:49
msgid "click to hide options"
msgstr "clique para ocultar opções"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:84
msgid "Text"
msgstr "Texto"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:88
msgid "Search"
msgstr "Pesquisar"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
-#: media/js/site/f_text_view_frame.js:407
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:93
+#: media/js/site/f_text_view_frame.js:428
msgid "Reset"
msgstr "Restabelecer"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
msgid "Hide all Comments"
msgstr "Ocultar todos os Comentários"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
msgid "Authors"
msgstr "Autores"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:110
msgid "States"
msgstr "Estados"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
msgid "Dates"
msgstr "Datas"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:127
msgid "Tags"
msgstr "Palavras-chave"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:135
+msgid "Categories"
+msgstr "Categorias"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:193
msgid "view previous comment"
msgstr "ver comentário anterior"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:194
msgid "view next comment"
msgstr "ver próximo comentário"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:195
msgid "view first comment"
msgstr "ver primeiro comentário"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:196
msgid "view last next comment"
msgstr "ver último comentário"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:197
msgid "view all comments"
msgstr "ver todos comentários"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:198
+msgid "view all detached comments"
+msgstr "visualizar todos os comentários destacados"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:199
+msgid "toggle advance interface"
+msgstr "alternar interface avançada"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:200
+msgid "toggle table of contents"
+msgstr "alternar a tabela de conteúdos"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:201
msgid "print document with/without comments"
msgstr "imprimir documento com/sem comentários"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:185
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:202
msgid "export document with/without comments"
msgstr "exportar documento com/sem comentários"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:186
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
msgid "toggle full screen view"
msgstr "alternar tela cheia"
-#: media/js/site/f_text_view_frame.js:193
-msgid "toggle table of contents"
-msgstr "alternar a tabela de conteúdos"
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+msgid "text feed"
+msgstr "feed do texto"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:188
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:205
msgid "add a comment"
msgstr "comentar"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:204
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:224
msgid "filter:"
msgstr "filtrar:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:209
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:229
msgid "browse by:"
msgstr "navegar por:"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:231
msgid "location"
msgstr "local"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:212
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:232
msgid "modification"
msgstr "alteração"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:332
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:343
+msgid "unthread discussions"
+msgstr "desagrupar discussões"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:346
msgid "thread discussions"
msgstr "agrupar discussões"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:366
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:387
msgid "Text style"
msgstr "Estilo do texto"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:411
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:432
msgid "Animation duration"
msgstr "Duração da animação"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:420
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:441
msgid "(0.001 to 1 second)"
msgstr "(0,001 a 1 segundo)"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:446
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:467
msgid "preferences reset (will apply on next load)"
msgstr "preferências restabelecidas (será aplicado no próxima sessão) "
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:452
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:473
msgid "preferences saved (will apply on next load)"
msgstr "preferências salvas (será aplicado no próxima sessão) "
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:556
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:580
msgid "filter reset"
msgstr "filtro restabelecido"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:566
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:590
msgid "filter applied"
msgstr "filtro aplicado"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:572
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:596
msgid "discussion"
msgid_plural "discussions"
msgstr[0] "discussão"
msgstr[1] "discussões"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:576
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:600
msgid "comment"
msgid_plural "comments"
msgstr[0] "comentário"
msgstr[1] "comentários"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:601
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:624
msgid "all"
msgstr "todos"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:619
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:643
msgid "last 24 hours (%(nb_comments)s)"
msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
msgstr[0] ""
msgstr[1] ""
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:733
-#: media/js/site/text_edit.js:86
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:781
+#: media/js/site/text_edit.js:29
msgid "No"
msgstr "Não"
-#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:734
-#: media/js/site/text_edit.js:89
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:782
+#: media/js/site/text_edit.js:32
msgid "Yes"
msgstr "Sim"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:66
msgid "First Level Heading"
msgstr "Título de primeiro nível"
-#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:20
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:22
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:24
-#: media/js/markitup/sets.js:65 media/js/markitup/sets.js.py:66
-#: media/js/markitup/sets.js:67 media/js/markitup/sets.js.py:68
-#: media/js/markitup/sets.js:69 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.c:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:23
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.c:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.c:69
+#: media/js/markitup/sets.js:70 media/js/markitup/sets.js.c:71
msgid "Your title here..."
msgstr "Seu título aqui"
-#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.c:67
msgid "Second Level Heading"
msgstr "Título de segundo nível"
-#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.c:68
msgid "Heading 3"
msgstr "Título 3"
-#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.c:69
msgid "Heading 4"
msgstr "Título 4"
-#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.c:70
msgid "Heading 5"
msgstr "Título 5"
-#: media/js/markitup/sets.js:24 media/js/markitup/sets.js.py:70
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.c:71
msgid "Heading 6"
msgstr "Título 6"
-#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.c:74
msgid "Bold"
msgstr "Negrito"
-#: media/js/markitup/sets.js:27 media/js/markitup/sets.js.py:74
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.c:75
msgid "Italic"
msgstr "Itálico"
-#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.c:78
msgid "Bulleted List"
msgstr "Lista com marcadores"
-#: media/js/markitup/sets.js:30 media/js/markitup/sets.js.py:78
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.c:79
msgid "Numeric List"
msgstr "Lista numerada"
-#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.c:82
msgid "Picture"
msgstr "Imagem"
-#: media/js/markitup/sets.js:35 media/js/markitup/sets.js.py:82
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.c:83
msgid "Link"
msgstr "Link"
-#: media/js/markitup/sets.js:37
+#: media/js/markitup/sets.js:36
msgid "Quotes"
msgstr "Citações"
-#: media/js/markitup/sets.js:38
+#: media/js/markitup/sets.js:37
msgid "Code Block / Code"
msgstr "Bloquear código / código"
-#: media/js/markitup/sets.js:40 media/js/markitup/sets.js.py:85
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.c:86
msgid "Preview"
msgstr "Previsão"
-#: media/js/markitup/sets.js:71
+#: media/js/markitup/sets.js:72
msgid "Paragraph"
msgstr "Parágrafo"
-#: media/js/markitup/sets.js:75
+#: media/js/markitup/sets.js:76
msgid "Stroke through"
msgstr "Barrar"
-#: media/js/markitup/sets.js:79
+#: media/js/markitup/sets.js:80
msgid "List element"
msgstr "Elemento da lista"
-#: media/js/markitup/sets.js:82
+#: media/js/markitup/sets.js:83
msgid "Your text to link..."
msgstr "Seu texto aqui"
-#: media/js/markitup/sets.js:84
+#: media/js/markitup/sets.js:85
msgid "Clean"
msgstr "Limpar"
-#: media/js/site/c_text_view_comments.js:19
-msgid "modern"
-msgstr "moderno"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "classic"
-msgstr "clássico"
-
-#: media/js/site/c_text_view_comments.js:19
-msgid "code"
-msgstr "código"
-
-#: media/js/site/c_text_view_comments.js:21
-#, fuzzy
-msgid "custom"
-msgstr "personalizado"
-
-#: media/js/site/f_text_view_frame.js:182
-#, fuzzy
-msgid "view all detached comments"
-msgstr "ver todos comentários"
-
-#: media/js/site/f_text_view_frame.js:183
-msgid "toggle advance interface"
-msgstr "alternar interface avançada"
-
-#: media/js/site/f_text_view_frame.js:187
-msgid "text feed"
-msgstr "feed do texto"
-
-#: media/js/site/f_text_view_frame.js:329
-msgid "unthread discussions"
-msgstr "desagrupar discussões"
-
-#: media/js/site/text_edit.js:11
-msgid ""
-"Should these comments be detached (i.e. kept with no scope) or removed from "
-"new version?"
-msgstr ""
-
-#: media/js/site/text_edit.js:28 media/js/site/text_edit.js.py:45
-#, fuzzy
-msgid "%(nb_comments)s comment applies to text that was modified."
-msgid_plural "%(nb_comments)s comments apply to text that was modified."
-msgstr[0] ""
-"%(nb_comments)s o comentário será perdido porque o texto a que ele se refere "
-"foi alterado"
-msgstr[1] ""
-"%(nb_comments)s os comentários serão perdidos porque o texto a que eles se "
-"referem foi alterado"
-
-#: media/js/site/text_edit.js:49
-msgid "(We suggest you create a new version)"
-msgstr "(Sugerimos criar uma nova versão)"
-
-#: media/js/site/text_edit.js:67
-#, fuzzy
+#: media/js/site/text_edit.js:10
msgid "You chose not to create a new version all comments will be deleted"
msgstr ""
"Você optou por não criar uma nova versão. Todos os comentários serão "
"excluídos."
-#: media/js/site/text_edit.js:69
+#: media/js/site/text_edit.js:12
msgid "Do you want to continue?"
msgstr "Deseja continuar?"
-#: media/js/site/text_edit.js:102
#, fuzzy
-msgid "Detach"
-msgstr "Pesquisar"
+#~ msgid "%(nb_comments)s comment applies to text that was modified."
+#~ msgid_plural "%(nb_comments)s comments apply to text that was modified."
+#~ msgstr[0] ""
+#~ "%(nb_comments)s o comentário será perdido porque o texto a que ele se "
+#~ "refere foi alterado"
+#~ msgstr[1] ""
+#~ "%(nb_comments)s os comentários serão perdidos porque o texto a que eles "
+#~ "se referem foi alterado"
-#: media/js/site/text_edit.js:103
-msgid "Remove"
-msgstr ""
+#~ msgid "(We suggest you create a new version)"
+#~ msgstr "(Sugerimos criar uma nova versão)"
-#: media/js/client/c_toc.js:45
-msgid "Table of contents"
-msgstr "Tabela de conteúdos"
+#, fuzzy
+#~ msgid "Detach"
+#~ msgstr "Pesquisar"
#~ msgid " reply"
#~ msgid_plural " replies"
@@ -653,18 +652,3 @@
#~ msgstr[1] ""
#~ "%(nb_comments)s os comentários serão removidos porque o texto a que eles "
#~ "se referem foi alterado"
-
-#: media/js/client/c_icomment.js:330
-#, fuzzy
-msgid "category"
-msgstr "categoria"
-
-#: media/js/client/c_interface_form.js:52
-#, fuzzy
-msgid "Category:"
-msgstr "Categoria:"
-
-#: media/js/site/f_text_view_frame.js:123
-#, fuzzy
-msgid "Categories"
-msgstr "Categorias"
--- a/src/cm/scripts/test-suite/README.txt Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-
---------------------------------
-- COMT test-suite instructions -
---------------------------------
-
-
-Prerequisite :
---------------
-You should have a running comt installation, made from a "comt" hg snapshot.
-You should have Firefox and/or Chrome navigators installed. You'll be able to
-run the tests against more brothers configuring them in the karma.conf.js file.
-
-
-Installation :
---------------
-apt-get install npm
-sudo ln /usr/bin/nodejs /usr/bin/node # /usr/share/doc/nodejs/README.Debian
-sudo npm install -g karma karma-mocha karma-e2e-dsl # goes here /usr/local/lib/node_modules/
-
-Starting comt :
----------------
-cd comt/
-./bin/django runserver localhost:8000 --settings=settings
-
-
-Starting the test-suite :
--------------------------
-cd comt/src/cm/scripts
-cp workspace.info.js.example workspace.info.js
-vi workspace.info.js # Customize tested workspace settings
-./start-test-suite.sh
-
--- a/src/cm/scripts/test-suite/karma.conf.js Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Karma configuration
-// Generated on Wed Jan 29 2014 15:32:16 GMT+0100 (CET)
-
-
-// SID: get WORKSPACE_URL configuration from one single file to customize
-var w = require ('./workspace.info.js');
-
-module.exports = function(config) {
- config.set({
- // list of files or patterns to load in the browser, from current directory
- files: [
- {pattern: 'tests/**/*.js', included: true}
- ],
- // list of files to exclude
- exclude: [
- ],
- // Start these browsers, currently available:
- // - Firefox ; Safari (only Mac; run `npm install karma-safari-launcher` first)
- // - Chrome ; ChromeCanary ; Opera (run `npm install karma-opera-launcher` first)
- // - PhantomJS ; IE (only Windows; run `npm install karma-ie-launcher` first)
- browsers: w.BROWSERS,
- // frameworks to use. SID: choosen mocha, added karma-e2e-dsl (end-to-end testing)
- frameworks: ['mocha', 'karma-e2e-dsl'],
- // SID: Karma will start and run somewhere else than '/', to allow proxying '/'
- urlRoot: '/karma/',
- // SID: directive added on karma-e2e-dsl purpose. Map of path-proxy pairs.
- proxies: {
- '/': w.WORKSPACE_URL
- },
- client: {
- mocha: {
- ui: 'tdd'
- },
- w: w // SID: exports the variable in the test execution browser window
- },
- // test results reporter to use : 'dots', 'progress', 'junit', 'growl', 'coverage'
- reporters: ['progress'],
- // web server port
- port: 9876,
- // enable / disable colors in the output (reporters and logs)
- colors: true,
- // level of logging : config.LOG_DISABLE || _ERROR || _WARN || _INFO || _DEBUG
- logLevel: config.LOG_INFO || config.LOG_DEBUG,
- // enable / disable watching file and executing tests whenever any file changes
- autoWatch: false,
- // If browser does not capture in given timeout [ms], kill it
- captureTimeout: 20000,
- // Continuous Integration mode : if true, it capture browsers, run tests and exit
- // singleRun: false
- singleRun: true,
- });
-};
--- a/src/cm/scripts/test-suite/start-test-suite.sh Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-export CHROME_BIN=`which chromium`
-
-if [ -z "$CHROME_BIN" ]; then
- export CHROME_BIN=`which chrome`
-fi
-if [[ -z "$CHROME_BIN" && $OSTYPE =~ ^darwin ]]; then
- CHROME_BIN_BASE=`mdfind "kMDItemCFBundleIdentifier == 'com.google.Chrome'"`
- export CHROME_BIN="$CHROME_BIN_BASE/Contents/MacOS/Google Chrome"
-fi
-export PHANTOMJS_BIN=`which phantomjs`
-
-export FIREFOX_BIN=`which firefox`
-if [[ -z "$FIREFOX_BIN" && $OSTYPE =~ ^darwin ]]; then
- FIREFOX_BIN_BASE=`mdfind "kMDItemCFBundleIdentifier == 'org.mozilla.firefox'"`
- export FIREFOX_BIN="$FIREFOX_BIN_BASE/Contents/MacOS/firefox"
-fi
-
-export SAFARI_BIN=`which safari`
-if [[ -z "$SAFARI_BIN" && $OSTYPE =~ ^darwin ]]; then
- SAFARI_BIN_BASE=`mdfind "kMDItemCFBundleIdentifier == 'com.apple.Safari'"`
- export SAFARI_BIN="$SAFARI_BIN_BASE/Contents/MacOS/safari"
-fi
-
-
-
-if [ -x ./node_modules/.bin/karma ]; then
- KARMA=./node_modules/.bin/karma
-else
- KARMA=`which karma`
-fi
-
-"$KARMA" start $@
-
-
--- a/src/cm/scripts/test-suite/tests/tests.js Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,754 +0,0 @@
-
-// " Vim settings
-// set tabstop=4 " number of spaces in a tab
-// set softtabstop=4 " as above
-// set shiftwidth=4 " as above
-
-
-// check that public texts still work while unlogged
-// check that non public texts are unavailable
-// Are the public texts displayed in the login page ?
-
-var w = __karma__.config.w,
- z = {};
-const non_visible = false, no_tagline = false;
-const t = {
- '#id_workspace_name': 'Test workspace name',
- '#id_workspace_tagline': 'Test workspace tagline',
- '#id_workspace_registration': 'on', // registration
- '#id_workspace_registration_moderation': 'on', // registration moderation
- '#id_workspace_role_model': 'generic',
- '#id_workspace_category_1': 'ws_cat_1',
- '#id_workspace_category_2': 'ws_cat_2',
- '#id_workspace_category_3': 'ws_cat_3',
- '#id_workspace_category_4': 'ws_cat_4',
- '#id_workspace_category_5': 'ws_cat_5',
- '#id_custom_css': "h2 { font-family: Test_Sopinspace !important; }",
- '#id_custom_font': 'Test_Sopinspace_custom_font',
- '#id_custom_titles_font': 'Test_Sopinspace_custom_titles_font',
-};
-
-
-suite ('comt', function () {
-
- this.timeout(150000);
-
- suite ('contact page conformity', function () {
- test_page_loading ('/contact/', 'Contact');
- test_unlogged_header ();
- test_val ('form#profile[action="."]'); // the form exists
- test_count ('form#profile :input', 7); // it has no more than 5 labels (may be no more fields)
- test_form_field ('profile', 'id_name', 'text', 0, 'Your name', true); // the field id_name is…
- test_form_field ('profile', 'id_email', 'text', 1, 'Your email address', true);
- test_form_field ('profile', 'id_title', 'text', 2, 'Subject of the message', true);
- test_form_field ('profile', 'id_body', 'textarea', 3, 'Body of the message', true);
- test_form_field ('profile', 'id_copy', 'checkbox', 4, 'Send me a copy of the email', false);
- test_val ('#profile input[type=submit]','Send'); // test that a the .val() of the element is
- test_val ('input#cancel_button[type=button]', 'Cancel');
- test_unlogged_footer ();
- test ('to check that toBeDefined test still works', dsl(function () {
- expect (elt ('#header_controls a[href="/xxx/"]').val ()).not ().toBeDefined ();
- }));
- test ('get back to / to avoid bugging next page load', dsl(function () {
- browser.navigateTo ('/');
- }));
- });
-
- suite ('help page conformity', function () {
- test_page_loading ('/help/', 'Help');
- test_unlogged_header ();
- test_unlogged_footer ();
- });
-
- suite ('contact page mandatory field test', function () {
- test_page_loading ('/contact/', 'Contact');
-
- test ('submit empty fields', dsl(function () {
- elt ('#profile input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_count ('div.help_text span.error-text', 4);
- test_form_field ('profile div.error', 'id_name', 'text', 0, 'Your name', true); // the field id_name is…
- test_form_field ('profile div.error', 'id_email', 'text', 1, 'Your email address', true);
- test_form_field ('profile div.error', 'id_title', 'text', 2, 'Subject of the message', true);
- test_form_field ('profile div.error', 'id_body', 'textarea', 3, 'Body of the message', true);
- test_form_field ('profile', 'id_copy', 'checkbox', 4, 'Send me a copy of the email', false);
- });
-
- suite ('reset password page conformity', function () {
- test_page_loading ('/password_reset/', 'Reset my password');
- test_unlogged_header ();
- test_val ('form#profile[action="."]');
- test_count ('form#profile :input', 3);
- test_form_field ('profile', 'id_email', 'text', 1, 'E-mail', true);
- test_val ('#profile input[type=submit]', 'Reset my password');
- test_unlogged_footer ();
-
- test ('submit empty fields', dsl(function () {
- elt ('#profile input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
-
- test_count ('div.help_text span.error-text', 1);
- test_form_field ('profile div.error', 'id_email', 'text', 0, 'E-mail', true);
- });
-
- suite ('login page conformity', function () {
- test_page_loading ('/', 'Home');
- test_unlogged_header ();
- test_val ('form#login[action="/login/"]');
- test_count ('form#login[action="/login/"] :input', 3);
- test_form_field ('login', 'id_username', 'text', 0, 'Username', true);
- test_form_field ('login', 'id_password', 'password', 1, 'Password', true);
- test_val ('form#login input[type=submit]', 'Login');
- test_text ('form#login a[href="/password_reset/"]', 'Forgot password?');
- test_unlogged_footer ();
- // test_i18n ();
-
- test ('get back to / to avoid bugging next page load', dsl(function () {
- browser.navigateTo ('/');
- }));
- test_page_loading ('/login/', 'Login');
- test ('submit empty fields', dsl(function () {
- elt ('#login input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_form_field ('login div.error', 'id_username', 'text', 0, 'Username', true);
- test_form_field ('login div.error', 'id_password', 'password', 1, 'Password', true);
- test ('logs an admin in', dsl(function () {
- input ('#id_username').enter (w.USER_ADMIN);
- input ('#id_password').enter (w.PASS_ADMIN);
- elt ('#login input[type=submit]').click ();
- // Must be done here in this test() block
- browser.waitForPageLoad ();
- browser.navigateTo ('/');
- expect (element ('title').text ()).toMatch (/Dashboard/m);
- }));
- });
-
- suite ('reading settings', function () {
- test_page_loading ('/settings/', 'Settings');
- test_readz_field ('#id_workspace_name');
- test_readz_field ('#id_workspace_tagline');
- test_readz_field ('#id_workspace_registration');
- test_readz_field ('#id_workspace_registration_moderation');
- test_readz_field ('#id_workspace_role_model');
- test_readz_field ('#id_workspace_category_1');
- test_readz_field ('#id_workspace_category_2');
- test_readz_field ('#id_workspace_category_3');
- test_readz_field ('#id_workspace_category_4');
- test_readz_field ('#id_workspace_category_5');
- test_page_loading ('/settings/design/', 'Settings');
- test_readz_field ('#id_custom_css');
- test_readz_field ('#id_custom_font');
- test_readz_field ('#id_custom_titles_font');
- /*test ('display z', dsl(function () {
- elt ('#main-tabs').text (function (t) {
- console.log ('z '+JSON.stringify(z));
- });
- }));*/
- });
-
- suite ('setting settings to test-values', function () {
- test_page_loading ('/settings/', 'Settings');
- test_fill_settings (t);
- test_val ('#id_workspace_name', t['#id_workspace_name']);
- test ('Save test settings ', dsl (function () {
- elt ('#settings input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_page_loading ('/settings/', 'Settings');
- test_text ('#content h1.main_title a[href="/"]', t['#id_workspace_name']);
- test_page_loading ('/settings/design/', 'Settings');
- test_fill_design (t);
- test ('Save test design settings ', dsl (function () {
- elt ('#settings input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- });
-
- suite ('admin dashboard page conformity', function () {
- test_page_loading ('/', 'Dashboard\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test ('get text and user nb', dsl(function () {
- element ('span.metadata:eq(0)').text (function (metadata) {
- var r = metadata.match (/(\d+) texts, (\d+) users/);
- if (r.length != 3) throw 'expected 3 matches got '+r.length;
- z.text_nb = r[1];
- z.user_nb = r[2];
- });
- }));
- test_default_tabs ();
- test_count ('table.dash_table', 5);
- test_text ('table.dash_table th:eq(0)', 'Actions');
- test_match ('table.dash_table:eq(0) a:eq(0)[href="/create/content/"]', /\sCreate a text/);
- test_text ('table.dash_table:eq(0) a:eq(1).tip[href="#"]', '\xa0');
- test_match ('table.dash_table:eq(0) a:eq(2)[href="/create/upload/"]', /\sUpload a text/);
- test_text ('table.dash_table:eq(0) a:eq(3).tip[href="#"]', '\xa0');
- test_match ('table.dash_table:eq(0) a:eq(4)[href="/create/import/"]', /\sImport a co-mented text/);
- test_text ('table.dash_table:eq(0) a:eq(5).tip[href="#"]', '\xa0');
- test_match ('table.dash_table:eq(0) a:eq(6)[href="/user/add/"]', /\sInvite user/);
- test_match ('table.dash_table:eq(0) a:eq(7)[href="/profile/"]', /\sEdit your profile/);
- test_match ('table.dash_table:eq(0) a:eq(8)[href="/text/"]', /\sView text list/);
- test_match ('table.dash_table:eq(0) a:eq(9)[href="/settings/"]', /\sConfigure workspace/);
- test_text ('table.dash_table th:eq(1)', 'Recent texts (all)');
- test_text ('table.dash_table:eq(1) a:eq(0)[href="/text/"]', 'all');
- test_text ('table.dash_table th:eq(2)', 'Recent comments');
- test_match ('table.dash_table th:eq(3)', /^Workspace activity\n\s+\(month\/week\/24 hours\)$/m);
- test_text ('table.dash_table:eq(3) a:eq(0)[href="?span=month"]', 'month');
- test_text ('table.dash_table:eq(3) a:eq(1)[href="?span=day"]', '24 hours');
- test_text ('table.dash_table th:eq(4) span.em', 'Activities');
- test_unlogged_footer ();
- });
-
- suite ('texts list page conformity', function () {
- test_page_loading ('/text/', 'Texts\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#text ul.sub_list:eq(0) a', 3);
- test_text ('#text ul.sub_list:eq(0) a:eq(0)[href="/create/content/"]', 'Create a text');
- test_text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/upload/"]', 'Upload a text');
- test_text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
- // TOTEST : filter by tag
- test_count ('form#filter_form[action="."] :input', 1);
- test_text ('select#tag_selected option:eq(0)[selected][value="0"]', '- All -', non_visible);
- test ('#texts_form input count', dsl (function () {
- elt ('form#texts_form[action="."] :input').count (function (c) {
- var n = 3 + z.text_nb % 10;
- if (c != n) throw 'expected computed '+n+' to equal got '+c;
- });
- }));
- test ('#paginator "of #" value', dsl (function () {
- elt ('span#paginator').text (function (t) {
- var r = t.match (/\s\d+-\d+ of (\d+)\s/m);
- if (r.length != 2) throw 'expected 2 matches got '+r.length;
- if (r[1] != z.text_nb) throw 'expected paginator total ('+r[1]+') to be '+z.text_nb;
- });
- }));
- // TOTEST : pagination
- // TOTEST : Bulk Actions -> Apply does enable
- test_text ('select#bulk_actions option:eq(0)[selected][value="-1"]', 'Bulk Actions', non_visible);
- test_text ('select#bulk_actions option:eq(1)[value="delete"]', 'Delete', non_visible);
- test_val ('form#texts_form input#apply[type=button][disabled]', 'Apply');
- test_count ('table.large_table:eq(1) th', 6);
- test_val ('table.large_table:eq(1) th:eq(0) input#all_check[type="checkbox"]', 'on');
- test_text ('table.large_table:eq(1) th:eq(1) a[href="?order=title"]', 'Text');
- test_text ('table.large_table:eq(1) th:eq(2)', 'Author');
- test_text ('table.large_table:eq(1) th:eq(3) a[href="?order=-modified"]', 'Modified');
- test_text ('table.large_table:eq(1) th:eq(4)', '# comments');
- test_text ('table.large_table:eq(1) th:eq(5)', 'Last week activity');
- test_unlogged_footer ();
- });
-
- suite ('create a text page conformity', function () {
- test_page_loading ('/create/content/', 'Create a text - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#text ul.sub_list:eq(0) a', 3);
- test_text ('#text ul.sub_list:eq(0) a:eq(0)[href="/text/"]', 'Text list');
- test_text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/upload/"]', 'Upload a text');
- test_text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
- test_count ('#text form[action="."]:eq(0) :input', 6);
- test_form_field ('text', 'id_title', 'text', 0, 'Title', true);
- test_form_field ('text', 'id_format', 'select', 1, 'Format', true);
- test_form_field ('text', 'id_content', 'textarea', 2, 'Content', true);
- test_form_field ('text', 'id_tags', 'text', 3, 'Tags');
- test_val ('#text :input:eq(4)[type=submit]', 'Save');
- test_val ('#text :input:eq(5)#cancel_button[type=button]', 'Cancel');
- test_count ('select#id_format option', 3);
- test_text ('select#id_format option:eq(0)[value="markdown"][selected]', 'markdown', non_visible);
- test_text ('select#id_format option:eq(1)[value="rst"]', 'rst', non_visible);
- test_text ('select#id_format option:eq(2)[value="html"]', 'html', non_visible);
- test_count ('#markItUpId_content li', 20); // How many buttons are in the WYSIWYG editor toolbar ?
- test_unlogged_footer ();
-
- test ('submit empty fields', dsl(function () {
- elt ('#text input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_count ('div.help_text span.error-text', 2);
- test_form_field ('text div.error', 'id_title', 'text', 0, 'Title', true);
- test_form_field ('text div.error', 'id_content', 'textarea', 1, 'Content', true);
- });
-
- suite ('upload text page conformity', function () {
- test_page_loading ('/create/upload/', 'Upload a text - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#text ul.sub_list:eq(0) a', 3);
- test_text ('#text ul.sub_list:eq(0) a:eq(0)[href="/text/"]', 'Text list');
- test_text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/content/"]', 'Create a text');
- test_text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
- test_count ('#text form[action="."]:eq(0) :input', 6);
- test_form_field ('text', 'id_title', 'text', 0, 'Title');
- test_form_field ('text', 'id_format', 'select', 1, 'Format', true);
- test_form_field ('text', 'id_tags', 'text', 2, 'Tags');
- test_form_field ('text', 'id_file', 'file', 3, 'Upload file');
- test_val ('#text :input:eq(4)[type=submit]', 'Save');
- test_val ('#text :input:eq(5)#cancel_button[type=button]', 'Cancel');
- test_count ('select#id_format option', 3);
- test_text ('select#id_format option:eq(0)[value="markdown"][selected]', 'markdown', non_visible);
- test_text ('select#id_format option:eq(1)[value="rst"]', 'rst', non_visible);
- test_text ('select#id_format option:eq(2)[value="html"]', 'html', non_visible);
- test_unlogged_footer ();
-
- test ('submit empty fields', dsl(function () {
- elt ('#text input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_count ('div.help_text span.error-text', 1);
- test_form_field ('text div.error', 'id_file', 'file', 0, 'Upload file');
- test_match ('#text div.help_text:eq(3) span.error-text:eq(0)', /You should specify a file to upload/m);
- });
-
- suite ('import a co-mented text page conformity', function () {
- test_page_loading ('/create/import/', 'Import a co-mented text - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#text ul.sub_list:eq(0) a', 3);
- test_text ('#text ul.sub_list:eq(0) a:eq(0)[href="/text/"]', 'Text list');
- test_text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/content/"]', 'Create a text');
- test_text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/upload/"]', 'Upload a text');
- test_count ('#text form[action="."]:eq(0) :input', 3);
- test_form_field ('text', 'id_file', 'file', 0, 'Upload XML file', true);
- test_val ('#text :input:eq(1)[type=submit]', 'Save');
- test_val ('#text :input:eq(2)#cancel_button[type=button]', 'Cancel');
- test_unlogged_footer ();
-
- test ('submit empty fields', dsl(function () {
- elt ('#text input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_count ('div.help_text span.error-text', 1);
- test_form_field ('text div.error', 'id_file', 'file', 0, 'Upload XML file', true);
- test_match ('#text div.help_text:eq(0) span.error-text:eq(0)', /You should specify a file to upload/m);
- });
-
- suite ('edit profile page conformity', function () {
- test_page_loading ('/profile/', 'Your profile [(]'+w.USER_ADMIN+'[)]\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN, no_tagline);
- test_count ('#content ul.sub_list:eq(0) a', 1);
- test_text ('#content ul.sub_list:eq(0) a:eq(0)[href="/profile-pw/"]', 'Password');
- test_count ('form#profile[action="."]:eq(0) :input', 5);
- test_form_field ('profile', 'id_email', 'text', 0, 'E-mail address', true);
- test_form_field ('profile', 'id_first_name','text', 1, 'First name');
- test_form_field ('profile', 'id_last_name', 'text', 2, 'Last name');
- test_form_field ('profile', 'id_tags', 'text', 3, 'Tags');
- test_val ('#profile :input:eq(4)[type=submit]', 'Save');
- test_unlogged_footer ();
- });
-
- suite ('edit password page conformity', function () {
- test_page_loading ('/profile-pw/', 'Your profile [(]'+w.USER_ADMIN+'[)]\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN, no_tagline);
- test_count ('#content ul.sub_list:eq(0) a', 1);
- test_text ('#content ul.sub_list:eq(0) a:eq(0)[href="/profile/"]', 'Profile');
- test_count ('form#profile[action="."]:eq(0) :input', 4);
- test_form_field ('profile', 'id_old_password', 'password', 0, 'Old password', true);
- test_form_field ('profile', 'id_new_password1', 'password', 1, 'New password', true);
- test_form_field ('profile', 'id_new_password2', 'password', 2, 'New password confirmation', true);
- test_val ('#profile :input:eq(3)[type=submit]', 'Save');
- test_unlogged_footer ();
- });
-
- suite ('people list page conformity', function () {
- test_page_loading ('/user/', 'People\' list\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#user ul.sub_list:eq(0) a', 2);
- test_text ('#user ul.sub_list:eq(0) a:eq(0)[href="/user/add/"]', 'Add a new user');
- test_text ('#user ul.sub_list:eq(0) a:eq(1)[href="/user/mass-add/"]', 'Add users in bulk');
- // TOTEST : filter by tag -> commentator user should be tagged commentator
- test_count ('form#filter_form[action="."] :input', 1);
- test_text ('#filter_form a[href="?display=1"]', 'Display suspended users');
- test_text ('select#tag_selected option:eq(0)[selected][value="0"]', '- All -', non_visible);
- // TOTEST : pagination
- // TOTEST : Bulk Actions -> Apply does enable
- test_text ('select#bulk_actions option:eq(0)[selected][value="-1"]', '- Bulk Actions -', non_visible);
- test_text ('select#bulk_actions option:eq(1)[value="disable"]', 'Suspend access', non_visible);
- test_text ('select#bulk_actions option:eq(2)[value="enable"]', 'Enable access', non_visible);
- test_text ('select#bulk_actions option:eq(3)[value="role_1"]', 'Change role to Manager', non_visible);
- test_text ('select#bulk_actions option:eq(4)[value="role_2"]', 'Change role to Editor', non_visible);
- test_text ('select#bulk_actions option:eq(5)[value="role_3"]', 'Change role to Moderator', non_visible);
- test_text ('select#bulk_actions option:eq(6)[value="role_4"]', 'Change role to Commentator', non_visible);
- test_text ('select#bulk_actions option:eq(7)[value="role_5"]', 'Change role to Observer', non_visible);
- test_val ('form#user_form input#apply[type=button][disabled]', 'Apply');
- test_count ('table.large_table:eq(1) th', 6);
- test_val ('table.large_table:eq(1) th:eq(0) input#all_check[type="checkbox"]', 'on');
- test_text ('table.large_table:eq(1) th:eq(1) a[href="?order=user__username"]', 'User');
- test_text ('table.large_table:eq(1) th:eq(2) a[href="?order=user__email"]', 'Email');
- test_text ('table.large_table:eq(1) th:eq(3) a[href="?order=-user__date_joined"]', 'Date joined');
- test_text ('table.large_table:eq(1) th:eq(4) a[href="?order=role__name"]', 'Role');
- test_text ('table.large_table:eq(1) th:eq(5)', 'Last week activity');
- test_text ('table.large_table:eq(1) tr:last a[href="/user/-/edit/"]', 'Anonymous users');
- test_text ('table.large_table:eq(1) a.main_object_title[href="/profile/"]', w.USER_ADMIN);
- test_text ('table.large_table:eq(1) div.hidden-user-actions a[href="/profile/"]', 'Your profile');
- // TOTEST presence of commentator and editor user
- test_unlogged_footer ();
- });
-
- suite ('check user number', function () {
- test_page_loading ('/user/?display=1', 'People\' list\n - '+t['#id_workspace_name']);
- test ('#user_form input count', dsl (function () {
- elt ('form#user_form[action="."] :input').count (function (c) {
- var n = 6 + (z.user_nb % 10) * 2;
- if (c != n) throw 'expected computed '+n+' to equal got '+c;
- });
- }));
- test ('#paginator "of #" value', dsl (function () {
- elt ('span#paginator').text (function (t) {
- var r = t.match (/\s\d+-\d+ of (\d+)\s/m);
- if (r.length != 2) throw 'expected 2 matches got '+r.length;
- if (r[1] != z.user_nb) throw 'expected paginator total ('+r[1]+') to be '+z.user_nb;
- });
- }));
- });
-
- suite ('add a user page conformity', function () {
- test_page_loading ('/user/add/', 'Add a new user\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#user ul.sub_list:eq(0) a', 2);
- test_text ('#user ul.sub_list:eq(0) a:eq(0)[href="/user/"]', 'Users\' list');
- test_text ('#user ul.sub_list:eq(0) a:eq(1)[href="/user/mass-add/"]', 'Add users in bulk');
- test_count ('#user form[action="."]:eq(0) :input', 8);
- test_form_field ('user', 'id_email', 'text', 0, 'E-mail address', true);
- test_form_field ('user', 'id_first_name', 'text', 1, 'First name');
- test_form_field ('user', 'id_last_name', 'text', 2, 'Last name');
- test_form_field ('user', 'id_tags', 'text', 3, 'Tags');
- test_form_field ('user', 'id_role', 'select', 4, 'Workspace level role');
- test_form_field ('user', 'id_note', 'textarea', 5, 'Note');
- test_count ('select#id_role option', 6);
- test_text ('select#id_role option:eq(0)[value][selected]', '---------', non_visible);
- test_text ('select#id_role option:eq(1)[value="1"]', 'Manager', non_visible);
- test_text ('select#id_role option:eq(2)[value="2"]', 'Editor', non_visible);
- test_text ('select#id_role option:eq(3)[value="3"]', 'Moderator', non_visible);
- test_text ('select#id_role option:eq(4)[value="4"]', 'Commentator', non_visible);
- test_text ('select#id_role option:eq(5)[value="5"]', 'Observer', non_visible);
- test_val ('#user :input:eq(6)[type=submit]', 'Add user');
- test_val ('#user :input:eq(7)#cancel_button[type=button]', 'Cancel');
- test_unlogged_footer ();
-
- test ('submit empty fields', dsl(function () {
- elt ('#user input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_count ('div.help_text span.error-text', 1);
- test_form_field ('user div.error', 'id_email', 'text', 0, 'E-mail address', true);
- test_match ('#user div.help_text:eq(0) span.error-text:eq(0)', /This field is required/m);
- // X TOTEST add user (pending)
- });
-
- suite ('add users in bulk page conformity', function () {
- test_page_loading ('/user/mass-add/', 'Add users in bulk\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#user ul.sub_list:eq(0) a', 2);
- test_text ('#user ul.sub_list:eq(0) a:eq(0)[href="/user/"]', 'Users\' list');
- test_text ('#user ul.sub_list:eq(0) a:eq(1)[href="/user/add/"]', 'Add a new user');
- test_count ('#user form[action="."]:eq(0) :input', 6);
- test_form_field ('user', 'id_email', 'textarea', 0, 'Emails', true);
- test_form_field ('user', 'id_tags', 'text', 1, 'Tags');
- test_form_field ('user', 'id_role', 'select', 2, 'Workspace level role');
- test_form_field ('user', 'id_note', 'textarea', 3, 'Note');
- test_count ('select#id_role option', 6);
- test_text ('select#id_role option:eq(0)[value][selected]', '---------', non_visible);
- test_text ('select#id_role option:eq(1)[value="1"]', 'Manager', non_visible);
- test_text ('select#id_role option:eq(2)[value="2"]', 'Editor', non_visible);
- test_text ('select#id_role option:eq(3)[value="3"]', 'Moderator', non_visible);
- test_text ('select#id_role option:eq(4)[value="4"]', 'Commentator', non_visible);
- test_text ('select#id_role option:eq(5)[value="5"]', 'Observer', non_visible);
- test_val ('#user :input:eq(4)[type=submit]', 'Add users');
- test_val ('#user :input:eq(5)#cancel_button[type=button]', 'Cancel');
- // X TOTEST add users (pending) -> can't be deleted
- test_unlogged_footer ();
-
- test ('submit empty fields', dsl(function () {
- elt ('#user input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_count ('div.help_text span.error-text', 1);
- test_form_field ('user div.error', 'id_email', 'textarea', 0, 'Emails', true);
- test_match ('#user div.help_text:eq(0) span.error-text:eq(0)', /This field is required/m);
- });
-
- suite ('settings page conformity', function () {
- test_page_loading ('/settings/', 'Settings - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#settings ul.sub_list:eq(0) a', 1);
- test_text ('#settings ul.sub_list:eq(0) a:eq(0)[href="/settings/design/"]', 'Appearance');
- test_count ('#settings form[action="."]:eq(0) :input', 12);
- test_form_field ('settings', 'id_workspace_name', 'text', 0, 'Workspace name');
- test_form_field ('settings', 'id_workspace_tagline', 'text', 1, 'Workspace tagline');
- test_form_field ('settings', 'id_workspace_registration', 'checkbox', 2, 'Workspace registration');
- test_form_field ('settings', 'id_workspace_registration_moderation', 'checkbox', 3, 'Workspace registration moderation');
- test_form_field ('settings', 'id_workspace_role_model', 'select', 4, 'Role model');
- test_text ('select#id_workspace_role_model option:eq(0)[selected][value="generic"]', 'Generic', non_visible);
- test_text ('select#id_workspace_role_model option:eq(1)[value="teacher"]', 'Class (education)', non_visible);
- test_form_field ('settings', 'id_workspace_category_1', 'text', 5, 'Label for the first category of comments');
- test_form_field ('settings', 'id_workspace_category_2', 'text', 6, 'Label for the second category of comments');
- test_form_field ('settings', 'id_workspace_category_3', 'text', 7, 'Label for the third category of comments');
- test_form_field ('settings', 'id_workspace_category_4', 'text', 8, 'Label for the fourth category of comments');
- test_form_field ('settings', 'id_workspace_category_5', 'text', 9, 'Label for the fifth category of comments');
- test_val ('#settings :input:eq(10)[type=submit]', 'Save');
- test_val ('#settings :input:eq(11)#cancel_button[type=button]', 'Cancel');
- // TOTEST Workspace registration feature (with newly accessible page)
- test_unlogged_footer ();
- });
-
- suite ('settings design page conformity', function () {
- test_page_loading ('/settings/design/', 'Settings - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_count ('#settings ul.sub_list:eq(0) a', 1);
- test_text ('#settings ul.sub_list:eq(0) a:eq(0)[href="/settings/"]', 'General');
- test_count ('#settings form[action="."]:eq(0) :input', 7);
- test_form_field ('settings', 'id_workspace_logo_file', 'file', 0, 'Workspace logo');
- test_form_field ('settings', 'id_custom_css', 'textarea', 1, 'Custom CSS rules');
- test_form_field ('settings', 'id_custom_font', 'text', 2, 'Custom font');
- test_form_field ('settings', 'id_custom_titles_font', 'text', 3, 'Custom font for titles');
- test_val ('#settings :input:eq(4)[type=submit]', 'Save');
- test_val ('#settings :input:eq(5)#cancel_button[type=button]', 'Cancel');
- test_val ('#settings :input:eq(6)#delete_logo_button[type=submit]', 'Delete logo');
- test_unlogged_footer ();
- });
-
- suite ('followup page conformity', function () {
- test_page_loading ('/followup/', 'Followup\n - '+t['#id_workspace_name']);
- test_logged_header (w.USER_ADMIN);
- test_default_tabs ();
- test_text ('#followup a:eq(0)[href="/help/#public_private_feed"]', '?');
- test_match ('#followup a:eq(1)[href$="/feed/"]', new RegExp (w.WORKSPACE_URL+'feed/', 'm'));
- test_text ('#followup a:eq(2)[href="/help/#public_private_feed"]', '?');
- test_count ('form#followup_form[action="."] :input', 3);
- test_val ('form#followup_form input[type=submit]', '(Activate private feed|Reset private feed url)');
- test_val ('form#followup_form input#workspace_notify_check[type=checkbox]', 'on');
- test_val ('form#followup_form input#own_notify_check[type=checkbox]', 'on');
-
- // X TOTEST qu'une fois cliqué, le bouton a le nvo label, et qu'une adresse est disponible
- // X TOTEST que si on reclique l'adresse est changée
-
- test_unlogged_footer ();
- });
-
- // vérifier les valeurs de settings sauvées
- // Tester les champs obligatoires
- // Tester les créations de textes
- // Tester les liens masqués des textes listés si bien créés
- // Tester suppression de text
- // Tester bulk actions sur les textes
-
- // tester l'affichage d'un texte
- // tester que : #textcontainer.custom h1 font: Test_Sopinspace_custom_titles_font
- // tester que si Text preferences -> custom -> #textcontainer.custom font: Test_Sopinspace_custom_font
- // #textcontainer #add_comment_btn span -> #textcontainer font-family: Test_Sopinspace
-
- suite ('settings restoration', function () {
- test_page_loading ('/settings/', 'Settings');
- test_fill_settings (z);
- test ('Restore settings ', dsl (function () {
- elt ('#settings input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- test_page_loading ('/settings/design/', 'Settings');
- test_fill_design (z);
- test ('Restore design settings ', dsl (function () {
- elt ('#settings input[type="submit"]').click ();
- browser.waitForPageLoad ();
- }));
- // next instruction must be a page loading
- // test_page_loading ('/settings/', 'Settings');
- });
-
-});
-
-function test_default_tabs () {
- test_count ('#main-tabs a', 5);
- test_text ('#main-tabs li:nth-of-type(1) a[href="/"]', 'Dashboard');
- test_match ('#main-tabs li:nth-of-type(2) a[href="/text/"]', /^Texts \(\d+\) $/);
- test_match ('#main-tabs li:nth-of-type(3) a[href="/user/"]', /^People \(\d+\)$/);
- test_text ('#main-tabs li:nth-of-type(4) a[href="/settings/"]', 'Settings');
- test_text ('#main-tabs li:nth-of-type(5) a[href="/followup/"]', 'Followup');
- test ('right tab nb', dsl(function () {
- elt ('#main-tabs a[href="/text/"]').text (function (t) {
- var r = t.match (/^Texts \((\d+)\) $/);
- if (r.length != 2) throw 'for Texts expected 2 matches got '+r.length;
- if (z.text_nb != r[1]) throw 'expected tab text nb ('+r[1]+') to be '+z.text_nb;
- });
- elt ('#main-tabs a[href="/user/"]').text (function (t) {
- var r = t.match (/^People \((\d+)\)$/);
- if (r.length != 2) throw 'for People expected 2 matches got '+r.length;
- if (z.user_nb != r[1]) throw 'expected tab people nb ('+r[1]+') to be '+z.user_nb;
- });
- }));
-}
-
-function test_logged_header (username, is_tagline) {
- is_tagline = typeof is_tagline == 'undefined' ? true : is_tagline;
-
- test_text ('#header_controls b', username)
- test_count ('#header_controls a', 6);
- test_text ('#header_controls a:nth-of-type(1)[href="/"]', 'Home');
- test_text ('#header_controls a:nth-of-type(2)[href="/create/content/"]', 'Create a text');
- test_text ('#header_controls a:nth-of-type(3)[href="/create/upload/"]', 'Upload a text');
- test_text ('#header_controls a:nth-of-type(4)[href="/create/import/"]', 'Import a co-mented text');
- test_text ('#header_controls a:nth-of-type(5)[href="/profile/"]', 'Profile');
- test_text ('#header_controls a:nth-of-type(6)[href="/logout/"]', 'Logout');
- test_text ('#content h1.main_title a[href="/"]', t['#id_workspace_name']);
-
- if (is_tagline) {
- test_match ('#content h1.main_title + div', new RegExp (t['#id_workspace_tagline'], 'm'));
- }
-}
-
-function test_unlogged_header () {
- test_count ('#header_controls a', 2);
- test_text ('#header_controls a[href="/"]', 'Home');
- test_text ('#header_controls a[href="/login/"]', 'Login');
-}
-
-function test_unlogged_footer (url) {
- test_count ('#footer a', 9);
- test_text ('#footer a:nth-of-type(1)[href="/contact/"]', 'Contact');
- test_match ('#footer #comentlink[href="http://www.co-ment.com"]', /Powered by/m);
- test_text ('#footer a:nth-of-type(3)[href="/help/"]', 'Help');
- test_text ('#footer a:nth-of-type(4)[href="/i18n/setlang/fr/"]', 'Français');
- test_text ('#footer a:nth-of-type(5)[href="/i18n/setlang/no/"]', 'Norsk');
- test_text ('#footer a:nth-of-type(6)[href="/i18n/setlang/pt_BR/"]', 'Português Brasileiro');
- test_text ('#footer a:nth-of-type(7)[href="/i18n/setlang/es/"]', 'Español');
- test_text ('#footer a:nth-of-type(8)[href="/i18n/setlang/bg/"]', 'Български');
- test_text ('#footer a:nth-of-type(9)[href="/i18n/setlang/it/"]', 'Italiano');
-}
-
-function test_readz_field (field_id) {
- test ('get '+field_id, dsl(function () {
- element (field_id).val (function (v) {
- z[field_id] = v;
- });
- }));
-}
-
-function test_fill_field (field_id, stored) {
- test ('set '+field_id, dsl(function () {
- input (field_id).enter (stored[field_id]);
- }));
-}
-
-function test_fill_settings (s) {
- test_fill_field ('#id_workspace_name', s);
- test_fill_field ('#id_workspace_tagline', s);
- test_fill_field ('#id_workspace_registration', s);
- test_fill_field ('#id_workspace_registration_moderation', s);
- test_fill_field ('#id_workspace_role_model', s);
- test_fill_field ('#id_workspace_category_1', s);
- test_fill_field ('#id_workspace_category_2', s);
- test_fill_field ('#id_workspace_category_3', s);
- test_fill_field ('#id_workspace_category_4', s);
- test_fill_field ('#id_workspace_category_5', s);
-}
-
-function test_fill_design (s) {
- test_fill_field ('#id_custom_css', s);
- test_fill_field ('#id_custom_font', s);
- test_fill_field ('#id_custom_titles_font', s);
-}
-
-function test_i18n () {
- test ('can change lang to french', dsl(function () {
- element ('#footer a[href="/i18n/setlang/fr/"]').click ();
-// browser.waitForPageLoad ();
-// browser.navigateTo ('/');
-// browser.reload ();
- expect (elt ('#footer a[href="/help/"]').text ()).toBe ('Aide');
- element ('#footer a[href="/i18n/setlang/en/"]').click ();
-// browser.waitForPageLoad ();
-// browser.navigateTo ('/');
- }));
-}
-
-function test_page_loading (url, title) {
- test (url+' loads', dsl(function () {
- // here we are in Karma page
- browser.navigateTo (url);
- expect (element ('title').text ()).toMatch (new RegExp (title,'m'));
- // The same test agin vaniller javascript
- element ('title').text (function (page_title) {
- // here we got a value from the test iframe
- // to display the tested value : console.log (page_title);
- if (!(new RegExp (title, 'm').test (page_title))) throw 'got page '+page_title+' instead';
- });
- }));
-}
-
-/** Test if the selected DOM element is defined or has a given value : .val()
- * s : CSS selector
- * e : expected value, if omited, test existence
- */
-function test_val (s, e) {
- e = typeof e == 'undefined' ? '' : e; // .val() returns defined ? '' : undefined; // if no value
- test (s+' is '+e, dsl(function () {
- expect (elt (s).val ()).toMatch (new RegExp (e, 'm'));
- }));
-}
-
-/** Test if the selected DOM element has the given text : .text()
- * s : CSS selector
- * e : expected value
- * v : should we test a visible value ?
- */
-function test_text (s, e, v) {
- v = typeof v == 'undefined' ? true : v;
- test (s+' has text '+e, dsl(function () {
- expect (elt (s, v).text ()).toBe (e);
- }));
-}
-
-/** Test if the selected DOM element .text() value match the given regexp
- * s : CSS selector
- * r : regexp to match
- */
-function test_match (s, r) {
- test (s+' text match '+r, dsl(function () {
- expect (elt (s).text ()).toMatch (r);
- }));
-}
-
-/** Count selector occurences
- * s : CSS selector
- * e : expected count
- */
-function test_count (s, e) {
- test (s+' count is '+e, dsl(function () {
- expect (elt (s).count ()).toBe (e);
- }));
-}
-
-/** Test Django form field presence
- */
-function test_form_field (form_id, field_id, type, position, label, mandatory) {
- test ('has a '+label+' form field', dsl(function () {
- var s = '';
-
- switch (type) {
- case 'textarea':s = 'textarea#'+field_id; break;
- case 'select': s = 'select#'+field_id; break;
- default: s = 'input#'+field_id+'[type="'+type+'"]';
- }
-
- expect (elt (s).val ()).toBeDefined ();
- expect (elt ('#'+form_id+' :input:eq('+position+')#'+field_id).val ()).toBeDefined ();
- expect (elt ('label[for='+field_id+']').text ()).toBe (label);
-
- if (mandatory)
- expect (elt ('label[for='+field_id+'] + span.required_star').val ()).toBeDefined ();
- }));
-}
-
-/** Ensure the given element is visible
- * s : CSS selector of the DOM element to check
- * v : should the element being visible
- */
-function elt (s, v) {
- return element (s + (v ? ':visible' : ''));
-}
--- a/src/cm/scripts/test-suite/workspace.info.js.example Sat Mar 15 10:03:04 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-define ("BROWSERS", ['Chrome']);
-
-define ("WORKSPACE_URL", '<workspace-url>'); // Under http://IP_ADDRESS:PORT_NUM/ format
-define ("USER_ADMIN", '<admin-login>');
-define ("PASS_ADMIN", '<admin-password>');
-
-define ("USER_EDIT", '');
-define ("PASS_EDIT", '');
-
-define ("USER_COM", '');
-define ("PASS_COM", '');
-
-define ("USER_OBSERV", '');
-define ("PASS_OBSERV", '');
-
-function define (name, value) {
- Object.defineProperty (exports, name, {
- value: value,
- enumerable: true
- });
-}
-
--- a/src/cm/settings.py Sat Mar 15 10:03:04 2014 +0100
+++ b/src/cm/settings.py Mon Apr 07 17:41:35 2014 +0200
@@ -1,4 +1,4 @@
-DEBUG = False
+DEBUG = True
CLIENT_DEBUG = DEBUG
TEMPLATE_DEBUG = DEBUG
@@ -7,7 +7,7 @@
ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
+ # ('Your Name', 'your_email@domain.com'),
)
MANAGERS = ADMINS
@@ -61,30 +61,30 @@
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.load_template_source',
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+# 'django.template.loaders.eggs.load_template_source',
)
TEMPLATE_CONTEXT_PROCESSORS = (
- 'cm.context_processors.static',
- 'cm.context_processors.tz',
- 'cm.context_processors.utils',
- 'django.contrib.auth.context_processors.auth',
- 'django.core.context_processors.request',
- "django.core.context_processors.i18n",
- "django.core.context_processors.media",
- 'djangoflash.context_processors.flash',
+ 'cm.context_processors.static',
+ 'cm.context_processors.tz',
+ 'cm.context_processors.utils',
+ 'django.contrib.auth.context_processors.auth',
+ 'django.core.context_processors.request',
+ "django.core.context_processors.i18n",
+ "django.core.context_processors.media",
+ 'djangoflash.context_processors.flash',
)
MIDDLEWARE_CLASSES = (
- 'django.middleware.gzip.GZipMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.locale.LocaleMiddleware',
- 'djangoflash.middleware.FlashMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'cm.middleware.CmMiddleware',
+ 'django.middleware.gzip.GZipMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.locale.LocaleMiddleware',
+ 'djangoflash.middleware.FlashMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'cm.middleware.CmMiddleware',
)
ROOT_URLCONF = 'urls'
@@ -93,29 +93,59 @@
)
INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django.contrib.admin',
- 'cm',
- 'tagging',
- 'django_extensions', # http://code.google.com/p/django-command-extensions/
- 'south',
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'django.contrib.admin',
+ 'cm',
+ 'tagging',
+ 'django_extensions', # http://code.google.com/p/django-command-extensions/
+ 'south',
)
_ = lambda s: s
LANGUAGES = (
- ('fr', _(u'French')),
- ('en', _(u'English')),
- ('no', _('Norwegian')),
- ('pt_BR', _('Brazilian Portuguese')),
- ('es', _('Spanish')),
- ('bg', _('Bulgarian')),
- ('it', _('Italian')),
+ ('fr', _(u'French')),
+ ('en', _(u'English')),
+ ('es', _('Spanish')),
+ ('it', _('Italian')),
+ ('de', _('German')),
+ ('pt_BR', _('Brazilian Portuguese')),
+ ('nb', _('Norwegian')),
+ ('bg', _('Bulgarian')),
)
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': True,
+ 'formatters': {
+ 'verbose': {
+ 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+ },
+ 'simple': {
+ 'format': '%(levelname)s %(message)s'
+ },
+ },
+ 'filters': {
+ },
+ 'handlers': {
+ 'console':{
+ 'level': 'DEBUG',
+ 'class': 'logging.StreamHandler',
+ 'formatter': 'verbose'
+ }
+ },
+ 'loggers': {
+ 'django': {
+ 'handlers': ['console'],
+ 'propagate': True,
+ 'level': 'WARNING',
+ }
+ }
+}
+
AUTH_PROFILE_MODULE = 'cm.UserProfile'
# always upload file to disk to pipe them through converters
@@ -133,6 +163,6 @@
CACHE_BACKEND = 'locmem:///?timeout=3600&max_entries=400'
try:
- from settings_local import *
+ from settings_local import *
except ImportError:
- pass
+ pass
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/README.txt Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,35 @@
+
+--------------------------------
+- COMT test-suite instructions -
+--------------------------------
+
+
+Prerequisite :
+--------------
+You should have a running comt installation, made from a "comt" hg snapshot.
+You gave your database user the right to create databases.
+You should have Firefox and/or Chrome navigators installed. You'll be able to
+run the tests against more brothers configuring them in the workspace.info.js
+file.
+
+
+Installation :
+--------------
+apt-get install npm
+sudo ln /usr/bin/nodejs /usr/bin/node # /usr/share/doc/nodejs/README.Debian
+sudo npm install -g karma karma-mocha karma-e2e-dsl # goes here /usr/local/lib/node_modules/
+
+
+Starting comt :
+---------------
+cd comt/
+./bin/django testserver localhost:8000 --noinput initial_data roles_generic test_content
+
+
+Starting the test-suite :
+-------------------------
+cd comt/src/cm/scripts
+cp workspace.info.js.example workspace.info.js
+vi workspace.info.js # Customize tested workspace settings
+./start-test-suite.sh
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/karma.conf.js Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,57 @@
+// Karma configuration
+// Generated on Wed Jan 29 2014 15:32:16 GMT+0100 (CET)
+
+
+// SID: get WORKSPACE_URL configuration from one single file to customize
+var w = require ('./workspace.info.js'),
+ t = require ('./lib/test_hlp.js');
+
+module.exports = function(config) {
+ config.set({
+ // list of files or patterns to load in the browser, from current directory
+ files: [
+ {pattern: 'tests/**/*.js', included: true}
+ ],
+ // list of files to exclude
+ exclude: [
+ ],
+ // Start these browsers, currently available:
+ // - Firefox ; Safari (only Mac; run `npm install karma-safari-launcher` first)
+ // - Chrome ; ChromeCanary ; Opera (run `npm install karma-opera-launcher` first)
+ // - PhantomJS ; IE (only Windows; run `npm install karma-ie-launcher` first)
+ browsers: w.BROWSERS,
+ // frameworks to use. SID: choosen mocha, added karma-e2e-dsl (end-to-end testing)
+ frameworks: ['mocha', 'karma-e2e-dsl'],
+ // SID: Karma will start and run somewhere else than '/', to allow proxying '/'
+ urlRoot: '/karma/',
+ // SID: directive added on karma-e2e-dsl purpose. Map of path-proxy pairs.
+ proxies: {
+ '/': w.WORKSPACE_URL
+ },
+ client: {
+ mocha: {
+ ui: 'tdd'
+ },
+ w: w, // SID: exports the variable in the test execution browser window
+ // SID: we can't pass living functions to testing (mocha) browser environment
+ // so we convert them to string, and send also a string body of a reviving function
+ // closures are lost in the process, that's ok.
+ t: JSON.stringify (t, function (k, v) { return typeof v === 'function' ? v.toString () : v }),
+ r: t.reviveFunc
+ },
+ // test results reporter to use : 'dots', 'progress', 'junit', 'growl', 'coverage'
+ reporters: ['progress'],
+ // web server port
+ port: 9876,
+ // enable / disable colors in the output (reporters and logs)
+ colors: true,
+ // level of logging : config.LOG_DISABLE || _ERROR || _WARN || _INFO || _DEBUG
+ logLevel: config.LOG_INFO,
+ // If browser does not capture in given timeout [ms], kill it
+ captureTimeout: 9999,
+ // enable / disable watching file and executing tests whenever any file changes
+ autoWatch: false,
+ // Continuous Integration mode : if true, it capture browsers, run tests and exit
+ singleRun: true,
+ });
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/lib/test_hlp.js Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,186 @@
+// Test helpers for karma-e2e-dsl environment
+//
+// https://github.com/winsonwq/karma-e2e-dsl
+
+
+exports.page_loading = function (url, title) {
+ test (url+' loads', dsl(function () {
+ // here we are in Karma page
+ browser.navigateTo (url);
+ expect (element ('title').text ()).toMatch (new RegExp (title,'m'));
+ // The same test agin vaniller javascript
+ element ('title').text (function (page_title) {
+ // here we got a value from the test iframe
+ // to display the tested value : console.log (page_title);
+ if (!(new RegExp (title, 'm').test (page_title))) throw 'got page '+page_title+' instead';
+ });
+ }));
+}
+
+/** Test if it's possible to change lang to the specified :
+ * c : lang code
+ * l : help label
+ */
+exports.i18n = function (c, l) {
+ test ('to '+c, dsl(function () {
+ element ('#footer a[href="/i18n/setlang/'+c+'/"]').click ();
+ browser.navigateTo ('/');
+ expect (test_.elt ('#footer a[href="/help/"]').text ()).toMatch (new RegExp (l, 'm'));
+ }));
+}
+
+/** Test if the selected DOM element is defined or has a given value : .val()
+ * s : CSS selector
+ * e : expected value, if omited, test existence
+ */
+exports.val = function (s, e) {
+ e = typeof e == 'undefined' ? '' : e; // .val() returns defined ? '' : undefined; // if no value
+ test (s+' is '+e, dsl(function () {
+ expect (test_.elt (s).val ()).toMatch (new RegExp (e, 'm'));
+ }));
+}
+
+exports.exist = function (s) {
+ test_.val (s);
+}
+
+/** Test if the selected DOM element has the given text : .text()
+ * s : CSS selector
+ * e : expected value
+ * v : should we test a visible value ?
+ */
+exports.text = function (s, e, v) {
+ v = typeof v == 'undefined' ? true : v;
+ test (s+' has text '+e, dsl(function () {
+ expect (test_.elt (s, v).text ()).toBe (e);
+ }));
+}
+
+/** Test if the selected DOM element .text() value match the given regexp
+ * s : CSS selector
+ * r : regexp to match
+ */
+exports.match = function (s, r) {
+ test (s+' text match '+r, dsl(function () {
+ expect (test_.elt (s).text ()).toMatch (r);
+ }));
+}
+
+/** Count selector occurences
+ * s : CSS selector
+ * e : expected count
+ */
+exports.count = function (s, e) {
+ test (s+' count is '+e, dsl(function () {
+ expect (test_.elt (s).count ()).toBe (e);
+ }));
+}
+
+/** Test Django form field presence
+ */
+exports.field = function (form_id, field_id, type, position, label, mandatory) {
+ test ('has a '+label+' form field', dsl(function () {
+ var s = '';
+
+ switch (type) {
+ case 'textarea':s = 'textarea#'+field_id; break;
+ case 'select': s = 'select#'+field_id; break;
+ default: s = 'input#'+field_id+'[type="'+type+'"]';
+ }
+
+ expect (test_.elt (s).val ()).toBeDefined ();
+ expect (test_.elt ('#'+form_id+' :input:eq('+position+')#'+field_id).val ()).toBeDefined ();
+ expect (test_.elt ('label[for='+field_id+']').text ()).toBe (label);
+
+ if (mandatory)
+ expect (test_.elt ('label[for='+field_id+'] + span.required_star').val ()).toBeDefined ();
+ }));
+}
+
+/**
+ * Fill form field
+ * s : form field id
+ * v : array containing the value to use
+ */
+exports.fill_field = function (s, v) {
+ test ('set '+s, dsl(function () {
+ input (s).enter (v[s]);
+ }));
+}
+
+/**
+ * Submit a form
+ * s : selector of the submit button
+ */
+exports.submit = function (s) {
+ test ('submit '+s, dsl(function () {
+ test_.elt (s).click ();
+ browser.waitForPageLoad ();
+ }));
+}
+
+/**
+ * Fails a test
+ */
+exports.fail = function () {
+ test ('must fail', dsl(function () {
+ throw 'have been programmed to fail now';
+ }));
+}
+
+/**
+ * Inbrowser debugger statement
+ */
+exports.debug = function () {
+ test ('debugger', dsl(function (){
+ debugger; // not seen to work
+ }));
+}
+
+/**
+ * Have the browser waiting while you inspect what's going on
+ */
+exports.pause = function () {
+ test ('pause', dsl(function () {
+ browser.pause ();
+ }));
+}
+
+/**
+ * Start back the testcases
+ */
+exports.resume = function () {
+ test ('resume', dsl(function (){
+ browser.resume ();
+ }));
+}
+
+/** Ensure the given element is visible
+ * s : CSS selector of the DOM element to check
+ * v : should the element being visible
+ */
+exports.elt = function (s, v) {
+ return element (s + (v ? ':visible' : ''));
+}
+
+/** Revive functions after a JSON.stringify which prevented their disappearence
+ * k : key in the object to revive functions in
+ * v : value
+ *
+ * We keep only the string of the body part in order to use it to define a new function in tests files
+ * /!\ do NEVER minify this code ! /!\
+ *
+ */
+exports.reviveFunc = multilineString (function (k, v) {
+/*! if (v && typeof v === 'string' && v.substr (0, 8) == 'function') {
+ var a = v.indexOf ('{') + 1, // start function body
+ b = v.lastIndexOf ('}'),
+ c = v.indexOf ('(') + 1, // start args
+ d = v.indexOf (')');
+ return new Function (v.substring (c, d), v.substring (a, b));
+ }
+
+ return v;*/
+});
+
+function multilineString (f) { return f.toString().replace(/^[^\/]+\/\*!?/, '').replace(/\*\/[^\/]+$/, ''); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/start-test-suite.sh Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+export CHROME_BIN=`which chromium`
+if [ -z "$CHROME_BIN" ]; then
+ export CHROME_BIN=`which chrome`
+fi
+if [[ -z "$CHROME_BIN" && $OSTYPE =~ ^darwin ]]; then
+ CHROME_BIN_BASE=`mdfind "kMDItemCFBundleIdentifier == 'com.google.Chrome'"`
+ export CHROME_BIN="$CHROME_BIN_BASE/Contents/MacOS/Google Chrome"
+fi
+export PHANTOMJS_BIN=`which phantomjs`
+
+export FIREFOX_BIN=`which firefox`
+if [[ -z "$FIREFOX_BIN" && $OSTYPE =~ ^darwin ]]; then
+ FIREFOX_BIN_BASE=`mdfind "kMDItemCFBundleIdentifier == 'org.mozilla.firefox'"`
+ export FIREFOX_BIN="$FIREFOX_BIN_BASE/Contents/MacOS/firefox"
+fi
+
+export SAFARI_BIN=`which safari`
+if [[ -z "$SAFARI_BIN" && $OSTYPE =~ ^darwin ]]; then
+ SAFARI_BIN_BASE=`mdfind "kMDItemCFBundleIdentifier == 'com.apple.Safari'"`
+ export SAFARI_BIN="$SAFARI_BIN_BASE/Contents/MacOS/safari"
+fi
+
+
+
+if [ -x ./node_modules/.bin/karma ]; then
+ KARMA=./node_modules/.bin/karma
+else
+ KARMA=`which karma`
+fi
+
+"$KARMA" start $@
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/000_comt-unlogged-prelude.js Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,115 @@
+
+// " Vim settings
+// set tabstop=4 " number of spaces in a tab
+// set softtabstop=4 " as above
+// set shiftwidth=4 " as above
+
+var k = __karma__.config,
+ test_ = JSON.parse (k.t, new Function (['k','v'], k.r)); // revive helper functions sent from Karma
+
+suite ('comt unlogged prelude', function () {
+
+ this.timeout(20000);
+
+ suite ('contact page conformity', function () {
+ test_.page_loading ('/contact/', 'Contact');
+ test_unlogged_header ();
+ test_.exist ('form#profile[action="."]'); // the form exists
+ test_.count ('form#profile :input', 7); // it has no more than 5 labels (may be no more fields)
+ test_.field ('profile', 'id_name', 'text', 0, 'Your name', true); // the field id_name is…
+ test_.field ('profile', 'id_email', 'text', 1, 'Your email address', true);
+ test_.field ('profile', 'id_title', 'text', 2, 'Subject of the message', true);
+ test_.field ('profile', 'id_body', 'textarea', 3, 'Body of the message', true);
+ test_.field ('profile', 'id_copy', 'checkbox', 4, 'Send me a copy of the email', false);
+ test_.val ('#profile input[type=submit]','Send'); // test that a the .val() of the element is
+ test_.val ('input#cancel_button[type=button]', 'Cancel');
+ test_unlogged_footer ();
+ test ('to check that toBeDefined test still works', dsl(function () {
+ expect (test_.elt ('#header_controls a[href="/xxx/"]').val ()).not ().toBeDefined ();
+ }));
+ test ('get back to / to avoid bugging next page load', dsl(function () { browser.navigateTo ('/'); }));
+ });
+
+ suite ('help page conformity', function () {
+ test_.page_loading ('/help/', 'Help');
+ test_unlogged_header ();
+ test_unlogged_footer ();
+ });
+
+ suite ('can change lang', function () {
+ test ('get back to / to avoid bugging next page load', dsl(function () { browser.navigateTo ('/'); }));
+ test_.i18n ('fr', 'Aide');
+ test_.i18n ('en', 'Help');
+ test_.i18n ('es', 'Ayuda');
+ test_.i18n ('it', 'Aiuto');
+ test_.i18n ('de', 'Hilfe');
+ test_.i18n ('pt_BR', 'Ajuda');
+ test_.i18n ('nb', 'Hjelp');
+ test_.i18n ('bg', 'Помощ');
+ test_.i18n ('en', 'Help');
+ });
+
+ suite ('contact page mandatory field test', function () {
+ test_.page_loading ('/contact/', 'Contact');
+ test_.submit('#profile input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 4);
+ test_.field ('profile div.error', 'id_name', 'text', 0, 'Your name', true); // the field id_name is…
+ test_.field ('profile div.error', 'id_email', 'text', 1, 'Your email address', true);
+ test_.field ('profile div.error', 'id_title', 'text', 2, 'Subject of the message', true);
+ test_.field ('profile div.error', 'id_body', 'textarea', 3, 'Body of the message', true);
+ test_.field ('profile', 'id_copy', 'checkbox', 4, 'Send me a copy of the email', false);
+ });
+
+ suite ('reset password page conformity', function () {
+ test_.page_loading ('/password_reset/', 'Reset my password');
+ test_unlogged_header ();
+ test_.count ('form#profile :input', 3);
+ test_.field ('profile', 'id_email', 'text', 1, 'E-mail', true);
+ test_.val ('#profile input[type=submit]', 'Reset my password');
+ test_unlogged_footer ();
+ test_.submit('#profile input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 1);
+ test_.field ('profile div.error', 'id_email', 'text', 0, 'E-mail', true);
+ });
+
+ suite ('login page conformity', function () {
+ test_.page_loading ('/', 'Home');
+ test_unlogged_header ();
+ test_.count ('form#login[action="/login/"] :input', 3);
+ test_.field ('login', 'id_username', 'text', 0, 'Username', true);
+ test_.field ('login', 'id_password', 'password', 1, 'Password', true);
+ test_.val ('form#login input[type=submit]', 'Login');
+ test_.text ('form#login a[href="/password_reset/"]', 'Forgot password?');
+ test_unlogged_footer ();
+ // test_.i18n ();
+
+ test ('get back to / to avoid bugging next page load', dsl(function () {
+ browser.navigateTo ('/');
+ }));
+ test_.page_loading ('/login/', 'Login');
+ test_.submit('#login input[type="submit"]');
+ test_.field ('login div.error', 'id_username', 'text', 0, 'Username', true);
+ test_.field ('login div.error', 'id_password', 'password', 1, 'Password', true);
+ });
+});
+
+function test_unlogged_header () {
+ test_.count ('#header_controls a', 2);
+ test_.text ('#header_controls a[href="/"]', 'Home');
+ test_.text ('#header_controls a[href="/login/"]', 'Login');
+}
+
+function test_unlogged_footer (url) {
+ test_.count ('#footer a', 10);
+ test_.text ('#footer a:nth-of-type(1)[href="/contact/"]', 'Contact');
+ test_.match ('#footer #comentlink[href="http://www.co-ment.com"]', /Powered by/m);
+ test_.text ('#footer a:nth-of-type(3)[href="/help/"]', 'Help');
+ test_.text ('#footer a:nth-of-type(4)[href="/i18n/setlang/fr/"]', 'Français');
+ test_.text ('#footer a:nth-of-type(5)[href="/i18n/setlang/es/"]', 'Español');
+ test_.text ('#footer a:nth-of-type(6)[href="/i18n/setlang/it/"]', 'Italiano');
+ test_.text ('#footer a:nth-of-type(7)[href="/i18n/setlang/de/"]', 'Deutsch');
+ test_.text ('#footer a:nth-of-type(8)[href="/i18n/setlang/pt_BR/"]', 'Português Brasileiro');
+ test_.text ('#footer a:nth-of-type(9)[href="/i18n/setlang/nb/"]', 'Norsk');
+ test_.text ('#footer a:nth-of-type(10)[href="/i18n/setlang/bg/"]', 'Български');
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/001_comt-logged-admin.js Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,493 @@
+
+// " Vim settings
+// set tabstop=4 " number of spaces in a tab
+// set softtabstop=4 " as above
+// set shiftwidth=4 " as above
+
+var k = __karma__.config,
+ test_ = JSON.parse (k.t, new Function (['k','v'], k.r)), // revive helper functions sent from Karma
+ t = {'text_nb': 0, 'user_nb': 4};
+
+var long_text = '';
+
+for (var i = 20; i--;)
+ long_text += 'Contenu du troisième texte.<br/>Sur <b>plusieurs</b> lignes<br/>';
+
+const non_visible = false,
+ no_tagline = false,
+ c = {
+ '#id_workspace_name': 'Test workspace name',
+ '#id_workspace_tagline': 'Test workspace tagline',
+ '#id_workspace_registration': 'on', // registration
+ '#id_workspace_registration_moderation':'on', // registration moderation
+ '#id_workspace_role_model': 'generic',
+ '#id_workspace_category_1': 'ws_cat_1',
+ '#id_workspace_category_2': 'ws_cat_2',
+ '#id_workspace_category_3': 'ws_cat_3',
+ '#id_workspace_category_4': 'ws_cat_4',
+ '#id_workspace_category_5': 'ws_cat_5',
+ '#id_custom_css': "h2 { font-family: Test_Sopinspace !important; }",
+ '#id_custom_font': 'Test_Sopinspace_custom_font',
+ '#id_custom_titles_font': 'Test_Sopinspace_custom_titles_font',
+ 'texts': [
+ {
+ '#id_title': 'Text One Sopinspace-Test éléguant',
+ '#id_format': 'markdown',
+ '#id_content': 'Contenu du premier texte.\nSur plusieurs lignes\nPour tester un cas réaliste',
+ '#id_tags': 'test_text, Text Premier'
+ },
+ {
+ '#id_title': 'Text Two Sopinspace-Test éléguant',
+ '#id_format': 'rst',
+ '#id_content': 'Contenu du deuxième texte.\nSur plusieurs lignes aussi\nPour tester un cas réaliste',
+ '#id_tags': 'test_text, Text Second'
+ },
+ {
+ '#id_title': 'Text Three Sopinspace-Test éléguant',
+ '#id_format': 'html',
+ '#id_content': long_text,
+ '#id_tags': 'test_text, Text Troisième'
+ }
+ ]
+};
+
+suite ('comt logged admin', function () {
+
+ this.timeout(20000);
+
+ suite ('logs as an admin', function () {
+ test ('logs an admin in', dsl(function () {
+ browser.navigateTo ('/');
+ input ('#id_username').enter (k.w.USER_ADMIN);
+ input ('#id_password').enter (k.w.PASS_ADMIN);
+ test_.elt ('#login input[type=submit]').click ();
+ browser.waitForPageLoad (); // Must be done here in this test() block
+ browser.navigateTo ('/');
+ expect (element ('title').text ()).toMatch (/Dashboard/m);
+ }));
+ });
+
+ suite ('setting settings to test-values', function () {
+ test_.page_loading ('/settings/', 'Settings');
+ test_fill_settings (c);
+ test_.val ('#id_workspace_name', c['#id_workspace_name']);
+ test_.submit ('#settings input[type="submit"]');
+ test_.page_loading ('/settings/', 'Settings');
+ test_.text ('#content h1.main_title a[href="/"]', c['#id_workspace_name']);
+ test_.page_loading ('/settings/design/', 'Settings');
+ test_fill_design (c);
+ test_.submit ('#settings input[type="submit"]');
+ });
+
+ suite ('admin dashboard page conformity', function () {
+ test_.page_loading ('/', 'Dashboard\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('table.dash_table', 5);
+ test_.text ('table.dash_table th:eq(0)', 'Actions');
+ test_.match ('table.dash_table:eq(0) a:eq(0)[href="/create/content/"]', /\sCreate a text/);
+ test_.text ('table.dash_table:eq(0) a:eq(1).tip[href="#"]', '\xa0');
+ test_.match ('table.dash_table:eq(0) a:eq(2)[href="/create/upload/"]', /\sUpload a text/);
+ test_.text ('table.dash_table:eq(0) a:eq(3).tip[href="#"]', '\xa0');
+ test_.match ('table.dash_table:eq(0) a:eq(4)[href="/create/import/"]', /\sImport a co-mented text/);
+ test_.text ('table.dash_table:eq(0) a:eq(5).tip[href="#"]', '\xa0');
+ test_.match ('table.dash_table:eq(0) a:eq(6)[href="/user/add/"]', /\sInvite user/);
+ test_.match ('table.dash_table:eq(0) a:eq(7)[href="/profile/"]', /\sEdit your profile/);
+ test_.match ('table.dash_table:eq(0) a:eq(8)[href="/text/"]', /\sView text list/);
+ test_.match ('table.dash_table:eq(0) a:eq(9)[href="/settings/"]', /\sConfigure workspace/);
+ test_.text ('table.dash_table th:eq(1)', 'Recent texts (all)');
+ test_.text ('table.dash_table:eq(1) a:eq(0)[href="/text/"]', 'all');
+ test_.text ('table.dash_table th:eq(2)', 'Recent comments');
+ test_.match ('table.dash_table th:eq(3)', /^Workspace activity\n\s+\(month\/week\/24 hours\)$/m);
+ test_.text ('table.dash_table:eq(3) a:eq(0)[href="?span=month"]', 'month');
+ test_.text ('table.dash_table:eq(3) a:eq(1)[href="?span=day"]', '24 hours');
+ test_.text ('table.dash_table th:eq(4) span.em', 'Activities');
+ test_unlogged_footer ();
+ });
+
+ suite ('empty texts list page conformity', function () {
+ test_.page_loading ('/text/', 'Texts\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#text ul.sub_list:eq(0) a', 3);
+ test_.text ('#text ul.sub_list:eq(0) a:eq(0)[href="/create/content/"]', 'Create a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/upload/"]', 'Upload a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
+ test_.match ('#text', /No texts yet/m);
+ test_.count ('#texts_form :input', 0);
+ });
+
+ suite ('create a text page conformity', function () {
+ test_.page_loading ('/create/content/', 'Create a text - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#text ul.sub_list:eq(0) a', 3);
+ test_.text ('#text ul.sub_list:eq(0) a:eq(0)[href="/text/"]', 'Text list');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/upload/"]', 'Upload a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
+ test_.count ('#text form[action="."]:eq(0) :input', 6);
+ test_.field ('text', 'id_title', 'text', 0, 'Title', true);
+ test_.field ('text', 'id_format', 'select', 1, 'Format', true);
+ test_.field ('text', 'id_content', 'textarea', 2, 'Content', true);
+ test_.field ('text', 'id_tags', 'text', 3, 'Tags');
+ test_.val ('#text :input:eq(4)[type=submit]', 'Save');
+ test_.val ('#text :input:eq(5)#cancel_button[type=button]', 'Cancel');
+ test_.count ('select#id_format option', 3);
+ test_.text ('select#id_format option:eq(0)[value="markdown"][selected]', 'markdown', non_visible);
+ test_.text ('select#id_format option:eq(1)[value="rst"]', 'rst', non_visible);
+ test_.text ('select#id_format option:eq(2)[value="html"]', 'html', non_visible);
+ test_.count ('.markdown #markItUpId_content li', 20); // How many buttons in the WYSIWYG editor toolbar ?
+ test_unlogged_footer ();
+ test_.submit('#text input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 2);
+ test_.field ('text div.error', 'id_title', 'text', 0, 'Title', true);
+ test_.field ('text div.error', 'id_content', 'textarea', 1, 'Content', true);
+ });
+
+ suite ('upload text page conformity', function () {
+ test_.page_loading ('/create/upload/', 'Upload a text - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#text ul.sub_list:eq(0) a', 3);
+ test_.text ('#text ul.sub_list:eq(0) a:eq(0)[href="/text/"]', 'Text list');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/content/"]', 'Create a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
+ test_.count ('#text form[action="."]:eq(0) :input', 6);
+ test_.field ('text', 'id_title', 'text', 0, 'Title');
+ test_.field ('text', 'id_format', 'select', 1, 'Format', true);
+ test_.field ('text', 'id_tags', 'text', 2, 'Tags');
+ test_.field ('text', 'id_file', 'file', 3, 'Upload file');
+ test_.val ('#text :input:eq(4)[type=submit]', 'Save');
+ test_.val ('#text :input:eq(5)#cancel_button[type=button]', 'Cancel');
+ test_.count ('select#id_format option', 3);
+ test_.text ('select#id_format option:eq(0)[value="markdown"][selected]', 'markdown', non_visible);
+ test_.text ('select#id_format option:eq(1)[value="rst"]', 'rst', non_visible);
+ test_.text ('select#id_format option:eq(2)[value="html"]', 'html', non_visible);
+ test_unlogged_footer ();
+ test_.submit('#text input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 1);
+ test_.field ('text div.error', 'id_file', 'file', 0, 'Upload file');
+ test_.match ('#text div.help_text:eq(3) span.error-text:eq(0)', /You should specify a file to upload/m);
+ });
+
+ suite ('import a co-mented text page conformity', function () {
+ test_.page_loading ('/create/import/', 'Import a co-mented text - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#text ul.sub_list:eq(0) a', 3);
+ test_.text ('#text ul.sub_list:eq(0) a:eq(0)[href="/text/"]', 'Text list');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/content/"]', 'Create a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/upload/"]', 'Upload a text');
+ test_.count ('#text form[action="."]:eq(0) :input', 3);
+ test_.field ('text', 'id_file', 'file', 0, 'Upload XML file', true);
+ test_.val ('#text :input:eq(1)[type=submit]', 'Save');
+ test_.val ('#text :input:eq(2)#cancel_button[type=button]', 'Cancel');
+ test_unlogged_footer ();
+ test_.submit('#text input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 1);
+ test_.field ('text div.error', 'id_file', 'file', 0, 'Upload XML file', true);
+ test_.match ('#text div.help_text:eq(0) span.error-text:eq(0)', /You should specify a file to upload/m);
+ });
+
+ suite ('create texts', function () {
+ for (var i=3; i--;)
+ create_text (i);
+ });
+
+ // check that public texts still work while unlogged
+ // check that non public texts are unavailable
+ // Are the public texts displayed in the login page ?
+
+ // vérifier les valeurs de settings sauvées
+ // Tester les liens masqués des textes listés si bien créés
+ // Tester suppression de text
+ // Tester bulk actions sur les textes
+
+ // tester l'affichage d'un texte
+ // tester que : #textcontainer.custom h1 font: Test_Sopinspace_custom_titles_font
+ // tester que si Text preferences -> custom -> #textcontainer.custom font: Test_Sopinspace_custom_font
+ // #textcontainer #add_comment_btn span -> #textcontainer font-family: Test_Sopinspace
+
+ suite ('texts list page conformity', function () {
+ test_.page_loading ('/text/', 'Texts\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#text ul.sub_list:eq(0) a', 3);
+ test_.text ('#text ul.sub_list:eq(0) a:eq(0)[href="/create/content/"]', 'Create a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(1)[href="/create/upload/"]', 'Upload a text');
+ test_.text ('#text ul.sub_list:eq(0) a:eq(2)[href="/create/import/"]', 'Import a co-mented text');
+ // TOTEST : filter by tag
+ test_.count ('form#filter_form[action="."] :input', 1);
+ test_.text ('select#tag_selected option:eq(0)[selected][value="0"]', '- All -', non_visible);
+ test_.count ('#texts_form :input', 3 + t.text_nb % 10);
+ test_.match ('#paginator', new RegExp ('\\s\\d+-\\d+ of '+t.text_nb+'\\s','m'));
+ // TOTEST : pagination
+ // TOTEST : Bulk Actions -> Apply does enable
+ test_.text ('select#bulk_actions option:eq(0)[selected][value="-1"]', 'Bulk Actions', non_visible);
+ test_.text ('select#bulk_actions option:eq(1)[value="delete"]', 'Delete', non_visible);
+ test_.val ('form#texts_form input#apply[type=button][disabled]', 'Apply');
+ test_.count ('table.large_table:eq(1) th', 6);
+ test_.val ('table.large_table:eq(1) th:eq(0) input#all_check[type="checkbox"]', 'on');
+ test_.text ('table.large_table:eq(1) th:eq(1) a[href="?order=title"]', 'Text');
+ test_.text ('table.large_table:eq(1) th:eq(2)', 'Author');
+ test_.text ('table.large_table:eq(1) th:eq(3) a[href="?order=-modified"]', 'Modified');
+ test_.text ('table.large_table:eq(1) th:eq(4)', '# comments');
+ test_.text ('table.large_table:eq(1) th:eq(5)', 'Last week activity');
+ test_unlogged_footer ();
+ });
+
+ suite ('edit profile page conformity', function () {
+ test_.page_loading ('/profile/', 'Your profile [(]'+k.w.USER_ADMIN+'[)]\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN, no_tagline);
+ test_.count ('#content ul.sub_list:eq(0) a', 1);
+ test_.text ('#content ul.sub_list:eq(0) a:eq(0)[href="/profile-pw/"]', 'Password');
+ test_.count ('form#profile[action="."]:eq(0) :input', 5);
+ test_.field ('profile', 'id_email', 'text', 0, 'E-mail address', true);
+ test_.field ('profile', 'id_first_name','text', 1, 'First name');
+ test_.field ('profile', 'id_last_name', 'text', 2, 'Last name');
+ test_.field ('profile', 'id_tags', 'text', 3, 'Tags');
+ test_.val ('#profile :input:eq(4)[type=submit]', 'Save');
+ test_unlogged_footer ();
+ });
+
+ suite ('edit password page conformity', function () {
+ test_.page_loading ('/profile-pw/', 'Your profile [(]'+k.w.USER_ADMIN+'[)]\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN, no_tagline);
+ test_.count ('#content ul.sub_list:eq(0) a', 1);
+ test_.text ('#content ul.sub_list:eq(0) a:eq(0)[href="/profile/"]', 'Profile');
+ test_.count ('form#profile[action="."]:eq(0) :input', 4);
+ test_.field ('profile', 'id_old_password', 'password', 0, 'Old password', true);
+ test_.field ('profile', 'id_new_password1', 'password', 1, 'New password', true);
+ test_.field ('profile', 'id_new_password2', 'password', 2, 'New password confirmation', true);
+ test_.val ('#profile :input:eq(3)[type=submit]', 'Save');
+ test_unlogged_footer ();
+ });
+
+ suite ('people list page conformity', function () {
+ test_.page_loading ('/user/', 'People\' list\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#user ul.sub_list:eq(0) a', 2);
+ test_.text ('#user ul.sub_list:eq(0) a:eq(0)[href="/user/add/"]', 'Add a new user');
+ test_.text ('#user ul.sub_list:eq(0) a:eq(1)[href="/user/mass-add/"]', 'Add users in bulk');
+ // TOTEST : filter by tag -> commentator user should be tagged commentator (to change in fixture)
+ test_.count ('form#filter_form[action="."] :input', 1);
+ test_.text ('#filter_form a[href="?display=1"]', 'Display suspended users');
+ test_.text ('select#tag_selected option:eq(0)[selected][value="0"]', '- All -', non_visible);
+ // TOTEST : pagination
+ // TOTEST : Bulk Actions -> Apply does enable
+ // TOTEST display suspended users
+ test_.text ('select#bulk_actions option:eq(0)[selected][value="-1"]', '- Bulk Actions -', non_visible);
+ test_.text ('select#bulk_actions option:eq(1)[value="disable"]', 'Suspend access', non_visible);
+ test_.text ('select#bulk_actions option:eq(2)[value="enable"]', 'Enable access', non_visible);
+ test_.text ('select#bulk_actions option:eq(3)[value="role_1"]', 'Change role to Manager', non_visible);
+ test_.text ('select#bulk_actions option:eq(4)[value="role_2"]', 'Change role to Editor', non_visible);
+ test_.text ('select#bulk_actions option:eq(5)[value="role_3"]', 'Change role to Moderator', non_visible);
+ test_.text ('select#bulk_actions option:eq(6)[value="role_4"]', 'Change role to Commentator', non_visible);
+ test_.text ('select#bulk_actions option:eq(7)[value="role_5"]', 'Change role to Observer', non_visible);
+ test_.val ('form#user_form input#apply[type=button][disabled]', 'Apply');
+ test_.count ('table.large_table:eq(1) th', 6);
+ test_.val ('table.large_table:eq(1) th:eq(0) input#all_check[type="checkbox"]', 'on');
+ test_.text ('table.large_table:eq(1) th:eq(1) a[href="?order=user__username"]', 'User');
+ test_.text ('table.large_table:eq(1) th:eq(2) a[href="?order=user__email"]', 'Email');
+ test_.text ('table.large_table:eq(1) th:eq(3) a[href="?order=-user__date_joined"]', 'Date joined');
+ test_.text ('table.large_table:eq(1) th:eq(4) a[href="?order=role__name"]', 'Role');
+ test_.text ('table.large_table:eq(1) th:eq(5)', 'Last week activity');
+ test_.text ('table.large_table:eq(1) tr:last a[href="/user/-/edit/"]', 'Anonymous users');
+ test_.text ('table.large_table:eq(1) a.main_object_title[href="/profile/"]', k.w.USER_ADMIN);
+ test_.text ('table.large_table:eq(1) div.hidden-user-actions a[href="/profile/"]', 'Your profile');
+ // TOTEST roles of users
+ test_unlogged_footer ();
+ });
+
+ suite ('check user number', function () {
+ test_.page_loading ('/user/?display=1', 'People\' list\n - '+c['#id_workspace_name']);
+ test_.count ('#user_form :input', 6 + (t.user_nb % 10) * 2);
+ test_.match ('#paginator', new RegExp ('\\s\\d+-\\d+ of '+t.user_nb+'\\s','m'));
+ });
+
+ suite ('add a user page conformity', function () {
+ test_.page_loading ('/user/add/', 'Add a new user\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#user ul.sub_list:eq(0) a', 2);
+ test_.text ('#user ul.sub_list:eq(0) a:eq(0)[href="/user/"]', 'Users\' list');
+ test_.text ('#user ul.sub_list:eq(0) a:eq(1)[href="/user/mass-add/"]', 'Add users in bulk');
+ test_.count ('#user form[action="."]:eq(0) :input', 8);
+ test_.field ('user', 'id_email', 'text', 0, 'E-mail address', true);
+ test_.field ('user', 'id_first_name', 'text', 1, 'First name');
+ test_.field ('user', 'id_last_name', 'text', 2, 'Last name');
+ test_.field ('user', 'id_tags', 'text', 3, 'Tags');
+ test_.field ('user', 'id_role', 'select', 4, 'Workspace level role');
+ test_.field ('user', 'id_note', 'textarea', 5, 'Note');
+ test_.count ('select#id_role option', 6);
+ test_.text ('select#id_role option:eq(0)[value][selected]', '---------', non_visible);
+ test_.text ('select#id_role option:eq(1)[value="1"]', 'Manager', non_visible);
+ test_.text ('select#id_role option:eq(2)[value="2"]', 'Editor', non_visible);
+ test_.text ('select#id_role option:eq(3)[value="3"]', 'Moderator', non_visible);
+ test_.text ('select#id_role option:eq(4)[value="4"]', 'Commentator', non_visible);
+ test_.text ('select#id_role option:eq(5)[value="5"]', 'Observer', non_visible);
+ test_.val ('#user :input:eq(6)[type=submit]', 'Add user');
+ test_.val ('#user :input:eq(7)#cancel_button[type=button]', 'Cancel');
+ test_unlogged_footer ();
+ test_.submit('#user input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 1);
+ test_.field ('user div.error', 'id_email', 'text', 0, 'E-mail address', true);
+ test_.match ('#user div.help_text:eq(0) span.error-text:eq(0)', /This field is required/m);
+ // X TOTEST add user (pending)
+ });
+
+ suite ('add-users-in-bulk page conformity', function () {
+ test_.page_loading ('/user/mass-add/', 'Add users in bulk\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#user ul.sub_list:eq(0) a', 2);
+ test_.text ('#user ul.sub_list:eq(0) a:eq(0)[href="/user/"]', 'Users\' list');
+ test_.text ('#user ul.sub_list:eq(0) a:eq(1)[href="/user/add/"]', 'Add a new user');
+ test_.count ('#user form[action="."]:eq(0) :input', 6);
+ test_.field ('user', 'id_email', 'textarea', 0, 'Emails', true);
+ test_.field ('user', 'id_tags', 'text', 1, 'Tags');
+ test_.field ('user', 'id_role', 'select', 2, 'Workspace level role');
+ test_.field ('user', 'id_note', 'textarea', 3, 'Note');
+ test_.count ('select#id_role option', 6);
+ test_.text ('select#id_role option:eq(0)[value][selected]', '---------', non_visible);
+ test_.text ('select#id_role option:eq(1)[value="1"]', 'Manager', non_visible);
+ test_.text ('select#id_role option:eq(2)[value="2"]', 'Editor', non_visible);
+ test_.text ('select#id_role option:eq(3)[value="3"]', 'Moderator', non_visible);
+ test_.text ('select#id_role option:eq(4)[value="4"]', 'Commentator', non_visible);
+ test_.text ('select#id_role option:eq(5)[value="5"]', 'Observer', non_visible);
+ test_.val ('#user :input:eq(4)[type=submit]', 'Add users');
+ test_.val ('#user :input:eq(5)#cancel_button[type=button]', 'Cancel');
+ // X TOTEST add users (pending) -> can't be deleted
+ test_unlogged_footer ();
+ test_.submit('#user input[type="submit"]');
+ test_.count ('div.help_text span.error-text', 1);
+ test_.field ('user div.error', 'id_email', 'textarea', 0, 'Emails', true);
+ test_.match ('#user div.help_text:eq(0) span.error-text:eq(0)', /This field is required/m);
+ });
+
+ suite ('settings page conformity', function () {
+ test_.page_loading ('/settings/', 'Settings - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#settings ul.sub_list:eq(0) a', 1);
+ test_.text ('#settings ul.sub_list:eq(0) a:eq(0)[href="/settings/design/"]', 'Appearance');
+ test_.count ('#settings form[action="."]:eq(0) :input', 12);
+ test_.field ('settings', 'id_workspace_name', 'text', 0, 'Workspace name');
+ test_.field ('settings', 'id_workspace_tagline', 'text', 1, 'Workspace tagline');
+ test_.field ('settings', 'id_workspace_registration', 'checkbox', 2, 'Workspace registration');
+ test_.field ('settings', 'id_workspace_registration_moderation', 'checkbox', 3, 'Workspace registration moderation');
+ test_.field ('settings', 'id_workspace_role_model', 'select', 4, 'Role model');
+ test_.text ('select#id_workspace_role_model option:eq(0)[selected][value="generic"]', 'Generic', non_visible);
+ test_.text ('select#id_workspace_role_model option:eq(1)[value="teacher"]', 'Class (education)', non_visible);
+ test_.field ('settings', 'id_workspace_category_1', 'text', 5, 'Label for the first category of comments');
+ test_.field ('settings', 'id_workspace_category_2', 'text', 6, 'Label for the second category of comments');
+ test_.field ('settings', 'id_workspace_category_3', 'text', 7, 'Label for the third category of comments');
+ test_.field ('settings', 'id_workspace_category_4', 'text', 8, 'Label for the fourth category of comments');
+ test_.field ('settings', 'id_workspace_category_5', 'text', 9, 'Label for the fifth category of comments');
+ test_.val ('#settings :input:eq(10)[type=submit]', 'Save');
+ test_.val ('#settings :input:eq(11)#cancel_button[type=button]', 'Cancel');
+ // TOTEST Workspace registration feature (with newly accessible page)
+ test_unlogged_footer ();
+ });
+
+ suite ('settings design page conformity', function () {
+ test_.page_loading ('/settings/design/', 'Settings - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.count ('#settings ul.sub_list:eq(0) a', 1);
+ test_.text ('#settings ul.sub_list:eq(0) a:eq(0)[href="/settings/"]', 'General');
+ test_.count ('#settings form[action="."]:eq(0) :input', 7);
+ test_.field ('settings', 'id_workspace_logo_file', 'file', 0, 'Workspace logo');
+ test_.field ('settings', 'id_custom_css', 'textarea', 1, 'Custom CSS rules');
+ test_.field ('settings', 'id_custom_font', 'text', 2, 'Custom font');
+ test_.field ('settings', 'id_custom_titles_font', 'text', 3, 'Custom font for titles');
+ test_.val ('#settings :input:eq(4)[type=submit]', 'Save');
+ test_.val ('#settings :input:eq(5)#cancel_button[type=button]', 'Cancel');
+ test_.val ('#settings :input:eq(6)#delete_logo_button[type=submit]', 'Delete logo');
+ test_unlogged_footer ();
+ });
+
+ suite ('followup page conformity', function () {
+ test_.page_loading ('/followup/', 'Followup\n - '+c['#id_workspace_name']);
+ test_logged_header (k.w.USER_ADMIN);
+ test_default_tabs (t.text_nb, t.user_nb);
+ test_.text ('#followup a:eq(0)[href="/help/#public_private_feed"]', '?');
+ test_.match ('#followup a:eq(1)[href$="/feed/"]', new RegExp (k.w.WORKSPACE_URL+'feed/', 'm'));
+ test_.text ('#followup a:eq(2)[href="/help/#public_private_feed"]', '?');
+ test_.count ('form#followup_form[action="."] :input', 3);
+ test_.val ('form#followup_form input[type=submit]', '(Activate private feed|Reset private feed url)');
+ test_.val ('form#followup_form input#workspace_notify_check[type=checkbox]', 'on');
+ test_.val ('form#followup_form input#own_notify_check[type=checkbox]', 'on');
+
+ // X TOTEST qu'une fois cliqué, le bouton a le nvo label, et qu'une adresse est disponible
+ // X TOTEST que si on reclique l'adresse est changée
+
+ test_unlogged_footer ();
+ });
+
+});
+
+function test_default_tabs (text_nb, user_nb) {
+ test_.count ('#main-tabs a', 5);
+ test_.text ('#main-tabs li:nth-of-type(1) a[href="/"]', 'Dashboard');
+ test_.match ('#main-tabs li:nth-of-type(2) a[href="/text/"]', /^Texts \(\d+\) $/);
+ test_.match ('#main-tabs li:nth-of-type(3) a[href="/user/"]', /^People \(\d+\)$/);
+ test_.text ('#main-tabs li:nth-of-type(4) a[href="/settings/"]', 'Settings');
+ test_.text ('#main-tabs li:nth-of-type(5) a[href="/followup/"]', 'Followup');
+ test_.match ('#main-tabs a[href="/text/"]', new RegExp ('^Texts\\s*\\('+text_nb+'\\)\\s*$'));
+ test_.match ('#main-tabs a[href="/user/"]', new RegExp ('^People\\s*\\('+user_nb+'\\)\\s*$'));
+}
+
+function test_logged_header (username, is_tagline) {
+ is_tagline = typeof is_tagline == 'undefined' ? true : is_tagline;
+
+ test_.text ('#header_controls b', username)
+ test_.count ('#header_controls a', 6);
+ test_.text ('#header_controls a:nth-of-type(1)[href="/"]', 'Home');
+ test_.text ('#header_controls a:nth-of-type(2)[href="/create/content/"]', 'Create a text');
+ test_.text ('#header_controls a:nth-of-type(3)[href="/create/upload/"]', 'Upload a text');
+ test_.text ('#header_controls a:nth-of-type(4)[href="/create/import/"]', 'Import a co-mented text');
+ test_.text ('#header_controls a:nth-of-type(5)[href="/profile/"]', 'Profile');
+ test_.text ('#header_controls a:nth-of-type(6)[href="/logout/"]', 'Logout');
+ test_.text ('#content h1.main_title a[href="/"]', c['#id_workspace_name']);
+
+ if (is_tagline) {
+ test_.match ('#content h1.main_title + div', new RegExp (c['#id_workspace_tagline'], 'm'));
+ }
+}
+
+function test_fill_settings (s) {
+ test_.fill_field ('#id_workspace_name', s);
+ test_.fill_field ('#id_workspace_tagline', s);
+ test_.fill_field ('#id_workspace_registration', s);
+ test_.fill_field ('#id_workspace_registration_moderation', s);
+ test_.fill_field ('#id_workspace_role_model', s);
+ test_.fill_field ('#id_workspace_category_1', s);
+ test_.fill_field ('#id_workspace_category_2', s);
+ test_.fill_field ('#id_workspace_category_3', s);
+ test_.fill_field ('#id_workspace_category_4', s);
+ test_.fill_field ('#id_workspace_category_5', s);
+}
+
+function test_fill_design (s) {
+ test_.fill_field ('#id_custom_css', s);
+ test_.fill_field ('#id_custom_font', s);
+ test_.fill_field ('#id_custom_titles_font', s);
+}
+
+function create_text (i) {
+ test_.page_loading ('/create/content/', 'Create a text - '+c['#id_workspace_name']);
+ test ('test creation', dsl(function () {
+ dropdownlist ('#id_format').option (c['texts'][i]['#id_format']);
+ }));
+
+ test_.fill_field ('#id_title', c['texts'][i]);
+ test ('fill content', dsl(function (){
+ test_.elt ('#id_content').val (c['texts'][i]['#id_content']);
+ }));
+
+ test_.fill_field ('#id_tags', c['texts'][i]);
+ test_.submit ('#save_button');
+ t.text_nb++;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/workspace.info.js.example Mon Apr 07 17:41:35 2014 +0200
@@ -0,0 +1,21 @@
+
+define ("DEBUG", false); // in DEBUG mode tests stop at first fail to let you check what happen
+define ("BROWSERS", ['Chrome']);
+
+define ("WORKSPACE_URL", '<workspace-url>'); // In http://IP_ADDRESS:PORT_NUM/ format
+define ("USER_ADMIN", '<admin-login>');
+define ("PASS_ADMIN", '<admin-password>');
+define ("USER_EDIT", '');
+define ("PASS_EDIT", '');
+define ("USER_COM", '');
+define ("PASS_COM", '');
+define ("USER_OBSERV", '');
+define ("PASS_OBSERV", '');
+
+function define (name, value) {
+ Object.defineProperty (exports, name, {
+ value: value,
+ enumerable: true
+ });
+}
+