# HG changeset patch # User raph # Date 1270029627 -7200 # Node ID 48c4d74c5cd9309d10fe0a08b425d3aa1b80a3cc # Parent 7256530809735463301f6fcd59539dbab1735123 help update / i18n diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/bg/LC_MESSAGES/django.mo Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/bg/LC_MESSAGES/django.po --- a/src/cm/locale/bg/LC_MESSAGES/django.po Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/locale/bg/LC_MESSAGES/django.po Wed Mar 31 12:00:27 2010 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-22 15:10+0100\n" +"POT-Creation-Date: 2010-03-31 11:35+0200\n" "PO-Revision-Date: 2010-03-10 20:58+0100\n" "Last-Translator: bistra \n" "Language-Team: Français \n" @@ -60,7 +60,7 @@ msgstr "Таговете не трябва да надвишават 250 символа." #: models.py:178 templates/site/text_history.html:79 views/create.py:30 -#: views/create.py:45 views/texts.py:600 +#: views/create.py:45 views/texts.py:618 msgid "Title" msgstr "Заглавие" @@ -68,11 +68,11 @@ msgid "Format" msgstr "Формат" -#: models.py:180 views/texts.py:692 +#: models.py:180 views/texts.py:710 msgid "Content" msgstr "Съдържание" -#: models.py:181 models.py:633 templates/site/help.html:39 +#: models.py:181 models.py:633 templates/site/help.html:47 msgid "Tags" msgstr "Тагове" @@ -404,9 +404,18 @@ #: templates/site/text_create_content.html:28 #: templates/site/text_create_upload.html:26 templates/site/text_list.html:40 #: templates/site/layout/header.html:10 -msgid "Write a text" +#, fuzzy +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:49 templates/site/text_create_content.html:30 #: templates/site/text_create_upload.html:4 #: templates/site/text_create_upload.html:28 templates/site/text_list.html:42 @@ -605,7 +614,7 @@ msgid "Followup" msgstr "В отговор" -#: templates/site/followup.html:20 templates/site/help.html:58 +#: templates/site/followup.html:20 templates/site/help.html:66 #: templates/site/text_followup.html:22 msgid "Feeds" msgstr "захранване" @@ -614,13 +623,6 @@ 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:13 -#: templates/site/macros/form_fields.html:15 -msgid "Help" -msgstr "Помощ" - #: templates/site/followup.html:25 msgid "Public feed for workspace" msgstr "Публично захранване за работното място" @@ -699,36 +701,58 @@ msgid "Glossary" msgstr "" -#: templates/site/help.html:22 templates/site/help.html.py:25 +#: templates/site/help.html:22 +#, fuzzy +msgid "Contents" +msgstr "Съдържание" + +#: templates/site/help.html:24 templates/site/help.html.py:30 +#: templates/site/help.html:33 msgid "Collaboration" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:25 templates/site/help.html.py:37 +#, fuzzy +msgid "Comments" +msgstr "коментари" + +#: templates/site/help.html:26 templates/site/help.html.py:60 +#, fuzzy +msgid "Notification and feeds" +msgstr "Уведомяването е дезактивирано." + +#: templates/site/help.html:27 templates/site/help.html.py:77 +#: templates/site/help.html:79 +#, fuzzy +msgid "Roles" +msgstr "Роля" + +#: templates/site/help.html:28 templates/site/help.html.py:88 +#: templates/site/text_list.html:12 +msgid "Texts" +msgstr "Текстове" + +#: templates/site/help.html:34 msgid "co-ment 2 collaboration is based on assigning roles for users." msgstr "" -#: templates/site/help.html:26 templates/site/help.html.py:37 +#: templates/site/help.html:34 templates/site/help.html.py:45 msgid "Click here for more details" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:34 msgid "" "The basic assumption in the collaboration model is that some users will have " "an overall management role, while others will have roles that are defined in " "relationship with texts or a given text." msgstr "" -#: templates/site/help.html:29 -#, fuzzy -msgid "Comments" -msgstr "коментари" - -#: templates/site/help.html:32 +#: templates/site/help.html:40 #, fuzzy msgid "Moderation" msgstr "Модератор" -#: templates/site/help.html:33 +#: templates/site/help.html:41 msgid "" "Comment moderation is the process of editing/removing comments from a text. " "The moderator role is the collection of permissions required to edit/remove " @@ -741,23 +765,23 @@ "them." msgstr "" -#: templates/site/help.html:36 +#: templates/site/help.html:44 #, fuzzy msgid "States" msgstr "Запамети" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "co-ment uses states to implement moderation policies." msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "" "Unapproved or pending comments are visible only to Managers, Editors and " "Moderators. Approved comments are visible to users with any role. The " "pending state exists only when a priori moderation is selected in settings." msgstr "" -#: templates/site/help.html:40 +#: templates/site/help.html:48 msgid "" "We believe that an adequate use of tags is sufficient to implement a variety " "of workflows for processing comments. You can use tags for signalling TODOs " @@ -765,12 +789,12 @@ "according to the issues or topics they address." msgstr "" -#: templates/site/help.html:42 +#: templates/site/help.html:50 #, fuzzy msgid "Linking to a comment" msgstr "Може да редактира коментар" -#: templates/site/help.html:43 +#: templates/site/help.html:51 msgid "" "You may find yourself needing to link to a comment from another one. In such " "case you can do so by copying your target comment's permalink that shows up " @@ -778,22 +802,22 @@ "title." msgstr "" -#: templates/site/help.html:45 +#: templates/site/help.html:53 msgid "Scope" msgstr "" -#: templates/site/help.html:46 +#: templates/site/help.html:54 msgid "" "The scope of the comment is the part of the text to which it applies. A " "comment's scope can be modified by anyone who has a role allowing to modify " "the comment." msgstr "" -#: templates/site/help.html:48 +#: templates/site/help.html:56 msgid "Keeping your comments across versions" msgstr "" -#: templates/site/help.html:49 +#: templates/site/help.html:57 msgid "" "When you create a new version of the text, comments are duplicated. In case " "the text edition did not change the scope of the comment, it will be kept " @@ -805,39 +829,34 @@ "simply removed from the new version." msgstr "" -#: templates/site/help.html:52 -#, fuzzy -msgid "Notification and feeds" -msgstr "Уведомяването е дезактивирано." - -#: templates/site/help.html:55 +#: templates/site/help.html:63 #, fuzzy msgid "Email notification" msgstr "Уведомления чрез е-майл" -#: templates/site/help.html:56 +#: templates/site/help.html:64 msgid "" "Email notifications are a way for users to be informed by email when a new " "comment is added on a text or a text is edited and a new version gets " "created." msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "Web feed definition on Wikipedia" msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "" "You can subscribe to the feed for a specific text or to a global feed for " "the full workspace." msgstr "" -#: templates/site/help.html:61 +#: templates/site/help.html:69 #, fuzzy msgid "Public and private feeds" msgstr "Частно захранване" -#: templates/site/help.html:62 +#: templates/site/help.html:70 msgid "" "The public feed includes all the events publically accessible on the " "workspace or a specific text. The private feed includes all events: do not " @@ -845,11 +864,11 @@ "really want them to know what's happening in it." msgstr "" -#: templates/site/help.html:64 +#: templates/site/help.html:72 msgid "Text embedding" msgstr "" -#: templates/site/help.html:65 +#: 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' " @@ -859,37 +878,32 @@ "in another tab of your browser." msgstr "" -#: templates/site/help.html:69 templates/site/help.html.py:71 -#, fuzzy -msgid "Roles" -msgstr "Роля" - -#: templates/site/help.html:72 +#: templates/site/help.html:80 msgid "Roles are predefined sets of permissions." msgstr "" -#: templates/site/help.html:73 +#: templates/site/help.html:81 msgid "" "A text is visible to the public (non-logged-in visitors, aka anonymous " "users) only if anonymous users are given a role on the text." msgstr "" -#: templates/site/help.html:74 templates/site/text_share.html:88 +#: templates/site/help.html:82 templates/site/text_share.html:88 msgid "Text role" msgstr "Роля в текста" -#: templates/site/help.html:75 +#: templates/site/help.html:83 msgid "" "A text role is a role that is set for a specific user on a specific text. It " "can be used to override a possibly existing workspace-level role or to give " "a user a role on a text (and not on every text in the workspace)." msgstr "" -#: templates/site/help.html:76 views/site.py:185 +#: templates/site/help.html:84 views/site.py:185 msgid "Role model" msgstr "Модел на роля" -#: templates/site/help.html:77 +#: templates/site/help.html:85 msgid "" "A role model is a role set useful in a specific use case. When you set up a " "co-ment service, you have to select a role model. The default model " @@ -898,34 +912,42 @@ "privately shared between a teacher and each student." msgstr "" -#: templates/site/help.html:80 -#, fuzzy -msgid "Text edition" -msgstr "Следваща модификация" +#: templates/site/help.html:91 +msgid "Create or upload?" +msgstr "" -#: templates/site/help.html:83 +#: templates/site/help.html:92 +msgid "" +"There are 3 main ways to produce a text in co-ment. If you start from " +"scratch, create your text in markdown format. If you start from an existing " +"file upload it to a markdown format. If you start from a Web page, create a " +"text with HTML as format, and copy and paste the full Web page into the " +"editor." +msgstr "" + +#: templates/site/help.html:96 #, fuzzy msgid "Text formats" msgstr "Известия отнасящи се за текста" -#: templates/site/help.html:84 +#: templates/site/help.html:97 msgid "" "There are at this date 3 text formats: markdown (default/preferred format), " "HTML and RST." msgstr "" -#: templates/site/help.html:88 +#: templates/site/help.html:101 msgid "Markdown" msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "" "Unless some import needs make it preferable to use HTML, we recommend that " "you use markdown for creating or importing texts. Our software and Web " "services use the pandoc extended version of markdown." msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Read more about this" msgstr "" @@ -981,7 +1003,7 @@ #: templates/site/profile.html:33 templates/site/profile_pw.html:33 #: templates/site/text_create_content.html:45 -#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36 +#: templates/site/text_create_upload.html:40 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 @@ -1152,16 +1174,16 @@ msgid "Compare with previous version" msgstr "Сравнете с предишни версий" -#: templates/site/text_history.html:105 +#: templates/site/text_history.html:106 msgid "Revert to this version" msgstr "Върнете се към тази версия" -#: templates/site/text_history.html:106 templates/site/text_list.html:80 +#: templates/site/text_history.html:120 templates/site/text_list.html:80 #: templates/site/text_list.html.py:161 msgid "Delete" msgstr "Изтриване" -#: templates/site/text_history.html:112 +#: templates/site/text_history.html:126 msgid "Are you sure you want to delete this version?" msgstr "Сигурни ли сте, че искате да изтриете тази версия?" @@ -1202,16 +1224,12 @@ msgid "Next version" msgstr "Следваща версия" -#: templates/site/text_history_version.html:45 views/texts.py:478 -#: views/texts.py:479 +#: templates/site/text_history_version.html:45 views/texts.py:496 +#: views/texts.py:497 #, python-format msgid "by %(author)s" msgstr "от %(author)s" -#: templates/site/text_list.html:12 -msgid "Texts" -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 @@ -1360,11 +1378,11 @@ msgid "Text preferences" msgstr "Предпочитания за текста" -#: templates/site/text_view_frame.html:100 +#: templates/site/text_view_frame.html:102 msgid "Which comments?" msgstr "Кой коментар?" -#: templates/site/text_view_frame.html:108 +#: templates/site/text_view_frame.html:110 msgid "How should comments' scope be shown in text?" msgstr "Как да бъде показан обхватът на коментарите в текста?" @@ -1666,7 +1684,7 @@ msgid "Private notifications feed reseted." msgstr "Частното захранване на уведомяването е реинициализирано." -#: views/site.py:82 views/texts.py:130 views/user.py:545 +#: views/site.py:82 views/texts.py:131 views/user.py:545 msgid "You're logged in!" msgstr "Вие сте включени!" @@ -1764,64 +1782,64 @@ msgid "Password changed" msgstr "" -#: views/texts.py:163 +#: views/texts.py:164 #, python-format msgid "%(nb_texts)i text(s) deleted" msgstr "%(nb_texts)i изтрит(и) текстове" -#: views/texts.py:208 +#: views/texts.py:209 #, python-format msgid "Text %(text_title)s deleted" msgstr "Текстът %(text_title)s е изтит" -#: views/texts.py:219 +#: views/texts.py:220 #, python-format msgid "Text version %(text_version_title)s deleted" msgstr "Версията на текста %(text_version_title)s е изтит" -#: views/texts.py:604 +#: views/texts.py:622 msgid "Note (optional)" msgstr "Бележка (по избор)" -#: views/texts.py:607 +#: views/texts.py:625 msgid "Add a note to explain the modifications made to the text" msgstr "Добавете бележка за да обясните промените извършени върху текста" -#: views/texts.py:617 +#: views/texts.py:635 msgid "New version (optional)" msgstr "Нова версия (по избор)" -#: views/texts.py:620 +#: views/texts.py:638 msgid "Create a new version of this text (recommended)" msgstr "Създайте нова версия на текста (препоръчително)" -#: views/texts.py:623 +#: views/texts.py:641 msgid "Keep comments (optional)" msgstr "Запазете коментарите (по избор)" -#: views/texts.py:626 +#: views/texts.py:644 msgid "Keep comments (if not affected by the edit)" msgstr "Запазете коментарите (ако не са засегнати от редактирането)" -#: views/texts.py:690 +#: views/texts.py:708 msgid "Name (optional)" msgstr "Име (по избор)" -#: views/texts.py:691 +#: views/texts.py:709 msgid "Email (optional)" msgstr "Майл (по избор)" -#: views/texts.py:741 +#: views/texts.py:761 #, python-format msgid "A new version (copied from version %(version_title)s) has been created" msgstr "Нова версия (копирана от %(version_title)s версия ) е създадена" -#: views/texts.py:849 views/user.py:79 views/user.py:99 +#: views/texts.py:869 views/user.py:79 views/user.py:99 #, fuzzy, python-format msgid "%(count)i user(s) role modified" msgstr "роля(и) на потребителя са изменени" -#: views/texts.py:907 +#: views/texts.py:927 msgid "Text settings updated" msgstr "Параметрите са актуализирани" @@ -1988,6 +2006,10 @@ "вашия имейл" #, fuzzy +#~ msgid "Text edition" +#~ msgstr "Следваща модификация" + +#, fuzzy #~ msgid "Your password has been reset." #~ msgstr "Достъпът на потребителя %(prof)s е отказан." diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/en/LC_MESSAGES/django.mo Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/en/LC_MESSAGES/django.po --- a/src/cm/locale/en/LC_MESSAGES/django.po Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/locale/en/LC_MESSAGES/django.po Wed Mar 31 12:00:27 2010 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-22 15:11+0100\n" +"POT-Creation-Date: 2010-03-31 11:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,7 +58,7 @@ msgstr "" #: models.py:178 templates/site/text_history.html:79 views/create.py:30 -#: views/create.py:45 views/texts.py:600 +#: views/create.py:45 views/texts.py:618 msgid "Title" msgstr "" @@ -66,11 +66,11 @@ msgid "Format" msgstr "" -#: models.py:180 views/texts.py:692 +#: models.py:180 views/texts.py:710 msgid "Content" msgstr "" -#: models.py:181 models.py:633 templates/site/help.html:39 +#: models.py:181 models.py:633 templates/site/help.html:47 msgid "Tags" msgstr "" @@ -398,7 +398,15 @@ #: templates/site/text_create_content.html:28 #: templates/site/text_create_upload.html:26 templates/site/text_list.html:40 #: templates/site/layout/header.html:10 -msgid "Write a text" +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:49 templates/site/text_create_content.html:30 @@ -595,7 +603,7 @@ msgid "Followup" msgstr "" -#: templates/site/followup.html:20 templates/site/help.html:58 +#: templates/site/followup.html:20 templates/site/help.html:66 #: templates/site/text_followup.html:22 msgid "Feeds" msgstr "" @@ -604,13 +612,6 @@ 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:13 -#: templates/site/macros/form_fields.html:15 -msgid "Help" -msgstr "" - #: templates/site/followup.html:25 msgid "Public feed for workspace" msgstr "" @@ -684,34 +685,53 @@ msgid "Glossary" msgstr "" -#: templates/site/help.html:22 templates/site/help.html.py:25 +#: templates/site/help.html:22 +msgid "Contents" +msgstr "" + +#: templates/site/help.html:24 templates/site/help.html.py:30 +#: templates/site/help.html:33 msgid "Collaboration" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:25 templates/site/help.html.py:37 +msgid "Comments" +msgstr "" + +#: templates/site/help.html:26 templates/site/help.html.py:60 +msgid "Notification and feeds" +msgstr "" + +#: templates/site/help.html:27 templates/site/help.html.py:77 +#: templates/site/help.html:79 +msgid "Roles" +msgstr "" + +#: templates/site/help.html:28 templates/site/help.html.py:88 +#: templates/site/text_list.html:12 +msgid "Texts" +msgstr "" + +#: templates/site/help.html:34 msgid "co-ment 2 collaboration is based on assigning roles for users." msgstr "" -#: templates/site/help.html:26 templates/site/help.html.py:37 +#: templates/site/help.html:34 templates/site/help.html.py:45 msgid "Click here for more details" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:34 msgid "" "The basic assumption in the collaboration model is that some users will have " "an overall management role, while others will have roles that are defined in " "relationship with texts or a given text." msgstr "" -#: templates/site/help.html:29 -msgid "Comments" -msgstr "" - -#: templates/site/help.html:32 +#: templates/site/help.html:40 msgid "Moderation" msgstr "" -#: templates/site/help.html:33 +#: templates/site/help.html:41 msgid "" "Comment moderation is the process of editing/removing comments from a text. " "The moderator role is the collection of permissions required to edit/remove " @@ -724,22 +744,22 @@ "them." msgstr "" -#: templates/site/help.html:36 +#: templates/site/help.html:44 msgid "States" msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "co-ment uses states to implement moderation policies." msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "" "Unapproved or pending comments are visible only to Managers, Editors and " "Moderators. Approved comments are visible to users with any role. The " "pending state exists only when a priori moderation is selected in settings." msgstr "" -#: templates/site/help.html:40 +#: templates/site/help.html:48 msgid "" "We believe that an adequate use of tags is sufficient to implement a variety " "of workflows for processing comments. You can use tags for signalling TODOs " @@ -747,11 +767,11 @@ "according to the issues or topics they address." msgstr "" -#: templates/site/help.html:42 +#: templates/site/help.html:50 msgid "Linking to a comment" msgstr "" -#: templates/site/help.html:43 +#: templates/site/help.html:51 msgid "" "You may find yourself needing to link to a comment from another one. In such " "case you can do so by copying your target comment's permalink that shows up " @@ -759,22 +779,22 @@ "title." msgstr "" -#: templates/site/help.html:45 +#: templates/site/help.html:53 msgid "Scope" msgstr "" -#: templates/site/help.html:46 +#: templates/site/help.html:54 msgid "" "The scope of the comment is the part of the text to which it applies. A " "comment's scope can be modified by anyone who has a role allowing to modify " "the comment." msgstr "" -#: templates/site/help.html:48 +#: templates/site/help.html:56 msgid "Keeping your comments across versions" msgstr "" -#: templates/site/help.html:49 +#: templates/site/help.html:57 msgid "" "When you create a new version of the text, comments are duplicated. In case " "the text edition did not change the scope of the comment, it will be kept " @@ -786,36 +806,32 @@ "simply removed from the new version." msgstr "" -#: templates/site/help.html:52 -msgid "Notification and feeds" -msgstr "" - -#: templates/site/help.html:55 +#: templates/site/help.html:63 msgid "Email notification" msgstr "" -#: templates/site/help.html:56 +#: templates/site/help.html:64 msgid "" "Email notifications are a way for users to be informed by email when a new " "comment is added on a text or a text is edited and a new version gets " "created." msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "Web feed definition on Wikipedia" msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "" "You can subscribe to the feed for a specific text or to a global feed for " "the full workspace." msgstr "" -#: templates/site/help.html:61 +#: templates/site/help.html:69 msgid "Public and private feeds" msgstr "" -#: templates/site/help.html:62 +#: templates/site/help.html:70 msgid "" "The public feed includes all the events publically accessible on the " "workspace or a specific text. The private feed includes all events: do not " @@ -823,11 +839,11 @@ "really want them to know what's happening in it." msgstr "" -#: templates/site/help.html:64 +#: templates/site/help.html:72 msgid "Text embedding" msgstr "" -#: templates/site/help.html:65 +#: 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' " @@ -837,36 +853,32 @@ "in another tab of your browser." msgstr "" -#: templates/site/help.html:69 templates/site/help.html.py:71 -msgid "Roles" -msgstr "" - -#: templates/site/help.html:72 +#: templates/site/help.html:80 msgid "Roles are predefined sets of permissions." msgstr "" -#: templates/site/help.html:73 +#: templates/site/help.html:81 msgid "" "A text is visible to the public (non-logged-in visitors, aka anonymous " "users) only if anonymous users are given a role on the text." msgstr "" -#: templates/site/help.html:74 templates/site/text_share.html:88 +#: templates/site/help.html:82 templates/site/text_share.html:88 msgid "Text role" msgstr "" -#: templates/site/help.html:75 +#: templates/site/help.html:83 msgid "" "A text role is a role that is set for a specific user on a specific text. It " "can be used to override a possibly existing workspace-level role or to give " "a user a role on a text (and not on every text in the workspace)." msgstr "" -#: templates/site/help.html:76 views/site.py:185 +#: templates/site/help.html:84 views/site.py:185 msgid "Role model" msgstr "" -#: templates/site/help.html:77 +#: templates/site/help.html:85 msgid "" "A role model is a role set useful in a specific use case. When you set up a " "co-ment service, you have to select a role model. The default model " @@ -875,32 +887,41 @@ "privately shared between a teacher and each student." msgstr "" -#: templates/site/help.html:80 -msgid "Text edition" +#: templates/site/help.html:91 +msgid "Create or upload?" msgstr "" -#: templates/site/help.html:83 +#: templates/site/help.html:92 +msgid "" +"There are 3 main ways to produce a text in co-ment. If you start from " +"scratch, create your text in markdown format. If you start from an existing " +"file upload it to a markdown format. If you start from a Web page, create a " +"text with HTML as format, and copy and paste the full Web page into the " +"editor." +msgstr "" + +#: templates/site/help.html:96 msgid "Text formats" msgstr "" -#: templates/site/help.html:84 +#: templates/site/help.html:97 msgid "" "There are at this date 3 text formats: markdown (default/preferred format), " "HTML and RST." msgstr "" -#: templates/site/help.html:88 +#: templates/site/help.html:101 msgid "Markdown" msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "" "Unless some import needs make it preferable to use HTML, we recommend that " "you use markdown for creating or importing texts. Our software and Web " "services use the pandoc extended version of markdown." msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Read more about this" msgstr "" @@ -956,7 +977,7 @@ #: templates/site/profile.html:33 templates/site/profile_pw.html:33 #: templates/site/text_create_content.html:45 -#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36 +#: templates/site/text_create_upload.html:40 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 @@ -1116,16 +1137,16 @@ msgid "Compare with previous version" msgstr "" -#: templates/site/text_history.html:105 +#: templates/site/text_history.html:106 msgid "Revert to this version" msgstr "" -#: templates/site/text_history.html:106 templates/site/text_list.html:80 +#: templates/site/text_history.html:120 templates/site/text_list.html:80 #: templates/site/text_list.html.py:161 msgid "Delete" msgstr "" -#: templates/site/text_history.html:112 +#: templates/site/text_history.html:126 msgid "Are you sure you want to delete this version?" msgstr "" @@ -1166,16 +1187,12 @@ msgid "Next version" msgstr "" -#: templates/site/text_history_version.html:45 views/texts.py:478 -#: views/texts.py:479 +#: templates/site/text_history_version.html:45 views/texts.py:496 +#: views/texts.py:497 #, python-format msgid "by %(author)s" msgstr "" -#: templates/site/text_list.html:12 -msgid "Texts" -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 @@ -1321,11 +1338,11 @@ msgid "Text preferences" msgstr "" -#: templates/site/text_view_frame.html:100 +#: templates/site/text_view_frame.html:102 msgid "Which comments?" msgstr "" -#: templates/site/text_view_frame.html:108 +#: templates/site/text_view_frame.html:110 msgid "How should comments' scope be shown in text?" msgstr "" @@ -1610,7 +1627,7 @@ msgid "Private notifications feed reseted." msgstr "" -#: views/site.py:82 views/texts.py:130 views/user.py:545 +#: views/site.py:82 views/texts.py:131 views/user.py:545 msgid "You're logged in!" msgstr "" @@ -1701,64 +1718,64 @@ msgid "Password changed" msgstr "" -#: views/texts.py:163 +#: views/texts.py:164 #, python-format msgid "%(nb_texts)i text(s) deleted" msgstr "" -#: views/texts.py:208 +#: views/texts.py:209 #, python-format msgid "Text %(text_title)s deleted" msgstr "" -#: views/texts.py:219 +#: views/texts.py:220 #, python-format msgid "Text version %(text_version_title)s deleted" msgstr "" -#: views/texts.py:604 +#: views/texts.py:622 msgid "Note (optional)" msgstr "" -#: views/texts.py:607 +#: views/texts.py:625 msgid "Add a note to explain the modifications made to the text" msgstr "" -#: views/texts.py:617 +#: views/texts.py:635 msgid "New version (optional)" msgstr "" -#: views/texts.py:620 +#: views/texts.py:638 msgid "Create a new version of this text (recommended)" msgstr "" -#: views/texts.py:623 +#: views/texts.py:641 msgid "Keep comments (optional)" msgstr "" -#: views/texts.py:626 +#: views/texts.py:644 msgid "Keep comments (if not affected by the edit)" msgstr "" -#: views/texts.py:690 +#: views/texts.py:708 msgid "Name (optional)" msgstr "" -#: views/texts.py:691 +#: views/texts.py:709 msgid "Email (optional)" msgstr "" -#: views/texts.py:741 +#: views/texts.py:761 #, python-format msgid "A new version (copied from version %(version_title)s) has been created" msgstr "" -#: views/texts.py:849 views/user.py:79 views/user.py:99 +#: views/texts.py:869 views/user.py:79 views/user.py:99 #, python-format msgid "%(count)i user(s) role modified" msgstr "" -#: views/texts.py:907 +#: views/texts.py:927 msgid "Text settings updated" msgstr "" diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/es/LC_MESSAGES/django.mo Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/es/LC_MESSAGES/django.po --- a/src/cm/locale/es/LC_MESSAGES/django.po Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/locale/es/LC_MESSAGES/django.po Wed Mar 31 12:00:27 2010 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: COMT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-22 15:10+0100\n" +"POT-Creation-Date: 2010-03-31 11:36+0200\n" "PO-Revision-Date: 2010-02-24 01:37+0900\n" "Last-Translator: dev \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ 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:600 +#: views/create.py:45 views/texts.py:618 msgid "Title" msgstr "Título" @@ -63,11 +63,11 @@ msgid "Format" msgstr "Formato" -#: models.py:180 views/texts.py:692 +#: models.py:180 views/texts.py:710 msgid "Content" msgstr "Contenido" -#: models.py:181 models.py:633 templates/site/help.html:39 +#: models.py:181 models.py:633 templates/site/help.html:47 msgid "Tags" msgstr "Etiquetas" @@ -396,9 +396,18 @@ #: templates/site/text_create_content.html:28 #: templates/site/text_create_upload.html:26 templates/site/text_list.html:40 #: templates/site/layout/header.html:10 -msgid "Write a text" +#, fuzzy +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:49 templates/site/text_create_content.html:30 #: templates/site/text_create_upload.html:4 #: templates/site/text_create_upload.html:28 templates/site/text_list.html:42 @@ -599,7 +608,7 @@ msgid "Followup" msgstr "" -#: templates/site/followup.html:20 templates/site/help.html:58 +#: templates/site/followup.html:20 templates/site/help.html:66 #: templates/site/text_followup.html:22 msgid "Feeds" msgstr "Respuestas" @@ -608,13 +617,6 @@ 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:13 -#: templates/site/macros/form_fields.html:15 -msgid "Help" -msgstr "Ayuda" - #: templates/site/followup.html:25 msgid "Public feed for workspace" msgstr "Respuesta pública para el espacio de trabajo" @@ -695,36 +697,58 @@ msgid "Glossary" msgstr "" -#: templates/site/help.html:22 templates/site/help.html.py:25 +#: templates/site/help.html:22 +#, fuzzy +msgid "Contents" +msgstr "Contenido" + +#: templates/site/help.html:24 templates/site/help.html.py:30 +#: templates/site/help.html:33 msgid "Collaboration" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:25 templates/site/help.html.py:37 +#, fuzzy +msgid "Comments" +msgstr "comentarios" + +#: templates/site/help.html:26 templates/site/help.html.py:60 +#, fuzzy +msgid "Notification and feeds" +msgstr "Avisos" + +#: templates/site/help.html:27 templates/site/help.html.py:77 +#: templates/site/help.html:79 +#, fuzzy +msgid "Roles" +msgstr "Perfil" + +#: templates/site/help.html:28 templates/site/help.html.py:88 +#: templates/site/text_list.html:12 +msgid "Texts" +msgstr "Textos" + +#: templates/site/help.html:34 msgid "co-ment 2 collaboration is based on assigning roles for users." msgstr "" -#: templates/site/help.html:26 templates/site/help.html.py:37 +#: templates/site/help.html:34 templates/site/help.html.py:45 msgid "Click here for more details" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:34 msgid "" "The basic assumption in the collaboration model is that some users will have " "an overall management role, while others will have roles that are defined in " "relationship with texts or a given text." msgstr "" -#: templates/site/help.html:29 -#, fuzzy -msgid "Comments" -msgstr "comentarios" - -#: templates/site/help.html:32 +#: templates/site/help.html:40 #, fuzzy msgid "Moderation" msgstr "Moderador" -#: templates/site/help.html:33 +#: templates/site/help.html:41 msgid "" "Comment moderation is the process of editing/removing comments from a text. " "The moderator role is the collection of permissions required to edit/remove " @@ -737,23 +761,23 @@ "them." msgstr "" -#: templates/site/help.html:36 +#: templates/site/help.html:44 #, fuzzy msgid "States" msgstr "Guardar" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "co-ment uses states to implement moderation policies." msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "" "Unapproved or pending comments are visible only to Managers, Editors and " "Moderators. Approved comments are visible to users with any role. The " "pending state exists only when a priori moderation is selected in settings." msgstr "" -#: templates/site/help.html:40 +#: templates/site/help.html:48 msgid "" "We believe that an adequate use of tags is sufficient to implement a variety " "of workflows for processing comments. You can use tags for signalling TODOs " @@ -761,12 +785,12 @@ "according to the issues or topics they address." msgstr "" -#: templates/site/help.html:42 +#: templates/site/help.html:50 #, fuzzy msgid "Linking to a comment" msgstr "Puede editar comentarios" -#: templates/site/help.html:43 +#: templates/site/help.html:51 msgid "" "You may find yourself needing to link to a comment from another one. In such " "case you can do so by copying your target comment's permalink that shows up " @@ -774,22 +798,22 @@ "title." msgstr "" -#: templates/site/help.html:45 +#: templates/site/help.html:53 msgid "Scope" msgstr "" -#: templates/site/help.html:46 +#: templates/site/help.html:54 msgid "" "The scope of the comment is the part of the text to which it applies. A " "comment's scope can be modified by anyone who has a role allowing to modify " "the comment." msgstr "" -#: templates/site/help.html:48 +#: templates/site/help.html:56 msgid "Keeping your comments across versions" msgstr "" -#: templates/site/help.html:49 +#: templates/site/help.html:57 msgid "" "When you create a new version of the text, comments are duplicated. In case " "the text edition did not change the scope of the comment, it will be kept " @@ -801,39 +825,34 @@ "simply removed from the new version." msgstr "" -#: templates/site/help.html:52 -#, fuzzy -msgid "Notification and feeds" -msgstr "Avisos" - -#: templates/site/help.html:55 +#: templates/site/help.html:63 #, fuzzy msgid "Email notification" msgstr "Avisos de correo electrónico" -#: templates/site/help.html:56 +#: templates/site/help.html:64 msgid "" "Email notifications are a way for users to be informed by email when a new " "comment is added on a text or a text is edited and a new version gets " "created." msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "Web feed definition on Wikipedia" msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "" "You can subscribe to the feed for a specific text or to a global feed for " "the full workspace." msgstr "" -#: templates/site/help.html:61 +#: templates/site/help.html:69 #, fuzzy msgid "Public and private feeds" msgstr "Respuesta privada" -#: templates/site/help.html:62 +#: templates/site/help.html:70 msgid "" "The public feed includes all the events publically accessible on the " "workspace or a specific text. The private feed includes all events: do not " @@ -841,11 +860,11 @@ "really want them to know what's happening in it." msgstr "" -#: templates/site/help.html:64 +#: templates/site/help.html:72 msgid "Text embedding" msgstr "" -#: templates/site/help.html:65 +#: 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' " @@ -855,38 +874,33 @@ "in another tab of your browser." msgstr "" -#: templates/site/help.html:69 templates/site/help.html.py:71 -#, fuzzy -msgid "Roles" -msgstr "Perfil" - -#: templates/site/help.html:72 +#: templates/site/help.html:80 msgid "Roles are predefined sets of permissions." msgstr "" -#: templates/site/help.html:73 +#: templates/site/help.html:81 msgid "" "A text is visible to the public (non-logged-in visitors, aka anonymous " "users) only if anonymous users are given a role on the text." msgstr "" -#: templates/site/help.html:74 templates/site/text_share.html:88 +#: templates/site/help.html:82 templates/site/text_share.html:88 #, fuzzy msgid "Text role" msgstr "Nivel del perfil del texto" -#: templates/site/help.html:75 +#: templates/site/help.html:83 msgid "" "A text role is a role that is set for a specific user on a specific text. It " "can be used to override a possibly existing workspace-level role or to give " "a user a role on a text (and not on every text in the workspace)." msgstr "" -#: templates/site/help.html:76 views/site.py:185 +#: templates/site/help.html:84 views/site.py:185 msgid "Role model" msgstr "Modelo de perfiles" -#: templates/site/help.html:77 +#: templates/site/help.html:85 msgid "" "A role model is a role set useful in a specific use case. When you set up a " "co-ment service, you have to select a role model. The default model " @@ -895,34 +909,42 @@ "privately shared between a teacher and each student." msgstr "" -#: templates/site/help.html:80 -#, fuzzy -msgid "Text edition" -msgstr "Avisos del texto" +#: templates/site/help.html:91 +msgid "Create or upload?" +msgstr "" -#: templates/site/help.html:83 +#: templates/site/help.html:92 +msgid "" +"There are 3 main ways to produce a text in co-ment. If you start from " +"scratch, create your text in markdown format. If you start from an existing " +"file upload it to a markdown format. If you start from a Web page, create a " +"text with HTML as format, and copy and paste the full Web page into the " +"editor." +msgstr "" + +#: templates/site/help.html:96 #, fuzzy msgid "Text formats" msgstr "Avisos del texto" -#: templates/site/help.html:84 +#: templates/site/help.html:97 msgid "" "There are at this date 3 text formats: markdown (default/preferred format), " "HTML and RST." msgstr "" -#: templates/site/help.html:88 +#: templates/site/help.html:101 msgid "Markdown" msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "" "Unless some import needs make it preferable to use HTML, we recommend that " "you use markdown for creating or importing texts. Our software and Web " "services use the pandoc extended version of markdown." msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Read more about this" msgstr "" @@ -978,7 +1000,7 @@ #: templates/site/profile.html:33 templates/site/profile_pw.html:33 #: templates/site/text_create_content.html:45 -#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36 +#: templates/site/text_create_upload.html:40 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 @@ -1150,17 +1172,17 @@ msgid "Compare with previous version" msgstr "" -#: templates/site/text_history.html:105 +#: templates/site/text_history.html:106 #, fuzzy msgid "Revert to this version" msgstr "Volver a la versión #%(v1_nid)s:" -#: templates/site/text_history.html:106 templates/site/text_list.html:80 +#: templates/site/text_history.html:120 templates/site/text_list.html:80 #: templates/site/text_list.html.py:161 msgid "Delete" msgstr "Borrar" -#: templates/site/text_history.html:112 +#: templates/site/text_history.html:126 #, fuzzy msgid "Are you sure you want to delete this version?" msgstr "¿Está seguro/a de que desea borrar este texto?" @@ -1207,16 +1229,12 @@ msgid "Next version" msgstr "Versiones" -#: templates/site/text_history_version.html:45 views/texts.py:478 -#: views/texts.py:479 +#: templates/site/text_history_version.html:45 views/texts.py:496 +#: views/texts.py:497 #, fuzzy, python-format msgid "by %(author)s" msgstr "autores" -#: templates/site/text_list.html:12 -msgid "Texts" -msgstr "Textos" - #: 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 @@ -1375,11 +1393,11 @@ msgid "Text preferences" msgstr "Preferencias de texto" -#: templates/site/text_view_frame.html:100 +#: templates/site/text_view_frame.html:102 msgid "Which comments?" msgstr "¿Qué comentarios?" -#: templates/site/text_view_frame.html:108 +#: templates/site/text_view_frame.html:110 msgid "How should comments' scope be shown in text?" msgstr "¿Cómo desea mostrar el campo de los comentarios en el texto?" @@ -1684,7 +1702,7 @@ msgid "Private notifications feed reseted." msgstr "Respuesta de avisos privados reiniciada" -#: views/site.py:82 views/texts.py:130 views/user.py:545 +#: views/site.py:82 views/texts.py:131 views/user.py:545 msgid "You're logged in!" msgstr "¡Se ha conectado!" @@ -1784,64 +1802,64 @@ msgid "Password changed" msgstr "Su texto \"%(title)s\" se ha creado" -#: views/texts.py:163 +#: views/texts.py:164 #, python-format msgid "%(nb_texts)i text(s) deleted" msgstr "%(nb_texts)i texto(s) borrado(s)" -#: views/texts.py:208 +#: views/texts.py:209 #, python-format msgid "Text %(text_title)s deleted" msgstr "El texto %(text_title)s ha sido borrado" -#: views/texts.py:219 +#: views/texts.py:220 #, fuzzy, python-format msgid "Text version %(text_version_title)s deleted" msgstr "El texto %(text_title)s ha sido borrado" -#: views/texts.py:604 +#: views/texts.py:622 msgid "Note (optional)" msgstr "Nota (opcional)" -#: views/texts.py:607 +#: views/texts.py:625 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:617 +#: views/texts.py:635 msgid "New version (optional)" msgstr "Nueva versión (opcional)" -#: views/texts.py:620 +#: views/texts.py:638 msgid "Create a new version of this text (recommended)" msgstr "Crear una nueva versión de este texto (recomendado)" -#: views/texts.py:623 +#: views/texts.py:641 msgid "Keep comments (optional)" msgstr "mantener los comentarios (opcional)" -#: views/texts.py:626 +#: views/texts.py:644 msgid "Keep comments (if not affected by the edit)" msgstr "mantener los comentarios (si no son afectados por la edición)" -#: views/texts.py:690 +#: views/texts.py:708 msgid "Name (optional)" msgstr "Nombre (opcional)" -#: views/texts.py:691 +#: views/texts.py:709 msgid "Email (optional)" msgstr "Email (opcional)" -#: views/texts.py:741 +#: views/texts.py:761 #, 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:849 views/user.py:79 views/user.py:99 +#: views/texts.py:869 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:907 +#: views/texts.py:927 msgid "Text settings updated" msgstr "Ajustes del texto actualizados" @@ -2009,6 +2027,10 @@ "confirmación en su correo electrónico." #, fuzzy +#~ msgid "Text edition" +#~ msgstr "Avisos del texto" + +#, fuzzy #~ msgid "Your password has been reset." #~ msgstr "Su texto \"%(title)s\" se ha creado" diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/fr/LC_MESSAGES/django.mo Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/fr/LC_MESSAGES/django.po --- a/src/cm/locale/fr/LC_MESSAGES/django.po Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/locale/fr/LC_MESSAGES/django.po Wed Mar 31 12:00:27 2010 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-22 15:11+0100\n" -"PO-Revision-Date: 2010-03-22 15:13+0100\n" +"POT-Creation-Date: 2010-03-31 11:37+0200\n" +"PO-Revision-Date: 2010-03-31 11:40+0100\n" "Last-Translator: dev \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ #: templates/site/text_history.html:79 #: views/create.py:30 #: views/create.py:45 -#: views/texts.py:600 +#: views/texts.py:618 msgid "Title" msgstr "Titre" @@ -71,13 +71,13 @@ msgstr "Format" #: models.py:180 -#: views/texts.py:692 +#: views/texts.py:710 msgid "Content" msgstr "Texte" #: models.py:181 #: models.py:633 -#: templates/site/help.html:39 +#: templates/site/help.html:47 msgid "Tags" msgstr "Tags" @@ -417,8 +417,20 @@ #: templates/site/text_create_upload.html:26 #: templates/site/text_list.html:40 #: templates/site/layout/header.html:10 -msgid "Write a text" -msgstr "Ecrire un texte" +msgid "Create a text" +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" #: templates/site/dashboard.html:49 #: templates/site/text_create_content.html:30 @@ -625,7 +637,7 @@ msgstr "Suivi" #: templates/site/followup.html:20 -#: templates/site/help.html:58 +#: templates/site/help.html:66 #: templates/site/text_followup.html:22 msgid "Feeds" msgstr "Flux" @@ -635,16 +647,6 @@ msgid "Public feed" msgstr "Flux public" -#: templates/site/followup.html:22 -#: templates/site/followup.html.py:35 -#: templates/site/help.html:6 -#: templates/site/help.html.py:14 -#: templates/site/text_embed.html:27 -#: templates/site/layout/footer.html:13 -#: templates/site/macros/form_fields.html:15 -msgid "Help" -msgstr "Aide" - #: templates/site/followup.html:25 msgid "Public feed for workspace" msgstr "Flux public de l'espace de travail" @@ -721,165 +723,183 @@ msgstr "Glossaire" #: templates/site/help.html:22 -#: templates/site/help.html.py:25 +msgid "Contents" +msgstr "Contenu" + +#: templates/site/help.html:24 +#: templates/site/help.html.py:30 +#: templates/site/help.html:33 msgid "Collaboration" msgstr "Collaboration" +#: templates/site/help.html:25 +#: templates/site/help.html.py:37 +msgid "Comments" +msgstr "Commentaires" + #: templates/site/help.html:26 +#: templates/site/help.html.py:60 +msgid "Notification and feeds" +msgstr "Notification et flux." + +#: templates/site/help.html:27 +#: templates/site/help.html.py:77 +#: templates/site/help.html:79 +msgid "Roles" +msgstr "Rôles" + +#: templates/site/help.html:28 +#: templates/site/help.html.py:88 +#: templates/site/text_list.html:12 +msgid "Texts" +msgstr "Textes" + +#: templates/site/help.html:34 msgid "co-ment 2 collaboration is based on assigning roles for users." msgstr "" -#: templates/site/help.html:26 -#: templates/site/help.html.py:37 +#: templates/site/help.html:34 +#: templates/site/help.html.py:45 msgid "Click here for more details" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:34 msgid "The basic assumption in the collaboration model is that some users will have an overall management role, while others will have roles that are defined in relationship with texts or a given text." msgstr "" -#: templates/site/help.html:29 -msgid "Comments" -msgstr "Commentaires" - -#: templates/site/help.html:32 +#: templates/site/help.html:40 msgid "Moderation" msgstr "Modération" -#: templates/site/help.html:33 +#: templates/site/help.html:41 msgid "" "Comment moderation is the process of editing/removing comments from a text. The moderator role is the collection of permissions required to edit/remove a comment submitted by users of the workspace.\n" " Although this is not the default, you can require comments to be approved before becoming public by unticking the \"a posteriori moderation\" box in the settings for the text. If you do so, comments from users with an Observer or Commentator role won't be visible to users who do not have moderation permissions before a user (with at least Moderator role) approves them." msgstr "" -#: templates/site/help.html:36 +#: templates/site/help.html:44 msgid "States" msgstr "Etats" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "co-ment uses states to implement moderation policies." msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "Unapproved or pending comments are visible only to Managers, Editors and Moderators. Approved comments are visible to users with any role. The pending state exists only when a priori moderation is selected in settings." msgstr "" -#: templates/site/help.html:40 +#: templates/site/help.html:48 msgid "We believe that an adequate use of tags is sufficient to implement a variety of workflows for processing comments. You can use tags for signalling TODOs or decisions on future revisions. You can also use them to classify comments according to the issues or topics they address." msgstr "" -#: templates/site/help.html:42 +#: templates/site/help.html:50 msgid "Linking to a comment" msgstr "Lien vers un commentaire" -#: templates/site/help.html:43 +#: templates/site/help.html:51 msgid "You may find yourself needing to link to a comment from another one. In such case you can do so by copying your target comment's permalink that shows up when you hover over the paragraph (¶) sign at the end of the comment title." msgstr "" -#: templates/site/help.html:45 +#: templates/site/help.html:53 msgid "Scope" msgstr "" -#: templates/site/help.html:46 +#: templates/site/help.html:54 msgid "The scope of the comment is the part of the text to which it applies. A comment's scope can be modified by anyone who has a role allowing to modify the comment." msgstr "" -#: templates/site/help.html:48 +#: templates/site/help.html:56 msgid "Keeping your comments across versions" msgstr "" -#: templates/site/help.html:49 +#: templates/site/help.html:57 msgid "When you create a new version of the text, comments are duplicated. In case the text edition did not change the scope of the comment, it will be kept \"as is\". If the text of the comment scope has been modified then a decision has to be made regarding the conservation of such comments in the new version: you'll be given a choice of either keep them in the new version as \"detached\" from the text (they do not have a scope in the new version's but are still visible when browsing, and you can give them a new scope) or simply removed from the new version." msgstr "" -#: templates/site/help.html:52 -msgid "Notification and feeds" -msgstr "Notification et flux." - -#: templates/site/help.html:55 +#: templates/site/help.html:63 msgid "Email notification" msgstr "Notification par email" -#: templates/site/help.html:56 +#: templates/site/help.html:64 msgid "Email notifications are a way for users to be informed by email when a new comment is added on a text or a text is edited and a new version gets created." msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "Web feed definition on Wikipedia" msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "You can subscribe to the feed for a specific text or to a global feed for the full workspace." msgstr "" -#: templates/site/help.html:61 +#: templates/site/help.html:69 msgid "Public and private feeds" msgstr "Flux privé et public" -#: templates/site/help.html:62 +#: templates/site/help.html:70 msgid "The public feed includes all the events publically accessible on the workspace or a specific text. The private feed includes all events: do not publicize it to people who are not registered in your workspace unless you really want them to know what's happening in it." msgstr "" -#: templates/site/help.html:64 +#: templates/site/help.html:72 msgid "Text embedding" msgstr "" -#: templates/site/help.html:65 +#: 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." msgstr "" -#: templates/site/help.html:69 -#: templates/site/help.html.py:71 -msgid "Roles" -msgstr "Rôles" - -#: templates/site/help.html:72 +#: templates/site/help.html:80 msgid "Roles are predefined sets of permissions." msgstr "" -#: templates/site/help.html:73 +#: templates/site/help.html:81 msgid "A text is visible to the public (non-logged-in visitors, aka anonymous users) only if anonymous users are given a role on the text." msgstr "" -#: templates/site/help.html:74 +#: templates/site/help.html:82 #: templates/site/text_share.html:88 msgid "Text role" msgstr "Rôle sur le texte" -#: templates/site/help.html:75 +#: templates/site/help.html:83 msgid "A text role is a role that is set for a specific user on a specific text. It can be used to override a possibly existing workspace-level role or to give a user a role on a text (and not on every text in the workspace)." msgstr "" -#: templates/site/help.html:76 +#: templates/site/help.html:84 #: views/site.py:185 msgid "Role model" msgstr "Modèle des rôles" -#: templates/site/help.html:77 +#: templates/site/help.html:85 msgid "A role model is a role set useful in a specific use case. When you set up a co-ment service, you have to select a role model. The default model addresses most cases. A specialized role model such as \"teacher\" includes specific roles making in this particular case possible for comments to be privately shared between a teacher and each student." msgstr "" -#: templates/site/help.html:80 -msgid "Text edition" -msgstr "Edition du texte" +#: templates/site/help.html:91 +msgid "Create or upload?" +msgstr "" -#: templates/site/help.html:83 +#: templates/site/help.html:92 +msgid "There are 3 main ways to produce a text in co-ment. If you start from scratch, create your text in markdown format. If you start from an existing file upload it to a markdown format. If you start from a Web page, create a text with HTML as format, and copy and paste the full Web page into the editor." +msgstr "" + +#: templates/site/help.html:96 msgid "Text formats" msgstr "Formats du texte" -#: templates/site/help.html:84 +#: templates/site/help.html:97 msgid "There are at this date 3 text formats: markdown (default/preferred format), HTML and RST." msgstr "" -#: templates/site/help.html:88 +#: templates/site/help.html:101 msgid "Markdown" msgstr "Markdown" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Unless some import needs make it preferable to use HTML, we recommend that you use markdown for creating or importing texts. Our software and Web services use the pandoc extended version of markdown." msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Read more about this" msgstr "En savoir plus" @@ -943,7 +963,7 @@ #: templates/site/profile_pw.html:33 #: templates/site/text_create_content.html:45 #: templates/site/text_create_upload.html:40 -#: templates/site/text_edit.html:36 +#: templates/site/text_edit.html:37 #: templates/site/text_settings.html:23 #: templates/site/text_share.html:153 #: templates/site/user_activate.html:27 @@ -1105,17 +1125,17 @@ msgid "Compare with previous version" msgstr "Comparer avec la version précédente" -#: templates/site/text_history.html:105 +#: templates/site/text_history.html:106 msgid "Revert to this version" msgstr "Revenir à cette version" -#: templates/site/text_history.html:106 +#: templates/site/text_history.html:120 #: templates/site/text_list.html:80 #: templates/site/text_list.html.py:161 msgid "Delete" msgstr "Supprimer" -#: templates/site/text_history.html:112 +#: templates/site/text_history.html:126 msgid "Are you sure you want to delete this version?" msgstr "Etes-vous sûr de vouloir supprimer cette version ?" @@ -1156,16 +1176,12 @@ msgstr "Version suivante" #: templates/site/text_history_version.html:45 -#: views/texts.py:478 -#: views/texts.py:479 +#: views/texts.py:496 +#: views/texts.py:497 #, python-format msgid "by %(author)s" msgstr "par %(author)s" -#: templates/site/text_list.html:12 -msgid "Texts" -msgstr "Textes" - #: templates/site/text_list.html:47 #: templates/site/text_share.html:35 #: templates/site/user_list.html:7 @@ -1335,11 +1351,11 @@ msgid "Text preferences" msgstr "Préférences pour le texte" -#: templates/site/text_view_frame.html:100 +#: templates/site/text_view_frame.html:102 msgid "Which comments?" msgstr "Quels commentaires ?" -#: templates/site/text_view_frame.html:108 +#: templates/site/text_view_frame.html:110 msgid "How should comments' scope be shown in text?" msgstr "Rendu de la portée des commentaires ?" @@ -1631,7 +1647,7 @@ msgstr "Flux privé réinitialisé." #: views/site.py:82 -#: views/texts.py:130 +#: views/texts.py:131 #: views/user.py:545 msgid "You're logged in!" msgstr "Vous êtes connecté !" @@ -1720,66 +1736,66 @@ msgid "Password changed" msgstr "Votre mot de passe a été modifié" -#: views/texts.py:163 +#: views/texts.py:164 #, python-format msgid "%(nb_texts)i text(s) deleted" msgstr "%(nb_texts)i texte(s) supprimés" -#: views/texts.py:208 +#: views/texts.py:209 #, python-format msgid "Text %(text_title)s deleted" msgstr "texte %(text_title)s supprimé" -#: views/texts.py:219 +#: views/texts.py:220 #, python-format msgid "Text version %(text_version_title)s deleted" msgstr "Version %(text_version_title)s supprimée" -#: views/texts.py:604 +#: views/texts.py:622 msgid "Note (optional)" msgstr "Note (facultative)" -#: views/texts.py:607 +#: views/texts.py:625 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:617 +#: views/texts.py:635 msgid "New version (optional)" msgstr "Nouvelle version (facultative)" -#: views/texts.py:620 +#: views/texts.py:638 msgid "Create a new version of this text (recommended)" msgstr "créér une nouvelle version de ce texte (recommandé)" -#: views/texts.py:623 +#: views/texts.py:641 msgid "Keep comments (optional)" msgstr "Conserver les commentaires (facultatif)" -#: views/texts.py:626 +#: views/texts.py:644 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:690 +#: views/texts.py:708 msgid "Name (optional)" msgstr "Nom (facultatif)" -#: views/texts.py:691 +#: views/texts.py:709 msgid "Email (optional)" msgstr "Email (facultatif)" -#: views/texts.py:741 +#: views/texts.py:761 #, 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:849 +#: views/texts.py:869 #: 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:907 +#: views/texts.py:927 msgid "Text settings updated" msgstr "Paramètres mis à jour" @@ -1928,6 +1944,8 @@ msgid "You've been registered, please check your email for the confirm message." msgstr "Enregistrement réussi, un message de confirmation vous a été envoyé" +#~ msgid "Text edition" +#~ msgstr "Edition du texte" #~ msgid "Your password has been reset." #~ msgstr "Votre mot de passe a été changé" #~ msgid "Username or email" diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/no/LC_MESSAGES/django.mo Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/no/LC_MESSAGES/django.po --- a/src/cm/locale/no/LC_MESSAGES/django.po Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/locale/no/LC_MESSAGES/django.po Wed Mar 31 12:00:27 2010 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: COMT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-22 15:10+0100\n" +"POT-Creation-Date: 2010-03-31 11:36+0200\n" "PO-Revision-Date: 2010-02-24 01:37+0900\n" "Last-Translator: dev \n" "Language-Team: \n" @@ -61,7 +61,7 @@ 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:600 +#: views/create.py:45 views/texts.py:618 msgid "Title" msgstr "Overskrift" @@ -69,11 +69,11 @@ msgid "Format" msgstr "Format" -#: models.py:180 views/texts.py:692 +#: models.py:180 views/texts.py:710 msgid "Content" msgstr "Innhold" -#: models.py:181 models.py:633 templates/site/help.html:39 +#: models.py:181 models.py:633 templates/site/help.html:47 msgid "Tags" msgstr "Etiketter" @@ -402,9 +402,18 @@ #: templates/site/text_create_content.html:28 #: templates/site/text_create_upload.html:26 templates/site/text_list.html:40 #: templates/site/layout/header.html:10 -msgid "Write a text" +#, fuzzy +msgid "Create a text" msgstr "Skriv 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:49 templates/site/text_create_content.html:30 #: templates/site/text_create_upload.html:4 #: templates/site/text_create_upload.html:28 templates/site/text_list.html:42 @@ -599,7 +608,7 @@ msgid "Followup" msgstr "Oppfølgning" -#: templates/site/followup.html:20 templates/site/help.html:58 +#: templates/site/followup.html:20 templates/site/help.html:66 #: templates/site/text_followup.html:22 msgid "Feeds" msgstr "Strømmer" @@ -608,13 +617,6 @@ 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:13 -#: templates/site/macros/form_fields.html:15 -msgid "Help" -msgstr "Hjelp" - #: templates/site/followup.html:25 msgid "Public feed for workspace" msgstr "Offentlig strøm for arbeidsområde" @@ -691,36 +693,58 @@ msgid "Glossary" msgstr "" -#: templates/site/help.html:22 templates/site/help.html.py:25 +#: templates/site/help.html:22 +#, fuzzy +msgid "Contents" +msgstr "Innhold" + +#: templates/site/help.html:24 templates/site/help.html.py:30 +#: templates/site/help.html:33 msgid "Collaboration" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:25 templates/site/help.html.py:37 +#, fuzzy +msgid "Comments" +msgstr "merknader" + +#: templates/site/help.html:26 templates/site/help.html.py:60 +#, fuzzy +msgid "Notification and feeds" +msgstr "Varsel stoppet." + +#: templates/site/help.html:27 templates/site/help.html.py:77 +#: templates/site/help.html:79 +#, fuzzy +msgid "Roles" +msgstr "Rolle" + +#: templates/site/help.html:28 templates/site/help.html.py:88 +#: templates/site/text_list.html:12 +msgid "Texts" +msgstr "Tekster" + +#: templates/site/help.html:34 msgid "co-ment 2 collaboration is based on assigning roles for users." msgstr "" -#: templates/site/help.html:26 templates/site/help.html.py:37 +#: templates/site/help.html:34 templates/site/help.html.py:45 msgid "Click here for more details" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:34 msgid "" "The basic assumption in the collaboration model is that some users will have " "an overall management role, while others will have roles that are defined in " "relationship with texts or a given text." msgstr "" -#: templates/site/help.html:29 -#, fuzzy -msgid "Comments" -msgstr "merknader" - -#: templates/site/help.html:32 +#: templates/site/help.html:40 #, fuzzy msgid "Moderation" msgstr "Moderator" -#: templates/site/help.html:33 +#: templates/site/help.html:41 msgid "" "Comment moderation is the process of editing/removing comments from a text. " "The moderator role is the collection of permissions required to edit/remove " @@ -733,23 +757,23 @@ "them." msgstr "" -#: templates/site/help.html:36 +#: templates/site/help.html:44 #, fuzzy msgid "States" msgstr "Lagre" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "co-ment uses states to implement moderation policies." msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "" "Unapproved or pending comments are visible only to Managers, Editors and " "Moderators. Approved comments are visible to users with any role. The " "pending state exists only when a priori moderation is selected in settings." msgstr "" -#: templates/site/help.html:40 +#: templates/site/help.html:48 msgid "" "We believe that an adequate use of tags is sufficient to implement a variety " "of workflows for processing comments. You can use tags for signalling TODOs " @@ -757,12 +781,12 @@ "according to the issues or topics they address." msgstr "" -#: templates/site/help.html:42 +#: templates/site/help.html:50 #, fuzzy msgid "Linking to a comment" msgstr "Kan endre merknader" -#: templates/site/help.html:43 +#: templates/site/help.html:51 msgid "" "You may find yourself needing to link to a comment from another one. In such " "case you can do so by copying your target comment's permalink that shows up " @@ -770,22 +794,22 @@ "title." msgstr "" -#: templates/site/help.html:45 +#: templates/site/help.html:53 msgid "Scope" msgstr "" -#: templates/site/help.html:46 +#: templates/site/help.html:54 msgid "" "The scope of the comment is the part of the text to which it applies. A " "comment's scope can be modified by anyone who has a role allowing to modify " "the comment." msgstr "" -#: templates/site/help.html:48 +#: templates/site/help.html:56 msgid "Keeping your comments across versions" msgstr "" -#: templates/site/help.html:49 +#: templates/site/help.html:57 msgid "" "When you create a new version of the text, comments are duplicated. In case " "the text edition did not change the scope of the comment, it will be kept " @@ -797,39 +821,34 @@ "simply removed from the new version." msgstr "" -#: templates/site/help.html:52 -#, fuzzy -msgid "Notification and feeds" -msgstr "Varsel stoppet." - -#: templates/site/help.html:55 +#: templates/site/help.html:63 #, fuzzy msgid "Email notification" msgstr "Epostvarsler" -#: templates/site/help.html:56 +#: templates/site/help.html:64 msgid "" "Email notifications are a way for users to be informed by email when a new " "comment is added on a text or a text is edited and a new version gets " "created." msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "Web feed definition on Wikipedia" msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "" "You can subscribe to the feed for a specific text or to a global feed for " "the full workspace." msgstr "" -#: templates/site/help.html:61 +#: templates/site/help.html:69 #, fuzzy msgid "Public and private feeds" msgstr "Privat strøm" -#: templates/site/help.html:62 +#: templates/site/help.html:70 msgid "" "The public feed includes all the events publically accessible on the " "workspace or a specific text. The private feed includes all events: do not " @@ -837,11 +856,11 @@ "really want them to know what's happening in it." msgstr "" -#: templates/site/help.html:64 +#: templates/site/help.html:72 msgid "Text embedding" msgstr "" -#: templates/site/help.html:65 +#: 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' " @@ -851,37 +870,32 @@ "in another tab of your browser." msgstr "" -#: templates/site/help.html:69 templates/site/help.html.py:71 -#, fuzzy -msgid "Roles" -msgstr "Rolle" - -#: templates/site/help.html:72 +#: templates/site/help.html:80 msgid "Roles are predefined sets of permissions." msgstr "" -#: templates/site/help.html:73 +#: templates/site/help.html:81 msgid "" "A text is visible to the public (non-logged-in visitors, aka anonymous " "users) only if anonymous users are given a role on the text." msgstr "" -#: templates/site/help.html:74 templates/site/text_share.html:88 +#: templates/site/help.html:82 templates/site/text_share.html:88 msgid "Text role" msgstr "Tekstrolle" -#: templates/site/help.html:75 +#: templates/site/help.html:83 msgid "" "A text role is a role that is set for a specific user on a specific text. It " "can be used to override a possibly existing workspace-level role or to give " "a user a role on a text (and not on every text in the workspace)." msgstr "" -#: templates/site/help.html:76 views/site.py:185 +#: templates/site/help.html:84 views/site.py:185 msgid "Role model" msgstr "Rollemodell" -#: templates/site/help.html:77 +#: templates/site/help.html:85 msgid "" "A role model is a role set useful in a specific use case. When you set up a " "co-ment service, you have to select a role model. The default model " @@ -890,34 +904,42 @@ "privately shared between a teacher and each student." msgstr "" -#: templates/site/help.html:80 -#, fuzzy -msgid "Text edition" -msgstr "Neste endring" +#: templates/site/help.html:91 +msgid "Create or upload?" +msgstr "" -#: templates/site/help.html:83 +#: templates/site/help.html:92 +msgid "" +"There are 3 main ways to produce a text in co-ment. If you start from " +"scratch, create your text in markdown format. If you start from an existing " +"file upload it to a markdown format. If you start from a Web page, create a " +"text with HTML as format, and copy and paste the full Web page into the " +"editor." +msgstr "" + +#: templates/site/help.html:96 #, fuzzy msgid "Text formats" msgstr "Tekstvarsler" -#: templates/site/help.html:84 +#: templates/site/help.html:97 msgid "" "There are at this date 3 text formats: markdown (default/preferred format), " "HTML and RST." msgstr "" -#: templates/site/help.html:88 +#: templates/site/help.html:101 msgid "Markdown" msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "" "Unless some import needs make it preferable to use HTML, we recommend that " "you use markdown for creating or importing texts. Our software and Web " "services use the pandoc extended version of markdown." msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Read more about this" msgstr "" @@ -973,7 +995,7 @@ #: templates/site/profile.html:33 templates/site/profile_pw.html:33 #: templates/site/text_create_content.html:45 -#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36 +#: templates/site/text_create_upload.html:40 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 @@ -1143,16 +1165,16 @@ msgid "Compare with previous version" msgstr "Sammenlikn med forrige versjon" -#: templates/site/text_history.html:105 +#: templates/site/text_history.html:106 msgid "Revert to this version" msgstr "Still tilbake til denne versjonen" -#: templates/site/text_history.html:106 templates/site/text_list.html:80 +#: templates/site/text_history.html:120 templates/site/text_list.html:80 #: templates/site/text_list.html.py:161 msgid "Delete" msgstr "Slett" -#: templates/site/text_history.html:112 +#: templates/site/text_history.html:126 msgid "Are you sure you want to delete this version?" msgstr "Ønsker du å slette denne versjonen?" @@ -1194,16 +1216,12 @@ msgid "Next version" msgstr "Neste versjon" -#: templates/site/text_history_version.html:45 views/texts.py:478 -#: views/texts.py:479 +#: templates/site/text_history_version.html:45 views/texts.py:496 +#: views/texts.py:497 #, python-format msgid "by %(author)s" msgstr "av %(author)s" -#: templates/site/text_list.html:12 -msgid "Texts" -msgstr "Tekster" - #: 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 @@ -1352,11 +1370,11 @@ msgid "Text preferences" msgstr "Tekstinnstillinger" -#: templates/site/text_view_frame.html:100 +#: templates/site/text_view_frame.html:102 msgid "Which comments?" msgstr "Hvilke merknader?" -#: templates/site/text_view_frame.html:108 +#: templates/site/text_view_frame.html:110 msgid "How should comments' scope be shown in text?" msgstr "Hvordan skal rekkevidden for merknadene i teksten vises?" @@ -1648,7 +1666,7 @@ msgid "Private notifications feed reseted." msgstr "Strøm for private varsler nullstilt." -#: views/site.py:82 views/texts.py:130 views/user.py:545 +#: views/site.py:82 views/texts.py:131 views/user.py:545 msgid "You're logged in!" msgstr "Du er logget inn!" @@ -1747,64 +1765,64 @@ msgid "Password changed" msgstr "Teksten %(text_title)s har blitt opprettet" -#: views/texts.py:163 +#: views/texts.py:164 #, python-format msgid "%(nb_texts)i text(s) deleted" msgstr "%(nb_texts)i tekst(er) slettet" -#: views/texts.py:208 +#: views/texts.py:209 #, python-format msgid "Text %(text_title)s deleted" msgstr "Tekstet %(text_title)s slettet" -#: views/texts.py:219 +#: views/texts.py:220 #, python-format msgid "Text version %(text_version_title)s deleted" msgstr "Tekstversjon %(text_version_title)s slettet" -#: views/texts.py:604 +#: views/texts.py:622 msgid "Note (optional)" msgstr "Kommentar (valgfritt)" -#: views/texts.py:607 +#: views/texts.py:625 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:617 +#: views/texts.py:635 msgid "New version (optional)" msgstr "Ny versjon (valgfritt)" -#: views/texts.py:620 +#: views/texts.py:638 msgid "Create a new version of this text (recommended)" msgstr "Opprett ny versjon av teksten (anbefales)" -#: views/texts.py:623 +#: views/texts.py:641 msgid "Keep comments (optional)" msgstr "Behold merknader (valgfritt)" -#: views/texts.py:626 +#: views/texts.py:644 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:690 +#: views/texts.py:708 msgid "Name (optional)" msgstr "Navn (valgfritt)" -#: views/texts.py:691 +#: views/texts.py:709 msgid "Email (optional)" msgstr "Epost (valgfritt)" -#: views/texts.py:741 +#: views/texts.py:761 #, 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:849 views/user.py:79 views/user.py:99 +#: views/texts.py:869 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:907 +#: views/texts.py:927 msgid "Text settings updated" msgstr "Tekstinnstillinger oppdatert" @@ -1967,6 +1985,10 @@ msgstr "Du er blitt registert. Se din epost for en melding med bekreftelsen." #, fuzzy +#~ msgid "Text edition" +#~ msgstr "Neste endring" + +#, fuzzy #~ msgid "Your password has been reset." #~ msgstr "Teksten %(text_title)s har blitt opprettet" diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/pt_BR/LC_MESSAGES/django.mo Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed diff -r 725653080973 -r 48c4d74c5cd9 src/cm/locale/pt_BR/LC_MESSAGES/django.po --- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Wed Mar 31 12:00:27 2010 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: COMT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-22 15:09+0100\n" +"POT-Creation-Date: 2010-03-31 11:35+0200\n" "PO-Revision-Date: 2010-02-24 01:36+0900\n" "Last-Translator: dev \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ 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:600 +#: views/create.py:45 views/texts.py:618 msgid "Title" msgstr "Título" @@ -63,11 +63,11 @@ msgid "Format" msgstr "Formatar" -#: models.py:180 views/texts.py:692 +#: models.py:180 views/texts.py:710 msgid "Content" msgstr "Conteúdo" -#: models.py:181 models.py:633 templates/site/help.html:39 +#: models.py:181 models.py:633 templates/site/help.html:47 msgid "Tags" msgstr "Palavras-chave" @@ -396,9 +396,18 @@ #: templates/site/text_create_content.html:28 #: templates/site/text_create_upload.html:26 templates/site/text_list.html:40 #: templates/site/layout/header.html:10 -msgid "Write a text" +#, fuzzy +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:49 templates/site/text_create_content.html:30 #: templates/site/text_create_upload.html:4 #: templates/site/text_create_upload.html:28 templates/site/text_list.html:42 @@ -593,7 +602,7 @@ msgid "Followup" msgstr "Acompanhamento" -#: templates/site/followup.html:20 templates/site/help.html:58 +#: templates/site/followup.html:20 templates/site/help.html:66 #: templates/site/text_followup.html:22 msgid "Feeds" msgstr "Feeds" @@ -602,13 +611,6 @@ 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:13 -#: templates/site/macros/form_fields.html:15 -msgid "Help" -msgstr "Ajuda" - #: templates/site/followup.html:25 msgid "Public feed for workspace" msgstr "Feed público para área de trabalho" @@ -686,36 +688,58 @@ msgid "Glossary" msgstr "" -#: templates/site/help.html:22 templates/site/help.html.py:25 +#: templates/site/help.html:22 +#, fuzzy +msgid "Contents" +msgstr "Conteúdo" + +#: templates/site/help.html:24 templates/site/help.html.py:30 +#: templates/site/help.html:33 msgid "Collaboration" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:25 templates/site/help.html.py:37 +#, fuzzy +msgid "Comments" +msgstr "comentários" + +#: templates/site/help.html:26 templates/site/help.html.py:60 +#, fuzzy +msgid "Notification and feeds" +msgstr "Aviso desativado." + +#: templates/site/help.html:27 templates/site/help.html.py:77 +#: templates/site/help.html:79 +#, fuzzy +msgid "Roles" +msgstr "Função" + +#: templates/site/help.html:28 templates/site/help.html.py:88 +#: templates/site/text_list.html:12 +msgid "Texts" +msgstr "Textos" + +#: templates/site/help.html:34 msgid "co-ment 2 collaboration is based on assigning roles for users." msgstr "" -#: templates/site/help.html:26 templates/site/help.html.py:37 +#: templates/site/help.html:34 templates/site/help.html.py:45 msgid "Click here for more details" msgstr "" -#: templates/site/help.html:26 +#: templates/site/help.html:34 msgid "" "The basic assumption in the collaboration model is that some users will have " "an overall management role, while others will have roles that are defined in " "relationship with texts or a given text." msgstr "" -#: templates/site/help.html:29 -#, fuzzy -msgid "Comments" -msgstr "comentários" - -#: templates/site/help.html:32 +#: templates/site/help.html:40 #, fuzzy msgid "Moderation" msgstr "Moderador" -#: templates/site/help.html:33 +#: templates/site/help.html:41 msgid "" "Comment moderation is the process of editing/removing comments from a text. " "The moderator role is the collection of permissions required to edit/remove " @@ -728,23 +752,23 @@ "them." msgstr "" -#: templates/site/help.html:36 +#: templates/site/help.html:44 #, fuzzy msgid "States" msgstr "Salvar" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "co-ment uses states to implement moderation policies." msgstr "" -#: templates/site/help.html:37 +#: templates/site/help.html:45 msgid "" "Unapproved or pending comments are visible only to Managers, Editors and " "Moderators. Approved comments are visible to users with any role. The " "pending state exists only when a priori moderation is selected in settings." msgstr "" -#: templates/site/help.html:40 +#: templates/site/help.html:48 msgid "" "We believe that an adequate use of tags is sufficient to implement a variety " "of workflows for processing comments. You can use tags for signalling TODOs " @@ -752,12 +776,12 @@ "according to the issues or topics they address." msgstr "" -#: templates/site/help.html:42 +#: templates/site/help.html:50 #, fuzzy msgid "Linking to a comment" msgstr "Pode editar comentário" -#: templates/site/help.html:43 +#: templates/site/help.html:51 msgid "" "You may find yourself needing to link to a comment from another one. In such " "case you can do so by copying your target comment's permalink that shows up " @@ -765,22 +789,22 @@ "title." msgstr "" -#: templates/site/help.html:45 +#: templates/site/help.html:53 msgid "Scope" msgstr "" -#: templates/site/help.html:46 +#: templates/site/help.html:54 msgid "" "The scope of the comment is the part of the text to which it applies. A " "comment's scope can be modified by anyone who has a role allowing to modify " "the comment." msgstr "" -#: templates/site/help.html:48 +#: templates/site/help.html:56 msgid "Keeping your comments across versions" msgstr "" -#: templates/site/help.html:49 +#: templates/site/help.html:57 msgid "" "When you create a new version of the text, comments are duplicated. In case " "the text edition did not change the scope of the comment, it will be kept " @@ -792,39 +816,34 @@ "simply removed from the new version." msgstr "" -#: templates/site/help.html:52 -#, fuzzy -msgid "Notification and feeds" -msgstr "Aviso desativado." - -#: templates/site/help.html:55 +#: templates/site/help.html:63 #, fuzzy msgid "Email notification" msgstr "Aviso de email" -#: templates/site/help.html:56 +#: templates/site/help.html:64 msgid "" "Email notifications are a way for users to be informed by email when a new " "comment is added on a text or a text is edited and a new version gets " "created." msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "Web feed definition on Wikipedia" msgstr "" -#: templates/site/help.html:59 +#: templates/site/help.html:67 msgid "" "You can subscribe to the feed for a specific text or to a global feed for " "the full workspace." msgstr "" -#: templates/site/help.html:61 +#: templates/site/help.html:69 #, fuzzy msgid "Public and private feeds" msgstr "Feed privado" -#: templates/site/help.html:62 +#: templates/site/help.html:70 msgid "" "The public feed includes all the events publically accessible on the " "workspace or a specific text. The private feed includes all events: do not " @@ -832,11 +851,11 @@ "really want them to know what's happening in it." msgstr "" -#: templates/site/help.html:64 +#: templates/site/help.html:72 msgid "Text embedding" msgstr "" -#: templates/site/help.html:65 +#: 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' " @@ -846,37 +865,32 @@ "in another tab of your browser." msgstr "" -#: templates/site/help.html:69 templates/site/help.html.py:71 -#, fuzzy -msgid "Roles" -msgstr "Função" - -#: templates/site/help.html:72 +#: templates/site/help.html:80 msgid "Roles are predefined sets of permissions." msgstr "" -#: templates/site/help.html:73 +#: templates/site/help.html:81 msgid "" "A text is visible to the public (non-logged-in visitors, aka anonymous " "users) only if anonymous users are given a role on the text." msgstr "" -#: templates/site/help.html:74 templates/site/text_share.html:88 +#: templates/site/help.html:82 templates/site/text_share.html:88 msgid "Text role" msgstr "Função do texto" -#: templates/site/help.html:75 +#: templates/site/help.html:83 msgid "" "A text role is a role that is set for a specific user on a specific text. It " "can be used to override a possibly existing workspace-level role or to give " "a user a role on a text (and not on every text in the workspace)." msgstr "" -#: templates/site/help.html:76 views/site.py:185 +#: templates/site/help.html:84 views/site.py:185 msgid "Role model" msgstr "Função modelo" -#: templates/site/help.html:77 +#: templates/site/help.html:85 msgid "" "A role model is a role set useful in a specific use case. When you set up a " "co-ment service, you have to select a role model. The default model " @@ -885,34 +899,42 @@ "privately shared between a teacher and each student." msgstr "" -#: templates/site/help.html:80 -#, fuzzy -msgid "Text edition" -msgstr "Aviso de texto" +#: templates/site/help.html:91 +msgid "Create or upload?" +msgstr "" -#: templates/site/help.html:83 +#: templates/site/help.html:92 +msgid "" +"There are 3 main ways to produce a text in co-ment. If you start from " +"scratch, create your text in markdown format. If you start from an existing " +"file upload it to a markdown format. If you start from a Web page, create a " +"text with HTML as format, and copy and paste the full Web page into the " +"editor." +msgstr "" + +#: templates/site/help.html:96 #, fuzzy msgid "Text formats" msgstr "Aviso de texto" -#: templates/site/help.html:84 +#: templates/site/help.html:97 msgid "" "There are at this date 3 text formats: markdown (default/preferred format), " "HTML and RST." msgstr "" -#: templates/site/help.html:88 +#: templates/site/help.html:101 msgid "Markdown" msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "" "Unless some import needs make it preferable to use HTML, we recommend that " "you use markdown for creating or importing texts. Our software and Web " "services use the pandoc extended version of markdown." msgstr "" -#: templates/site/help.html:89 +#: templates/site/help.html:102 msgid "Read more about this" msgstr "" @@ -968,7 +990,7 @@ #: templates/site/profile.html:33 templates/site/profile_pw.html:33 #: templates/site/text_create_content.html:45 -#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36 +#: templates/site/text_create_upload.html:40 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 @@ -1144,17 +1166,17 @@ msgid "Compare with previous version" msgstr "" -#: templates/site/text_history.html:105 +#: templates/site/text_history.html:106 #, fuzzy msgid "Revert to this version" msgstr "Reverter para a versão #%(v1_nid)s" -#: templates/site/text_history.html:106 templates/site/text_list.html:80 +#: templates/site/text_history.html:120 templates/site/text_list.html:80 #: templates/site/text_list.html.py:161 msgid "Delete" msgstr "Apagar" -#: templates/site/text_history.html:112 +#: templates/site/text_history.html:126 #, fuzzy msgid "Are you sure you want to delete this version?" msgstr "Confirmar a exclusão desse texto?" @@ -1200,16 +1222,12 @@ msgid "Next version" msgstr "Versões" -#: templates/site/text_history_version.html:45 views/texts.py:478 -#: views/texts.py:479 +#: templates/site/text_history_version.html:45 views/texts.py:496 +#: views/texts.py:497 #, fuzzy, python-format msgid "by %(author)s" msgstr "por %(v1name)s" -#: templates/site/text_list.html:12 -msgid "Texts" -msgstr "Textos" - #: 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 @@ -1358,11 +1376,11 @@ msgid "Text preferences" msgstr "Preferências de texto" -#: templates/site/text_view_frame.html:100 +#: templates/site/text_view_frame.html:102 msgid "Which comments?" msgstr "Quais comentários" -#: templates/site/text_view_frame.html:108 +#: templates/site/text_view_frame.html:110 msgid "How should comments' scope be shown in text?" msgstr "Como os assuntos dos comentários deve aparecer no texto?" @@ -1657,7 +1675,7 @@ msgid "Private notifications feed reseted." msgstr "Feed privado de avisos restabelecido." -#: views/site.py:82 views/texts.py:130 views/user.py:545 +#: views/site.py:82 views/texts.py:131 views/user.py:545 msgid "You're logged in!" msgstr "Você entrou!" @@ -1754,64 +1772,64 @@ msgid "Password changed" msgstr "" -#: views/texts.py:163 +#: views/texts.py:164 #, python-format msgid "%(nb_texts)i text(s) deleted" msgstr "%(nb_texts)i texto(s) apagado(s)" -#: views/texts.py:208 +#: views/texts.py:209 #, python-format msgid "Text %(text_title)s deleted" msgstr "Texto %(text_title)s apagado" -#: views/texts.py:219 +#: views/texts.py:220 #, fuzzy, python-format msgid "Text version %(text_version_title)s deleted" msgstr "Texto %(text_title)s apagado" -#: views/texts.py:604 +#: views/texts.py:622 msgid "Note (optional)" msgstr "Observação (opcional)" -#: views/texts.py:607 +#: views/texts.py:625 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:617 +#: views/texts.py:635 msgid "New version (optional)" msgstr "Nova versão (opcional)" -#: views/texts.py:620 +#: views/texts.py:638 msgid "Create a new version of this text (recommended)" msgstr "Criar uma nova versão desse texto (recomendado)" -#: views/texts.py:623 +#: views/texts.py:641 msgid "Keep comments (optional)" msgstr "Manter comentários (opcional)" -#: views/texts.py:626 +#: views/texts.py:644 msgid "Keep comments (if not affected by the edit)" msgstr "Manter comentários (se não afetados pela edição)" -#: views/texts.py:690 +#: views/texts.py:708 msgid "Name (optional)" msgstr "Nome (opcional)" -#: views/texts.py:691 +#: views/texts.py:709 msgid "Email (optional)" msgstr "Email (opcional)" -#: views/texts.py:741 +#: views/texts.py:761 #, 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:849 views/user.py:79 views/user.py:99 +#: views/texts.py:869 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:907 +#: views/texts.py:927 msgid "Text settings updated" msgstr "Configurações do texto atualizadas" @@ -1977,6 +1995,10 @@ "Você se inscreveu. Favor verifique em seu email a mensagem de confirmação." #, fuzzy +#~ msgid "Text edition" +#~ msgstr "Aviso de texto" + +#, fuzzy #~ msgid "Your password has been reset." #~ msgstr "O acesso do usuário %(prof)s foi rejeitado." diff -r 725653080973 -r 48c4d74c5cd9 src/cm/templates/site/dashboard.html --- a/src/cm/templates/site/dashboard.html Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/templates/site/dashboard.html Wed Mar 31 12:00:27 2010 +0200 @@ -45,8 +45,8 @@ - {% if can_create_text %}
 {% blocktrans %}Write a text{% endblocktrans %}
{% endif %} - {% if can_create_text %}
 {% blocktrans %}Upload a text{% endblocktrans %}
{% endif %} + {% if can_create_text %}
 {% blocktrans %}Create a text{% endblocktrans %} (?)
{% endif %} + {% if can_create_text %}
 {% blocktrans %}Upload a text{% endblocktrans %} (?)
{% endif %} {% if can_manage_workspace %}
 {% blocktrans %}Invite user{% endblocktrans %}
{% endif %}
 {% blocktrans %}Edit your profile{% endblocktrans %}
 {% blocktrans %}View text list{% endblocktrans %}
