Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/bg/LC_MESSAGES/django.po Mon Oct 11 15:04:45 2010 +0200
+++ b/src/cm/locale/bg/LC_MESSAGES/django.po Mon Oct 11 15:39:29 2010 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 16:59+0200\n"
+"POT-Creation-Date: 2010-10-11 15:06+0200\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"
@@ -59,150 +59,150 @@
msgid "Tags input must be no longer than 250 characters."
msgstr "Таговете не трябва да надвишават 250 символа."
-#: models.py:178 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:622
+#: models.py:184 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:630
msgid "Title"
msgstr "Заглавие"
-#: models.py:179
+#: models.py:185
msgid "Format"
msgstr "Формат"
-#: models.py:180 views/texts.py:714
+#: models.py:186 views/texts.py:725
msgid "Content"
msgstr "Съдържание"
-#: models.py:181 models.py:633 templates/site/help.html:47
+#: models.py:187 models.py:643 templates/site/help.html:47
msgid "Tags"
msgstr "Тагове"
-#: models.py:183 templates/site/text_history.html:80 views/user.py:223
+#: models.py:189 templates/site/text_history.html:80 views/user.py:223
msgid "Note"
msgstr "Бележка"
-#: models.py:185
+#: models.py:191
msgid "Moderation a posteriori?"
msgstr "Модерирането се извършва по-късно."
-#: models.py:301
+#: models.py:307
msgid "Format:"
msgstr "Формат"
-#: models.py:536
+#: models.py:545
msgid "name"
msgstr "име"
-#: models.py:537
+#: models.py:546
msgid "description"
msgstr "описание"
-#: models.py:627
+#: models.py:637
msgid "Allow contact"
msgstr "Разрешете връзка"
-#: models.py:627
+#: models.py:637
msgid "Allow email messages from other users"
msgstr "Разрешете имейл съобщения от други потребители"
-#: models.py:628
+#: models.py:638
msgid "Preferred language"
msgstr "Предпочитан език"
-#: models.py:631
+#: models.py:641
msgid "Suspended access"
msgstr "Преустановен достъп"
-#: models.py:655
+#: models.py:665
msgid "suspended"
msgstr "прекъснат"
-#: models.py:657
+#: models.py:667
msgid "waiting approval"
msgstr "в очакване на одобрение"
-#: models.py:663
+#: models.py:673
msgid "pending"
msgstr "предстоящ"
-#: models.py:678
+#: models.py:688
msgid "Invitation"
msgstr "Покана"
-#: models.py:746
+#: models.py:756
#, fuzzy, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Текстът %(link_to_text)s е променен"
-#: models.py:747
+#: models.py:757
#, fuzzy, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Текстът %(link_to_text)s е променен (създадена е нова версия)"
-#: models.py:748
+#: models.py:758
#, fuzzy, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Текстът %(link_to_text)s е добавен"
-#: models.py:749
+#: models.py:759
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Текстът %(link_to_text)s е изтрит"
-#: models.py:750
+#: models.py:760
#, fuzzy, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Коментарът %(link_to_comment)s е добавен към текста %(link_to_text)s"
-#: models.py:751
+#: models.py:761
#, 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:752
+#: models.py:762
#, python-format
msgid "User %(username)s added"
msgstr "Потребителя %(username)s е добавен"
-#: models.py:753
+#: models.py:763
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr ""
" гщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщщДостъпът "
"към работното място е разрешен на потребителя %(username)s"
-#: models.py:754
+#: models.py:764
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Достъпът към работното място е отказан на потребителя %(username)s"
-#: models.py:755
+#: models.py:765
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr ""
"Достъпът към работното място е преустановен на потребителя %(username)s"
-#: models.py:756
+#: models.py:766
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Достъпът към работното място е активиран на потребителя %(username)s"
-#: models.py:757
+#: models.py:767
#, python-format
msgid "User %(username)s has activated his account"
msgstr "Потребителя %(username)s активира своя акаунт"
-#: models.py:806
+#: models.py:816
#, fuzzy
msgid "anonymous"
msgstr "Анонимни потребители"
-#: models.py:813 models.py:821
+#: models.py:823 models.py:831
#, python-format
msgid "by \"%(username)s\""
msgstr "От \"%(username)s\""
-#: models.py:815
+#: models.py:825
#, python-format
msgid "%(time_since)s ago"
msgstr "преди %(time_since)s"
@@ -363,6 +363,10 @@
msgid "An error has occurred."
msgstr "Възникна грешка."
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr ""
+
#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:330
msgid "Activate your account"
@@ -372,21 +376,21 @@
msgid "Activate"
msgstr "Активиране"
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6 templates/site/layout/footer.html:7
#: templates/site/macros/user_actions.html:20
msgid "Contact"
msgstr "Контакт"
-#: templates/site/contact.html:24
+#: templates/site/contact.html:24 templates/site/user_contact.html:50
msgid "Send"
msgstr "Изпращане"
#: 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:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:37 templates/site/user_contact.html:25
+#: 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"
@@ -408,13 +412,9 @@
msgid "Create a text"
msgstr "Напишете текст"
-#: templates/site/dashboard.html:48 templates/site/dashboard.html.py:49
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/help.html.py:14
-#: templates/site/text_embed.html:27 templates/site/layout/footer.html:13
-#: templates/site/macros/form_fields.html:15
-msgid "Help"
-msgstr "Помощ"
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
#: templates/site/text_create_upload.html:4
@@ -423,6 +423,12 @@
msgid "Upload a text"
msgstr "Качване на текст"
+#: templates/site/dashboard.html:49
+msgid ""
+"Upload a document from your computer (Text document, Open Format document, "
+"Word document)"
+msgstr ""
+
#: templates/site/dashboard.html:50
msgid "Invite user"
msgstr "Покани потребител"
@@ -533,7 +539,7 @@
msgstr[0] "1 версия"
msgstr[1] "Версий"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:221
+#: templates/site/dashboard.html:208 templates/site/text_list.html:223
msgid "No texts yet"
msgstr "Все още няма текст "
@@ -558,7 +564,7 @@
msgstr "Достъп"
#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/text_list.html:208 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Зареждане..."
@@ -623,6 +629,13 @@
msgid "Public feed"
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/macros/form_fields.html:20
+msgid "Help"
+msgstr "Помощ"
+
#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr "Публично захранване за работното място"
@@ -1002,8 +1015,8 @@
msgstr ""
#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:37
+#: 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
@@ -1021,7 +1034,7 @@
msgstr ""
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Настройки"
@@ -1153,7 +1166,7 @@
msgid "Selection"
msgstr "Подбор"
-#: templates/site/text_history.html:81 templates/site/text_list.html:137
+#: templates/site/text_history.html:81 templates/site/text_list.html:139
msgid "Author"
msgstr "Автор"
@@ -1161,29 +1174,29 @@
msgid "Created"
msgstr "Създаден"
-#: templates/site/text_history.html:83 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "# comments"
msgstr "# коментари"
-#: templates/site/text_history.html:103 templates/site/text_list.html:159
+#: templates/site/text_history.html:105 templates/site/text_list.html:161
msgid "View"
msgstr "Виж"
-#: templates/site/text_history.html:104
+#: templates/site/text_history.html:106
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr "Сравнете с предишни версий"
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
msgid "Revert to this version"
msgstr "Върнете се към тази версия"
-#: templates/site/text_history.html:120 templates/site/text_list.html:80
-#: templates/site/text_list.html.py:161
+#: templates/site/text_history.html:122 templates/site/text_list.html:82
+#: templates/site/text_list.html.py:163
msgid "Delete"
msgstr "Изтриване"
-#: templates/site/text_history.html:126
+#: templates/site/text_history.html:128
msgid "Are you sure you want to delete this version?"
msgstr "Сигурни ли сте, че искате да изтриете тази версия?"
@@ -1230,84 +1243,78 @@
msgid "by %(author)s"
msgstr "от %(author)s"
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
-msgid "People' list"
-msgstr "Списък на потребителите"
-
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:51 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr "Филтър с ключовата дума"
-#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:53 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Всички"
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:81 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Множествени действия"
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:85 templates/site/user_list.html:81
msgid "Apply"
msgstr "Приложи"
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:106 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Сигурни ли сте?"
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Текст"
-#: templates/site/text_list.html:138
+#: templates/site/text_list.html:140
msgid "Modified"
msgstr "Изменен"
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:142 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Дейност от изминалата седмица"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "Тагове"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: 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:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Редактиране"
-#: templates/site/text_list.html:167
+#: templates/site/text_list.html:169
msgid "Are you sure you want to delete this text?"
msgstr "Сигурни ли сте, че искате да изтриете този текст?"
-#: templates/site/text_list.html:180
+#: templates/site/text_list.html:182
msgid "Users"
msgstr "Потребители"
-#: templates/site/text_list.html:198
+#: templates/site/text_list.html:200
msgid "Edit user"
msgstr "Редактиране на потребител"
#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/user_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 "Списък на потребителите"
#: templates/site/text_share.html:29 templates/site/user_add.html:6
#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_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
@@ -1316,12 +1323,19 @@
msgstr "Добавяне на нов потребител"
#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/user_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 "Добави потребители наведнъж"
+#: 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 "Списък на потребителите"
+
#: templates/site/text_share.html:38 templates/site/user_list.html:43
msgid "Hide suspended users"
msgstr "Скрий преустановените потребители"
@@ -1362,27 +1376,27 @@
msgid "Anonymous users"
msgstr "Анонимни потребители"
-#: templates/site/text_view_frame.html:63
+#: templates/site/text_view_frame.html:64
msgid "add a comment"
msgstr "добави коментар"
-#: templates/site/text_view_frame.html:73
+#: templates/site/text_view_frame.html:74
msgid "Filter comments"
msgstr "Филтрирай коментарите"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:75
msgid "Preferences"
msgstr "Предпочитания"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:76
msgid "Text preferences"
msgstr "Предпочитания за текста"
-#: templates/site/text_view_frame.html:102
+#: templates/site/text_view_frame.html:104
msgid "Which comments?"
msgstr "Кой коментар?"
-#: templates/site/text_view_frame.html:110
+#: templates/site/text_view_frame.html:112
msgid "How should comments' scope be shown in text?"
msgstr "Как да бъде показан обхватът на коментарите в текста?"
@@ -1415,7 +1429,7 @@
msgid "Contact user"
msgstr "Свържете се с потребителя"
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:26
#, python-format
msgid "Contact user %(username)s"
msgstr "Свържете се с потребителя %(username)s"
@@ -1450,6 +1464,12 @@
msgid "Role"
msgstr "Роля"
+#: templates/site/user_list.html:177
+msgid ""
+"Those are non-registered users. Assign them a role to open your texts to "
+"simple visitors."
+msgstr ""
+
#: 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."
@@ -1475,14 +1495,26 @@
msgstr[0] "%(nb_users)s потребител"
msgstr[1] "%(nb_users)s потребителя"
-#: templates/site/layout/footer.html:7
-msgid "About"
-msgstr "Относно"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Излез"
+#: 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)"
@@ -1523,7 +1555,7 @@
msgid "by %(name)s on %(date)s"
msgstr "от %(name)s на %(date)s"
-#: templates/site/macros/text_editor.html:43
+#: 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?"
@@ -1797,49 +1829,49 @@
msgid "Text version %(text_version_title)s deleted"
msgstr "Версията на текста %(text_version_title)s е изтит"
-#: views/texts.py:626
+#: views/texts.py:634
msgid "Note (optional)"
msgstr "Бележка (по избор)"
-#: views/texts.py:629
+#: views/texts.py:638
msgid "Add a note to explain the modifications made to the text"
msgstr "Добавете бележка за да обясните промените извършени върху текста"
-#: views/texts.py:639
+#: views/texts.py:648
msgid "New version (optional)"
msgstr "Нова версия (по избор)"
-#: views/texts.py:642
+#: views/texts.py:651
msgid "Create a new version of this text (recommended)"
msgstr "Създайте нова версия на текста (препоръчително)"
-#: views/texts.py:645
+#: views/texts.py:654
msgid "Keep comments (optional)"
msgstr "Запазете коментарите (по избор)"
-#: views/texts.py:648
+#: views/texts.py:657
msgid "Keep comments (if not affected by the edit)"
msgstr "Запазете коментарите (ако не са засегнати от редактирането)"
-#: views/texts.py:712
+#: views/texts.py:723
msgid "Name (optional)"
msgstr "Име (по избор)"
-#: views/texts.py:713
+#: views/texts.py:724
msgid "Email (optional)"
msgstr "Майл (по избор)"
-#: views/texts.py:765
+#: views/texts.py:776
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr "Нова версия (копирана от %(version_title)s версия ) е създадена"
-#: views/texts.py:873 views/user.py:79 views/user.py:99
+#: views/texts.py:884 views/user.py:79 views/user.py:99
#, fuzzy, python-format
msgid "%(count)i user(s) role modified"
msgstr "роля(и) на потребителя са изменени"
-#: views/texts.py:931
+#: views/texts.py:942
msgid "Text settings updated"
msgstr "Параметрите са актуализирани"
@@ -1986,11 +2018,11 @@
"Този акаунт е дезактивиран. Моля контактирайте администратор на работното "
"място."
-#: views/user.py:570
+#: views/user.py:574
msgid "You've been logged out."
msgstr "Вие сте офлайн"
-#: views/user.py:586
+#: views/user.py:590
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -1999,13 +2031,16 @@
"изпратено на вашия имейл, след като вашия акаунт е активиран от "
"администратор на работното място"
-#: views/user.py:589
+#: views/user.py:593
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
"Регистрацията завърши успешно, едно потвърдително съобщение е изпратено на "
"вашия имейл"
+#~ msgid "About"
+#~ msgstr "Относно"
+
#~ msgid "Save user"
#~ msgid_plural "Save users"
#~ msgstr[0] "Запамети този потребител"
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po Mon Oct 11 15:04:45 2010 +0200
+++ b/src/cm/locale/en/LC_MESSAGES/django.po Mon Oct 11 15:39:29 2010 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 17:00+0200\n"
+"POT-Creation-Date: 2010-10-11 15:07+0200\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"
@@ -57,146 +57,146 @@
msgid "Tags input must be no longer than 250 characters."
msgstr ""
-#: models.py:178 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:622
+#: models.py:184 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:630
msgid "Title"
msgstr ""
-#: models.py:179
+#: models.py:185
msgid "Format"
msgstr ""
-#: models.py:180 views/texts.py:714
+#: models.py:186 views/texts.py:725
msgid "Content"
msgstr ""
-#: models.py:181 models.py:633 templates/site/help.html:47
+#: models.py:187 models.py:643 templates/site/help.html:47
msgid "Tags"
msgstr ""
-#: models.py:183 templates/site/text_history.html:80 views/user.py:223
+#: models.py:189 templates/site/text_history.html:80 views/user.py:223
msgid "Note"
msgstr ""
-#: models.py:185
+#: models.py:191
msgid "Moderation a posteriori?"
msgstr ""
-#: models.py:301
+#: models.py:307
msgid "Format:"
msgstr ""
-#: models.py:536
+#: models.py:545
msgid "name"
msgstr ""
-#: models.py:537
+#: models.py:546
msgid "description"
msgstr ""
-#: models.py:627
+#: models.py:637
msgid "Allow contact"
msgstr ""
-#: models.py:627
+#: models.py:637
msgid "Allow email messages from other users"
msgstr ""
-#: models.py:628
+#: models.py:638
msgid "Preferred language"
msgstr ""
-#: models.py:631
+#: models.py:641
msgid "Suspended access"
msgstr ""
-#: models.py:655
+#: models.py:665
msgid "suspended"
msgstr ""
-#: models.py:657
+#: models.py:667
msgid "waiting approval"
msgstr ""
-#: models.py:663
+#: models.py:673
msgid "pending"
msgstr ""
-#: models.py:678
+#: models.py:688
msgid "Invitation"
msgstr ""
-#: models.py:746
+#: models.py:756
#, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr ""
-#: models.py:747
+#: models.py:757
#, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr ""
-#: models.py:748
+#: models.py:758
#, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr ""
-#: models.py:749
+#: models.py:759
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr ""
-#: models.py:750
+#: models.py:760
#, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr ""
-#: models.py:751
+#: models.py:761
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr ""
-#: models.py:752
+#: models.py:762
#, python-format
msgid "User %(username)s added"
msgstr ""
-#: models.py:753
+#: models.py:763
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr ""
-#: models.py:754
+#: models.py:764
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr ""
-#: models.py:755
+#: models.py:765
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr ""
-#: models.py:756
+#: models.py:766
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr ""
-#: models.py:757
+#: models.py:767
#, python-format
msgid "User %(username)s has activated his account"
msgstr ""
-#: models.py:806
+#: models.py:816
msgid "anonymous"
msgstr ""
-#: models.py:813 models.py:821
+#: models.py:823 models.py:831
#, python-format
msgid "by \"%(username)s\""
msgstr ""
-#: models.py:815
+#: models.py:825
#, python-format
msgid "%(time_since)s ago"
msgstr ""
@@ -357,6 +357,10 @@
msgid "An error has occurred."
msgstr ""
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr ""
+
#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:330
msgid "Activate your account"
@@ -366,21 +370,21 @@
msgid "Activate"
msgstr ""
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6 templates/site/layout/footer.html:7
#: templates/site/macros/user_actions.html:20
msgid "Contact"
msgstr ""
-#: templates/site/contact.html:24
+#: templates/site/contact.html:24 templates/site/user_contact.html:50
msgid "Send"
msgstr ""
#: 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:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:37 templates/site/user_contact.html:25
+#: 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"
@@ -401,12 +405,8 @@
msgid "Create a text"
msgstr ""
-#: templates/site/dashboard.html:48 templates/site/dashboard.html.py:49
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/help.html.py:14
-#: templates/site/text_embed.html:27 templates/site/layout/footer.html:13
-#: templates/site/macros/form_fields.html:15
-msgid "Help"
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
@@ -416,6 +416,12 @@
msgid "Upload a text"
msgstr ""
+#: templates/site/dashboard.html:49
+msgid ""
+"Upload a document from your computer (Text document, Open Format document, "
+"Word document)"
+msgstr ""
+
#: templates/site/dashboard.html:50
msgid "Invite user"
msgstr ""
@@ -522,7 +528,7 @@
msgstr[0] ""
msgstr[1] ""
-#: templates/site/dashboard.html:208 templates/site/text_list.html:221
+#: templates/site/dashboard.html:208 templates/site/text_list.html:223
msgid "No texts yet"
msgstr ""
@@ -547,7 +553,7 @@
msgstr ""
#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/text_list.html:208 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr ""
@@ -612,6 +618,13 @@
msgid "Public feed"
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/macros/form_fields.html:20
+msgid "Help"
+msgstr ""
+
#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr ""
@@ -976,8 +989,8 @@
msgstr ""
#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:37
+#: 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
@@ -995,7 +1008,7 @@
msgstr ""
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr ""
@@ -1116,7 +1129,7 @@
msgid "Selection"
msgstr ""
-#: templates/site/text_history.html:81 templates/site/text_list.html:137
+#: templates/site/text_history.html:81 templates/site/text_list.html:139
msgid "Author"
msgstr ""
@@ -1124,29 +1137,29 @@
msgid "Created"
msgstr ""
-#: templates/site/text_history.html:83 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "# comments"
msgstr ""
-#: templates/site/text_history.html:103 templates/site/text_list.html:159
+#: templates/site/text_history.html:105 templates/site/text_list.html:161
msgid "View"
msgstr ""
-#: templates/site/text_history.html:104
+#: templates/site/text_history.html:106
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr ""
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
msgid "Revert to this version"
msgstr ""
-#: templates/site/text_history.html:120 templates/site/text_list.html:80
-#: templates/site/text_list.html.py:161
+#: templates/site/text_history.html:122 templates/site/text_list.html:82
+#: templates/site/text_list.html.py:163
msgid "Delete"
msgstr ""
-#: templates/site/text_history.html:126
+#: templates/site/text_history.html:128
msgid "Are you sure you want to delete this version?"
msgstr ""
@@ -1193,84 +1206,78 @@
msgid "by %(author)s"
msgstr ""
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
-msgid "People' list"
-msgstr ""
-
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:51 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr ""
-#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:53 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr ""
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:81 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr ""
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:85 templates/site/user_list.html:81
msgid "Apply"
msgstr ""
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:106 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr ""
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr ""
-#: templates/site/text_list.html:138
+#: templates/site/text_list.html:140
msgid "Modified"
msgstr ""
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:142 templates/site/user_list.html:136
msgid "Last week activity"
msgstr ""
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr ""
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr ""
-#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr ""
-#: templates/site/text_list.html:167
+#: templates/site/text_list.html:169
msgid "Are you sure you want to delete this text?"
msgstr ""
-#: templates/site/text_list.html:180
+#: templates/site/text_list.html:182
msgid "Users"
msgstr ""
-#: templates/site/text_list.html:198
+#: templates/site/text_list.html:200
msgid "Edit user"
msgstr ""
#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/user_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 ""
#: templates/site/text_share.html:29 templates/site/user_add.html:6
#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_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
@@ -1279,12 +1286,19 @@
msgstr ""
#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/user_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 ""
+#: 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 ""
+
#: templates/site/text_share.html:38 templates/site/user_list.html:43
msgid "Hide suspended users"
msgstr ""
@@ -1322,27 +1336,27 @@
msgid "Anonymous users"
msgstr ""
-#: templates/site/text_view_frame.html:63
+#: templates/site/text_view_frame.html:64
msgid "add a comment"
msgstr ""
-#: templates/site/text_view_frame.html:73
-msgid "Filter comments"
-msgstr ""
-
#: templates/site/text_view_frame.html:74
-msgid "Preferences"
+msgid "Filter comments"
msgstr ""
#: templates/site/text_view_frame.html:75
+msgid "Preferences"
+msgstr ""
+
+#: templates/site/text_view_frame.html:76
msgid "Text preferences"
msgstr ""
-#: templates/site/text_view_frame.html:102
+#: templates/site/text_view_frame.html:104
msgid "Which comments?"
msgstr ""
-#: templates/site/text_view_frame.html:110
+#: templates/site/text_view_frame.html:112
msgid "How should comments' scope be shown in text?"
msgstr ""
@@ -1369,7 +1383,7 @@
msgid "Contact user"
msgstr ""
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:26
#, python-format
msgid "Contact user %(username)s"
msgstr ""
@@ -1404,6 +1418,12 @@
msgid "Role"
msgstr ""
+#: templates/site/user_list.html:177
+msgid ""
+"Those are non-registered users. Assign them a role to open your texts to "
+"simple visitors."
+msgstr ""
+
#: 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."
@@ -1428,12 +1448,24 @@
msgstr[0] ""
msgstr[1] ""
-#: templates/site/layout/footer.html:7
-msgid "About"
+#: templates/site/layout/header.html:15
+msgid "Logout"
msgstr ""
-#: templates/site/layout/header.html:15
-msgid "Logout"
+#: 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
@@ -1476,7 +1508,7 @@
msgid "by %(name)s on %(date)s"
msgstr ""
-#: templates/site/macros/text_editor.html:43
+#: 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?"
@@ -1733,49 +1765,49 @@
msgid "Text version %(text_version_title)s deleted"
msgstr ""
-#: views/texts.py:626
+#: views/texts.py:634
msgid "Note (optional)"
msgstr ""
-#: views/texts.py:629
+#: views/texts.py:638
msgid "Add a note to explain the modifications made to the text"
msgstr ""
-#: views/texts.py:639
+#: views/texts.py:648
msgid "New version (optional)"
msgstr ""
-#: views/texts.py:642
+#: views/texts.py:651
msgid "Create a new version of this text (recommended)"
msgstr ""
-#: views/texts.py:645
+#: views/texts.py:654
msgid "Keep comments (optional)"
msgstr ""
-#: views/texts.py:648
+#: views/texts.py:657
msgid "Keep comments (if not affected by the edit)"
msgstr ""
-#: views/texts.py:712
+#: views/texts.py:723
msgid "Name (optional)"
msgstr ""
-#: views/texts.py:713
+#: views/texts.py:724
msgid "Email (optional)"
msgstr ""
-#: views/texts.py:765
+#: views/texts.py:776
#, python-format
msgid "A new version (copied from version %(version_title)s) has been created"
msgstr ""
-#: views/texts.py:873 views/user.py:79 views/user.py:99
+#: views/texts.py:884 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr ""
-#: views/texts.py:931
+#: views/texts.py:942
msgid "Text settings updated"
msgstr ""
@@ -1914,17 +1946,17 @@
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
-#: views/user.py:570
+#: views/user.py:574
msgid "You've been logged out."
msgstr ""
-#: views/user.py:586
+#: views/user.py:590
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
msgstr ""
-#: views/user.py:589
+#: views/user.py:593
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/django.po Mon Oct 11 15:04:45 2010 +0200
+++ b/src/cm/locale/es/LC_MESSAGES/django.po Mon Oct 11 15:39:29 2010 +0200
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 17:00+0200\n"
+"POT-Creation-Date: 2010-10-11 15:06+0200\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"
@@ -54,147 +54,147 @@
msgid "Tags input must be no longer than 250 characters."
msgstr "El contenido de las etiquetas no debe exceder los 250 caracteres"
-#: models.py:178 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:622
+#: models.py:184 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:630
msgid "Title"
msgstr "Título"
-#: models.py:179
+#: models.py:185
msgid "Format"
msgstr "Formato"
-#: models.py:180 views/texts.py:714
+#: models.py:186 views/texts.py:725
msgid "Content"
msgstr "Contenido"
-#: models.py:181 models.py:633 templates/site/help.html:47
+#: models.py:187 models.py:643 templates/site/help.html:47
msgid "Tags"
msgstr "Etiquetas"
-#: models.py:183 templates/site/text_history.html:80 views/user.py:223
+#: models.py:189 templates/site/text_history.html:80 views/user.py:223
msgid "Note"
msgstr "Nota"
-#: models.py:185
+#: models.py:191
msgid "Moderation a posteriori?"
msgstr "¿Moderar a posteriori?"
-#: models.py:301
+#: models.py:307
msgid "Format:"
msgstr "Formato:"
-#: models.py:536
+#: models.py:545
msgid "name"
msgstr "nombre"
-#: models.py:537
+#: models.py:546
msgid "description"
msgstr "descripción"
-#: models.py:627
+#: models.py:637
msgid "Allow contact"
msgstr "Permitir contacto"
-#: models.py:627
+#: models.py:637
msgid "Allow email messages from other users"
msgstr "Permitir correos electrónicos de otros usuarios"
-#: models.py:628
+#: models.py:638
msgid "Preferred language"
msgstr "Idioma preferido"
-#: models.py:631
+#: models.py:641
msgid "Suspended access"
msgstr "Acceso anulado"
-#: models.py:655
+#: models.py:665
msgid "suspended"
msgstr "anulado"
-#: models.py:657
+#: models.py:667
msgid "waiting approval"
msgstr "esperando aprobación"
-#: models.py:663
+#: models.py:673
msgid "pending"
msgstr "pendiente"
-#: models.py:678
+#: models.py:688
msgid "Invitation"
msgstr "Invitación"
-#: models.py:746
+#: models.py:756
#, fuzzy, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Texto %(link_to_text)s editado "
-#: models.py:747
+#: models.py:757
#, fuzzy, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Texto %(link_to_text)s editado (se ha creado una nueva versión)"
-#: models.py:748
+#: models.py:758
#, fuzzy, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Texto %(link_to_text)s añadido"
-#: models.py:749
+#: models.py:759
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Texto %(link_to_text)s eliminado"
-#: models.py:750
+#: models.py:760
#, fuzzy, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Comentario %(link_to_comment)s añadido al texto %(link_to_text)s"
-#: models.py:751
+#: models.py:761
#, 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:752
+#: models.py:762
#, python-format
msgid "User %(username)s added"
msgstr "Usuario %(username)s añadido"
-#: models.py:753
+#: models.py:763
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Permitido acceso de Usuario %(username)s a espacio de trabajo"
-#: models.py:754
+#: models.py:764
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Denegado el acceso del Usuario %(username)s al espacio de trabajo"
-#: models.py:755
+#: models.py:765
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Anulado el acceso del Usuario %(username)s al espacio de trabajo"
-#: models.py:756
+#: models.py:766
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Activado el acceso del Usuario %(username)s al espacio de trabajo"
-#: models.py:757
+#: models.py:767
#, python-format
msgid "User %(username)s has activated his account"
msgstr "El usuario %(username)s ha activado su cuenta"
-#: models.py:806
+#: models.py:816
#, fuzzy
msgid "anonymous"
msgstr "Usuarios anónimos"
-#: models.py:813 models.py:821
+#: models.py:823 models.py:831
#, python-format
msgid "by \"%(username)s\""
msgstr "por \"%(username)s\""
-#: models.py:815
+#: models.py:825
#, python-format
msgid "%(time_since)s ago"
msgstr "hace %(time_since)s"
@@ -355,6 +355,10 @@
msgid "An error has occurred."
msgstr "Se ha producido un error"
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr ""
+
#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:330
msgid "Activate your account"
@@ -364,21 +368,21 @@
msgid "Activate"
msgstr "Activar"
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6 templates/site/layout/footer.html:7
#: templates/site/macros/user_actions.html:20
msgid "Contact"
msgstr "Contactar"
-#: templates/site/contact.html:24
+#: templates/site/contact.html:24 templates/site/user_contact.html:50
msgid "Send"
msgstr "Enviar"
#: 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:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:37 templates/site/user_contact.html:25
+#: 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"
@@ -400,13 +404,9 @@
msgid "Create a text"
msgstr "Escribir un texto"
-#: templates/site/dashboard.html:48 templates/site/dashboard.html.py:49
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/help.html.py:14
-#: templates/site/text_embed.html:27 templates/site/layout/footer.html:13
-#: templates/site/macros/form_fields.html:15
-msgid "Help"
-msgstr "Ayuda"
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
#: templates/site/text_create_upload.html:4
@@ -415,6 +415,12 @@
msgid "Upload a text"
msgstr "Subir un texto"
+#: templates/site/dashboard.html:49
+msgid ""
+"Upload a document from your computer (Text document, Open Format document, "
+"Word document)"
+msgstr ""
+
#: templates/site/dashboard.html:50
#, fuzzy
msgid "Invite user"
@@ -526,7 +532,7 @@
msgstr[0] "Versiones"
msgstr[1] "Versiones"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:221
+#: templates/site/dashboard.html:208 templates/site/text_list.html:223
msgid "No texts yet"
msgstr "Aún no hay ningún texto"
@@ -551,7 +557,7 @@
msgstr "Acceso"
#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/text_list.html:208 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Cargando..."
@@ -617,6 +623,13 @@
msgid "Public feed"
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/macros/form_fields.html:20
+msgid "Help"
+msgstr "Ayuda"
+
#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr "Respuesta pública para el espacio de trabajo"
@@ -999,8 +1012,8 @@
msgstr ""
#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:37
+#: 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
@@ -1018,7 +1031,7 @@
msgstr ""
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Ajustes"
@@ -1150,7 +1163,7 @@
msgid "Selection"
msgstr "Acciones"
-#: templates/site/text_history.html:81 templates/site/text_list.html:137
+#: templates/site/text_history.html:81 templates/site/text_list.html:139
msgid "Author"
msgstr "Autor"
@@ -1158,31 +1171,31 @@
msgid "Created"
msgstr ""
-#: templates/site/text_history.html:83 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
#, fuzzy
msgid "# comments"
msgstr "comentarios"
-#: templates/site/text_history.html:103 templates/site/text_list.html:159
+#: templates/site/text_history.html:105 templates/site/text_list.html:161
msgid "View"
msgstr "Visualizar"
-#: templates/site/text_history.html:104
+#: templates/site/text_history.html:106
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr ""
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#, fuzzy
msgid "Revert to this version"
msgstr "Volver a la versión #%(v1_nid)s:"
-#: templates/site/text_history.html:120 templates/site/text_list.html:80
-#: templates/site/text_list.html.py:161
+#: templates/site/text_history.html:122 templates/site/text_list.html:82
+#: templates/site/text_list.html.py:163
msgid "Delete"
msgstr "Borrar"
-#: templates/site/text_history.html:126
+#: templates/site/text_history.html:128
#, fuzzy
msgid "Are you sure you want to delete this version?"
msgstr "¿Está seguro/a de que desea borrar este texto?"
@@ -1235,89 +1248,83 @@
msgid "by %(author)s"
msgstr "autores"
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
-msgid "People' list"
-msgstr "Lista de personas"
-
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:51 templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr ""
-#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:53 templates/site/text_share.html:42
#: templates/site/user_list.html:47
#, fuzzy
msgid "All"
msgstr "Todo"
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:81 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Acciones masivas"
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:85 templates/site/user_list.html:81
msgid "Apply"
msgstr "Aplicar"
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:106 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "¿Está seguro/a?"
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texto"
-#: templates/site/text_list.html:138
+#: templates/site/text_list.html:140
msgid "Modified"
msgstr "Modificado"
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:142 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Actividad de la pasada semana"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
#, fuzzy
msgid "tags:"
msgstr "Etiquetas"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
#, python-format
msgid "Filter by tag: %(tag_name)s"
msgstr ""
-#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
#, fuzzy
msgid "Edit"
msgstr "Editar"
-#: templates/site/text_list.html:167
+#: templates/site/text_list.html:169
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:180
+#: templates/site/text_list.html:182
#, fuzzy
msgid "Users"
msgstr "Usuarios"
-#: templates/site/text_list.html:198
+#: templates/site/text_list.html:200
#, fuzzy
msgid "Edit user"
msgstr "Editar usuario"
#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/user_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 "Lista de los usuarios"
#: templates/site/text_share.html:29 templates/site/user_add.html:6
#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_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
@@ -1327,13 +1334,20 @@
msgstr "Añadir un nuevo usuario"
#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/user_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
#, fuzzy
msgid "Add users in bulk"
msgstr "Añadir usuarios masivamente"
+#: 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 "Lista de personas"
+
#: templates/site/text_share.html:38 templates/site/user_list.html:43
msgid "Hide suspended users"
msgstr "Ocultar usuarios desactivados"
@@ -1377,27 +1391,27 @@
msgid "Anonymous users"
msgstr "Usuarios anónimos"
-#: templates/site/text_view_frame.html:63
+#: templates/site/text_view_frame.html:64
msgid "add a comment"
msgstr "añadir un comentario"
-#: templates/site/text_view_frame.html:73
+#: templates/site/text_view_frame.html:74
msgid "Filter comments"
msgstr "Filtrar comentarios"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:75
msgid "Preferences"
msgstr "Preferencias"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:76
msgid "Text preferences"
msgstr "Preferencias de texto"
-#: templates/site/text_view_frame.html:102
+#: templates/site/text_view_frame.html:104
msgid "Which comments?"
msgstr "¿Qué comentarios?"
-#: templates/site/text_view_frame.html:110
+#: templates/site/text_view_frame.html:112
msgid "How should comments' scope be shown in text?"
msgstr "¿Cómo desea mostrar el campo de los comentarios en el texto?"
@@ -1432,7 +1446,7 @@
msgid "Contact user"
msgstr "Contactar con un usuario"
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:26
#, python-format
msgid "Contact user %(username)s"
msgstr "Contactar con el usuario %(username)s"
@@ -1467,6 +1481,12 @@
msgid "Role"
msgstr "Perfil"
+#: templates/site/user_list.html:177
+msgid ""
+"Those are non-registered users. Assign them a role to open your texts to "
+"simple visitors."
+msgstr ""
+
#: 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."
@@ -1493,14 +1513,26 @@
msgstr[0] "%(nb_users)s usuario"
msgstr[1] "%(nb_users)s usuarios"
-#: templates/site/layout/footer.html:7
-msgid "About"
-msgstr "Acerca de"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Desconectarse"
+#: 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)"
@@ -1542,7 +1574,7 @@
msgid "by %(name)s on %(date)s"
msgstr "por %(name)s en %(date)s"
-#: templates/site/macros/text_editor.html:43
+#: 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?"
@@ -1817,49 +1849,49 @@
msgid "Text version %(text_version_title)s deleted"
msgstr "El texto %(text_title)s ha sido borrado"
-#: views/texts.py:626
+#: views/texts.py:634
msgid "Note (optional)"
msgstr "Nota (opcional)"
-#: views/texts.py:629
+#: views/texts.py:638
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:639
+#: views/texts.py:648
msgid "New version (optional)"
msgstr "Nueva versión (opcional)"
-#: views/texts.py:642
+#: views/texts.py:651
msgid "Create a new version of this text (recommended)"
msgstr "Crear una nueva versión de este texto (recomendado)"
-#: views/texts.py:645
+#: views/texts.py:654
msgid "Keep comments (optional)"
msgstr "mantener los comentarios (opcional)"
-#: views/texts.py:648
+#: views/texts.py:657
msgid "Keep comments (if not affected by the edit)"
msgstr "mantener los comentarios (si no son afectados por la edición)"
-#: views/texts.py:712
+#: views/texts.py:723
msgid "Name (optional)"
msgstr "Nombre (opcional)"
-#: views/texts.py:713
+#: views/texts.py:724
msgid "Email (optional)"
msgstr "Email (opcional)"
-#: views/texts.py:765
+#: views/texts.py:776
#, fuzzy, 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_id)s)"
-#: views/texts.py:873 views/user.py:79 views/user.py:99
+#: views/texts.py:884 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:931
+#: views/texts.py:942
msgid "Text settings updated"
msgstr "Ajustes del texto actualizados"
@@ -2008,11 +2040,11 @@
"Esta cuenta está suspendida. Contacte con el administrador del espacio de "
"trabajo"
-#: views/user.py:570
+#: views/user.py:574
msgid "You've been logged out."
msgstr "Se ha desconectado."
-#: views/user.py:586
+#: views/user.py:590
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -2020,13 +2052,16 @@
"Se ha registrado. Recibirá una confirmación por correo electrónico una vez "
"que el moderador apruebe su inscripción."
-#: views/user.py:589
+#: views/user.py:593
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 "About"
+#~ msgstr "Acerca de"
+
#~ msgid "Save user"
#~ msgid_plural "Save users"
#~ msgstr[0] "Guardar usuario"
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po Mon Oct 11 15:04:45 2010 +0200
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po Mon Oct 11 15:39:29 2010 +0200
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 17:01+0200\n"
-"PO-Revision-Date: 2010-04-14 17:04+0100\n"
+"POT-Creation-Date: 2010-10-11 15:08+0200\n"
+"PO-Revision-Date: 2010-10-11 15:31+0100\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: <en@li.org>\n"
"MIME-Version: 1.0\n"
@@ -58,154 +58,154 @@
msgid "Tags input must be no longer than 250 characters."
msgstr "La longueur des tags est limitée à 250 caractères."
-#: models.py:178
+#: models.py:184
#: templates/site/text_history.html:79
#: views/create.py:30
#: views/create.py:45
-#: views/texts.py:622
+#: views/texts.py:630
msgid "Title"
msgstr "Titre"
-#: models.py:179
+#: models.py:185
msgid "Format"
msgstr "Format"
-#: models.py:180
-#: views/texts.py:714
+#: models.py:186
+#: views/texts.py:725
msgid "Content"
msgstr "Texte"
-#: models.py:181
-#: models.py:633
+#: models.py:187
+#: models.py:643
#: templates/site/help.html:47
msgid "Tags"
msgstr "Tags"
-#: models.py:183
+#: models.py:189
#: templates/site/text_history.html:80
#: views/user.py:223
msgid "Note"
msgstr "Note"
-#: models.py:185
+#: models.py:191
msgid "Moderation a posteriori?"
msgstr "Modération a posteriori ?"
-#: models.py:301
+#: models.py:307
msgid "Format:"
msgstr "Format :"
-#: models.py:536
+#: models.py:545
msgid "name"
msgstr "nom"
-#: models.py:537
+#: models.py:546
msgid "description"
msgstr "description"
-#: models.py:627
+#: models.py:637
msgid "Allow contact"
msgstr "Autorise à être contacté"
-#: models.py:627
+#: models.py:637
msgid "Allow email messages from other users"
msgstr "Autoriser les participants de l'espace de travail à vous envoyer un email"
-#: models.py:628
+#: models.py:638
msgid "Preferred language"
msgstr "Langage de préférence"
-#: models.py:631
+#: models.py:641
msgid "Suspended access"
msgstr "Accès désactivé"
-#: models.py:655
+#: models.py:665
msgid "suspended"
msgstr "désactivé"
-#: models.py:657
+#: models.py:667
msgid "waiting approval"
msgstr "en attente d'approbation"
-#: models.py:663
+#: models.py:673
msgid "pending"
msgstr "en attente"
-#: models.py:678
+#: models.py:688
msgid "Invitation"
msgstr "Invitation"
-#: models.py:746
+#: models.py:756
#, 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:747
+#: models.py:757
#, 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:748
+#: models.py:758
#, 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:749
+#: models.py:759
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Le texte %(link_to_text)s a été supprimé"
-#: models.py:750
+#: models.py:760
#, python-format
msgid "Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s par %(creator)s"
-#: models.py:751
+#: models.py:761
#, 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:752
+#: models.py:762
#, python-format
msgid "User %(username)s added"
msgstr "L'utilisateur %(username)s a été ajouté"
-#: models.py:753
+#: models.py:763
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
-#: models.py:754
+#: models.py:764
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
-#: models.py:755
+#: models.py:765
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
-#: models.py:756
+#: models.py:766
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
-#: models.py:757
+#: models.py:767
#, python-format
msgid "User %(username)s has activated his account"
msgstr "L'utilisateur %(username)s a activé son compte"
-#: models.py:806
+#: models.py:816
msgid "anonymous"
msgstr "anonyme"
-#: models.py:813
-#: models.py:821
+#: models.py:823
+#: models.py:831
#, python-format
msgid "by \"%(username)s\""
msgstr "par \"%(username)s\""
-#: models.py:815
+#: models.py:825
#, python-format
msgid "%(time_since)s ago"
msgstr "il y a %(time_since)s"
@@ -367,6 +367,10 @@
msgid "An error has occurred."
msgstr "Une erreur s'est produite."
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr "Documentation de l'API"
+
#: templates/site/activate.html:10
#: templates/site/user_activate.html:10
#: views/user.py:330
@@ -378,12 +382,13 @@
msgstr "Activer"
#: templates/site/contact.html:6
-#: templates/site/layout/footer.html:9
+#: templates/site/layout/footer.html:7
#: templates/site/macros/user_actions.html:20
msgid "Contact"
msgstr "Contact"
#: templates/site/contact.html:24
+#: templates/site/user_contact.html:50
msgid "Send"
msgstr "Envoyer"
@@ -391,11 +396,11 @@
#: templates/site/notifications_desactivate.html:32
#: templates/site/settings.html:29
#: templates/site/settings_design.html:29
-#: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42
+#: templates/site/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:25
+#: 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
@@ -421,16 +426,8 @@
msgstr "Créer un texte"
#: templates/site/dashboard.html:48
-#: templates/site/dashboard.html.py:49
-#: templates/site/followup.html:22
-#: templates/site/followup.html.py:35
-#: templates/site/help.html:6
-#: templates/site/help.html.py:14
-#: templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:13
-#: templates/site/macros/form_fields.html:15
-msgid "Help"
-msgstr "Aide"
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr "Saisir votre texte dans votre navigateur ou coller du contenu à partir du presse papier."
#: templates/site/dashboard.html:49
#: templates/site/text_create_content.html:30
@@ -441,6 +438,10 @@
msgid "Upload a text"
msgstr "Charger un texte"
+#: templates/site/dashboard.html:49
+msgid "Upload a document from your computer (Text document, Open Format document, Word document)"
+msgstr "Charger un document à partir de votre ordinateur (document texte, document Open Format, document Word)"
+
#: templates/site/dashboard.html:50
msgid "Invite user"
msgstr "Inviter un utilisateur"
@@ -552,7 +553,7 @@
msgstr[1] "%(versions_number)s versions"
#: templates/site/dashboard.html:208
-#: templates/site/text_list.html:221
+#: templates/site/text_list.html:223
msgid "No texts yet"
msgstr "Aucun texte"
@@ -578,7 +579,7 @@
#: templates/site/dashboard.html:235
#: templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:206
+#: templates/site/text_list.html:208
#: templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
@@ -647,6 +648,16 @@
msgid "Public feed"
msgstr "Flux public"
+#: templates/site/followup.html:22
+#: templates/site/followup.html.py:35
+#: templates/site/help.html:6
+#: templates/site/help.html.py:14
+#: templates/site/text_embed.html:27
+#: templates/site/layout/footer.html:11
+#: templates/site/macros/form_fields.html:20
+msgid "Help"
+msgstr "Aide"
+
#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr "Flux public de l'espace de travail"
@@ -761,7 +772,7 @@
#: templates/site/help.html:34
#: templates/site/help.html.py:45
msgid "Click here for more details"
-msgstr ""
+msgstr "Cliquer ici pour plus de détails"
#: 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."
@@ -827,11 +838,11 @@
#: templates/site/help.html:67
msgid "Web feed definition on Wikipedia"
-msgstr ""
+msgstr "Definition d'un flux sur Wikipedia"
#: 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 ""
+msgstr "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
msgid "Public and private feeds"
@@ -843,7 +854,7 @@
#: templates/site/help.html:72
msgid "Text embedding"
-msgstr ""
+msgstr "Encapsulation du texte"
#: 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 your are not logged into your workspace in another tab of your browser."
@@ -877,7 +888,7 @@
#: templates/site/help.html:91
msgid "Create or upload?"
-msgstr ""
+msgstr "Créer ou charger ?"
#: 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."
@@ -961,8 +972,8 @@
#: templates/site/profile.html:33
#: templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40
+#: templates/site/text_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
@@ -985,7 +996,7 @@
#: templates/site/settings.html:5
#: templates/site/settings_design.html:5
-#: templates/site/text_list.html:181
+#: templates/site/text_list.html:183
#: templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
@@ -1102,7 +1113,7 @@
msgstr "Sélection"
#: templates/site/text_history.html:81
-#: templates/site/text_list.html:137
+#: templates/site/text_list.html:139
msgid "Author"
msgstr "Auteur"
@@ -1111,31 +1122,31 @@
msgstr "Crée"
#: templates/site/text_history.html:83
-#: templates/site/text_list.html:139
+#: templates/site/text_list.html:141
msgid "# comments"
msgstr "nb. de commentaires"
-#: templates/site/text_history.html:103
-#: templates/site/text_list.html:159
+#: templates/site/text_history.html:105
+#: templates/site/text_list.html:161
msgid "View"
msgstr "Voir"
-#: templates/site/text_history.html:104
+#: templates/site/text_history.html:106
#: 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:106
+#: templates/site/text_history.html:108
msgid "Revert to this version"
msgstr "Revenir à cette version"
-#: templates/site/text_history.html:120
-#: templates/site/text_list.html:80
-#: templates/site/text_list.html.py:161
+#: templates/site/text_history.html:122
+#: templates/site/text_list.html:82
+#: templates/site/text_list.html.py:163
msgid "Delete"
msgstr "Supprimer"
-#: templates/site/text_history.html:126
+#: templates/site/text_history.html:128
msgid "Are you sure you want to delete this version?"
msgstr "Etes-vous sûr de vouloir supprimer cette version ?"
@@ -1182,89 +1193,79 @@
msgid "by %(author)s"
msgstr "par %(author)s"
-#: templates/site/text_list.html:47
-#: templates/site/text_share.html:35
-#: templates/site/user_list.html:7
-#: templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40
-#: templates/site/user_list.html.py:116
-msgid "People' list"
-msgstr "Liste des utilisateurs"
-
-#: templates/site/text_list.html:50
+#: templates/site/text_list.html:51
#: templates/site/text_share.html:40
#: templates/site/user_list.html:45
msgid "Filter by tag:"
msgstr "Filtrer avec le mot-clé"
-#: templates/site/text_list.html:52
+#: templates/site/text_list.html:53
#: templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Tous"
-#: templates/site/text_list.html:79
+#: templates/site/text_list.html:81
#: templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Actions multiples"
-#: templates/site/text_list.html:83
+#: templates/site/text_list.html:85
#: templates/site/user_list.html:81
msgid "Apply"
msgstr "Appliquer"
-#: templates/site/text_list.html:104
+#: templates/site/text_list.html:106
#: templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Etes vous sûr ?"
-#: templates/site/text_list.html:136
+#: templates/site/text_list.html:138
#: templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texte"
-#: templates/site/text_list.html:138
+#: templates/site/text_list.html:140
msgid "Modified"
msgstr "Modifié"
-#: templates/site/text_list.html:140
+#: templates/site/text_list.html:142
#: templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Activités de la dernière semaine"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "mots-clés :"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: 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:160
+#: templates/site/text_list.html:162
#: templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Editer"
-#: templates/site/text_list.html:167
+#: templates/site/text_list.html:169
msgid "Are you sure you want to delete this text?"
msgstr "Etes-vous sûr de vouloir supprimer ce texte ?"
-#: templates/site/text_list.html:180
+#: templates/site/text_list.html:182
msgid "Users"
msgstr "Utilisateurs"
-#: templates/site/text_list.html:198
+#: templates/site/text_list.html:200
msgid "Edit user"
msgstr "Editer l'utilisateur"
#: templates/site/text_share.html:27
#: templates/site/user_add.html:20
#: templates/site/user_add_text.html:23
-#: templates/site/user_contact.html:19
#: templates/site/user_edit.html:20
#: templates/site/user_mass_add.html:20
#: templates/site/user_mass_add_text.html:23
@@ -1276,7 +1277,7 @@
#: templates/site/user_add.html.py:22
#: templates/site/user_add_text.html:6
#: templates/site/user_add_text.html:25
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:22
#: templates/site/user_edit.html:22
#: templates/site/user_list.html:34
#: templates/site/user_mass_add.html:22
@@ -1288,6 +1289,7 @@
#: 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
@@ -1295,6 +1297,15 @@
msgid "Add users in bulk"
msgstr "Ajouter des utilisateurs en masse"
+#: 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 "Liste des utilisateurs"
+
#: templates/site/text_share.html:38
#: templates/site/user_list.html:43
msgid "Hide suspended users"
@@ -1335,27 +1346,27 @@
msgid "Anonymous users"
msgstr "Utilisateurs anonymes"
-#: templates/site/text_view_frame.html:63
+#: templates/site/text_view_frame.html:64
msgid "add a comment"
msgstr "ajouter un commentaire"
-#: templates/site/text_view_frame.html:73
+#: templates/site/text_view_frame.html:74
msgid "Filter comments"
msgstr "Filtrer les commentaires"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:75
msgid "Preferences"
msgstr "Préférences"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:76
msgid "Text preferences"
msgstr "Préférences pour le texte"
-#: templates/site/text_view_frame.html:102
+#: templates/site/text_view_frame.html:104
msgid "Which comments?"
msgstr "Quels commentaires ?"
-#: templates/site/text_view_frame.html:110
+#: templates/site/text_view_frame.html:112
msgid "How should comments' scope be shown in text?"
msgstr "Rendu de la portée des commentaires ?"
@@ -1385,7 +1396,7 @@
msgid "Contact user"
msgstr "Contacter l'utilisateur"
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:26
#, python-format
msgid "Contact user %(username)s"
msgstr "Contacter l'utilisateur %(username)s"
@@ -1424,6 +1435,10 @@
msgid "Role"
msgstr "Rôle"
+#: templates/site/user_list.html:177
+msgid "Those are non-registered users. Assign them a role to open your texts to simple visitors."
+msgstr ""
+
#: 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."
@@ -1448,14 +1463,18 @@
msgstr[0] "%(nb_users)s utilisateurs"
msgstr[1] "%(nb_users)s utilisateurs"
-#: templates/site/layout/footer.html:7
-msgid "About"
-msgstr "A propos"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Se déconnecter"
+#: 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 (ou rst) est un format structuré qui permet une mise en forme simplifiée par l'usage d'une syntaxe simple. Nous recommandons l'usage du format 'markdown' sauf si vous voulez coller du HTML (dans ce cas vous devriez utiliser le format 'html')."
+
+#: 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 (ou rst) est un format structuré qui permet une mise en forme simplifiée par l'usage d'une syntaxe simple. Nous recommandons l'usage du format 'markdown' si votre texte est constitué principalement de contenu textuel et/ou si vous comptez faire de nombreuses éditions de ce texte. Vous pouvez choisir le format 'html' si votre texte ne sera pas édité ou si vous voulez préserver des formats complexes (tables, images, etc.)."
+
#: templates/site/macros/main_tabs.html:11
#, python-format
msgid "Texts (%(nb_texts)s)"
@@ -1496,7 +1515,7 @@
msgid "by %(name)s on %(date)s"
msgstr "par %(name)s le %(date)s"
-#: templates/site/macros/text_editor.html:43
+#: 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 "Vous avez tenté de quitter la page. Les modifications non sauvegardées seront perdues. Etes vous sûr de vouloir quitter cette page ?"
@@ -1751,51 +1770,51 @@
msgid "Text version %(text_version_title)s deleted"
msgstr "Version %(text_version_title)s supprimée"
-#: views/texts.py:626
+#: views/texts.py:634
msgid "Note (optional)"
msgstr "Note (facultative)"
-#: views/texts.py:629
+#: views/texts.py:638
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:639
+#: views/texts.py:648
msgid "New version (optional)"
msgstr "Nouvelle version (facultative)"
-#: views/texts.py:642
+#: views/texts.py:651
msgid "Create a new version of this text (recommended)"
msgstr "créér une nouvelle version de ce texte (recommandé)"
-#: views/texts.py:645
+#: views/texts.py:654
msgid "Keep comments (optional)"
msgstr "Conserver les commentaires (facultatif)"
-#: views/texts.py:648
+#: views/texts.py:657
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:712
+#: views/texts.py:723
msgid "Name (optional)"
msgstr "Nom (facultatif)"
-#: views/texts.py:713
+#: views/texts.py:724
msgid "Email (optional)"
msgstr "Email (facultatif)"
-#: views/texts.py:765
+#: views/texts.py:776
#, 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:873
+#: views/texts.py:884
#: 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:931
+#: views/texts.py:942
msgid "Text settings updated"
msgstr "Paramètres mis à jour"
@@ -1932,18 +1951,20 @@
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:570
+#: views/user.py:574
msgid "You've been logged out."
msgstr "Vous êtes déconnecté."
-#: views/user.py:586
+#: views/user.py:590
msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
msgstr "Enregistrement réussi, vous recevrez un message de confirmation quand un gestionnaire de l'espace de travail aura activé votre compte."
-#: views/user.py:589
+#: views/user.py:593
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 "About"
+#~ msgstr "A propos"
#~ msgid "Save user"
#~ msgid_plural "Save users"
#~ msgstr[0] "Enregistrer l'utilisateur"
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/django.po Mon Oct 11 15:04:45 2010 +0200
+++ b/src/cm/locale/no/LC_MESSAGES/django.po Mon Oct 11 15:39:29 2010 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 17:00+0200\n"
+"POT-Creation-Date: 2010-10-11 15:07+0200\n"
"PO-Revision-Date: 2010-05-06 09:45+0200\n"
"Last-Translator: km@krot.org\n"
"Language-Team: <no@li.org>\n"
@@ -60,147 +60,147 @@
msgid "Tags input must be no longer than 250 characters."
msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn."
-#: models.py:178 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:622
+#: 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:179
+#: models.py:185
msgid "Format"
msgstr "Format"
-#: models.py:180 views/texts.py:714
+#: models.py:186 views/texts.py:725
msgid "Content"
msgstr "Innhold"
-#: models.py:181 models.py:633 templates/site/help.html:47
+#: models.py:187 models.py:643 templates/site/help.html:47
msgid "Tags"
msgstr "Etiketter"
-#: models.py:183 templates/site/text_history.html:80 views/user.py:223
+#: models.py:189 templates/site/text_history.html:80 views/user.py:223
msgid "Note"
msgstr "Kommentar"
-#: models.py:185
+#: models.py:191
msgid "Moderation a posteriori?"
msgstr "Godkjenning i ettertid?"
-#: models.py:301
+#: models.py:307
msgid "Format:"
msgstr "Format:"
-#: models.py:536
+#: models.py:545
msgid "name"
msgstr "navn"
-#: models.py:537
+#: models.py:546
msgid "description"
msgstr "beskrivelse"
-#: models.py:627
+#: models.py:637
msgid "Allow contact"
msgstr "Tillatt kontakt"
-#: models.py:627
+#: models.py:637
msgid "Allow email messages from other users"
msgstr "Motta epost fra andre brukere"
-#: models.py:628
+#: models.py:638
msgid "Preferred language"
msgstr "Foretrukket språk"
-#: models.py:631
+#: models.py:641
msgid "Suspended access"
msgstr "Sperret tilgang"
-#: models.py:655
+#: models.py:665
msgid "suspended"
msgstr "sperret"
-#: models.py:657
+#: models.py:667
msgid "waiting approval"
msgstr "venter på godkjenning"
-#: models.py:663
+#: models.py:673
msgid "pending"
msgstr "pågående"
-#: models.py:678
+#: models.py:688
msgid "Invitation"
msgstr "Invitasjon"
-#: models.py:746
+#: 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:747
+#: 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:748
+#: 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:749
+#: models.py:759
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Tekst %(link_to_text)s slettet"
-#: models.py:750
+#: 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:751
+#: 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:752
+#: models.py:762
#, python-format
msgid "User %(username)s added"
msgstr "Bruker %(username)s opprettet"
-#: models.py:753
+#: models.py:763
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Aktivert tilgang for brukeren %(username)s"
-#: models.py:754
+#: models.py:764
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Nektet tilgang for brukeren %(username)s"
-#: models.py:755
+#: models.py:765
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Stoppet tilgang for brukeren %(username)s"
-#: models.py:756
+#: models.py:766
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Aktivert tilgang for brukeren %(username)s"
-#: models.py:757
+#: models.py:767
#, python-format
msgid "User %(username)s has activated his account"
msgstr "Bruker %(username)s har aktivert kontoen"
-#: models.py:806
+#: models.py:816
msgid "anonymous"
msgstr "anonym bruker"
-#: models.py:813 models.py:821
+#: models.py:823 models.py:831
#, python-format
msgid "by \"%(username)s\""
msgstr "av %(username)s"
-#: models.py:815
+#: models.py:825
#, python-format
msgid "%(time_since)s ago"
msgstr "for %(time_since)s siden"
@@ -361,6 +361,10 @@
msgid "An error has occurred."
msgstr "En feil har oppstått."
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr ""
+
#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:330
msgid "Activate your account"
@@ -370,21 +374,21 @@
msgid "Activate"
msgstr "Aktiver"
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: 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/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:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:37 templates/site/user_contact.html:25
+#: 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"
@@ -405,13 +409,9 @@
msgid "Create a text"
msgstr "Opprett en tekst"
-#: templates/site/dashboard.html:48 templates/site/dashboard.html.py:49
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/help.html.py:14
-#: templates/site/text_embed.html:27 templates/site/layout/footer.html:13
-#: templates/site/macros/form_fields.html:15
-msgid "Help"
-msgstr "Hjelp"
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
#: templates/site/text_create_upload.html:4
@@ -420,6 +420,12 @@
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 ""
+
#: templates/site/dashboard.html:50
msgid "Invite user"
msgstr "Inviter bruker"
@@ -526,7 +532,7 @@
msgstr[0] "Versjoner"
msgstr[1] "Versjoner"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:221
+#: templates/site/dashboard.html:208 templates/site/text_list.html:223
msgid "No texts yet"
msgstr "Ingen tekster ennå"
@@ -551,7 +557,7 @@
msgstr "Tilgang"
#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/text_list.html:208 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Laster..."
@@ -616,6 +622,13 @@
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"
@@ -983,8 +996,8 @@
msgstr "Passord"
#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:37
+#: 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
@@ -1002,7 +1015,7 @@
msgstr "Nullstill ditt passord"
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Innstillinger"
@@ -1133,7 +1146,7 @@
msgid "Selection"
msgstr "Tekstområde"
-#: templates/site/text_history.html:81 templates/site/text_list.html:137
+#: templates/site/text_history.html:81 templates/site/text_list.html:139
msgid "Author"
msgstr "Forfatter"
@@ -1141,29 +1154,29 @@
msgid "Created"
msgstr "Opprettet"
-#: templates/site/text_history.html:83 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
msgid "# comments"
msgstr "# merknader"
-#: templates/site/text_history.html:103 templates/site/text_list.html:159
+#: templates/site/text_history.html:105 templates/site/text_list.html:161
msgid "View"
msgstr "Se"
-#: templates/site/text_history.html:104
+#: 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:106
+#: templates/site/text_history.html:108
msgid "Revert to this version"
msgstr "Still tilbake til denne versjonen"
-#: templates/site/text_history.html:120 templates/site/text_list.html:80
-#: templates/site/text_list.html.py:161
+#: templates/site/text_history.html:122 templates/site/text_list.html:82
+#: templates/site/text_list.html.py:163
msgid "Delete"
msgstr "Slett"
-#: templates/site/text_history.html:126
+#: templates/site/text_history.html:128
msgid "Are you sure you want to delete this version?"
msgstr "Ønsker du å slette denne versjonen?"
@@ -1211,84 +1224,78 @@
msgid "by %(author)s"
msgstr "av %(author)s"
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
-msgid "People' list"
-msgstr "Personer"
-
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: 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:52 templates/site/text_share.html:42
+#: 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:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:81 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Handlinger"
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:85 templates/site/user_list.html:81
msgid "Apply"
msgstr "Utfør"
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: 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:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Tekst"
-#: templates/site/text_list.html:138
+#: templates/site/text_list.html:140
msgid "Modified"
msgstr "Endret"
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: 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:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "etiketter:"
-#: templates/site/text_list.html:156
+#: 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:160 templates/site/macros/text_tabs.html:12
+#: 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:167
+#: 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:180
+#: templates/site/text_list.html:182
msgid "Users"
msgstr "Brukere"
-#: templates/site/text_list.html:198
+#: 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_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_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:19
+#: 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
@@ -1297,12 +1304,19 @@
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_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_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"
@@ -1343,27 +1357,27 @@
msgid "Anonymous users"
msgstr "Anonyme brukere"
-#: templates/site/text_view_frame.html:63
+#: templates/site/text_view_frame.html:64
msgid "add a comment"
msgstr "opprett merknad"
-#: templates/site/text_view_frame.html:73
+#: templates/site/text_view_frame.html:74
msgid "Filter comments"
msgstr "Filtrer merknader"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:75
msgid "Preferences"
msgstr "Innstillinger"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:76
msgid "Text preferences"
msgstr "Tekstinnstillinger"
-#: templates/site/text_view_frame.html:102
+#: templates/site/text_view_frame.html:104
msgid "Which comments?"
msgstr "Hvilke merknader?"
-#: templates/site/text_view_frame.html:110
+#: 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?"
@@ -1395,7 +1409,7 @@
msgid "Contact user"
msgstr "Kontakt bruker"
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:26
#, python-format
msgid "Contact user %(username)s"
msgstr "Kontakt bruker %(username)s"
@@ -1430,6 +1444,12 @@
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 ""
+
#: 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."
@@ -1454,14 +1474,26 @@
msgstr[0] "%(nb_users)s bruker"
msgstr[1] "%(nb_users)s brukere"
-#: templates/site/layout/footer.html:7
-msgid "About"
-msgstr "Om"
-
#: 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)"
@@ -1502,7 +1534,7 @@
msgid "by %(name)s on %(date)s"
msgstr "av %(name)s %(date)s"
-#: templates/site/macros/text_editor.html:43
+#: 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?"
@@ -1770,49 +1802,49 @@
msgid "Text version %(text_version_title)s deleted"
msgstr "Tekstversjon %(text_version_title)s slettet"
-#: views/texts.py:626
+#: views/texts.py:634
msgid "Note (optional)"
msgstr "Kommentar (valgfritt)"
-#: views/texts.py:629
+#: 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:639
+#: views/texts.py:648
msgid "New version (optional)"
msgstr "Ny versjon (valgfritt)"
-#: views/texts.py:642
+#: views/texts.py:651
msgid "Create a new version of this text (recommended)"
msgstr "Opprett ny versjon av teksten (anbefales)"
-#: views/texts.py:645
+#: views/texts.py:654
msgid "Keep comments (optional)"
msgstr "Behold merknader (valgfritt)"
-#: views/texts.py:648
+#: 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:712
+#: views/texts.py:723
msgid "Name (optional)"
msgstr "Navn (valgfritt)"
-#: views/texts.py:713
+#: views/texts.py:724
msgid "Email (optional)"
msgstr "Epost (valgfritt)"
-#: views/texts.py:765
+#: 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:873 views/user.py:79 views/user.py:99
+#: 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:931
+#: views/texts.py:942
msgid "Text settings updated"
msgstr "Tekstinnstillinger oppdatert"
@@ -1957,11 +1989,11 @@
msgstr ""
"Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
-#: views/user.py:570
+#: views/user.py:574
msgid "You've been logged out."
msgstr "Du er logget ut."
-#: views/user.py:586
+#: views/user.py:590
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -1969,11 +2001,14 @@
"Du er blitt registert. Du vil motta en epost med bekreftelse når en "
"administrator godkjenner ditt medlemskap."
-#: views/user.py:589
+#: 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 "About"
+#~ msgstr "Om"
+
#~ msgid "Save user"
#~ msgid_plural "Save users"
#~ msgstr[0] "Lagre bruker"
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Oct 11 15:04:45 2010 +0200
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Mon Oct 11 15:39:29 2010 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: COMT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 16:59+0200\n"
+"POT-Creation-Date: 2010-10-11 15:06+0200\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"
@@ -54,147 +54,147 @@
msgid "Tags input must be no longer than 250 characters."
msgstr "Palavras-chave não pode exceder 250 caracteres."
-#: models.py:178 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:622
+#: models.py:184 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:630
msgid "Title"
msgstr "Título"
-#: models.py:179
+#: models.py:185
msgid "Format"
msgstr "Formatar"
-#: models.py:180 views/texts.py:714
+#: models.py:186 views/texts.py:725
msgid "Content"
msgstr "Conteúdo"
-#: models.py:181 models.py:633 templates/site/help.html:47
+#: models.py:187 models.py:643 templates/site/help.html:47
msgid "Tags"
msgstr "Palavras-chave"
-#: models.py:183 templates/site/text_history.html:80 views/user.py:223
+#: models.py:189 templates/site/text_history.html:80 views/user.py:223
msgid "Note"
msgstr "Observação"
-#: models.py:185
+#: models.py:191
msgid "Moderation a posteriori?"
msgstr "Moderação a posteriori?"
-#: models.py:301
+#: models.py:307
msgid "Format:"
msgstr "Formatar:"
-#: models.py:536
+#: models.py:545
msgid "name"
msgstr "nome"
-#: models.py:537
+#: models.py:546
msgid "description"
msgstr "descrição"
-#: models.py:627
+#: models.py:637
msgid "Allow contact"
msgstr "Permitir contato"
-#: models.py:627
+#: models.py:637
msgid "Allow email messages from other users"
msgstr "Permitir mensagens de email de outros usuários"
-#: models.py:628
+#: models.py:638
msgid "Preferred language"
msgstr "Idioma preferido"
-#: models.py:631
+#: models.py:641
msgid "Suspended access"
msgstr "Suspender acesso"
-#: models.py:655
+#: models.py:665
msgid "suspended"
msgstr "suspenso"
-#: models.py:657
+#: models.py:667
msgid "waiting approval"
msgstr "aguardando aprovação"
-#: models.py:663
+#: models.py:673
msgid "pending"
msgstr "pendente"
-#: models.py:678
+#: models.py:688
msgid "Invitation"
msgstr "Convite"
-#: models.py:746
+#: models.py:756
#, fuzzy, python-format
msgid "Text %(link_to_text)s edited by %(creator)s"
msgstr "Texto %(link_to_text)s editado"
-#: models.py:747
+#: models.py:757
#, fuzzy, python-format
msgid "Text %(link_to_text)s edited (new version created) by %(creator)s"
msgstr "Texto %(link_to_text)s editado (criada nova versão)"
-#: models.py:748
+#: models.py:758
#, fuzzy, python-format
msgid "Text %(link_to_text)s added by %(creator)s"
msgstr "Texto %(link_to_text)s adicionado"
-#: models.py:749
+#: models.py:759
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Texto %(link_to_text)s removido"
-#: models.py:750
+#: models.py:760
#, fuzzy, python-format
msgid ""
"Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s"
msgstr "Comentário %(link_to_comment)s adicionado ao texto %(link_to_text)s "
-#: models.py:751
+#: models.py:761
#, 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:752
+#: models.py:762
#, python-format
msgid "User %(username)s added"
msgstr "Usuário %(username)s adicionado"
-#: models.py:753
+#: models.py:763
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Acesso do usuário %(username)s à área de trabalho permitido"
-#: models.py:754
+#: models.py:764
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Acesso do usuário %(username)s à área de trabalho recusado"
-#: models.py:755
+#: models.py:765
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Acesso do usuário %(username)s à área de trabalho suspenso"
-#: models.py:756
+#: models.py:766
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Acesso do usuário %(username)s à área de trabalho ativado"
-#: models.py:757
+#: models.py:767
#, python-format
msgid "User %(username)s has activated his account"
msgstr "O usuário %(username)s ativou sua conta"
-#: models.py:806
+#: models.py:816
#, fuzzy
msgid "anonymous"
msgstr "Usuários anônimos"
-#: models.py:813 models.py:821
+#: models.py:823 models.py:831
#, python-format
msgid "by \"%(username)s\""
msgstr "por \"%(username)s\""
-#: models.py:815
+#: models.py:825
#, python-format
msgid "%(time_since)s ago"
msgstr "há %(time_since)s"
@@ -355,6 +355,10 @@
msgid "An error has occurred."
msgstr "Ocorreu um erro."
+#: templates/api_doc.html:6
+msgid "API Documentation"
+msgstr ""
+
#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:330
msgid "Activate your account"
@@ -364,21 +368,21 @@
msgid "Activate"
msgstr "Ativar"
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6 templates/site/layout/footer.html:7
#: templates/site/macros/user_actions.html:20
msgid "Contact"
msgstr "Contato"
-#: templates/site/contact.html:24
+#: templates/site/contact.html:24 templates/site/user_contact.html:50
msgid "Send"
msgstr "Enviar"
#: 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:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:37 templates/site/user_contact.html:25
+#: 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"
@@ -400,13 +404,9 @@
msgid "Create a text"
msgstr "Escrever um texto"
-#: templates/site/dashboard.html:48 templates/site/dashboard.html.py:49
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/help.html.py:14
-#: templates/site/text_embed.html:27 templates/site/layout/footer.html:13
-#: templates/site/macros/form_fields.html:15
-msgid "Help"
-msgstr "Ajuda"
+#: templates/site/dashboard.html:48
+msgid "Write a text inside your browser or paste a content from your clipboard"
+msgstr ""
#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
#: templates/site/text_create_upload.html:4
@@ -415,6 +415,12 @@
msgid "Upload a text"
msgstr "Carregar um texto"
+#: templates/site/dashboard.html:49
+msgid ""
+"Upload a document from your computer (Text document, Open Format document, "
+"Word document)"
+msgstr ""
+
#: templates/site/dashboard.html:50
msgid "Invite user"
msgstr "Convidar usuários"
@@ -521,7 +527,7 @@
msgstr[0] "Versões"
msgstr[1] "Versões"
-#: templates/site/dashboard.html:208 templates/site/text_list.html:221
+#: templates/site/dashboard.html:208 templates/site/text_list.html:223
msgid "No texts yet"
msgstr "Sem textos ainda"
@@ -546,7 +552,7 @@
msgstr "Acessar"
#: templates/site/dashboard.html:235 templates/site/dashboard.html.py:246
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/text_list.html:208 templates/site/user_list.html:158
#: templates/site/user_list.html.py:188
msgid "Loading..."
msgstr "Carregando"
@@ -611,6 +617,13 @@
msgid "Public feed"
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/macros/form_fields.html:20
+msgid "Help"
+msgstr "Ajuda"
+
#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr "Feed público para área de trabalho"
@@ -989,8 +1002,8 @@
msgstr ""
#: templates/site/profile.html:33 templates/site/profile_pw.html:33
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:37
+#: 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
@@ -1008,7 +1021,7 @@
msgstr ""
#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/text_list.html:183 templates/site/macros/main_tabs.html:14
#: templates/site/macros/text_tabs.html:19
msgid "Settings"
msgstr "Configurações"
@@ -1144,7 +1157,7 @@
msgid "Selection"
msgstr "Ações"
-#: templates/site/text_history.html:81 templates/site/text_list.html:137
+#: templates/site/text_history.html:81 templates/site/text_list.html:139
msgid "Author"
msgstr "Autor"
@@ -1152,31 +1165,31 @@
msgid "Created"
msgstr ""
-#: templates/site/text_history.html:83 templates/site/text_list.html:139
+#: templates/site/text_history.html:83 templates/site/text_list.html:141
#, fuzzy
msgid "# comments"
msgstr "comentários"
-#: templates/site/text_history.html:103 templates/site/text_list.html:159
+#: templates/site/text_history.html:105 templates/site/text_list.html:161
msgid "View"
msgstr "Ver"
-#: templates/site/text_history.html:104
+#: templates/site/text_history.html:106
#: templates/site/text_history_version.html:32
msgid "Compare with previous version"
msgstr ""
-#: templates/site/text_history.html:106
+#: templates/site/text_history.html:108
#, fuzzy
msgid "Revert to this version"
msgstr "Reverter para a versão #%(v1_nid)s"
-#: templates/site/text_history.html:120 templates/site/text_list.html:80
-#: templates/site/text_list.html.py:161
+#: templates/site/text_history.html:122 templates/site/text_list.html:82
+#: templates/site/text_list.html.py:163
msgid "Delete"
msgstr "Apagar"
-#: templates/site/text_history.html:126
+#: templates/site/text_history.html:128
#, fuzzy
msgid "Are you sure you want to delete this version?"
msgstr "Confirmar a exclusão desse texto?"
@@ -1228,84 +1241,78 @@
msgid "by %(author)s"
msgstr "por %(v1name)s"
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
-msgid "People' list"
-msgstr "Lista de pessoas"
-
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:51 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:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:53 templates/site/text_share.html:42
#: templates/site/user_list.html:47
msgid "All"
msgstr "Todas"
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:81 templates/site/user_list.html:72
msgid "Bulk Actions"
msgstr "Ações em massa"
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:85 templates/site/user_list.html:81
msgid "Apply"
msgstr "Aplicar"
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:106 templates/site/user_list.html:102
msgid "Are you sure?"
msgstr "Confirma?"
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:138 templates/site/macros/text_tabs.html:10
msgid "Text"
msgstr "Texto"
-#: templates/site/text_list.html:138
+#: templates/site/text_list.html:140
msgid "Modified"
msgstr "Modificar"
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:142 templates/site/user_list.html:136
msgid "Last week activity"
msgstr "Atividade da última semana"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: templates/site/macros/user_actions.html:13
msgid "tags:"
msgstr "palavras-chave:"
-#: templates/site/text_list.html:156
+#: templates/site/text_list.html:158
#: 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:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:162 templates/site/macros/text_tabs.html:12
#: templates/site/macros/user_actions.html:19
msgid "Edit"
msgstr "Editar"
-#: templates/site/text_list.html:167
+#: templates/site/text_list.html:169
msgid "Are you sure you want to delete this text?"
msgstr "Confirmar a exclusão desse texto?"
-#: templates/site/text_list.html:180
+#: templates/site/text_list.html:182
msgid "Users"
msgstr "Usuários"
-#: templates/site/text_list.html:198
+#: templates/site/text_list.html:200
msgid "Edit user"
msgstr "Editar usuários"
#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/user_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 "Lista de usuários"
#: templates/site/text_share.html:29 templates/site/user_add.html:6
#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_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
@@ -1314,12 +1321,19 @@
msgstr "Adicionar um novo usuários"
#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/user_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 "Adicionar usuários em massa"
+#: 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 "Lista de pessoas"
+
#: templates/site/text_share.html:38 templates/site/user_list.html:43
msgid "Hide suspended users"
msgstr "Ocultar usuários suspensos"
@@ -1360,27 +1374,27 @@
msgid "Anonymous users"
msgstr "Usuários anônimos"
-#: templates/site/text_view_frame.html:63
+#: templates/site/text_view_frame.html:64
msgid "add a comment"
msgstr "comentar"
-#: templates/site/text_view_frame.html:73
+#: templates/site/text_view_frame.html:74
msgid "Filter comments"
msgstr "Filtrar comentários"
-#: templates/site/text_view_frame.html:74
+#: templates/site/text_view_frame.html:75
msgid "Preferences"
msgstr "Preferências"
-#: templates/site/text_view_frame.html:75
+#: templates/site/text_view_frame.html:76
msgid "Text preferences"
msgstr "Preferências de texto"
-#: templates/site/text_view_frame.html:102
+#: templates/site/text_view_frame.html:104
msgid "Which comments?"
msgstr "Quais comentários"
-#: templates/site/text_view_frame.html:110
+#: templates/site/text_view_frame.html:112
msgid "How should comments' scope be shown in text?"
msgstr "Como os assuntos dos comentários deve aparecer no texto?"
@@ -1411,7 +1425,7 @@
msgid "Contact user"
msgstr "Contatar usuário"
-#: templates/site/user_contact.html:19
+#: templates/site/user_contact.html:26
#, python-format
msgid "Contact user %(username)s"
msgstr "Contatar usuário %(username)s"
@@ -1446,6 +1460,12 @@
msgid "Role"
msgstr "Função"
+#: templates/site/user_list.html:177
+msgid ""
+"Those are non-registered users. Assign them a role to open your texts to "
+"simple visitors."
+msgstr ""
+
#: 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."
@@ -1471,14 +1491,26 @@
msgstr[0] "%(nb_users)s usuário"
msgstr[1] "%(nb_users)s usuários"
-#: templates/site/layout/footer.html:7
-msgid "About"
-msgstr "Sobre"
-
#: templates/site/layout/header.html:15
msgid "Logout"
msgstr "Sair"
+#: 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)"
@@ -1520,7 +1552,7 @@
msgid "by %(name)s on %(date)s"
msgstr "por %(name)s em %(date)s"
-#: templates/site/macros/text_editor.html:43
+#: 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?"
@@ -1787,49 +1819,49 @@
msgid "Text version %(text_version_title)s deleted"
msgstr "Texto %(text_title)s apagado"
-#: views/texts.py:626
+#: views/texts.py:634
msgid "Note (optional)"
msgstr "Observação (opcional)"
-#: views/texts.py:629
+#: 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:639
+#: views/texts.py:648
msgid "New version (optional)"
msgstr "Nova versão (opcional)"
-#: views/texts.py:642
+#: views/texts.py:651
msgid "Create a new version of this text (recommended)"
msgstr "Criar uma nova versão desse texto (recomendado)"
-#: views/texts.py:645
+#: views/texts.py:654
msgid "Keep comments (optional)"
msgstr "Manter comentários (opcional)"
-#: views/texts.py:648
+#: views/texts.py:657
msgid "Keep comments (if not affected by the edit)"
msgstr "Manter comentários (se não afetados pela edição)"
-#: views/texts.py:712
+#: views/texts.py:723
msgid "Name (optional)"
msgstr "Nome (opcional)"
-#: views/texts.py:713
+#: views/texts.py:724
msgid "Email (optional)"
msgstr "Email (opcional)"
-#: views/texts.py:765
+#: views/texts.py:776
#, fuzzy, 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:873 views/user.py:79 views/user.py:99
+#: views/texts.py:884 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:931
+#: views/texts.py:942
msgid "Text settings updated"
msgstr "Configurações do texto atualizadas"
@@ -1977,11 +2009,11 @@
"Essa conta estpa suspensa, entre em contato com o administrador da área de "
"trabalho."
-#: views/user.py:570
+#: views/user.py:574
msgid "You've been logged out."
msgstr "Você saiu."
-#: views/user.py:586
+#: views/user.py:590
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
@@ -1989,12 +2021,15 @@
"Você se inscreveu. Você receberá um email de confirmação quando o moderador "
"aprovar sua participação."
-#: views/user.py:589
+#: views/user.py:593
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 "About"
+#~ msgstr "Sobre"
+
#~ msgid "Save user"
#~ msgid_plural "Save users"
#~ msgstr[0] "salvar usuário"