--- a/.hgignore Wed Jan 20 20:43:55 2010 +0100
+++ b/.hgignore Wed Jan 20 20:45:52 2010 +0100
@@ -32,3 +32,7 @@
^\.pydevproject$
syntax: regexp
^\.settings/.*$
+
+syntax: glob
+*.pyc
+
--- a/LICENSE.txt Wed Jan 20 20:43:55 2010 +0100
+++ b/LICENSE.txt Wed Jan 20 20:45:52 2010 +0100
@@ -1,6 +1,8 @@
-co-ment: Web-based text annotation
-Copyright (C) 2006-2007 Sopinspace, Society for Public Information Spaces, www.sopinspace.com
-Developers: Renaud Bernard, Raphaël Badin
+COMT: Web-based text annotation
+Copyright (C) 2006-2010 Sopinspace, Society for Public Information Spaces, www.sopinspace.com
+Key developers: Renaud Bernard, Raphaël Badin
+Software license: GNU AGPLv3 or any later version
+Translation files license: CC-By
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License
--- a/README.txt Wed Jan 20 20:43:55 2010 +0100
+++ b/README.txt Wed Jan 20 20:45:52 2010 +0100
@@ -10,6 +10,11 @@
=======
GNU AFFERO GENERAL PUBLIC LICENSE
http://www.gnu.org/licenses/agpl.html
+for software files
+
+CC-BY
+http://creativecommons.org/licenses/by/3.0/
+for translation files
Dependencies
============
@@ -143,10 +148,32 @@
Credits
========
We'd like to thank:
-- Kirill Miazine (http://km.krot.org/) for the norwegian translation
+- Kirill Miazine (http://km.krot.org/) for the Norwegian translation
+
+How to contribute
+=================
+
+Contribute using mercurial
+--------------------------
+We use mercurial as our source code management system.
+1. Create a mercurial profile (nickname/email) in ~/.hgrc (cf. http://mercurial.selenic.com/quickstart for more info).
+ This is important because your name will appear in your changeset once it gets accepted into the mainline
+2. Clone the repository `hg clone http://hg.co-ment.org/ comt`
+ OR update your copy of the source code: `hg update`
+3. Hack, hack
+4. Commit locally: `hg commit -m "MY COMMIT MESSAGE"`
+5. Export your changeset to a file: `hg export tip > my_patch.txt`
+6. Create a ticket describing your change and attach your patch to it: http://www.co-ment.org/newticket
+7. We will review the patch as soon as possible. If we judge it acceptable and useful, we will be back to you regarding copyright, licensing and other legalese.
+
+Contribute without using mercurial
+----------------------------------
+If you don't want to use mercurial, you can also create a ticket (http://www.co-ment.org/newticket) with a few modified files to the bugtracker.
+Make sure you leave us a nickname and an email for inclusion in the changelog. Point 7 above also applies to contributions without using mercurial.
+
Translation
-============
+===========
Update all po files
---------------------
@@ -159,8 +186,8 @@
cd src/cm
../../bin/django compilemessages
-Create new file for lang 'lg'
+Create new file for lang 'LG'
-----------------------------
cd src/cm
-../../bin/django makemessages -l=lg -e=html,txt
-../../bin/django makemessages -d djangojs -l=lg
\ No newline at end of file
+../../bin/django makemessages -l LG -e .html,.txt
+../../bin/django makemessages -d djangojs -l LG
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po Wed Jan 20 20:45:52 2010 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-14 13:50+0100\n"
+"POT-Creation-Date: 2010-01-15 13:15+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,145 +61,145 @@
msgid "unknown"
msgstr ""
-#: models.py:176 views/create.py:30 views/create.py:45 views/texts.py:608
+#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:613
msgid "Title"
msgstr ""
-#: models.py:177
+#: models.py:176
msgid "Format"
msgstr ""
-#: models.py:178 views/texts.py:685
+#: models.py:177 views/texts.py:702
msgid "Content"
msgstr ""
-#: models.py:179 models.py:572
+#: models.py:178 models.py:579
msgid "Tags"
msgstr ""
-#: models.py:181 views/user.py:218
+#: models.py:180 views/user.py:218
msgid "Note"
msgstr ""
-#: models.py:183
+#: models.py:182
msgid "Moderation a posteriori?"
msgstr ""
-#: models.py:275
+#: models.py:274
msgid "Format:"
msgstr ""
-#: models.py:334
+#: models.py:341
#, python-format
msgid "%(workspace_name)s's workspace"
msgstr ""
-#: models.py:475
+#: models.py:482
msgid "name"
msgstr ""
-#: models.py:476
+#: models.py:483
msgid "description"
msgstr ""
-#: models.py:566
+#: models.py:573
msgid "Allow contact"
msgstr ""
-#: models.py:566
+#: models.py:573
msgid "Allow email messages from other users"
msgstr ""
-#: models.py:567
+#: models.py:574
msgid "Preferred language"
msgstr ""
-#: models.py:570
+#: models.py:577
msgid "Suspended access"
msgstr ""
-#: models.py:594
+#: models.py:601
msgid "suspended"
msgstr ""
-#: models.py:596
+#: models.py:603
msgid "waiting approval"
msgstr ""
-#: models.py:602
+#: models.py:609
msgid "pending"
msgstr ""
-#: models.py:617
+#: models.py:624
msgid "Invitation"
msgstr ""
-#: models.py:685
+#: models.py:692
#, python-format
msgid "Text %(link_to_text)s edited"
msgstr ""
-#: models.py:686
+#: models.py:693
#, python-format
msgid "Text %(link_to_text)s edited (new version created)"
msgstr ""
-#: models.py:687
+#: models.py:694
#, python-format
msgid "Text %(link_to_text)s added"
msgstr ""
-#: models.py:688
+#: models.py:695
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr ""
-#: models.py:689
+#: models.py:696
#, python-format
msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
msgstr ""
-#: models.py:690
+#: models.py:697
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr ""
-#: models.py:691
+#: models.py:698
#, python-format
msgid "User %(username)s added"
msgstr ""
-#: models.py:692
+#: models.py:699
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr ""
-#: models.py:693
+#: models.py:700
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr ""
-#: models.py:694
+#: models.py:701
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr ""
-#: models.py:695
+#: models.py:702
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr ""
-#: models.py:696
+#: models.py:703
#, python-format
msgid "User %(username)s has activated his account"
msgstr ""
-#: models.py:751 models.py:759
+#: models.py:758 models.py:766
#, python-format
msgid "by \"%(username)s\""
msgstr ""
-#: models.py:753
+#: models.py:760
#, python-format
msgid "%(time_since)s ago"
msgstr ""
@@ -212,7 +212,7 @@
msgid "Email:"
msgstr ""
-#: notifications.py:60 templates/email/activity_notification.txt:1
+#: notifications.py:60
msgid "Notification:"
msgstr ""
@@ -232,6 +232,10 @@
msgid "English"
msgstr ""
+#: settings.py:107
+msgid "Norwegian"
+msgstr ""
+
#: static_i18n.py:6 static_i18n.py:11
msgid "Observer"
msgstr ""
@@ -344,39 +348,6 @@
msgid "An error has occurred."
msgstr ""
-#: templates/email/activation_email.txt:2
-#, python-format
-msgid "You've been invited to join the workspace %(workspace_name)s."
-msgstr ""
-
-#: templates/email/activation_email.txt:3
-#: templates/email/invitation_email.txt:3
-msgid ""
-"Click the following link to complete your registration and access the "
-"workspace:"
-msgstr ""
-
-#: templates/email/base_email_notification.txt:2
-#, python-format
-msgid ""
-"If you'd like to unsubscribe from this notification, click the following "
-"link: %(SITE_URL)s%(desactivate_notification_url)s."
-msgstr ""
-
-#: templates/email/site_contact_email.txt:4
-#, fuzzy, python-format
-msgid "Contact from user: %(name)s / %(email)s"
-msgstr "Ajouter un utilisateur"
-
-#: templates/email/text_created.txt:4
-#, python-format
-msgid "Your text \"%(title)s\" has been created."
-msgstr ""
-
-#: templates/email/text_created.txt:6
-msgid "To publish it click on the following link:"
-msgstr ""
-
#: templates/site/activate.html:10 templates/site/user_activate.html:10
#: views/user.py:325
msgid "Activate your account"
@@ -600,68 +571,69 @@
msgid "No comments yet"
msgstr ""
-#: templates/site/followup.html:7 templates/site/macros/text_tabs.html:22
+#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/macros/text_tabs.html:22
msgid "Followup"
msgstr ""
+#: templates/site/followup.html:20 templates/site/text_followup.html:22
+msgid "Feeds"
+msgstr ""
+
#: templates/site/followup.html:22 templates/site/text_followup.html:24
-msgid "Feeds"
-msgstr ""
-
-#: templates/site/followup.html:24 templates/site/text_followup.html:26
msgid "Public feed"
msgstr ""
-#: templates/site/followup.html:24 templates/site/followup.html.py:34
+#: templates/site/followup.html:22 templates/site/followup.html.py:35
#: templates/site/help.html:6 templates/site/text_embed.html:26
#: templates/site/layout/footer.html:26
#: templates/site/macros/form_fields.html:15
msgid "Help"
msgstr ""
-#: templates/site/followup.html:27
+#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr ""
-#: templates/site/followup.html:31
+#: templates/site/followup.html:29
msgid "This is the public feed for the workspace."
msgstr ""
-#: templates/site/followup.html:34 templates/site/text_followup.html:36
+#: templates/site/followup.html:35 templates/site/text_followup.html:37
msgid "Private feed"
msgstr ""
-#: templates/site/followup.html:38
+#: templates/site/followup.html:39
msgid "Private feed for workspace"
msgstr ""
-#: templates/site/followup.html:42
+#: templates/site/followup.html:43
msgid ""
"This is the private feed for the workspace. Don't share this address with "
"others unless you want them to see all activities on the workspace."
msgstr ""
-#: templates/site/followup.html:44 templates/site/text_followup.html:46
+#: templates/site/followup.html:45 templates/site/text_followup.html:47
msgid "Reset private feed url"
msgstr ""
-#: templates/site/followup.html:48 templates/site/text_followup.html:50
+#: templates/site/followup.html:49 templates/site/text_followup.html:51
msgid "Activate private feed"
msgstr ""
-#: templates/site/followup.html:50
+#: templates/site/followup.html:51
msgid "The private feed for this workspace is not yet activated."
msgstr ""
-#: templates/site/followup.html:54 templates/site/text_followup.html:57
+#: templates/site/followup.html:55 templates/site/text_followup.html:58
msgid "Email notifications"
msgstr ""
-#: templates/site/followup.html:57
+#: templates/site/followup.html:58
msgid "Subscribe to workspace notifications"
msgstr ""
-#: templates/site/followup.html:61
+#: templates/site/followup.html:62
msgid ""
"Subscribe to all replies notifications in discussions where you have "
"participated"
@@ -713,7 +685,7 @@
msgstr "Ajouter un utilisateur"
#: templates/site/profile.html:26 templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:111
+#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:34
#: 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
@@ -743,26 +715,6 @@
msgid "Text list"
msgstr "Ajouter un utilisateur"
-#: templates/site/text_edit.html:33
-msgid ""
-"{nb_comments} comment(s) will be removed because the text they apply to has "
-"been changed. Do you want to continue?"
-msgstr ""
-
-#: templates/site/text_edit.html:43
-msgid "{nb_comments} comment(s) will be lost, do you want to continue?"
-msgstr ""
-
-#: templates/site/text_edit.html:44
-msgid "We suggest you create a new version"
-msgstr ""
-
-#: templates/site/text_edit.html:57
-msgid ""
-"Since you chose not to create a new version all comments will be deleted, do "
-"you want to continue?"
-msgstr ""
-
#: templates/site/text_embed.html:7
msgid "Text notifications"
msgstr ""
@@ -791,36 +743,36 @@
msgid "Text followup"
msgstr ""
-#: templates/site/text_followup.html:29
+#: templates/site/text_followup.html:27
#, python-format
msgid "Public feed for text %(title)s"
msgstr ""
-#: templates/site/text_followup.html:33
+#: templates/site/text_followup.html:31
msgid "This is the public feed for the text."
msgstr ""
-#: templates/site/text_followup.html:40
+#: templates/site/text_followup.html:41
msgid "Private feed for text "
msgstr ""
-#: templates/site/text_followup.html:44
+#: templates/site/text_followup.html:45
msgid ""
"This is the private feed for the text. Don't share this address with others "
"unless you want them to see all activities on this text."
msgstr ""
-#: templates/site/text_followup.html:52
+#: templates/site/text_followup.html:53
msgid "The private feed for this text is not yet activated."
msgstr ""
-#: templates/site/text_followup.html:60
+#: templates/site/text_followup.html:61
msgid ""
"You will receive text notifications because you subscribed to notifications "
"at the workspace level"
msgstr ""
-#: templates/site/text_followup.html:63
+#: templates/site/text_followup.html:64
msgid "Subscribe to all text notifications"
msgstr ""
@@ -1013,8 +965,7 @@
#: templates/site/text_share.html:101
#, python-format
-msgid ""
-"This role has been overriden on this text by a local role: %( rolename)s"
+msgid "This role has been overriden on this text by a local role: %(rolename)s"
msgstr ""
#: templates/site/text_share.html:128 templates/site/user_edit.html:6
@@ -1297,31 +1248,31 @@
msgid "Private activity feed for text %(text_title)s"
msgstr ""
-#: views/followup.py:29 views/followup.py:78
+#: views/followup.py:31 views/followup.py:80
msgid "Private feed activated."
msgstr ""
-#: views/followup.py:32
+#: views/followup.py:34
msgid "Private feed reseted."
msgstr ""
-#: views/followup.py:50
+#: views/followup.py:52
msgid "This notification has already been desactivated."
msgstr ""
-#: views/followup.py:56
+#: views/followup.py:58
msgid "Notification desactivated."
msgstr ""
-#: views/followup.py:60
+#: views/followup.py:62
msgid "Desactivate notification?"
msgstr ""
-#: views/followup.py:82
+#: views/followup.py:84
msgid "Private notifications feed reseted."
msgstr ""
-#: views/site.py:81 views/texts.py:131 views/user.py:524
+#: views/site.py:81 views/texts.py:132 views/user.py:522
msgid "You're logged in!"
msgstr ""
@@ -1392,59 +1343,59 @@
msgid "Settings saved"
msgstr ""
-#: views/texts.py:164
+#: views/texts.py:165
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr ""
-#: views/texts.py:206
+#: views/texts.py:211
#, python-format
msgid "Text %(text_title)s deleted"
msgstr ""
-#: views/texts.py:612
+#: views/texts.py:617
msgid "Note (optional)"
msgstr ""
-#: views/texts.py:615
+#: views/texts.py:620
msgid "Add a note to explain the modifications made to the text"
msgstr ""
-#: views/texts.py:625
+#: views/texts.py:630
msgid "New version (optional)"
msgstr ""
-#: views/texts.py:628
+#: views/texts.py:633
msgid "Create a new version of this text (recommended)"
msgstr ""
-#: views/texts.py:631
+#: views/texts.py:636
msgid "Keep comments (optional)"
msgstr ""
-#: views/texts.py:634
+#: views/texts.py:639
msgid "Keep comments (if not affected by the edit)"
msgstr ""
-#: views/texts.py:683
+#: views/texts.py:700
msgid "Name (optional)"
msgstr ""
-#: views/texts.py:684
+#: views/texts.py:701
msgid "Email (optional)"
msgstr ""
-#: views/texts.py:734
+#: views/texts.py:751
#, python-format
msgid "A new version (copied from version %(version_id)s) has been created"
msgstr ""
-#: views/texts.py:840 views/user.py:79 views/user.py:99
+#: views/texts.py:857 views/user.py:79 views/user.py:99
#, python-format
msgid "%(count)i user(s) role modified"
msgstr ""
-#: views/texts.py:898
+#: views/texts.py:915
msgid "Text settings updated"
msgstr ""
@@ -1522,81 +1473,85 @@
msgid "activate account"
msgstr ""
-#: views/user.py:357
+#: views/user.py:356
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr ""
-#: views/user.py:363
+#: views/user.py:362
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr ""
-#: views/user.py:376
+#: views/user.py:374
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr ""
-#: views/user.py:380
+#: views/user.py:378
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr ""
-#: views/user.py:390
+#: views/user.py:388
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr ""
-#: views/user.py:404
+#: views/user.py:402
msgid "Profile updated"
msgstr ""
-#: views/user.py:436
+#: views/user.py:434
msgid "Anonymous user role modified."
msgstr ""
-#: views/user.py:458
+#: views/user.py:456
msgid "User modified"
msgstr ""
-#: views/user.py:473
+#: views/user.py:471
msgid "Subject"
msgstr ""
-#: views/user.py:474
+#: views/user.py:472
msgid "Subject of the email"
msgstr ""
-#: views/user.py:477
+#: views/user.py:475
msgid "Body"
msgstr ""
-#: views/user.py:478
+#: views/user.py:476
msgid "Body of the email"
msgstr ""
-#: views/user.py:498
+#: views/user.py:496
msgid "Email sent."
msgstr ""
-#: views/user.py:518
+#: views/user.py:516
msgid "This account is suspended, contact the workspace administrator."
msgstr ""
-#: views/user.py:549
+#: views/user.py:547
msgid "You've been logged out."
msgstr ""
-#: views/user.py:565
+#: views/user.py:563
msgid ""
"You've been registered, you will receive a confirmation mail once a "
"moderator has approved your membership."
msgstr ""
-#: views/user.py:568
+#: views/user.py:566
msgid ""
"You've been registered, please check your email for the confirm message."
msgstr ""
+#, fuzzy
+#~ msgid "Contact from user: %(name)s / %(email)s"
+#~ msgstr "Ajouter un utilisateur"
+
#~ msgid "Add user"
#~ msgstr "Ajouter un utilisateur"
Binary file src/cm/locale/en/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/djangojs.po Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/djangojs.po Wed Jan 20 20:45:52 2010 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-14 17:55+0100\n"
+"POT-Creation-Date: 2010-01-15 09:45+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po Wed Jan 20 20:45:52 2010 +0100
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-14 13:50+0100\n"
-"PO-Revision-Date: 2009-12-14 13:51+0100\n"
+"POT-Creation-Date: 2010-01-15 13:16+0100\n"
+"PO-Revision-Date: 2010-01-15 13:17+0100\n"
"Last-Translator: dev <dev@sopinspace.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -61,152 +61,152 @@
msgid "unknown"
msgstr "inconnu"
-#: models.py:176
+#: models.py:175
#: views/create.py:30
#: views/create.py:45
-#: views/texts.py:608
+#: views/texts.py:613
msgid "Title"
msgstr "Titre"
-#: models.py:177
+#: models.py:176
msgid "Format"
msgstr "Format"
-#: models.py:178
-#: views/texts.py:685
+#: models.py:177
+#: views/texts.py:702
msgid "Content"
msgstr "Texte"
-#: models.py:179
-#: models.py:572
+#: models.py:178
+#: models.py:579
msgid "Tags"
msgstr "Tags"
-#: models.py:181
+#: models.py:180
#: views/user.py:218
msgid "Note"
msgstr "Note"
-#: models.py:183
+#: models.py:182
msgid "Moderation a posteriori?"
msgstr "Modération a posteriori ?"
-#: models.py:275
+#: models.py:274
msgid "Format:"
msgstr "Format :"
-#: models.py:334
+#: models.py:341
#, python-format
msgid "%(workspace_name)s's workspace"
msgstr "espace de travail : %(workspace_name)s"
-#: models.py:475
+#: models.py:482
msgid "name"
msgstr "nom"
-#: models.py:476
+#: models.py:483
msgid "description"
msgstr "description"
-#: models.py:566
+#: models.py:573
msgid "Allow contact"
msgstr "Autorise à être contacté"
-#: models.py:566
+#: models.py:573
msgid "Allow email messages from other users"
msgstr "Autoriser les participants de l'espace de travail à vous envoyer un email"
-#: models.py:567
+#: models.py:574
msgid "Preferred language"
msgstr "Langage de préférence"
-#: models.py:570
+#: models.py:577
msgid "Suspended access"
msgstr "Accès désactivé"
-#: models.py:594
+#: models.py:601
msgid "suspended"
msgstr "désactivé"
-#: models.py:596
+#: models.py:603
msgid "waiting approval"
msgstr "en attente d'approbation"
-#: models.py:602
+#: models.py:609
msgid "pending"
msgstr "en attente"
-#: models.py:617
+#: models.py:624
msgid "Invitation"
msgstr "Invitation"
-#: models.py:685
+#: models.py:692
#, python-format
msgid "Text %(link_to_text)s edited"
msgstr "Le texte %(link_to_text)s a été édité"
-#: models.py:686
+#: models.py:693
#, python-format
msgid "Text %(link_to_text)s edited (new version created)"
msgstr "Le texte %(link_to_text)s a été édité (nouvelle version créée)"
-#: models.py:687
+#: models.py:694
#, python-format
msgid "Text %(link_to_text)s added"
msgstr "Le texte %(link_to_text)s a été ajouté"
-#: models.py:688
+#: models.py:695
#, python-format
msgid "Text %(link_to_text)s removed"
msgstr "Le texte %(link_to_text)s a été supprimé"
-#: models.py:689
+#: models.py:696
#, python-format
msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
msgstr "Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s"
-#: models.py:690
+#: models.py:697
#, python-format
msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
msgstr "Commentaire %(link_to_comment)s supprimé du texte %(link_to_text)s"
-#: models.py:691
+#: models.py:698
#, python-format
msgid "User %(username)s added"
msgstr "L'utilisateur %(username)s a été ajouté"
-#: models.py:692
+#: models.py:699
#, python-format
msgid "User %(username)s access to workspace enabled"
msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
-#: models.py:693
+#: models.py:700
#, python-format
msgid "User %(username)s access to workspace refused"
msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
-#: models.py:694
+#: models.py:701
#, python-format
msgid "User %(username)s access to workspace suspended"
msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
-#: models.py:695
+#: models.py:702
#, python-format
msgid "User %(username)s access to workspace activated"
msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
-#: models.py:696
+#: models.py:703
#, python-format
msgid "User %(username)s has activated his account"
msgstr "L'utilisateur %(username)s a activé son compte"
-#: models.py:751
-#: models.py:759
+#: models.py:758
+#: models.py:766
#, python-format
msgid "by \"%(username)s\""
msgstr "par \"%(username)s\""
-#: models.py:753
+#: models.py:760
#, python-format
msgid "%(time_since)s ago"
msgstr "il y a %(time_since)s"
@@ -220,7 +220,6 @@
msgstr "Email :"
#: notifications.py:60
-#: templates/email/activity_notification.txt:1
msgid "Notification:"
msgstr "Notification:"
@@ -240,6 +239,10 @@
msgid "English"
msgstr "Anglais"
+#: settings.py:107
+msgid "Norwegian"
+msgstr "Norvégien"
+
#: static_i18n.py:6
#: static_i18n.py:11
msgid "Observer"
@@ -353,35 +356,6 @@
msgid "An error has occurred."
msgstr "Une erreur s'est produite."
-#: templates/email/activation_email.txt:2
-#, python-format
-msgid "You've been invited to join the workspace %(workspace_name)s."
-msgstr "Vous avez été invité à rejoindre l'espace de travail %(workspace_name)s."
-
-#: templates/email/activation_email.txt:3
-#: templates/email/invitation_email.txt:3
-msgid "Click the following link to complete your registration and access the workspace:"
-msgstr "Cliquer le lien suivant pour terminer votre enregistrement et accéder à l'espace de travail :"
-
-#: templates/email/base_email_notification.txt:2
-#, python-format
-msgid "If you'd like to unsubscribe from this notification, click the following link: %(SITE_URL)s%(desactivate_notification_url)s."
-msgstr "Si vous voulez vous désabonner de cette notification, cliquez sur le lien suivant : %(SITE_URL)s%(desactivate_notification_url)s."
-
-#: templates/email/site_contact_email.txt:4
-#, python-format
-msgid "Contact from user: %(name)s / %(email)s"
-msgstr "Contact de l'utilisateur : %(name)s / %(email)s"
-
-#: templates/email/text_created.txt:4
-#, python-format
-msgid "Your text \"%(title)s\" has been created."
-msgstr "Votre texte \"%(title)s\" a été créé."
-
-#: templates/email/text_created.txt:6
-msgid "To publish it click on the following link:"
-msgstr "Pour le publier, cliquez sur le lien suivant :"
-
#: templates/site/activate.html:10
#: templates/site/user_activate.html:10
#: views/user.py:325
@@ -622,22 +596,23 @@
msgstr "Aucun commentaire"
#: templates/site/followup.html:7
+#: templates/site/macros/main_tabs.html:16
#: templates/site/macros/text_tabs.html:22
msgid "Followup"
msgstr "Suivi"
-#: templates/site/followup.html:22
-#: templates/site/text_followup.html:24
+#: templates/site/followup.html:20
+#: templates/site/text_followup.html:22
msgid "Feeds"
msgstr "Flux"
-#: templates/site/followup.html:24
-#: templates/site/text_followup.html:26
+#: templates/site/followup.html:22
+#: templates/site/text_followup.html:24
msgid "Public feed"
msgstr "Flux public"
-#: templates/site/followup.html:24
-#: templates/site/followup.html.py:34
+#: templates/site/followup.html:22
+#: templates/site/followup.html.py:35
#: templates/site/help.html:6
#: templates/site/text_embed.html:26
#: templates/site/layout/footer.html:26
@@ -645,51 +620,51 @@
msgid "Help"
msgstr "Aide"
-#: templates/site/followup.html:27
+#: templates/site/followup.html:25
msgid "Public feed for workspace"
msgstr "Flux public de l'espace de travail"
-#: templates/site/followup.html:31
+#: templates/site/followup.html:29
msgid "This is the public feed for the workspace."
msgstr "Ceci est le flux public de l'espace de travail."
-#: templates/site/followup.html:34
-#: templates/site/text_followup.html:36
+#: templates/site/followup.html:35
+#: templates/site/text_followup.html:37
msgid "Private feed"
msgstr "Flux privé"
-#: templates/site/followup.html:38
+#: templates/site/followup.html:39
msgid "Private feed for workspace"
msgstr "Flux privé de l'espace de travail"
-#: templates/site/followup.html:42
+#: templates/site/followup.html:43
msgid "This is the private feed for the workspace. Don't share this address with others unless you want them to see all activities on the workspace."
msgstr "Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités de l'espace de travail."
-#: templates/site/followup.html:44
-#: templates/site/text_followup.html:46
+#: templates/site/followup.html:45
+#: templates/site/text_followup.html:47
msgid "Reset private feed url"
msgstr "Réinitialiser l'adresse du flux privé"
-#: templates/site/followup.html:48
-#: templates/site/text_followup.html:50
+#: templates/site/followup.html:49
+#: templates/site/text_followup.html:51
msgid "Activate private feed"
msgstr "Activer le flux privé"
-#: templates/site/followup.html:50
+#: templates/site/followup.html:51
msgid "The private feed for this workspace is not yet activated."
msgstr "Le flux privé de cet espace de travail n'est pas encore activé."
-#: templates/site/followup.html:54
-#: templates/site/text_followup.html:57
+#: templates/site/followup.html:55
+#: templates/site/text_followup.html:58
msgid "Email notifications"
msgstr "Notifications par email"
-#: templates/site/followup.html:57
+#: templates/site/followup.html:58
msgid "Subscribe to workspace notifications"
msgstr "S'abonner aux notifications de l'espace de travail"
-#: templates/site/followup.html:61
+#: templates/site/followup.html:62
msgid "Subscribe to all replies notifications in discussions where you have participated"
msgstr "S'abonner aux notifications concernant les commentaires ou réponses dans les discussions auxquelles vous avez participé"
@@ -744,7 +719,7 @@
#: templates/site/profile.html:26
#: templates/site/text_create_content.html:45
#: templates/site/text_create_upload.html:40
-#: templates/site/text_edit.html:111
+#: templates/site/text_edit.html:34
#: templates/site/text_settings.html:23
#: templates/site/text_share.html:153
#: templates/site/user_activate.html:27
@@ -775,22 +750,6 @@
msgid "Text list"
msgstr "Textes"
-#: templates/site/text_edit.html:33
-msgid "{nb_comments} comment(s) will be removed because the text they apply to has been changed. Do you want to continue?"
-msgstr "{nb_comments} commentaire(s) vont être supprimés parce que le texte a changé. Continuer ?"
-
-#: templates/site/text_edit.html:43
-msgid "{nb_comments} comment(s) will be lost, do you want to continue?"
-msgstr "{nb_comments} commentaire(s) vont être perdus, continuer ?"
-
-#: templates/site/text_edit.html:44
-msgid "We suggest you create a new version"
-msgstr "Nous vous suggérons de créer une nouvelle version"
-
-#: templates/site/text_edit.html:57
-msgid "Since you chose not to create a new version all comments will be deleted, do you want to continue?"
-msgstr "Tous les commentaires vont être supprimés parce que vous avez choisi de ne pas créer une nouvelle version, continuer ?"
-
#: templates/site/text_embed.html:7
msgid "Text notifications"
msgstr "Notifications du texte"
@@ -815,32 +774,32 @@
msgid "Text followup"
msgstr "Suivi du texte"
-#: templates/site/text_followup.html:29
+#: templates/site/text_followup.html:27
#, python-format
msgid "Public feed for text %(title)s"
msgstr "Flux public pour le texte %(title)s"
-#: templates/site/text_followup.html:33
+#: templates/site/text_followup.html:31
msgid "This is the public feed for the text."
msgstr "Ceci est le flux public du texte."
-#: templates/site/text_followup.html:40
+#: templates/site/text_followup.html:41
msgid "Private feed for text "
msgstr "Flux privé du texte"
-#: templates/site/text_followup.html:44
+#: templates/site/text_followup.html:45
msgid "This is the private feed for the text. Don't share this address with others unless you want them to see all activities on this text."
msgstr "Ceci est le flux privé du texte. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités du texte."
-#: templates/site/text_followup.html:52
+#: templates/site/text_followup.html:53
msgid "The private feed for this text is not yet activated."
msgstr "Le flux privé de ce texte n'est pas encore activé."
-#: templates/site/text_followup.html:60
+#: templates/site/text_followup.html:61
msgid "You will receive text notifications because you subscribed to notifications at the workspace level"
msgstr "Vous recevrez les notifications de ce texte parce que vous vous êtes abonné aux notifications au niveau de l'espace de travail tout entier"
-#: templates/site/text_followup.html:63
+#: templates/site/text_followup.html:64
msgid "Subscribe to all text notifications"
msgstr "S'abonner aux notifications du texte"
@@ -1048,8 +1007,8 @@
#: templates/site/text_share.html:101
#, python-format
-msgid "This role has been overriden on this text by a local role: %( rolename)s"
-msgstr "Ce rôle a été surchargé par un rôle local : %( rolename)s"
+msgid "This role has been overriden on this text by a local role: %(rolename)s"
+msgstr "Ce rôle a été surchargé par un rôle local : %(rolename)s"
#: templates/site/text_share.html:128
#: templates/site/user_edit.html:6
@@ -1336,34 +1295,34 @@
msgid "Private activity feed for text %(text_title)s"
msgstr "Flux public pour le texte %(text_title)s"
-#: views/followup.py:29
-#: views/followup.py:78
+#: views/followup.py:31
+#: views/followup.py:80
msgid "Private feed activated."
msgstr "Flux privé activé."
-#: views/followup.py:32
+#: views/followup.py:34
msgid "Private feed reseted."
msgstr "Flux privé réinitialisé."
-#: views/followup.py:50
+#: views/followup.py:52
msgid "This notification has already been desactivated."
msgstr "Cette notification a été désactivée."
-#: views/followup.py:56
+#: views/followup.py:58
msgid "Notification desactivated."
msgstr "Notification désactivée."
-#: views/followup.py:60
+#: views/followup.py:62
msgid "Desactivate notification?"
msgstr "Désactiver la notification ?"
-#: views/followup.py:82
+#: views/followup.py:84
msgid "Private notifications feed reseted."
msgstr "Flux privé réinitialisé."
#: views/site.py:81
-#: views/texts.py:131
-#: views/user.py:524
+#: views/texts.py:132
+#: views/user.py:522
msgid "You're logged in!"
msgstr "Vous êtes connecté !"
@@ -1431,61 +1390,61 @@
msgid "Settings saved"
msgstr "Paramètres sauvegardés"
-#: views/texts.py:164
+#: views/texts.py:165
#, python-format
msgid "%(nb_texts)i text(s) deleted"
msgstr "%(nb_texts)i texte(s) supprimés"
-#: views/texts.py:206
+#: views/texts.py:211
#, python-format
msgid "Text %(text_title)s deleted"
msgstr "texte %(text_title)s supprimé"
-#: views/texts.py:612
+#: views/texts.py:617
msgid "Note (optional)"
msgstr "Note (facultative)"
-#: views/texts.py:615
+#: views/texts.py:620
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:625
+#: views/texts.py:630
msgid "New version (optional)"
msgstr "Nouvelle version (facultative)"
-#: views/texts.py:628
+#: views/texts.py:633
msgid "Create a new version of this text (recommended)"
msgstr "créér une nouvelle version de ce texte (recommandé)"
-#: views/texts.py:631
+#: views/texts.py:636
msgid "Keep comments (optional)"
msgstr "Conserver les commentaires (facultatif)"
-#: views/texts.py:634
+#: views/texts.py:639
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:683
+#: views/texts.py:700
msgid "Name (optional)"
msgstr "Nom (facultatif)"
-#: views/texts.py:684
+#: views/texts.py:701
msgid "Email (optional)"
msgstr "Email (facultatif)"
-#: views/texts.py:734
+#: views/texts.py:751
#, python-format
msgid "A new version (copied from version %(version_id)s) has been created"
msgstr "Une nouvelle version (copiée depuis la version %(version_id)s) a été créée"
-#: views/texts.py:840
+#: views/texts.py:857
#: 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:898
+#: views/texts.py:915
msgid "Text settings updated"
msgstr "Paramètres mis à jour"
@@ -1561,79 +1520,116 @@
msgid "activate account"
msgstr "activation du compte"
-#: views/user.py:357
+#: views/user.py:356
#, python-format
msgid "User's access %(prof)s has been suspended."
msgstr "L'accès de l'utilisateur %(prof)s a été desactivé."
-#: views/user.py:363
+#: views/user.py:362
#, python-format
msgid "User's access %(prof)s has been refused."
msgstr "L'accès de l'utilisateur %(prof)s a été refusé."
-#: views/user.py:376
+#: views/user.py:374
#, python-format
msgid "User's access %(prof)s has been restored."
msgstr "L'accès de l'utilisateur %(prof)s a été restauré."
-#: views/user.py:380
+#: views/user.py:378
#, python-format
msgid "User's access %(prof)s has been approved."
msgstr "L'accès de l'utilisateur %(prof)s a été activé."
-#: views/user.py:390
+#: views/user.py:388
#, python-format
msgid "A new invitation has been sent to user %(prof)s."
msgstr "Une nouvelle invitation a été envoyée à l'utilisateur %(prof)s."
-#: views/user.py:404
+#: views/user.py:402
msgid "Profile updated"
msgstr "Profil mis à jour"
-#: views/user.py:436
+#: views/user.py:434
msgid "Anonymous user role modified."
msgstr "Role de l'utilisateur anonyme modifié."
-#: views/user.py:458
+#: views/user.py:456
msgid "User modified"
msgstr "Utilisateur modifié"
-#: views/user.py:473
+#: views/user.py:471
msgid "Subject"
msgstr "Sujet"
-#: views/user.py:474
+#: views/user.py:472
msgid "Subject of the email"
msgstr "Sujet du message"
-#: views/user.py:477
+#: views/user.py:475
msgid "Body"
msgstr "Corps"
-#: views/user.py:478
+#: views/user.py:476
msgid "Body of the email"
msgstr "Corps du message"
-#: views/user.py:498
+#: views/user.py:496
msgid "Email sent."
msgstr "Email envoyé."
-#: views/user.py:518
+#: views/user.py:516
msgid "This account is suspended, contact the workspace administrator."
msgstr "Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de travail."
-#: views/user.py:549
+#: views/user.py:547
msgid "You've been logged out."
msgstr "Vous êtes déconnecté."
-#: views/user.py:565
+#: views/user.py:563
msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
msgstr "Enregistrement réussi, vous recevrez un message de confirmation quand un gestionnaire de l'espace de travail aura activé votre compte."
-#: views/user.py:568
+#: views/user.py:566
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 "You've been invited to join the workspace %(workspace_name)s."
+#~ msgstr ""
+#~ "Vous avez été invité à rejoindre l'espace de travail %(workspace_name)s."
+#~ msgid ""
+#~ "Click the following link to complete your registration and access the "
+#~ "workspace:"
+#~ msgstr ""
+#~ "Cliquer le lien suivant pour terminer votre enregistrement et accéder à "
+#~ "l'espace de travail :"
+#~ msgid ""
+#~ "If you'd like to unsubscribe from this notification, click the following "
+#~ "link: %(SITE_URL)s%(desactivate_notification_url)s."
+#~ msgstr ""
+#~ "Si vous voulez vous désabonner de cette notification, cliquez sur le lien "
+#~ "suivant : %(SITE_URL)s%(desactivate_notification_url)s."
+#~ msgid "Contact from user: %(name)s / %(email)s"
+#~ msgstr "Contact de l'utilisateur : %(name)s / %(email)s"
+#~ msgid "Your text \"%(title)s\" has been created."
+#~ msgstr "Votre texte \"%(title)s\" a été créé."
+#~ msgid "To publish it click on the following link:"
+#~ msgstr "Pour le publier, cliquez sur le lien suivant :"
+#~ msgid ""
+#~ "{nb_comments} comment(s) will be removed because the text they apply to "
+#~ "has been changed. Do you want to continue?"
+#~ msgstr ""
+#~ "{nb_comments} commentaire(s) vont être supprimés parce que le texte a "
+#~ "changé. Continuer ?"
+#~ msgid "{nb_comments} comment(s) will be lost, do you want to continue?"
+#~ msgstr "{nb_comments} commentaire(s) vont être perdus, continuer ?"
+#~ msgid "We suggest you create a new version"
+#~ msgstr "Nous vous suggérons de créer une nouvelle version"
+#~ msgid ""
+#~ "Since you chose not to create a new version all comments will be deleted, "
+#~ "do you want to continue?"
+#~ msgstr ""
+#~ "Tous les commentaires vont être supprimés parce que vous avez choisi de "
+#~ "ne pas créer une nouvelle version, continuer ?"
#~ msgid "Notifications"
#~ msgstr "Notifications"
#~ msgid "Authors:"
Binary file src/cm/locale/fr/LC_MESSAGES/djangojs.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/djangojs.po Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/djangojs.po Wed Jan 20 20:45:52 2010 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: djangojs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-14 17:55+0100\n"
+"POT-Creation-Date: 2010-01-15 09:45+0100\n"
"PO-Revision-Date: 2009-12-14 17:55+0100\n"
"Last-Translator: renaud bernard <renaud.bernard@sopinspace.com>\n"
"Language-Team: <en@li.org>\n"
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/no/LC_MESSAGES/django.po Wed Jan 20 20:45:52 2010 +0100
@@ -0,0 +1,1575 @@
+# COMT Norwegian translation
+# Copyright (C) Sopinspace
+# This file is distributed under the same license as the COMT package.
+# Kirill Miazine (km@krot.org), 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: COMT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-16 17:56+0100\n"
+"PO-Revision-Date: 2010-01-16 18:00+0100\n"
+"Last-Translator: Kirill Miazine <km@krot.org>\n"
+"Language-Team: <no@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: hand-crafted with vim.\n"
+
+#: client.py:25
+msgid ""
+"A selection is required. Select in the text the part your comment applies to."
+msgstr ""
+"Et område i teksten må merkes. Merk et område i teksten som din merknad "
+"skal gjelde"
+
+#: client.py:133
+msgid "name is required"
+msgstr "navn må angis"
+
+#: client.py:136
+msgid "email is required"
+msgstr "epost må angis"
+
+#: client.py:138
+msgid "invalid email"
+msgstr "ugyldig epost"
+
+#: client.py:140
+msgid "title is required"
+msgstr "overskriften må angis"
+
+#: client.py:142
+msgid "content is required"
+msgstr "teksten må fylles ut"
+
+#: client.py:157
+msgid "comment removed"
+msgstr "merknad slettet"
+
+#: client.py:208 client.py:273
+msgid "comment saved"
+msgstr "merknad lagret"
+
+#: client.py:275
+msgid "comment saved, it is being held for moderation"
+msgstr "merknad lagret og holdes tilbake for godkjenning"
+
+#: client.py:336
+msgid "Tags input must be no longer than 250 characters."
+msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn."
+
+#: diff.py:53
+msgid "unknown"
+msgstr "ukjent"
+
+#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:613
+msgid "Title"
+msgstr "Overskrift"
+
+#: models.py:176
+msgid "Format"
+msgstr "Format"
+
+#: models.py:177 views/texts.py:702
+msgid "Content"
+msgstr "Innhold"
+
+#: models.py:178 models.py:579
+msgid "Tags"
+msgstr "Etiketter"
+
+#: models.py:180 views/user.py:218
+msgid "Note"
+msgstr "Kommentar"
+
+#: models.py:182
+msgid "Moderation a posteriori?"
+msgstr "Godkjenning i ettertid?"
+
+#: models.py:274
+msgid "Format:"
+msgstr "Format:"
+
+#: models.py:341
+#, python-format
+msgid "%(workspace_name)s's workspace"
+msgstr "Arbeidsområde til %(workspace_name)s"
+
+#: models.py:482
+msgid "name"
+msgstr "navn"
+
+#: models.py:483
+msgid "description"
+msgstr "beskrivelse"
+
+#: models.py:573
+msgid "Allow contact"
+msgstr "Tillatt kontakt"
+
+#: models.py:573
+msgid "Allow email messages from other users"
+msgstr "Motta epost fra andre brukere"
+
+#: models.py:574
+msgid "Preferred language"
+msgstr "Foretrukket språk"
+
+#: models.py:577
+msgid "Suspended access"
+msgstr "Sperret tilgang"
+
+#: models.py:601
+msgid "suspended"
+msgstr "sperret"
+
+#: models.py:603
+msgid "waiting approval"
+msgstr "venter på godkjenning"
+
+#: models.py:609
+msgid "pending"
+msgstr "pågående"
+
+#: models.py:624
+msgid "Invitation"
+msgstr "Invitasjon"
+
+#: models.py:692
+#, python-format
+msgid "Text %(link_to_text)s edited"
+msgstr "Tekst %(link_to_text)s endret"
+
+#: models.py:693
+#, python-format
+msgid "Text %(link_to_text)s edited (new version created)"
+msgstr "Tekst %(link_to_text)s endret (ny versjon opprettet)"
+
+#: models.py:694
+#, python-format
+msgid "Text %(link_to_text)s added"
+msgstr "Tekst %(link_to_text)s lagt til"
+
+#: models.py:695
+#, python-format
+msgid "Text %(link_to_text)s removed"
+msgstr "Tekst %(link_to_text)s slettet"
+
+#: models.py:696
+#, python-format
+msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
+msgstr "Merknad %(link_to_comment)s lagt til teksten %(link_to_text)s"
+
+#: models.py:697
+#, python-format
+msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
+msgstr "Merknad %(link_to_comment)s slettet fra teksten %(link_to_text)s"
+
+#: models.py:698
+#, python-format
+msgid "User %(username)s added"
+msgstr "Bruker %(username)s opprettet"
+
+#: models.py:699
+#, python-format
+msgid "User %(username)s access to workspace enabled"
+msgstr "Aktivert tilgang for brukeren %(username)s"
+
+#: models.py:700
+#, python-format
+msgid "User %(username)s access to workspace refused"
+msgstr "Nektet tilgang for brukeren %(username)s"
+
+#: models.py:701
+#, python-format
+msgid "User %(username)s access to workspace suspended"
+msgstr "Stoppet tilgang for brukeren %(username)s"
+
+#: models.py:702
+#, python-format
+msgid "User %(username)s access to workspace activated"
+msgstr "Aktivert tilgang for brukeren %(username)s"
+
+#: models.py:703
+#, python-format
+msgid "User %(username)s has activated his account"
+msgstr "Bruker %(username)s har aktivert kontoen"
+
+#: models.py:758 models.py:766
+#, python-format
+msgid "by \"%(username)s\""
+msgstr "av %(username)s"
+
+#: models.py:760
+#, python-format
+msgid "%(time_since)s ago"
+msgstr "for %(time_since)s siden"
+
+#: models_base.py:53
+msgid "Name:"
+msgstr "Navn:"
+
+#: models_base.py:54
+msgid "Email:"
+msgstr "Epost:"
+
+#: notifications.py:60
+msgid "Notification:"
+msgstr "Varsler:"
+
+#: role_models.py:7
+msgid "Generic"
+msgstr "Generell"
+
+#: role_models.py:7
+msgid "Class (education)"
+msgstr "Klasse (i skole osv.)"
+
+#: settings.py:105
+msgid "French"
+msgstr "Fransk"
+
+#: settings.py:106
+msgid "English"
+msgstr "Engelsk"
+
+#: settings.py:107
+msgid "Norwegian"
+msgstr "Norsk"
+
+#: static_i18n.py:6 static_i18n.py:11
+msgid "Observer"
+msgstr "Observatør"
+
+#: static_i18n.py:7
+msgid "Manager"
+msgstr "Administrator"
+
+#: static_i18n.py:8
+msgid "Editor"
+msgstr "Redaktør"
+
+#: static_i18n.py:9
+msgid "Moderator"
+msgstr "Moderator"
+
+#: static_i18n.py:10
+msgid "Commentator"
+msgstr "Kommentator"
+
+#: static_i18n.py:12
+msgid "Participant"
+msgstr "Deltaker"
+
+#: static_i18n.py:15
+msgid "Can view text"
+msgstr "Kan se tekster"
+
+#: static_i18n.py:16
+msgid "Can edit text"
+msgstr "Kan endre tekster"
+
+#: static_i18n.py:17
+msgid "Can create text"
+msgstr "Kan opprette tekster"
+
+#: static_i18n.py:18
+msgid "Can delete text"
+msgstr "Kan slette tekster"
+
+#: static_i18n.py:19
+msgid "Can manage text"
+msgstr "Kan administrere tekster"
+
+#: static_i18n.py:20
+msgid "Can create comment"
+msgstr "Kan opprette merknader"
+
+#: static_i18n.py:21
+msgid "Can delete comment"
+msgstr "Kan slette merknader"
+
+#: static_i18n.py:22
+msgid "Can delete own comment"
+msgstr "Kan slette egne merknader"
+
+#: static_i18n.py:23
+msgid "Can view approved comment"
+msgstr "Kan se godkjente merknader"
+
+#: static_i18n.py:24
+msgid "Can view own comment"
+msgstr "Kan se egne merknader"
+
+#: static_i18n.py:25
+msgid "Can view unapproved comment"
+msgstr "Kan se ikke-godkjente merknader"
+
+#: static_i18n.py:26
+msgid "Can edit comment"
+msgstr "Kan endre merknader"
+
+#: static_i18n.py:27
+msgid "Can edit own comment"
+msgstr "Kan endre egne merknader"
+
+#: static_i18n.py:28
+msgid "Can manage workspace"
+msgstr "Kan administrere arbeidsområde"
+
+#: static_i18n.py:29
+msgid "Can view workspace"
+msgstr "Kan se arbeidsområde"
+
+#: static_i18n.py:32
+msgid "Teacher"
+msgstr "Lærer"
+
+#: static_i18n.py:33
+msgid "Student"
+msgstr "Student"
+
+#: static_i18n.py:34
+msgid "Individual student"
+msgstr "Individuell student"
+
+#: templates/404.html:4
+msgid "Page not found"
+msgstr "Ukjent side"
+
+#: templates/404.html:6
+msgid "The requested page could not be found."
+msgstr "Siden ble ikke funnet."
+
+#: templates/500.html:4
+msgid "Server Error"
+msgstr "Serverfeil"
+
+#: templates/500.html:6
+msgid "An error has occurred."
+msgstr "En feil har oppstått."
+
+#: templates/site/activate.html:10 templates/site/user_activate.html:10
+#: views/user.py:325
+msgid "Activate your account"
+msgstr "Aktiver din konto"
+
+#: templates/site/activate.html:23
+msgid "Activate"
+msgstr "Aktiver"
+
+#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/macros/user_actions.html:20
+msgid "Contact"
+msgstr "Kontakt"
+
+#: templates/site/contact.html:24
+msgid "Send"
+msgstr "Send"
+
+#: templates/site/contact.html:26
+#: templates/site/notifications_desactivate.html:32
+#: templates/site/settings.html:23 templates/site/text_create_content.html:47
+#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/user_mass_add_text.html:38
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+msgid "Dashboard"
+msgstr "Kontrollpanell"
+
+#: templates/site/dashboard.html:43
+msgid "Actions"
+msgstr "Handlinger"
+
+#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/text_create_content.html:28
+#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/layout/header.html:10
+msgid "Write a text"
+msgstr "Skriv tekst"
+
+#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/text_create_upload.html:4
+#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/layout/header.html:11
+msgid "Upload a text"
+msgstr "Last opp tekst"
+
+#: templates/site/dashboard.html:50
+msgid "Invite user"
+msgstr "Inviter bruker"
+
+#: templates/site/dashboard.html:51
+msgid "Edit your profile"
+msgstr "Rediger din profil"
+
+#: templates/site/dashboard.html:52
+msgid "View text list"
+msgstr "Se tekstoversikt"
+
+#: templates/site/dashboard.html:53
+msgid "Configure workspace"
+msgstr "Tilpass arbeidsområde"
+
+#: templates/site/dashboard.html:64
+msgid "Moderation queue"
+msgstr "Godkjenningskø"
+
+#: templates/site/dashboard.html:76
+#, python-format
+msgid "user %(user)s awaits approval"
+msgstr "bruker %(user)s venter på godkjenning"
+
+#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+msgid "approve"
+msgstr "godkjenne"
+
+#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+msgid "refuse"
+msgstr "nekte godkjenning"
+
+#: templates/site/dashboard.html:80
+msgid "membership"
+msgstr "medlemskap"
+
+#: templates/site/dashboard.html:85
+#: templates/site/macros/user_moderation.html:8
+msgid ""
+"Are you sure you want to approve this user's membership to the workspace?"
+msgstr "Ønsker du å godkjenne brukerens medlemskap i arbeidsområdet?"
+
+#: templates/site/dashboard.html:94
+#: templates/site/macros/user_moderation.html:17
+msgid ""
+"Are you sure you want to refuse this user's membership to the workspace?"
+msgstr "Ønsker du å nekte å godkjenne brukerens medlemskap i arbeidsområdet?"
+
+#: templates/site/dashboard.html:106
+#, python-format
+msgid "registered %(duration)s ago"
+msgstr "registrert for %(duration)s siden"
+
+#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+msgid "comment"
+msgstr "merknad"
+
+#: templates/site/dashboard.html:121
+#, python-format
+msgid "by %(cuser)s on text"
+msgstr "av %(cuser)s til teksten"
+
+#: templates/site/dashboard.html:121
+msgid "awaits approval"
+msgstr "venter på godkjenning"
+
+#: templates/site/dashboard.html:127
+msgid "view in context"
+msgstr "se i kontekst"
+
+#: templates/site/dashboard.html:132
+msgid "Are you sure you want to approve this comment?"
+msgstr "Ønsker du å godkjenne denne merknaden?"
+
+#: templates/site/dashboard.html:148
+msgid "Are you sure you want to refuse this comment?"
+msgstr "Ønsker du å nekte å godkjenne denne merknaden?"
+
+#: templates/site/dashboard.html:166 templates/site/dashboard.html.py:199
+#, python-format
+msgid "modified %(duration)s ago"
+msgstr "endret for %(duration)s siden"
+
+#: templates/site/dashboard.html:184
+msgid "Recent texts"
+msgstr "Nye tekster"
+
+#: templates/site/dashboard.html:184 templates/site/macros/paginator.html:9
+msgid "all"
+msgstr "alle"
+
+#: templates/site/dashboard.html:199 templates/site/macros/text_meta.html:4
+#, python-format
+msgid "%(nb_comments)s comment"
+msgid_plural "%(nb_comments)s comments"
+msgstr[0] "%(nb_comments)s merknad"
+msgstr[1] "%(nb_comments)s merknader"
+
+#: templates/site/dashboard.html:204 templates/site/text_list.html:221
+msgid "No texts yet"
+msgstr "Ingen tekster ennå"
+
+#: templates/site/dashboard.html:223
+msgid "Workspace activity"
+msgstr "Aktivitet i arbeidsområde"
+
+#: templates/site/dashboard.html:224
+msgid "month"
+msgstr "måned"
+
+#: templates/site/dashboard.html:224
+msgid "week"
+msgstr "uke"
+
+#: templates/site/dashboard.html:224
+msgid "24 hours"
+msgstr "24 timer"
+
+#: templates/site/dashboard.html:230
+msgid "Access"
+msgstr "Tilgang"
+
+#: templates/site/dashboard.html:231 templates/site/dashboard.html.py:242
+#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/user_list.html.py:188
+msgid "Loading..."
+msgstr "Laster..."
+
+#: templates/site/dashboard.html:241
+msgid "Commenting"
+msgstr "Kommentering"
+
+#: templates/site/dashboard.html:258
+msgid "Activities"
+msgstr "Aktivitetsjournal"
+
+#: templates/site/dashboard.html:261
+msgid "texts"
+msgstr "tekster"
+
+#: templates/site/dashboard.html:262 templates/site/text_list.html:139
+msgid "comments"
+msgstr "merknader"
+
+#: templates/site/dashboard.html:264
+msgid "users"
+msgstr "brukere"
+
+#: templates/site/dashboard.html:304
+msgid "No activities"
+msgstr "Ingen aktiviteter"
+
+#: templates/site/dashboard_bloc_recent_comments.html:9
+msgid "Recent comments"
+msgstr "Nye merknader"
+
+#: templates/site/dashboard_bloc_recent_comments.html:20
+msgid "on text"
+msgstr "til teksten"
+
+#: templates/site/dashboard_bloc_recent_comments.html:23
+#, python-format
+msgid "created %(duration)s ago"
+msgstr "opprettet for %(duration)s siden"
+
+#: templates/site/dashboard_bloc_recent_comments.html:28
+msgid "No comments yet"
+msgstr "Ingen merknader ennå"
+
+#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/macros/text_tabs.html:22
+msgid "Followup"
+msgstr "Oppfølgning"
+
+#: templates/site/followup.html:20 templates/site/text_followup.html:22
+msgid "Feeds"
+msgstr "Strømmer"
+
+#: templates/site/followup.html:22 templates/site/text_followup.html:24
+msgid "Public feed"
+msgstr "Offentlig strøm"
+
+#: templates/site/followup.html:22 templates/site/followup.html.py:35
+#: templates/site/help.html:6 templates/site/text_embed.html:26
+#: templates/site/layout/footer.html:26
+#: 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"
+
+#: templates/site/followup.html:29
+msgid "This is the public feed for the workspace."
+msgstr "Dette er den offentlige strømmen for arbeidsområdet."
+
+#: templates/site/followup.html:35 templates/site/text_followup.html:37
+msgid "Private feed"
+msgstr "Privat strøm"
+
+#: templates/site/followup.html:39
+msgid "Private feed for workspace"
+msgstr "Privat strøm for arbeidsområde"
+
+#: templates/site/followup.html:43
+msgid ""
+"This is the private feed for the workspace. Don't share this address with "
+"others unless you want them to see all activities on the workspace."
+msgstr ""
+"Dette er den private strømmen for arbeidsområdet. Ikke del adressen for "
+"denne strømmen med andre, men mindre du ønsker at de skal kunne se alt "
+"som skjer på arbeidsområdet."
+
+#: templates/site/followup.html:45 templates/site/text_followup.html:47
+msgid "Reset private feed url"
+msgstr "Nullstill adresse for den private strømmen"
+
+#: templates/site/followup.html:49 templates/site/text_followup.html:51
+msgid "Activate private feed"
+msgstr "Aktiver privat strøm"
+
+#: templates/site/followup.html:51
+msgid "The private feed for this workspace is not yet activated."
+msgstr "Privat strøm for arbeidsområdet er ikke aktivert ennå."
+
+#: templates/site/followup.html:55 templates/site/text_followup.html:58
+msgid "Email notifications"
+msgstr "Epostvarsler"
+
+#: templates/site/followup.html:58
+msgid "Subscribe to workspace notifications"
+msgstr "Abonner på varsler for arbeidsområdet"
+
+#: templates/site/followup.html:62
+msgid ""
+"Subscribe to all replies notifications in discussions where you have "
+"participated"
+msgstr "Abonner på varsler for svar i diskusjoner hvor du har deltatt"
+
+#: templates/site/login.html:8 templates/site/login_form.html:19
+#: templates/site/layout/header.html:17
+msgid "Login"
+msgstr "Logg inn"
+
+#: templates/site/login_form.html:7
+#, python-format
+msgid "%(wname)s Login"
+msgstr "Innlogging til %(wname)s"
+
+#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/layout/header.html:18
+msgid "Register"
+msgstr "Registrer"
+
+#: templates/site/non_authenticated_index.html:10
+#: templates/site/layout/header.html:8
+msgid "Home"
+msgstr "Startside"
+
+#: templates/site/non_authenticated_index.html:20
+#, python-format
+msgid "One public text"
+msgid_plural "%(counter)s public texts"
+msgstr[0] "Én offentlig tekst"
+msgstr[1] "%(counter)s offentlige tekster"
+
+#: templates/site/notifications_desactivate.html:8
+msgid "Desactivate notification"
+msgstr "Stopp varsler"
+
+#: templates/site/notifications_desactivate.html:19
+#, python-format
+msgid "%(title)s"
+msgstr "%(title)s"
+
+#: templates/site/notifications_desactivate.html:31
+msgid "Desactivate"
+msgstr "Stopp"
+
+#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#, python-format
+msgid "Your profile (%(username)s)"
+msgstr "Din profil (%(username)s)"
+
+#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:34
+#: templates/site/text_settings.html:23 templates/site/text_share.html:153
+#: templates/site/user_activate.html:27 templates/site/user_list.html:210
+#: templates/site/layout/base_workspace_form.html:32
+msgid "Save"
+msgstr "Lagre"
+
+#: templates/site/register.html:19
+#, python-format
+msgid "%(wname)s Registration"
+msgstr "Registrering på %(wname)s"
+
+#: templates/site/settings.html:5 templates/site/text_list.html:181
+#: templates/site/macros/main_tabs.html:14
+#: templates/site/macros/text_tabs.html:19
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: templates/site/settings.html:32
+msgid ""
+"Are you sure you want to change the role model? All roles (except managers) "
+"will be resetted!"
+msgstr ""
+"Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli "
+"nullstilt!"
+
+#: templates/site/text_create_content.html:26
+#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+msgid "Text list"
+msgstr "Tekster"
+
+#: templates/site/text_embed.html:7
+msgid "Text notifications"
+msgstr "Tekstvarsler"
+
+#: templates/site/text_embed.html:24
+msgid "Embed text"
+msgstr "Integrer tekst"
+
+#: templates/site/text_embed.html:25
+msgid ""
+"Copy this code into your site to display text with comments. Users will also "
+"be able to add comments from your site depending an anonymous users' roles."
+msgstr ""
+"Kopier denne koden til din side for å vise teksten med merknader. Avhengig "
+"av rettighetene til anonyme brukere, vil andre muligens også kunne kommentere "
+"teksten direkte fra din side."
+
+#: templates/site/text_embed.html:33
+msgid "Warning:"
+msgstr "Advarsel:"
+
+#: templates/site/text_embed.html:33
+msgid ""
+"You won't successfully embed the text before you give anonymous users a role "
+"allowing them to view the text."
+msgstr ""
+"Du vil ikke kunne integrere teksten før du har gitt anonyme brukere en "
+"rolle, som tillater dem å se teksten."
+
+#: templates/site/text_followup.html:7
+msgid "Text followup"
+msgstr "Oppfølgning av tekst"
+
+#: templates/site/text_followup.html:27
+#, python-format
+msgid "Public feed for text %(title)s"
+msgstr "Offentlig strøm for teksten %(title)s"
+
+#: templates/site/text_followup.html:31
+msgid "This is the public feed for the text."
+msgstr "Dette er den offentlige strømmen for teksten."
+
+#: templates/site/text_followup.html:41
+msgid "Private feed for text "
+msgstr "Privat strøm for teksten "
+
+#: templates/site/text_followup.html:45
+msgid ""
+"This is the private feed for the text. Don't share this address with others "
+"unless you want them to see all activities on this text."
+msgstr ""
+"Dette er den private strømmen for teksten. Ikke del denne adressen med "
+"andre, men mindre du ønsker at de skal kunne se alt som skjer med teksten."
+
+#: templates/site/text_followup.html:53
+msgid "The private feed for this text is not yet activated."
+msgstr "Den private strømmen for denne teksten er ikke aktivert ennå."
+
+#: templates/site/text_followup.html:61
+msgid ""
+"You will receive text notifications because you subscribed to notifications "
+"at the workspace level"
+msgstr ""
+"Du vil motta varsler for denne teksten, fordi du har abonnert på varsler for "
+"arbeidsområdet"
+
+#: templates/site/text_followup.html:64
+msgid "Subscribe to all text notifications"
+msgstr "Abonner på alle varsler for teksten"
+
+#: templates/site/text_history.html:38
+msgid "Versions:"
+msgstr "Versjoner:"
+
+#: templates/site/text_history.html:46
+#, python-format
+msgid "version #%(v1number)s"
+msgstr "versjon #%(v1number)s"
+
+#: templates/site/text_history.html:46
+#, python-format
+msgid "by %(v1name)s"
+msgstr "av %(v1name)s"
+
+#: templates/site/text_history.html:46
+#, python-format
+msgid "created %(v1created)s"
+msgstr "opprettet %(v1created)s"
+
+#: templates/site/text_history.html:54
+#, python-format
+msgid "differences between version #%(v1number)s and #%(v2number)s"
+msgstr "forskjeller mellom versjonene #%(v1number)s og #%(v2number)s"
+
+#: templates/site/text_history.html:66
+#, python-format
+msgid "Revert to version #%(v1_nid)s"
+msgstr "Still tilbake til versjonen #%(v1_nid)s"
+
+#: templates/site/text_history.html:70
+#, python-format
+msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
+msgstr "Forskjeller mellom versjon #%(v1_nid)s og versjon #%(v2_nid)s:"
+
+#: templates/site/text_history.html:73 templates/site/text_history.html:85
+#: templates/site/text_history.html:91
+#, python-format
+msgid "Version #%(version_number)s created on %(date)s"
+msgstr "Versjon #%(version_number)s opprettet %(date)s"
+
+#: templates/site/text_history.html:101
+msgid "No differences"
+msgstr "Ingen forskjeller"
+
+#: 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
+msgid "People' list"
+msgstr "Personer"
+
+#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/user_list.html:45
+msgid "Filter by tag:"
+msgstr "Filtrer etter etikett:"
+
+#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/user_list.html:47
+msgid "All"
+msgstr "Alle"
+
+#: templates/site/text_list.html:79 templates/site/user_list.html:72
+msgid "Bulk Actions"
+msgstr "Handlinger"
+
+#: templates/site/text_list.html:80 templates/site/text_list.html.py:161
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/site/text_list.html:83 templates/site/user_list.html:81
+msgid "Apply"
+msgstr "Utfør"
+
+#: templates/site/text_list.html:104 templates/site/user_list.html:102
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+msgid "Text"
+msgstr "Tekst"
+
+#: templates/site/text_list.html:137
+msgid "Author"
+msgstr "Forfatter"
+
+#: templates/site/text_list.html:138
+msgid "Modified"
+msgstr "Endret"
+
+#: templates/site/text_list.html:140 templates/site/user_list.html:136
+msgid "Last week activity"
+msgstr "Aktivitet siste uke"
+
+#: templates/site/text_list.html:156
+#: templates/site/macros/user_actions.html:13
+msgid "tags:"
+msgstr "etiketter:"
+
+#: templates/site/text_list.html:156
+#: templates/site/macros/user_actions.html:13
+#, python-format
+msgid "Filter by tag: %(tag_name)s"
+msgstr "Filtrer etter etikett: %(tag_name)s"
+
+#: templates/site/text_list.html:159
+msgid "View"
+msgstr "Se"
+
+#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/macros/user_actions.html:19
+msgid "Edit"
+msgstr "Rediger"
+
+#: templates/site/text_list.html:167
+msgid "Are you sure you want to delete this text?"
+msgstr "Ønsker du å slette denne teksten?"
+
+#: templates/site/text_list.html:180
+msgid "Users"
+msgstr "Brukere"
+
+#: templates/site/text_list.html:198
+msgid "Edit user"
+msgstr "Endre bruker"
+
+#: templates/site/text_share.html:27 templates/site/user_add.html:20
+#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
+#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/user_mass_add_text.html:23
+msgid "Users' list"
+msgstr "Brukere"
+
+#: templates/site/text_share.html:29 templates/site/user_add.html:6
+#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
+#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_edit.html:22 templates/site/user_list.html:34
+#: templates/site/user_mass_add.html:22
+#: templates/site/user_mass_add_text.html:6
+#: templates/site/user_mass_add_text.html:25
+msgid "Add a new user"
+msgstr "Opprett ny bruker"
+
+#: templates/site/text_share.html:31 templates/site/user_add.html:24
+#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
+#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/user_mass_add_text.html:27
+msgid "Add users in bulk"
+msgstr "Opprett flere brukere"
+
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
+msgid "Hide suspended users"
+msgstr "Skjul sperrede brukere"
+
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
+msgid "Display suspended users"
+msgstr "Vis sperrede brukere"
+
+#: templates/site/text_share.html:86 templates/site/user_list.html:132
+msgid "User"
+msgstr "Bruker"
+
+#: templates/site/text_share.html:87
+msgid ""
+"The 'Workspace role' is the global role that applies to every text, you can "
+"give a user a particular role on this text using the 'local role' column on "
+"the right"
+msgstr ""
+"Rollen 'Rolle for arbeidsområde' er en global rolle, som vil anvendes på "
+"alle tekster. Du kan gi en bruker en særskilt rolle for denne teksten ved å "
+"velge en passende rolle i kolonnen Tekstrolle til høyre."
+
+#: templates/site/text_share.html:87
+msgid "Workspace role"
+msgstr "Rolle for arbeidsområde"
+
+#: templates/site/text_share.html:88
+msgid "Local role"
+msgstr "Tekstrolle"
+
+#: templates/site/text_share.html:101
+#, python-format
+msgid "This role has been overriden on this text by a local role: %(rolename)s"
+msgstr "Denne rollen viker for en lokal rolle for teksten: %(rolename)s"
+
+#: templates/site/text_share.html:128 templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
+msgid "Edit anonymous users"
+msgstr "Endre anonyme brukere"
+
+#: templates/site/text_share.html:128 templates/site/user_list.html:177
+msgid "Anonymous users"
+msgstr "Anonyme brukere"
+
+#: templates/site/text_view_frame.html:63
+msgid "add a comment"
+msgstr "opprett merknad"
+
+#: templates/site/text_view_frame.html:73
+msgid "Filter comments"
+msgstr "Filtrer merknader"
+
+#: templates/site/text_view_frame.html:74
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: templates/site/text_view_frame.html:75
+msgid "Text preferences"
+msgstr "Tekstinnstillinger"
+
+#: templates/site/text_view_frame.html:100
+msgid "Which comments?"
+msgstr "Hvilke merknader?"
+
+#: templates/site/text_view_frame.html:104
+msgid "How do you want to print?"
+msgstr "Hvordan ønsker du å skrive ut?"
+
+#: templates/site/text_view_frame.html:108
+msgid "How should comments' scope be shown in text?"
+msgstr "Hvordan skal rekkevidden for merknadene i teksten vises?"
+
+#: templates/site/unauthorized.html:5
+msgid "Unauthorized"
+msgstr "Ingen rettigheter"
+
+#: templates/site/user_add.html:26
+msgid ""
+"The user will receive an email invitation to join the workspace.\n"
+"You can customize the email sent by using the 'Note' field bellow."
+msgstr ""
+"Brukeren vil motta en invitasjon til å slutte seg til arbeidsområdet.\n"
+"Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' "
+"nedenfor."
+
+#: templates/site/user_add_text.html:29
+msgid "The user will receive an email invitation to join the workspace."
+msgstr "Brukeren vil motta en invitasjon til å slutte seg til arbeidsområdet."
+
+#: templates/site/user_add_text.html:30 templates/site/user_mass_add.html:27
+#: templates/site/user_mass_add_text.html:30
+msgid "You can customize the email sent by using the 'Note' field bellow."
+msgstr ""
+"Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' "
+"nedenfor."
+
+#: templates/site/user_contact.html:6
+msgid "Contact user"
+msgstr "Kontakt bruker"
+
+#: templates/site/user_contact.html:19
+#, python-format
+msgid "Contact user %(username)s"
+msgstr "Kontakt bruker %(username)s"
+
+#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#, python-format
+msgid "Edit user %(username)s"
+msgstr "Endre bruker %(username)s"
+
+#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+msgid "Suspend access"
+msgstr "Sperr tilgang"
+
+#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+msgid "Enable access"
+msgstr "Åpne tilgang"
+
+#: templates/site/user_list.html:76
+#, python-format
+msgid "Change role to %(role_name)s"
+msgstr "Endre rollen til %(role_name)s"
+
+#: templates/site/user_list.html:133 views/user.py:278
+msgid "Email"
+msgstr "Epostadresse"
+
+#: templates/site/user_list.html:134
+msgid "Date joined"
+msgstr "Dato for tilslutning"
+
+#: templates/site/user_list.html:135
+msgid "Role"
+msgstr "Rolle"
+
+#: templates/site/user_mass_add.html:26
+#: templates/site/user_mass_add_text.html:29
+msgid "The users will receive an email invitation to join the workspace."
+msgstr "Brukere vil bli invitert til å slutte seg til arbeidsområdet."
+
+#: templates/site/layout/base_text.html:16
+#: templates/site/layout/base_workspace.html:14
+msgid "back to workspace"
+msgstr "tilbake til arbeidsområde"
+
+#: templates/site/layout/base_workspace.html:17
+#, python-format
+msgid "%(nb_texts)s text"
+msgid_plural "%(nb_texts)s texts"
+msgstr[0] "%(nb_texts)s tekst"
+msgstr[1] "%(nb_texts)s tekster"
+
+#: templates/site/layout/base_workspace.html:17
+#, python-format
+msgid "%(nb_users)s user"
+msgid_plural "%(nb_users)s users"
+msgstr[0] "%(nb_users)s bruker"
+msgstr[1] "%(nb_users)s brukere"
+
+#: templates/site/layout/footer.html:7
+msgid "About"
+msgstr "Om"
+
+#: templates/site/layout/header.html:14
+msgid "Profile"
+msgstr "Profil"
+
+#: templates/site/layout/header.html:15
+msgid "Logout"
+msgstr "Logg ut"
+
+#: templates/site/macros/main_tabs.html:11
+#, python-format
+msgid "Texts (%(nb_texts)s)"
+msgstr "Tekster (%(nb_texts)s)"
+
+#: templates/site/macros/main_tabs.html:13
+#, python-format
+msgid "People (%(nb_users)s)"
+msgstr "Personer (%(nb_users)s)"
+
+#: templates/site/macros/paginator.html:6
+#, python-format
+msgid "%(sindex)s-%(eindex)s of %(pcount)s"
+msgstr "%(sindex)s-%(eindex)s av %(pcount)s"
+
+#: templates/site/macros/paginator.html:11
+msgid "paginate"
+msgstr "paginer"
+
+#: templates/site/macros/text_actions.html:12
+msgid "Share"
+msgstr "Deling"
+
+#: templates/site/macros/text_comments.html:18
+#, python-format
+msgid "by %(name)s on %(date)s"
+msgstr "av %(name)s %(date)s"
+
+#: templates/site/macros/text_editor.html:38
+msgid ""
+"You have attempted to leave this page. Unsaved changes will be lost. Are you "
+"sure you want to exit this page?"
+msgstr ""
+"Du har forsøkt å forlate denne siden. Endringer som ikke er lagret vil bli "
+"tapt. Ønsker du å forlate denne siden?"
+
+#: templates/site/macros/text_tabs.html:15
+msgid "People"
+msgstr "Personer"
+
+#: templates/site/macros/text_tabs.html:17
+msgid "Versions"
+msgstr "Versjoner"
+
+#: templates/site/macros/text_tabs.html:25
+msgid "Embed"
+msgstr "Integrer"
+
+#: templates/site/macros/user_actions.html:6
+#: templates/site/macros/user_actions.html:17
+msgid "Your profile"
+msgstr "Din profil"
+
+#: templates/site/macros/user_actions.html:8
+#, python-format
+msgid "Edit user %(userprint)s"
+msgstr "Endre bruker %(userprint)s"
+
+#: templates/site/macros/user_actions.html:29
+msgid "(Re-)send invitation"
+msgstr "Send invitasjon"
+
+#: templates/site/macros/user_actions.html:38
+msgid "Are you sure you want to suspend this user's access to the workspace?"
+msgstr "Ønsker du å sperre brukerens tilgang til arbeidsområdet?"
+
+#: templates/site/macros/user_actions.html:47
+msgid "Are you sure you want to enable this user's access to the workspace?"
+msgstr "Ønsker du å åpne brukerens tilgang til arbeidsområdet?"
+
+#: templates/site/macros/user_actions.html:56
+msgid "Are you sure you want to send this user an invitation to the workspace?"
+msgstr "Ønsker du å invitere brukeren til arbeidsområdet?"
+
+#: templates/site/macros/user_moderation.html:3
+msgid "Approve"
+msgstr "Godkjenn"
+
+#: templatetags/com.py:142
+msgid "F j, Y \\a\\t g:i a"
+msgstr "j.n.Y \\k\\l. G:i"
+
+#: utils/date.py:6
+msgid "%Y-%m-%d %H:%M"
+msgstr "%Y-%m-%d %H:%M"
+
+#: views/create.py:26
+msgid "Upload file (optional)"
+msgstr "Last opp fil"
+
+#: views/create.py:27
+msgid ""
+"Upload a file from your computer instead of using the direct input above"
+msgstr "Last opp en fil fra din datamaskin"
+
+#: views/create.py:38
+msgid "You should specify a file to upload."
+msgstr "Du må angi en fil til å laste opp"
+
+#: views/create.py:46
+msgid "The title of your text"
+msgstr "Overskriften for din tekst"
+
+#: views/create.py:71 views/create.py:108
+#, python-format
+msgid "Text \"%(text_title)s\" has been created"
+msgstr "Teksten %(text_title)s har blitt opprettet"
+
+#: views/feeds.py:26
+#, python-format
+msgid "%(workspace_name)s's public feed"
+msgstr "Offentlig strøm for %(workspace_name)s"
+
+#: views/feeds.py:27
+#, python-format
+msgid "Workspace %(workspace_name)s public activity feed"
+msgstr "Offentlig strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
+
+#: views/feeds.py:37
+#, python-format
+msgid "%(workspace_name)s's private feed"
+msgstr "Privat strøm for %(workspace_name)s"
+
+#: views/feeds.py:38
+#, python-format
+msgid "Workspace %(workspace_name)s private feed"
+msgstr "Privat strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
+
+#: views/feeds.py:73
+#, python-format
+msgid "Text %(text_title)s's public feed"
+msgstr "Offentlig strøm for teksten %(text_title)s"
+
+#: views/feeds.py:74
+#, python-format
+msgid "Public activity feed for text %(text_title)s"
+msgstr "Offentlig strøm for aktiviteter på teksten %(text_title)s"
+
+#: views/feeds.py:85
+#, python-format
+msgid "Text %(text_title)s's private feed"
+msgstr "Privat strøm for teksten %(text_title)s"
+
+#: views/feeds.py:86
+#, python-format
+msgid "Private activity feed for text %(text_title)s"
+msgstr "Privat strøm for aktiviteter på teksten %(text_title)s"
+
+#: views/followup.py:31 views/followup.py:80
+msgid "Private feed activated."
+msgstr "Privat strøm aktivert."
+
+#: views/followup.py:34
+msgid "Private feed reseted."
+msgstr "Privat strøm nullstilt."
+
+#: views/followup.py:52
+msgid "This notification has already been desactivated."
+msgstr "Dette varselet har allerede blitt stoppet."
+
+#: views/followup.py:58
+msgid "Notification desactivated."
+msgstr "Varsel stoppet."
+
+#: views/followup.py:62
+msgid "Desactivate notification?"
+msgstr "Stope varsel?"
+
+#: views/followup.py:84
+msgid "Private notifications feed reseted."
+msgstr "Strøm for private varsler nullstilt."
+
+#: views/site.py:81 views/texts.py:132 views/user.py:520
+msgid "You're logged in!"
+msgstr "Du er logget inn!"
+
+#: views/site.py:99
+msgid "Your name"
+msgstr "Ditt navn"
+
+#: views/site.py:101
+msgid "Your email address"
+msgstr "Din epostadresse"
+
+#: views/site.py:104
+msgid "Subject of the message"
+msgstr "Emne"
+
+#: views/site.py:105
+msgid "Body of the message"
+msgstr "Tekst"
+
+#: views/site.py:107
+msgid "Send me a copy of the email"
+msgstr "Send meg en kopi av eposten"
+
+#: views/site.py:133
+msgid "Copy of message:"
+msgstr "Kopi av meldingen:"
+
+#: views/site.py:135
+msgid "Email sent. We will get back to you as quickly as possible."
+msgstr ""
+"Eposten er blitt sendt. Vi vil komme tilbake til deg så raskt som mulig."
+
+#: views/site.py:149
+msgid "Workspace name"
+msgstr "Navn for arbeidsområde"
+
+#: views/site.py:154
+msgid "Workspace tagline"
+msgstr "Beskrivelse av arbeidsområde"
+
+#: views/site.py:159
+msgid "Workspace registration"
+msgstr "Registering på arbeidsområde"
+
+#: views/site.py:160
+msgid ""
+"Can users register themselves into the workspace? (if not, only invitations "
+"by managers can create new users)"
+msgstr ""
+"Skal brukere kunne registrere seg på arbeidsområdet? (Hvis ikke, må brukere "
+"inviteres av en administrator.)"
+
+#: views/site.py:164
+msgid "Workspace registration moderation"
+msgstr "Godkjenning av registreringer på arbeidsområde"
+
+#: views/site.py:165
+msgid ""
+"Should new users be moderated (registration will require manager's approval)"
+msgstr ""
+"Skal nye brukere godkjennes (registrering vil kreve administratorens "
+"godkjenning)"
+
+#: views/site.py:169
+msgid "Role model"
+msgstr "Rollemodell"
+
+#: views/site.py:170
+msgid "Change the roles available in the workspace"
+msgstr "Endre roller i arbeidsområdet"
+
+#: views/site.py:195
+msgid "Settings saved"
+msgstr "Innstillinger lagret"
+
+#: views/texts.py:165
+#, python-format
+msgid "%(nb_texts)i text(s) deleted"
+msgstr "%(nb_texts)i tekst(er) slettet"
+
+#: views/texts.py:211
+#, python-format
+msgid "Text %(text_title)s deleted"
+msgstr "Tekstet %(text_title)s slettet"
+
+#: views/texts.py:617
+msgid "Note (optional)"
+msgstr "Kommentar (valgfritt)"
+
+#: views/texts.py:620
+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:630
+msgid "New version (optional)"
+msgstr "Ny versjon (valgfritt)"
+
+#: views/texts.py:633
+msgid "Create a new version of this text (recommended)"
+msgstr "Opprett ny versjon av teksten (anbefales)"
+
+#: views/texts.py:636
+msgid "Keep comments (optional)"
+msgstr "Behold merknader (valgfritt)"
+
+#: views/texts.py:639
+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:700
+msgid "Name (optional)"
+msgstr "Navn (valgfritt)"
+
+#: views/texts.py:701
+msgid "Email (optional)"
+msgstr "Epost (valgfritt)"
+
+#: views/texts.py:751
+#, python-format
+msgid "A new version (copied from version %(version_id)s) has been created"
+msgstr "Ny versjon (kopiert fra versjon %(version_id)s) har blitt opprettet"
+
+#: views/texts.py:859 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:917
+msgid "Text settings updated"
+msgstr "Tekstinnstillinger oppdatert"
+
+#: views/user.py:61
+#, python-format
+msgid "%(count)i User's access suspended"
+msgstr "Tilgang for %(count)i bruker(e) sperret"
+
+#: views/user.py:68
+#, python-format
+msgid "%(count)i User's access enabled"
+msgstr "Tilgang for %(count)i bruker(e) åpnet"
+
+#: views/user.py:140
+msgid "E-mail address"
+msgstr "Epostadresse"
+
+#: views/user.py:160
+msgid "This user is already a member."
+msgstr "Denne brukeren er allerede et medlem."
+
+#: views/user.py:163
+msgid "Emails"
+msgstr "Epostadresser"
+
+#: views/user.py:164
+msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
+msgstr ""
+"Oppgi flere epostadresser (en per linje eller atskilt med ',' eller ';')"
+
+#: views/user.py:181
+msgid "Workspace level role"
+msgstr "Rolle for arbeidsområde"
+
+#: views/user.py:182
+msgid ""
+"This role will apply to every text in the workspace. To share only a (few) "
+"texts with this user, you can leave this blank and delegate roles on texts "
+"once the user is created."
+msgstr ""
+"Denne rollen vil anvendes på alle tekster i arbeidsområdet. For å dele bare "
+"visse tekster med denne brukeren, kan du la dette feltet stå tomt og "
+"tilordne brukeren tekstroller etter at brukeren er opprettet."
+
+#: views/user.py:198
+msgid "Text level role"
+msgstr "Tekstrolle"
+
+#: views/user.py:199
+msgid "This role will apply only to this text."
+msgstr "Denne roller vil anvendes på denne teksten."
+
+#: views/user.py:219
+msgid "Optional text to add to invitation email"
+msgstr "Valgfri melding som skal sendes sammen med invitasjonen"
+
+#: views/user.py:254
+#, python-format
+msgid "%(nb_users)d user added"
+msgid_plural "%(nb_users)d users added"
+msgstr[0] "%(nb_users)d bruker opprettet"
+msgstr[1] "%(nb_users)d brukere opprettet"
+
+#: views/user.py:272
+msgid "Save user"
+msgid_plural "Save users"
+msgstr[0] "Lagre bruker"
+msgstr[1] "Lagre brukere"
+
+#: views/user.py:294
+msgid "This username is already in use. Please supply a different username."
+msgstr ""
+"Dette brukernavnet er allerde registrert. Vennligst velg et annet brukernavn."
+
+#: views/user.py:315 views/user.py:331
+msgid "Your account has been activated. You're now logged-in."
+msgstr "Din brukerkonto er blitt aktivert. Du er nå logged inn."
+
+#: views/user.py:326
+msgid "activate account"
+msgstr "aktiver konto"
+
+#: views/user.py:356
+#, python-format
+msgid "User's access %(prof)s has been suspended."
+msgstr "Tilgang for brukeren %(prof)s har blitt sperret."
+
+#: views/user.py:362
+#, python-format
+msgid "User's access %(prof)s has been refused."
+msgstr "Tilgang for brukeren %(prof)s har blitt nektet."
+
+#: views/user.py:374
+#, python-format
+msgid "User's access %(prof)s has been restored."
+msgstr "Tilgang for brukeren %(prof)s har blitt åpnet."
+
+#: views/user.py:378
+#, python-format
+msgid "User's access %(prof)s has been approved."
+msgstr "Tilgang for brukeren %(prof)s har blitt godkjent."
+
+#: views/user.py:388
+#, python-format
+msgid "A new invitation has been sent to user %(prof)s."
+msgstr "Ny invitasjon har blitt sendt til brukeren %(prof)s."
+
+#: views/user.py:402
+msgid "Profile updated"
+msgstr "Profil oppdatert"
+
+#: views/user.py:432
+msgid "Anonymous user role modified."
+msgstr "Rollen for anonyme brukere har blitt endret."
+
+#: views/user.py:454
+msgid "User modified"
+msgstr "Bruker endret."
+
+#: views/user.py:469
+msgid "Subject"
+msgstr "Emne"
+
+#: views/user.py:470
+msgid "Subject of the email"
+msgstr "Emne for eposten"
+
+#: views/user.py:473
+msgid "Body"
+msgstr "Tekst"
+
+#: views/user.py:474
+msgid "Body of the email"
+msgstr "Epostteksten"
+
+#: views/user.py:494
+msgid "Email sent."
+msgstr "Eposten er blitt sendt."
+
+#: views/user.py:514
+msgid "This account is suspended, contact the workspace administrator."
+msgstr ""
+"Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
+
+#: views/user.py:545
+msgid "You've been logged out."
+msgstr "Du er logget ut."
+
+#: views/user.py:561
+msgid ""
+"You've been registered, you will receive a confirmation mail once a "
+"moderator has approved your membership."
+msgstr ""
+"Du er blitt registert. Du vil motta en epost med bekreftelse når en "
+"administrator godkjenner ditt medlemskap."
+
+#: views/user.py:564
+msgid ""
+"You've been registered, please check your email for the confirm message."
+msgstr "Du er blitt registert. Se din epost for en melding med bekreftelsen."
Binary file src/cm/locale/no/LC_MESSAGES/djangojs.mo has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/no/LC_MESSAGES/djangojs.po Wed Jan 20 20:45:52 2010 +0100
@@ -0,0 +1,582 @@
+# COMT Norwegian translation
+# Copyright (C) Sopinspace
+# This file is distributed under the same license as the COMT package.
+# Kirill Miazine (km@krot.org), 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: COMT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-16 17:57+0100\n"
+"PO-Revision-Date: 2010-01-16 18:00+0100\n"
+"Last-Translator: Kirill Miazine <km@krot.org>\n"
+"Language-Team: <no@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: hand-crafted with vim.\n"
+
+#: media/js/client/c_addcomment_form.js:52
+msgid "New comment"
+msgstr "Ny merknad"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37
+msgid "New reply"
+msgstr "Nytt svar"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:4
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:5
+msgid "E-mail address:"
+msgstr "Epostadresse:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:6
+msgid "Title:"
+msgstr "Overskrift:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:7
+msgid "Content:"
+msgstr "Innhold:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:8
+msgid "Tag:"
+msgstr "Etikett:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:11
+msgid "Modify comment's scope:"
+msgstr "Endre merknadens rekkevidde:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:13
+msgid "Comment will apply to this selection:"
+msgstr "Merknaden vil gjelde følgende tekstområde:"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:395
+msgid "Save"
+msgstr "Lagre"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:100
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25
+#: media/js/client/c_interface_forms.js:15
+msgid "close"
+msgstr "lukk"
+
+#: media/js/client/c_dlg_intercept.js:48
+msgid "New comment will be canceled, continue?"
+msgstr "Ønsker du å avbryte opprettelsen av en ny merknad?"
+
+#: media/js/client/c_dlg_intercept.js:48 media/js/client/c_dlg_intercept.js:50
+#: media/js/client/c_dlg_intercept.js:52 media/js/client/c_sync.js:223
+#: media/js/site/text_edit.js:84
+msgid "Warning"
+msgstr "Advarsel"
+
+#: media/js/client/c_dlg_intercept.js:50
+msgid "Started reply will be canceled, continue?"
+msgstr "Ønsker du å avbryte påbegynt svar?"
+
+#: media/js/client/c_dlg_intercept.js:52
+msgid "Started comment edition will be canceled, continue?"
+msgstr "Ønsker du å avbryte påbegynte endringer i merknaden?"
+
+#: media/js/client/c_edit_form.js:47
+msgid "Edit comment"
+msgstr "Endre merknad"
+
+#: media/js/client/c_icomment.js:10
+msgid "change comment state to pending"
+msgstr "endre tilstand til pågående"
+
+#: media/js/client/c_icomment.js:11
+msgid "change comment state to approved"
+msgstr "endre tilstand til godkjent"
+
+#: media/js/client/c_icomment.js:12
+msgid "change comment state to unapproved"
+msgstr "endre tilstand til ikke-godkjent"
+
+#: media/js/client/c_icomment.js:13
+msgid "cancel changing the state of this comment"
+msgstr "avbryt endring av tilstand for merknaden"
+
+#: media/js/client/c_icomment.js:14
+msgid "pending"
+msgstr "pågående"
+
+#: media/js/client/c_icomment.js:15
+msgid "approved"
+msgstr "godkjent"
+
+#: media/js/client/c_icomment.js:16
+msgid "unapproved"
+msgstr "ikke-godkjent"
+
+#: media/js/client/c_icomment.js:17
+msgid "cancel"
+msgstr "avbryt"
+
+#: media/js/client/c_icomment.js:18
+msgid "show replies"
+msgstr "vis svar"
+
+#: media/js/client/c_icomment.js:19
+msgid "change to:"
+msgstr "endre til:"
+
+#: media/js/client/c_icomment.js:20
+msgid "reply"
+msgstr "svar"
+
+#: media/js/client/c_icomment.js:21
+msgid "edit comment"
+msgstr "endre merknad"
+
+#: media/js/client/c_icomment.js:22
+msgid "delete comment"
+msgstr "slett merknad"
+
+#: media/js/client/c_icomment.js:23
+msgid "edit"
+msgstr "endre"
+
+#: media/js/client/c_icomment.js:24
+msgid "delete"
+msgstr "slett"
+
+#: media/js/client/c_icomment.js:26
+msgid "show scope"
+msgstr "vis rekkevidde"
+
+#: media/js/client/c_icomment.js:274
+msgid "last modified on %(date)s"
+msgstr "sist endret %(date)s"
+
+#: media/js/client/c_icomment.js:277
+msgid "Permalink to this comment"
+msgstr "Fast adresse til denne merknaden"
+
+#: media/js/client/c_icomment.js:280
+msgid "by %(name)s, created on %(date)s"
+msgstr "av %(name)s, opprettet %(date)s"
+
+#: media/js/client/c_interface_forms.js:1
+msgid "No selection yet"
+msgstr "Intet merket ennå"
+
+#: media/js/client/c_server_exchange.js:48
+msgid "error:"
+msgstr "feil:"
+
+#: media/js/client/c_sync.js:57
+msgid "no filtered comments left"
+msgstr "ingen filtrerte merknader igjen"
+
+#: media/js/client/c_sync.js:129
+msgid ""
+"Do you want to subscribe to all replies notifications in discussions you "
+"participated in?"
+msgstr ""
+"Ønsker du å abonnere på varsler for alle svar i diskusjoner hvor du har "
+"deltatt?"
+
+#: media/js/client/c_sync.js:129
+msgid "Follow up"
+msgstr "Følg opp"
+
+#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208
+msgid "could not save comment"
+msgstr "kunne ikke lagre merknad"
+
+#: media/js/client/c_sync.js:223
+msgid "Are you sure you want to delete this comment?"
+msgstr "Ønsker du å slette denne merknaden?"
+
+#: media/js/client/c_sync.js:227
+msgid "could not remove comment"
+msgstr "kunne ikke slette merknad"
+
+#: media/js/client/f_client-min.js:1
+msgid "loading..."
+msgstr "laster..."
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:4
+msgid "print from the browser"
+msgstr "skriv ut fra nettleser"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5
+msgid "download html file (.html)"
+msgstr "last ned fil i HTML-format (.html)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:6
+msgid "download markdown file (.mkd)"
+msgstr "last ned fil i Markdown-format (.mkd)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:7
+msgid "download portable object format file (.pdf)"
+msgstr "last ned fil i PDF-format (.pdf)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8
+msgid "download latex file (.tex)"
+msgstr "last ned fil i LaTeX-format (.tex)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9
+msgid "download open document file (.odt)"
+msgstr "lest ned fil i OpenDocument-format (.odt)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12
+msgid "Print text"
+msgstr "Skriv ut tekst"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13
+msgid "Export text"
+msgstr "Eksporter tekst"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:40
+msgid "using markers only, no background colors"
+msgstr "bruker bare markører, ingen bakrunnsfarger"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41
+msgid "using markers and background colors"
+msgstr "bruker markører og bakgrunnsfarger"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:53
+msgid "all (%(nb_comments)s)"
+msgstr "alle (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54
+msgid "current filtered ones (%(nb_comments)s)"
+msgstr "filtrert (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:56
+msgid "none (0)"
+msgstr "ingen (0)"
+
+#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:89
+msgid "Go !"
+msgstr "Kjør!"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43
+msgid "click to show options"
+msgstr "klikk for å vise valg"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44
+msgid "click to hide options"
+msgstr "klikk for å skjule valg"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76
+msgid "Text"
+msgstr "Tekst"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80
+msgid "Search"
+msgstr "Søk"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85
+#: media/js/site/f_text_view_frame.js:395
+msgid "Reset"
+msgstr "Nullstill"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86
+msgid "Hide all Comments"
+msgstr "Skjul alle merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94
+msgid "Authors"
+msgstr "Forfattere"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102
+msgid "States"
+msgstr "Tilstander"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111
+msgid "Dates"
+msgstr "Datoer"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119
+msgid "Tags"
+msgstr "Etiketter"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177
+msgid "view previous comment"
+msgstr "se forrige merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178
+msgid "view next comment"
+msgstr "se neste merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179
+msgid "view first comment"
+msgstr "se første merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180
+msgid "view last next comment"
+msgstr "se siste merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181
+msgid "view all comments"
+msgstr "se alle merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:182
+msgid "toggle advance interface"
+msgstr "slå på/av avansert grensesnitt"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:183
+msgid "print document with/without comments"
+msgstr "skriv ut dokument med/uten merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184
+msgid "export document with/without comments"
+msgstr "eksporter dokument med/uten merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:187
+msgid "add a comment"
+msgstr "opprett merknad"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203
+msgid "filter:"
+msgstr "filter:"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:208
+msgid "browse by:"
+msgstr "navigasjon etter:"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:210
+msgid "location"
+msgstr "plassering"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211
+msgid "modification"
+msgstr "endring"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:354
+msgid "Text style"
+msgstr "Stil"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:399
+msgid "Animation duration"
+msgstr "Varighet for animasjon"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:408
+msgid "(0.001 to 1 second)"
+msgstr "(fra 0.001 til 1 sekund)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:434
+msgid "preferences reset (will apply on next load)"
+msgstr "innstillinger nullstilt (aktiveres ved neste innlasting)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:440
+msgid "preferences saved (will apply on next load)"
+msgstr "innstillinger lagret (aktiveres ved neste innlasting)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:544
+msgid "filter reset"
+msgstr "filter nullstilt"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:554
+msgid "filter applied"
+msgstr "filtrert"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:560
+msgid "discussion"
+msgid_plural "discussions"
+msgstr[0] "diskusjon"
+msgstr[1] "diskusjoner"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:564
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "merknad"
+msgstr[1] "merknader"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:567
+msgid " reply"
+msgid_plural " replies"
+msgstr[0] " svar"
+msgstr[1] " svar"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:589
+msgid "all"
+msgstr "alle"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:607
+msgid "last 24 hours (%(nb_comments)s)"
+msgid_plural "last %(nb_days)s days (%(nb_comments)s)"
+msgstr[0] "siste 24 timer (%(nb_comments)s)"
+msgstr[1] "siste %(nb_days)s dager (%(nb_comments)s)"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:721
+#: media/js/site/text_edit.js:78
+msgid "No"
+msgstr "Nei"
+
+#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:722
+#: media/js/site/text_edit.js:79
+msgid "Yes"
+msgstr "Ja"
+
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.py:64
+msgid "First Level Heading"
+msgstr "Overskrift - nivå 1"
+
+#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.py:19
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:21
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:23
+#: media/js/markitup/sets.js:64 media/js/markitup/sets.js.py:65
+#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.py:67
+#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.py:69
+msgid "Your title here..."
+msgstr "Din overskrift kommer her..."
+
+#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65
+msgid "Second Level Heading"
+msgstr "Overskrift - nivå 2"
+
+#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66
+msgid "Heading 3"
+msgstr "Overskrift - nivå 3"
+
+#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67
+msgid "Heading 4"
+msgstr "Overskrift - nivå 4"
+
+#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68
+msgid "Heading 5"
+msgstr "Overskrift - nivå 5"
+
+#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69
+msgid "Heading 6"
+msgstr "Overskrift - nivå 6"
+
+#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.py:72
+msgid "Bold"
+msgstr "Fett"
+
+#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73
+msgid "Italic"
+msgstr "Kursiv"
+
+#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.py:76
+msgid "Bulleted List"
+msgstr "Punktliste"
+
+#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77
+msgid "Numeric List"
+msgstr "Nummerert liste"
+
+#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.py:80
+msgid "Picture"
+msgstr "Bilde"
+
+#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81
+msgid "Link"
+msgstr "Kobling"
+
+#: media/js/markitup/sets.js:36
+msgid "Quotes"
+msgstr "Sitat"
+
+#: media/js/markitup/sets.js:37
+msgid "Code Block / Code"
+msgstr "Kode"
+
+#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.py:84
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: media/js/markitup/sets.js:70
+msgid "Paragraph"
+msgstr "Avsnitt"
+
+#: media/js/markitup/sets.js:74
+msgid "Stroke through"
+msgstr "Strøket"
+
+#: media/js/markitup/sets.js:78
+msgid "List element"
+msgstr "Listeelement"
+
+#: media/js/markitup/sets.js:81
+msgid "Your text to link..."
+msgstr "Koblingstekst..."
+
+#: media/js/markitup/sets.js:83
+msgid "Clean"
+msgstr "Ren"
+
+#: media/js/site/c_text_view_comments.js:18
+msgid "modern"
+msgstr "moderne"
+
+#: media/js/site/c_text_view_comments.js:18
+msgid "classic"
+msgstr "klassisk"
+
+#: media/js/site/c_text_view_comments.js:18
+msgid "code"
+msgstr "kode"
+
+#: media/js/site/f_text_view_frame.js:185
+msgid "toggle full screen view"
+msgstr "slå på/av visning på full side"
+
+#: media/js/site/f_text_view_frame.js:186
+msgid "text feed"
+msgstr "textstrøm"
+
+#: media/js/site/f_text_view_frame.js:317
+msgid "unthread discussions"
+msgstr "skjul diskusjonstråder"
+
+#: media/js/site/f_text_view_frame.js:320
+msgid "thread discussions"
+msgstr "vis diskusjonstråder"
+
+#: media/js/site/text_edit.js:26
+msgid ""
+"%(nb_comments)s comment will be removed because the text it applies to has "
+"been changed."
+msgid_plural ""
+"%(nb_comments)s comments will be removed because the text they apply to has "
+"been changed."
+msgstr[0] ""
+"%(nb_comments)s merknad vil bli slettet, fordi teksten som den er knyttet til "
+"har blitt endret."
+msgstr[1] ""
+"%(nb_comments)s merknader vil bli slettet, fordi teksten som de er knyttet til "
+"har blitt endret."
+
+#: media/js/site/text_edit.js:30 media/js/site/text_edit.js.py:49
+#: media/js/site/text_edit.js:66
+msgid "Do you want to continue?"
+msgstr "Ønsker du å fortsette?"
+
+#: media/js/site/text_edit.js:43
+msgid ""
+"%(nb_comments)s comment will be lost because the text it applies to has been "
+"changed."
+msgid_plural ""
+"%(nb_comments)s comments will be lost because the text they apply to has "
+"been changed."
+msgstr[0] ""
+"%(nb_comments)s merknad vil bli tapt, fordi teksten som den er knyttet til har "
+"blitt endret."
+msgstr[1] ""
+"%(nb_comments)s merknader vil bli tapt, fordi teksten som de er knyttet til har "
+"blitt endret."
+
+#: media/js/site/text_edit.js:47
+msgid "(We suggest you create a new version)"
+msgstr "(Vi anbefaler at du oppretter en ny versjon)"
+
+#: media/js/site/text_edit.js:64
+msgid ""
+"Since you chose not to create a new version all comments will be deleted"
+msgstr ""
+"Siden du ikke ønsket å opprette en ny versjon, vil alle merknader bli slettet"
--- a/src/cm/security.py Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/security.py Wed Jan 20 20:45:52 2010 +0100
@@ -120,7 +120,7 @@
# return Text.objects.filter(Q(userrole__role__permissions__codename__exact=perm_name), Q(userrole__user=user) | Q(userrole__user=None)).distinct()
# local role OVERRIDES global role:
- texts_with_local_role = Text.objects.filter(userrole__in=UserRole.objects.filter(user=user).filter(~Q(role=None)))
+ texts_with_local_role = Text.objects.filter(userrole__in=UserRole.objects.filter(Q(user=user) | Q(user=None)).filter(~Q(role=None)))
#Text.objects.filter(Q(userrole__user=user) & ~Q(userrole__role=None))
texts_without_local_role = Text.objects.exclude(id__in=texts_with_local_role)
--- a/src/cm/settings.py Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/settings.py Wed Jan 20 20:45:52 2010 +0100
@@ -104,7 +104,7 @@
LANGUAGES = (
('fr', _(u'French')),
('en', _(u'English')),
-# ('no', _('Norwegian')),
+ ('no', _('Norwegian')),
)
AUTH_PROFILE_MODULE = 'cm.UserProfile'
--- a/src/cm/templates/site/followup.html Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/templates/site/followup.html Wed Jan 20 20:45:52 2010 +0100
@@ -17,8 +17,6 @@
<div id="followup" class="tab-meta">
-<form id="followup_form" enctype="multipart/form-data" action="." method="post">
-
<h2 class="title_first">{% blocktrans %}Feeds{% endblocktrans %}</h2>
<h3>{% blocktrans %}Public feed{% endblocktrans %} (<a title="{% blocktrans %}Help{% endblocktrans %}" target="_blank" href="{% url help %}#public_private_feed">?</a>)</h3>
@@ -30,6 +28,9 @@
</div>
{% blocktrans %}This is the public feed for the workspace.{% endblocktrans %}
+{% if user.is_authenticated %}
+<form id="followup_form" enctype="multipart/form-data" action="." method="post">
+
{% if can_manage_workspace %}
<h3>{% blocktrans %}Private feed{% endblocktrans %} (<a title="{% blocktrans %}Help{% endblocktrans %}" target="_blank" href="{% url help %}#public_private_feed">?</a>)</h3>
@@ -83,8 +84,9 @@
}) ;
-->
</script>
+</form>
+{% endif %}
-</form>
</div>
--- a/src/cm/templates/site/text_followup.html Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/templates/site/text_followup.html Wed Jan 20 20:45:52 2010 +0100
@@ -19,8 +19,6 @@
<div id="followup_settings" class="tab-meta">
-<form id="notifications" enctype="multipart/form-data" action="." method="post">
-
<h2 class="title_first">{% blocktrans %}Feeds{% endblocktrans %}</h2>
<h3>{% blocktrans %}Public feed{% endblocktrans %}</h3>
@@ -32,6 +30,9 @@
</div>
{% blocktrans %}This is the public feed for the text.{% endblocktrans %}
+{% if user.is_authenticated %}
+<form id="notifications" enctype="multipart/form-data" action="." method="post">
+
{% if can_view_unapproved_comment %}
<h3>{% blocktrans %}Private feed{% endblocktrans %}</h3>
@@ -75,8 +76,11 @@
});
}) ;
--->
-</script>
+ -->
+ </script>
+
+</form>
+{% endif %}
</div>
--- a/src/cm/templates/site/text_list.html Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/templates/site/text_list.html Wed Jan 20 20:45:52 2010 +0100
@@ -156,8 +156,8 @@
{% if tag_list %}<div class="tag_list>">{% blocktrans %}tags:{% endblocktrans %} {% for tag in tag_list %}<a class="tag" title="{% blocktrans with tag.name as tag_name %}Filter by tag: {{ tag_name }}{% endblocktrans %}" href="?{% newparams 'tag_selected' tag.name %}"">{{ tag.name }}</a> {% endfor %}</div>{% endif %}
<div class="hidden-text-actions text-actions-{{ text.key }}">
- <a href="{% url text-view text.key %}">{% blocktrans %}View{% endblocktrans %}</a> |
- {% if can_edit_text %}<a href="{% url text-edit text.key %}">{% blocktrans %}Edit{% endblocktrans %}</a> | {% endif %}
+ <a href="{% url text-view text.key %}">{% blocktrans %}View{% endblocktrans %}</a>
+ {% if can_edit_text %} | <a href="{% url text-edit text.key %}">{% blocktrans %}Edit{% endblocktrans %}</a> | {% endif %}
{% if can_delete_text %}<a id="text-delete-{{ text.key }}" href="#">{% blocktrans %}Delete{% endblocktrans %}</a> |
<script type="text/javascript">
<!--
--- a/src/cm/templates/site/text_share.html Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/templates/site/text_share.html Wed Jan 20 20:45:52 2010 +0100
@@ -98,7 +98,7 @@
{% include "site/macros/user_actions.html" %}
</td>
<td>
- {% if userrole.role and user.get_profile.global_userrole.role %}<a class="tip" href="#" title="{% blocktrans with userrole.role.name_i18n as rolename %}This role has been overriden on this text by a local role: {{ rolename }}{% endblocktrans %}">{% endif %}
+ {% if userrole.role and user.get_profile.global_userrole.role %}<a class="tip" href="#" title="{% blocktrans with userrole.role.name_i18n as rolename %}This role has been overriden on this text by a local role: {{rolename}}{% endblocktrans %}">{% endif %}
<span {% if userrole.role %}class="non_active"{% endif %}>
{% if user.get_profile.global_userrole.role %}{{ user.get_profile.global_userrole.role.name_i18n}}{% else %}-{% endif %}
--- a/src/cm/views/followup.py Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/views/followup.py Wed Jan 20 20:45:52 2010 +0100
@@ -4,6 +4,7 @@
from cm.models_base import generate_key
from cm.views import get_text_by_keys_or_404
from cm.utils.embed import embed_html
+from cm.security import get_request_user
from django import forms
from django.conf import settings
from django.contrib.auth.decorators import login_required
@@ -18,10 +19,11 @@
import re
import time
-@login_required
+#@login_required
def followup(request):
- workspace_notify_check = Notification.objects.filter(text=None,type='workspace',user=request.user, active=True).count()
- own_notify_check = Notification.objects.filter(text=None,type='own',user=request.user, active=True).count()
+ user = get_request_user(request)
+ workspace_notify_check = Notification.objects.filter(text=None,type='workspace',user=user, active=True).count()
+ own_notify_check = Notification.objects.filter(text=None,type='own',user=user, active=True).count()
if request.method == 'POST':
if 'activate' in request.POST:
@@ -35,7 +37,7 @@
notif_type = 'own' if notif_id == 'own_notify_check' else 'workspace'
notif_val = request.POST.get(notif_id,None)
if notif_val != None :
- Notification.objects.set_notification(text=None, type=notif_type, active=(notif_val == 'true'), email_or_user=request.user)
+ Notification.objects.set_notification(text=None, type=notif_type, active=(notif_val == 'true'), email_or_user=user)
return render_to_response('site/followup.html', {'workspace_notify_check':workspace_notify_check,
'own_notify_check' :own_notify_check,
--- a/src/cm/views/texts.py Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/views/texts.py Wed Jan 20 20:45:52 2010 +0100
@@ -819,10 +819,13 @@
return render_to_response('site/wysiwyg_preview.html', {'content':html_content} , context_instance=RequestContext(request))
#return HttpResponse(pandoc_convert(content, format, "html", full=False))
+USER_PAGINATION = 10
+
@has_perm_on_text('can_manage_text')
def text_share(request, key):
display_suspended_users = get_int(request.GET, 'display', 0)
tag_selected = request.GET.get('tag_selected', 0)
+ paginate_by = get_int(request.GET, 'paginate', USER_PAGINATION)
text = get_text_by_keys_or_404(key)
order_by = get_among(request.GET,'order',('user__username',
@@ -833,7 +836,6 @@
'-role__name',
),
'user__username')
- paginate_by = 10
UserRole.objects.create_userroles_text(text)
--- a/src/cm/views/user.py Wed Jan 20 20:43:55 2010 +0100
+++ b/src/cm/views/user.py Wed Jan 20 20:45:52 2010 +0100
@@ -350,7 +350,6 @@
def user_suspend(request, key):
if request.method == 'POST':
profile = get_object_or_404(UserProfile, key=key)
- profile = UserProfile.objects.get(key=key)
profile.is_suspended = True
profile.save()
if profile.user.is_active:
@@ -369,7 +368,6 @@
def user_enable(request, key):
if request.method == 'POST':
profile = get_object_or_404(UserProfile, key=key)
- profile = UserProfile.objects.get(key=key)
profile.is_suspended = False
profile.save()
if profile.user.is_active:
@@ -421,8 +419,6 @@
role_field = self.fields['role']
role_field.required = False
role_field.choices = [(u'', u'---------')] + [(r.id, str(r)) for r in Role.objects.filter(anon=True)] # limit anon choices
- for c in role_field.choices:
- print c
self.fields['role'] = role_field
@@ -444,7 +440,7 @@
@has_global_perm('can_manage_workspace')
def user_edit(request, key):
- profile = UserProfile.objects.get(key=key)
+ profile = get_object_or_404(UserProfile, key=key)
user = profile.user
userrole = profile.global_userrole()
if request.method == 'POST':
@@ -481,7 +477,7 @@
@login_required
def user_contact(request, key):
- recipient_profile = UserProfile.objects.get(key=key)
+ recipient_profile = get_object_or_404(UserProfile, key=key)
if request.method == 'POST':
contact_form = UserContactForm(request.POST)