diff -r 725653080973 -r 48c4d74c5cd9 src/cm/templates/site/help.html --- a/src/cm/templates/site/help.html Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/templates/site/help.html Wed Mar 31 12:00:27 2010 +0200 @@ -19,14 +19,22 @@

{% blocktrans %}Glossary{% endblocktrans %}

-

{% blocktrans %}Collaboration{% endblocktrans %}

+

{% blocktrans %}Contents{% endblocktrans %}

+ +{% blocktrans %}Collaboration{% endblocktrans %}
+{% blocktrans %}Comments{% endblocktrans %}
+{% blocktrans %}Notification and feeds{% endblocktrans %}
+{% blocktrans %}Roles{% endblocktrans %}
+{% blocktrans %}Texts{% endblocktrans %}
+ +

{% blocktrans %}Collaboration{% endblocktrans %}

{% blocktrans %}Collaboration{% endblocktrans %}
{% blocktrans %}co-ment 2 collaboration is based on assigning roles for users.{% endblocktrans %} {% blocktrans %}Click here for more details{% endblocktrans %}. {% blocktrans %}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.{% endblocktrans %}
-

{% blocktrans %}Comments{% endblocktrans %}

+

{% blocktrans %}Comments{% endblocktrans %}

{% blocktrans %}Moderation{% endblocktrans %}
@@ -49,7 +57,7 @@
{% blocktrans %}When you create a new version of the text, comments are duplicated. In case the text edition did not change the scope of the comment, it will be kept "as is". If the text of the comment scope has been modified then a decision has to be made regarding the conservation of such comments in the new version: you'll be given a choice of either keep them in the new version as "detached" from the text (they do not have a scope in the new version's but are still visible when browsing, and you can give them a new scope) or simply removed from the new version.{% endblocktrans %}
-

{% blocktrans %}Notification and feeds{% endblocktrans %}

+

{% blocktrans %}Notification and feeds{% endblocktrans %}

{% blocktrans %}Email notification{% endblocktrans %}
@@ -66,7 +74,7 @@
-

{% blocktrans %}Roles{% endblocktrans %}

+

{% blocktrans %}Roles{% endblocktrans %}

{% blocktrans %}Roles{% endblocktrans %}
{% blocktrans %}Roles are predefined sets of permissions.{% endblocktrans %}
@@ -77,7 +85,12 @@
{% blocktrans %}A role model is a role set useful in a specific use case. When you set up a co-ment service, you have to select a role model. The default model addresses most cases. A specialized role model such as "teacher" includes specific roles making in this particular case possible for comments to be privately shared between a teacher and each student.{% endblocktrans %}
-

{% blocktrans %}Text edition{% endblocktrans %}

+

{% blocktrans %}Texts{% endblocktrans %}

+ +
+
{% blocktrans %}Create or upload?{% endblocktrans %}
+
{% blocktrans %}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.{% endblocktrans %}
+
{% blocktrans %}Text formats{% endblocktrans %}
diff -r 725653080973 -r 48c4d74c5cd9 src/cm/templates/site/layout/header.html --- a/src/cm/templates/site/layout/header.html Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/templates/site/layout/header.html Wed Mar 31 12:00:27 2010 +0200 @@ -7,7 +7,7 @@ {% if user.is_authenticated %}{{ user.username }} ·{% endif %} {% blocktrans %}Home{% endblocktrans %} {% if can_create_text %} - · {% blocktrans %}Write a text{% endblocktrans %} + · {% blocktrans %}Create a text{% endblocktrans %} · {% blocktrans %}Upload a text{% endblocktrans %} {% endif %} {% if user.is_authenticated %} diff -r 725653080973 -r 48c4d74c5cd9 src/cm/templates/site/text_create_content.html --- a/src/cm/templates/site/text_create_content.html Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/templates/site/text_create_content.html Wed Mar 31 12:00:27 2010 +0200 @@ -1,7 +1,7 @@ {% extends "site/layout/base_workspace.html" %} {% load i18n %} -{% block title %}{% blocktrans %}Write a text{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans %}Create a text{% endblocktrans %}{% endblock %} {% block main %} {% include "site/macros/text_editor.html" %} @@ -25,7 +25,7 @@ diff -r 725653080973 -r 48c4d74c5cd9 src/cm/templates/site/text_create_upload.html --- a/src/cm/templates/site/text_create_upload.html Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/templates/site/text_create_upload.html Wed Mar 31 12:00:27 2010 +0200 @@ -23,7 +23,7 @@ diff -r 725653080973 -r 48c4d74c5cd9 src/cm/templates/site/text_list.html --- a/src/cm/templates/site/text_list.html Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/templates/site/text_list.html Wed Mar 31 12:00:27 2010 +0200 @@ -37,7 +37,7 @@
  • {% blocktrans %}Text list{% endblocktrans %}
    • {% if can_create_text %}
  • /
    • -
  • {% blocktrans %}Write a text{% endblocktrans %}
    • +
  • {% blocktrans %}Create a text{% endblocktrans %}
  • /
  • {% blocktrans %}Upload a text{% endblocktrans %}
    • {% endif %} diff -r 725653080973 -r 48c4d74c5cd9 src/cm/urls.py --- a/src/cm/urls.py Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/urls.py Wed Mar 31 12:00:27 2010 +0200 @@ -90,8 +90,8 @@ url(r'^text/(?P\w*)/user/mass-add/$', user_mass_add, name="user-mass-add-text"), # site - url(r'^contact/', contact, name="contact"), - url(r'^help/', help, name="help"), + url(r'^contact/$', contact, name="contact"), + url(r'^help/$', help, name="help"), # notifications ## workspace followup diff -r 725653080973 -r 48c4d74c5cd9 src/cm/views/texts.py --- a/src/cm/views/texts.py Tue Mar 30 14:13:45 2010 +0200 +++ b/src/cm/views/texts.py Wed Mar 31 12:00:27 2010 +0200 @@ -686,7 +686,7 @@ # override manually to disabled format_field = self.fields['format'] - format_field.widget.attrs = attrs={'disabled':'disabled'} + format_field.widget.attrs = {'disabled':'disabled'} format_field.required = False self.fields['format'] = format_field