fix typo desactivate -> deactivate
authorraph
Fri, 12 Feb 2010 15:54:48 +0100
changeset 170 31288d47e729
parent 169 132100852cd6
child 176 07019190bfe3
child 177 6fcd0f9cc08b
fix typo desactivate -> deactivate
src/cm/locale/en/LC_MESSAGES/django.mo
src/cm/locale/en/LC_MESSAGES/django.po
src/cm/locale/es/LC_MESSAGES/django.mo
src/cm/locale/es/LC_MESSAGES/django.po
src/cm/locale/fr/LC_MESSAGES/django.mo
src/cm/locale/fr/LC_MESSAGES/django.po
src/cm/locale/no/LC_MESSAGES/django.mo
src/cm/locale/no/LC_MESSAGES/django.po
src/cm/locale/pt_BR/LC_MESSAGES/django.mo
src/cm/locale/pt_BR/LC_MESSAGES/django.po
src/cm/templates/site/notifications_desactivate.html
src/cm/urls.py
src/cm/views/followup.py
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po	Fri Feb 12 15:54:48 2010 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 13:10+0100\n"
+"POT-Creation-Date: 2010-02-12 15:50+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"
@@ -669,7 +669,7 @@
 msgstr ""
 
 #: templates/site/notifications_desactivate.html:31
-msgid "Desactivate"
+msgid "Deactivate"
 msgstr ""
 
 #: templates/site/profile.html:6 templates/site/profile.html.py:14
@@ -1260,42 +1260,42 @@
 msgid "Text \"%(text_title)s\" has been created"
 msgstr ""
 
-#: views/feeds.py:26
+#: views/feeds.py:25
 #, python-format
 msgid "%(workspace_name)s's public feed"
 msgstr ""
 
-#: views/feeds.py:27
+#: views/feeds.py:26
 #, python-format
 msgid "Workspace %(workspace_name)s public activity feed"
 msgstr ""
 
-#: views/feeds.py:37
+#: views/feeds.py:36
 #, python-format
 msgid "%(workspace_name)s's private feed"
 msgstr ""
 
-#: views/feeds.py:38
+#: views/feeds.py:37
 #, python-format
 msgid "Workspace %(workspace_name)s private feed"
 msgstr ""
 
-#: views/feeds.py:73
+#: views/feeds.py:72
 #, python-format
 msgid "Text %(text_title)s's public feed"
 msgstr ""
 
-#: views/feeds.py:74
+#: views/feeds.py:73
 #, python-format
 msgid "Public activity feed for text %(text_title)s"
 msgstr ""
 
-#: views/feeds.py:85
+#: views/feeds.py:84
 #, python-format
 msgid "Text %(text_title)s's private feed"
 msgstr ""
 
-#: views/feeds.py:86
+#: views/feeds.py:85
 #, python-format
 msgid "Private activity feed for text %(text_title)s"
 msgstr ""
@@ -1309,11 +1309,11 @@
 msgstr ""
 
 #: views/followup.py:52
-msgid "This notification has already been desactivated."
+msgid "This notification has already been deactivated."
 msgstr ""
 
 #: views/followup.py:58
-msgid "Notification desactivated."
+msgid "Notification deactivated."
 msgstr ""
 
 #: views/followup.py:62
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/django.po	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po	Fri Feb 12 15:54:48 2010 +0100
@@ -1,23 +1,20 @@
-# COMT es translation
-# 
-#, fuzzy
+# COMT es translation
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 13:09+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alejandro Martin Ortin <alejandromartinortin@gmail.com>\n"
+"POT-Creation-Date: 2010-02-12 15:49+0100\n"
+"PO-Revision-Date: 2010-02-12 15:53+0100\n"
+"Last-Translator: dev <dev@sopinspace.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: client.py:25
-msgid ""
-"A selection is required. Select in the text the part your comment applies to."
-msgstr ""
-"Se necesita una selección. Seleccione el texto cuya parte desee comentar."
+msgid "A selection is required. Select in the text the part your comment applies to."
+msgstr "Se necesita una selección. Seleccione el texto cuya parte desee comentar."
 
 #: client.py:134
 msgid "name is required"
@@ -43,7 +40,8 @@
 msgid "comment removed"
 msgstr "comentario borrado"
 
-#: client.py:209 client.py:274
+#: client.py:209
+#: client.py:274
 msgid "comment saved"
 msgstr "comentario guardado"
 
@@ -55,8 +53,11 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "El contenido de las etiquetas no debe exceder los 250 caracteres"
 
-#: models.py:176 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:591
+#: models.py:176
+#: templates/site/text_history.html:79
+#: views/create.py:30
+#: views/create.py:45
+#: views/texts.py:591
 msgid "Title"
 msgstr "Título"
 
@@ -64,15 +65,18 @@
 msgid "Format"
 msgstr "Formato"
 
-#: models.py:178 views/texts.py:682
+#: models.py:178
+#: views/texts.py:682
 msgid "Content"
 msgstr "Contenido"
 
-#: models.py:179 models.py:637
+#: models.py:179
+#: models.py:637
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: models.py:181 views/user.py:223
+#: models.py:181
+#: views/user.py:223
 msgid "Note"
 msgstr "Nota"
 
@@ -184,7 +188,8 @@
 msgid "User %(username)s has activated his account"
 msgstr "El usuario %(username)s ha activado su cuenta"
 
-#: models.py:816 models.py:824
+#: models.py:816
+#: models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "por \"%(username)s\""
@@ -234,7 +239,8 @@
 msgid "Spanish"
 msgstr "Español"
 
-#: static_i18n.py:6 static_i18n.py:11
+#: static_i18n.py:6
+#: static_i18n.py:11
 msgid "Observer"
 msgstr "Supervisor"
 
@@ -346,7 +352,8 @@
 msgid "An error has occurred."
 msgstr "Se ha producido un error"
 
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
+#: templates/site/activate.html:10
+#: templates/site/user_activate.html:10
 #: views/user.py:330
 msgid "Activate your account"
 msgstr "Activar su cuenta"
@@ -355,7 +362,8 @@
 msgid "Activate"
 msgstr "Activar"
 
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6
+#: templates/site/layout/footer.html:9
 #: templates/site/macros/user_actions.html:20
 msgid "Contact"
 msgstr "Contactar"
@@ -366,16 +374,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_design.html:29
+#: templates/site/settings.html:29
+#: templates/site/settings_design.html:29
 #: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/text_create_upload.html:42
+#: templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38
+#: templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29
+#: templates/site/user_mass_add.html:34
 #: templates/site/user_mass_add_text.html:38
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+#: templates/site/dashboard.html:12
+#: templates/site/macros/main_tabs.html:10
 msgid "Dashboard"
 msgstr "Tablero"
 
@@ -383,16 +396,20 @@
 msgid "Actions"
 msgstr "Acciones"
 
-#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/dashboard.html:48
+#: templates/site/text_create_content.html:4
 #: templates/site/text_create_content.html:28
-#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/text_create_upload.html:26
+#: templates/site/text_list.html:40
 #: templates/site/layout/header.html:10
 msgid "Write a text"
 msgstr "Escribir un texto"
 
-#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/dashboard.html:49
+#: templates/site/text_create_content.html:30
 #: templates/site/text_create_upload.html:4
-#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/text_create_upload.html:28
+#: templates/site/text_list.html:42
 #: templates/site/layout/header.html:11
 msgid "Upload a text"
 msgstr "Subir un texto"
@@ -423,11 +440,13 @@
 msgid "user %(user)s awaits approval"
 msgstr "El usuario %(user)s está a la espera de aprobación"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "approve"
 msgstr "Aprobar"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "refuse"
 msgstr "Rechazar"
 
@@ -437,26 +456,21 @@
 
 #: templates/site/dashboard.html:85
 #: templates/site/macros/user_moderation.html:8
-msgid ""
-"Are you sure you want to approve this user's membership to the workspace?"
-msgstr ""
-"¿Está seguro/a de que desea aprobar la afiliación de este usuario al espacio "
-"de trabajo?"
+msgid "Are you sure you want to approve this user's membership to the workspace?"
+msgstr "¿Está seguro/a de que desea aprobar la afiliación de este usuario al espacio de trabajo?"
 
 #: 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 ""
-"¿Está seguro/a de que desea rechazar la afiliación de este usuario al "
-"espacio de trabajo?"
+msgid "Are you sure you want to refuse this user's membership to the workspace?"
+msgstr "¿Está seguro/a de que desea rechazar la afiliación de este usuario al espacio de trabajo?"
 
 #: templates/site/dashboard.html:106
 #, python-format
 msgid "registered %(duration)s ago"
 msgstr "resgistrado hace %(duration)s"
 
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:120
+#: templates/site/dashboard.html.py:126
 msgid "comment"
 msgstr "Comentar"
 
@@ -481,7 +495,8 @@
 msgid "Are you sure you want to refuse this comment?"
 msgstr "¿Está seguro/a de que desea rechazar este comentario?"
 
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168
+#: templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "modificado hace %(duration)s"
@@ -490,7 +505,8 @@
 msgid "Recent texts"
 msgstr "Textos recientes"
 
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186
+#: templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "Todo"
 
@@ -501,7 +517,8 @@
 msgstr[0] "%(nb_comments)s Comentario"
 msgstr[1] "%(nb_comments)s Comentarios"
 
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206
+#: templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Aún no hay ningún texto"
 
@@ -525,8 +542,10 @@
 msgid "Access"
 msgstr "Acceso"
 
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/dashboard.html:233
+#: templates/site/dashboard.html.py:244
+#: templates/site/text_list.html:206
+#: templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Cargando..."
@@ -573,21 +592,26 @@
 msgid "No comments yet"
 msgstr "Aún no hay ningún comentario"
 
-#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/followup.html:7
+#: templates/site/macros/main_tabs.html:16
 #: templates/site/macros/text_tabs.html:22
 msgid "Followup"
 msgstr ""
 
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20
+#: templates/site/text_followup.html:22
 msgid "Feeds"
 msgstr "Respuestas"
 
-#: templates/site/followup.html:22 templates/site/text_followup.html:24
+#: templates/site/followup.html:22
+#: templates/site/text_followup.html:24
 msgid "Public feed"
 msgstr "Respuesta pública"
 
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
+#: templates/site/followup.html:22
+#: templates/site/followup.html.py:35
+#: templates/site/help.html:6
+#: templates/site/text_embed.html:27
 #: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
@@ -601,7 +625,8 @@
 msgid "This is the public feed for the workspace."
 msgstr "Esta es la respuesta pública para el espacio de trabajo"
 
-#: templates/site/followup.html:35 templates/site/text_followup.html:37
+#: templates/site/followup.html:35
+#: templates/site/text_followup.html:37
 msgid "Private feed"
 msgstr "Respuesta privada"
 
@@ -610,28 +635,25 @@
 msgstr "Respuesta privada para el espacio de trabajo"
 
 #: 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 ""
-"Esta es la respuesta privada para el espacio de trabajo. No comparta esta "
-"dirección con otras personas, a menos que desee que vean todas las "
-"actividades del espacio de trabajo."
+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 "Esta es la respuesta privada para el espacio de trabajo. No comparta esta dirección con otras personas, a menos que desee que vean todas las actividades del espacio de trabajo."
 
-#: templates/site/followup.html:45 templates/site/text_followup.html:47
+#: templates/site/followup.html:45
+#: templates/site/text_followup.html:47
 msgid "Reset private feed url"
 msgstr "Reinciar la url de respuesta privada"
 
-#: templates/site/followup.html:49 templates/site/text_followup.html:51
+#: templates/site/followup.html:49
+#: templates/site/text_followup.html:51
 msgid "Activate private feed"
 msgstr "Activar respuestas privadas"
 
 #: templates/site/followup.html:51
 msgid "The private feed for this workspace is not yet activated."
-msgstr ""
-"Las respuestas privadas de este espacio de trabajo aún no han sido activadas"
+msgstr "Las respuestas privadas de este espacio de trabajo aún no han sido activadas"
 
-#: templates/site/followup.html:55 templates/site/text_followup.html:58
+#: templates/site/followup.html:55
+#: templates/site/text_followup.html:58
 msgid "Email notifications"
 msgstr "Avisos de correo electrónico"
 
@@ -641,14 +663,11 @@
 
 #: templates/site/followup.html:62
 #, fuzzy
-msgid ""
-"Subscribe to all replies notifications in discussions where you have "
-"participated"
-msgstr ""
-"Subscribirse a todos los avisos de comentario/respuesta de los debates en "
-"los que ha participado"
+msgid "Subscribe to all replies notifications in discussions where you have participated"
+msgstr "Subscribirse a todos los avisos de comentario/respuesta de los debates en los que ha participado"
 
-#: templates/site/login.html:8 templates/site/login_form.html:19
+#: templates/site/login.html:8
+#: templates/site/login_form.html:19
 #: templates/site/layout/header.html:17
 msgid "Login"
 msgstr "Identificación"
@@ -658,7 +677,8 @@
 msgid "%(wname)s Login"
 msgstr "Identificación de %(wname)s"
 
-#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/login_form.html:20
+#: templates/site/register.html:8
 #: templates/site/layout/header.html:18
 msgid "Register"
 msgstr "Registro"
@@ -680,18 +700,23 @@
 msgstr "Desactivar aviso"
 
 #: templates/site/notifications_desactivate.html:31
-msgid "Desactivate"
+msgid "Deactivate"
 msgstr "Desactivar"
 
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile.html:6
+#: templates/site/profile.html.py:14
 #, python-format
 msgid "Your profile (%(username)s)"
 msgstr "Su perfil (%(username)s)"
 
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
-#: templates/site/text_settings.html:23 templates/site/text_share.html:153
-#: templates/site/user_activate.html:27 templates/site/user_list.html:210
+#: templates/site/profile.html:26
+#: templates/site/text_create_content.html:45
+#: templates/site/text_create_upload.html:40
+#: templates/site/text_edit.html:36
+#: templates/site/text_settings.html:23
+#: templates/site/text_share.html:153
+#: templates/site/user_activate.html:27
+#: templates/site/user_list.html:210
 #: templates/site/layout/base_workspace_form.html:32
 msgid "Save"
 msgstr "Guardar"
@@ -701,28 +726,29 @@
 msgid "%(wname)s Registration"
 msgstr "Registro de %(wname)s"
 
-#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5
+#: templates/site/settings_design.html:5
+#: templates/site/text_list.html:181
+#: templates/site/macros/main_tabs.html:14
 #: templates/site/macros/text_tabs.html:19
 msgid "Settings"
 msgstr "Ajustes"
 
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21
+#: templates/site/settings_design.html:21
 #, fuzzy
 msgid "General"
 msgstr "Genérico"
 
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23
+#: templates/site/settings_design.html:23
 msgid "Appearance"
 msgstr ""
 
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
-msgid ""
-"Are you sure you want to change the role model? All roles (except managers) "
-"will be resetted!"
-msgstr ""
-"¿Está seguro/a de querer cambiar el modelo de perfiles? ¡Todos los roles "
-"(excepto los administradores) se reiniciarán!"
+#: templates/site/settings.html:38
+#: templates/site/settings_design.html:40
+msgid "Are you sure you want to change the role model? All roles (except managers) will be resetted!"
+msgstr "¿Está seguro/a de querer cambiar el modelo de perfiles? ¡Todos los roles (excepto los administradores) se reiniciarán!"
 
 #: templates/site/settings_design.html:31
 #, fuzzy
@@ -730,7 +756,8 @@
 msgstr "Borrar"
 
 #: templates/site/text_create_content.html:26
-#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+#: templates/site/text_create_upload.html:24
+#: templates/site/text_list.html:37
 msgid "Text list"
 msgstr "Lista de textos"
 
@@ -748,9 +775,7 @@
 msgstr ""
 
 #: templates/site/text_embed.html:26
-msgid ""
-"Users will also be able to add comments from your site depending on "
-"anonymous users' roles."
+msgid "Users will also be able to add comments from your site depending on anonymous users' roles."
 msgstr ""
 
 #: templates/site/text_embed.html:36
@@ -758,9 +783,7 @@
 msgstr ""
 
 #: templates/site/text_embed.html:36
-msgid ""
-"You won't successfully embed the text before you give anonymous users a role "
-"allowing them to view the text."
+msgid "You won't successfully embed the text before you give anonymous users a role allowing them to view the text."
 msgstr ""
 
 #: templates/site/text_followup.html:7
@@ -781,22 +804,15 @@
 msgstr "Respuesta privada para el texto."
 
 #: 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 ""
-"Esta es la respuesta privada para el texto. No comparta esta dirección con "
-"otras personas a no ser que desee que dichas personas puedan ver todas las "
-"actividades de este texto."
+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 "Esta es la respuesta privada para el texto. No comparta esta dirección con otras personas a no ser que desee que dichas personas puedan ver todas las actividades de este texto."
 
 #: templates/site/text_followup.html:53
 msgid "The private feed for this text is not yet activated."
 msgstr "La respuesta privada para este texto aún no ha sido activada"
 
 #: templates/site/text_followup.html:61
-msgid ""
-"You will receive text notifications because you subscribed to notifications "
-"at the workspace level"
+msgid "You will receive text notifications because you subscribed to notifications at the workspace level"
 msgstr ""
 
 #: templates/site/text_followup.html:64
@@ -834,7 +850,8 @@
 msgid "Selection"
 msgstr "Acciones"
 
-#: templates/site/text_history.html:80 templates/site/text_list.html:137
+#: templates/site/text_history.html:80
+#: templates/site/text_list.html:137
 msgid "Author"
 msgstr "Autor"
 
@@ -842,12 +859,14 @@
 msgid "Created"
 msgstr ""
 
-#: templates/site/text_history.html:82 templates/site/text_list.html:139
+#: templates/site/text_history.html:82
+#: templates/site/text_list.html:139
 #, fuzzy
 msgid "# comments"
 msgstr "comentarios"
 
-#: templates/site/text_history.html:102 templates/site/text_list.html:159
+#: templates/site/text_history.html:102
+#: templates/site/text_list.html:159
 msgid "View"
 msgstr "Visualizar"
 
@@ -861,7 +880,8 @@
 msgid "Revert to this version"
 msgstr "Volver a la versión #%(v1_nid)s:"
 
-#: templates/site/text_history.html:105 templates/site/text_list.html:80
+#: templates/site/text_history.html:105
+#: templates/site/text_list.html:80
 #: templates/site/text_list.html.py:161
 msgid "Delete"
 msgstr "Borrar"
@@ -880,8 +900,7 @@
 
 #: templates/site/text_history_compare.html:32
 #, fuzzy, python-format
-msgid ""
-"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgid "Comparison between version #%(version_1_number)s and #%(version_2_number)s"
 msgstr "diferencias entre las versiones #%(v1number)s y #%(v2number)s"
 
 #: templates/site/text_history_compare.html:43
@@ -897,36 +916,45 @@
 msgid "Texts"
 msgstr "Textos"
 
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
+#: templates/site/text_list.html:47
+#: templates/site/text_share.html:35
+#: templates/site/user_list.html:7
+#: templates/site/user_list.html.py:32
+#: templates/site/user_list.html:40
+#: templates/site/user_list.html.py:116
 msgid "People' list"
 msgstr "Lista de personas"
 
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:50
+#: templates/site/text_share.html:40
 #: templates/site/user_list.html:45
 msgid "Filter by tag:"
 msgstr ""
 
-#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:52
+#: templates/site/text_share.html:42
 #: templates/site/user_list.html:47
 #, fuzzy
 msgid "All"
 msgstr "Todo"
 
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:79
+#: templates/site/user_list.html:72
 msgid "Bulk Actions"
 msgstr "Acciones masivas"
 
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:83
+#: templates/site/user_list.html:81
 msgid "Apply"
 msgstr "Aplicar"
 
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:104
+#: templates/site/user_list.html:102
 msgid "Are you sure?"
 msgstr "¿Está seguro/a?"
 
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:136
+#: templates/site/macros/text_tabs.html:10
 msgid "Text"
 msgstr "Texto"
 
@@ -934,7 +962,8 @@
 msgid "Modified"
 msgstr "Modificado"
 
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:140
+#: templates/site/user_list.html:136
 msgid "Last week activity"
 msgstr "Actividad de la pasada semana"
 
@@ -950,7 +979,8 @@
 msgid "Filter by tag: %(tag_name)s"
 msgstr ""
 
-#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:160
+#: templates/site/macros/text_tabs.html:12
 #: templates/site/macros/user_actions.html:19
 #, fuzzy
 msgid "Edit"
@@ -970,17 +1000,24 @@
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/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 "Lista de los usuarios"
 
-#: templates/site/text_share.html:29 templates/site/user_add.html:6
-#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:22 templates/site/user_list.html:34
+#: templates/site/text_share.html:29
+#: templates/site/user_add.html:6
+#: templates/site/user_add.html.py:22
+#: templates/site/user_add_text.html:6
+#: templates/site/user_add_text.html:25
+#: templates/site/user_contact.html:19
+#: templates/site/user_edit.html:22
+#: templates/site/user_list.html:34
 #: templates/site/user_mass_add.html:22
 #: templates/site/user_mass_add_text.html:6
 #: templates/site/user_mass_add_text.html:25
@@ -988,37 +1025,37 @@
 msgid "Add a new user"
 msgstr "Añadir un nuevo usuario"
 
-#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/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
 #, fuzzy
 msgid "Add users in bulk"
 msgstr "Añadir usuarios masivamente"
 
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
+#: templates/site/text_share.html:38
+#: templates/site/user_list.html:43
 msgid "Hide suspended users"
 msgstr "Ocultar usuarios desactivados"
 
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
+#: templates/site/text_share.html:38
+#: templates/site/user_list.html:43
 msgid "Display suspended users"
 msgstr "Mostrar usuarios desactivados"
 
-#: templates/site/text_share.html:86 templates/site/user_list.html:132
+#: templates/site/text_share.html:86
+#: templates/site/user_list.html:132
 #, fuzzy
 msgid "User"
 msgstr "Usuario"
 
 #: templates/site/text_share.html:87
 #, fuzzy
-msgid ""
-"The 'Workspace role' is the global role that applies to every text, you can "
-"give a user a particular role on this text using the 'text role' column on "
-"the right"
-msgstr ""
-"El 'perfil del espacio de trabajo' es el perfil que se aplica a cada texto. "
-"Puede otorgar un perfil concreto para este texto mediante la columna 'perfil "
-"local'."
+msgid "The 'Workspace role' is the global role that applies to every text, you can give a user a particular role on this text using the 'text role' column on the right"
+msgstr "El 'perfil del espacio de trabajo' es el perfil que se aplica a cada texto. Puede otorgar un perfil concreto para este texto mediante la columna 'perfil local'."
 
 #: templates/site/text_share.html:87
 msgid "Workspace role"
@@ -1034,13 +1071,16 @@
 msgid "This role has been overriden on this text by a text role: %(rolename)s"
 msgstr "Este perfil ha sido invalidado por el perfil local: %( rolename)s"
 
-#: templates/site/text_share.html:128 templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
+#: templates/site/text_share.html:128
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
+#: templates/site/user_list.html:177
 #, fuzzy
 msgid "Edit anonymous users"
 msgstr "Editar usuarios anónimos"
 
-#: templates/site/text_share.html:128 templates/site/user_list.html:177
+#: templates/site/text_share.html:128
+#: templates/site/user_list.html:177
 msgid "Anonymous users"
 msgstr "Usuarios anónimos"
 
@@ -1081,23 +1121,18 @@
 "The user will receive an email invitation to join the workspace.\n"
 "You can customize the email sent by using the 'Note' field bellow."
 msgstr ""
-"El usuario recibirá una invitación para unirse al espacio de trabajo "
-"mediante correo electrónico.\n"
-"Puede personalizar el correo electrónico que se enviará usando el campo "
-"'Nota' que tiene en la parte inferior."
+"El usuario recibirá una invitación para unirse al espacio de trabajo mediante correo electrónico.\n"
+"Puede personalizar el correo electrónico que se enviará usando el campo 'Nota' que tiene en la parte inferior."
 
 #: templates/site/user_add_text.html:29
 msgid "The user will receive an email invitation to join the workspace."
-msgstr ""
-"El usuario recibirá una invitación por correo electrónico para unirse al "
-"espacio de trabajo."
+msgstr "El usuario recibirá una invitación por correo electrónico para unirse al espacio de trabajo."
 
-#: templates/site/user_add_text.html:30 templates/site/user_mass_add.html:27
+#: templates/site/user_add_text.html:30
+#: templates/site/user_mass_add.html:27
 #: templates/site/user_mass_add_text.html:30
 msgid "You can customize the email sent by using the 'Note' field bellow."
-msgstr ""
-"Puede personalizar el correo electrónico que se enviará usando el campo "
-"'Nota' que tiene en la parte inferior."
+msgstr "Puede personalizar el correo electrónico que se enviará usando el campo 'Nota' que tiene en la parte inferior."
 
 #: templates/site/user_contact.html:6
 msgid "Contact user"
@@ -1108,16 +1143,19 @@
 msgid "Contact user %(username)s"
 msgstr "Contactar con el usuario %(username)s"
 
-#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
 #, python-format
 msgid "Edit user %(username)s"
 msgstr "Editar usuario %(username)s"
 
-#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+#: templates/site/user_list.html:73
+#: templates/site/macros/user_actions.html:28
 msgid "Suspend access"
 msgstr "Anular acceso"
 
-#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+#: templates/site/user_list.html:74
+#: templates/site/macros/user_actions.html:23
 msgid "Enable access"
 msgstr "Activar acceso"
 
@@ -1126,7 +1164,8 @@
 msgid "Change role to %(role_name)s"
 msgstr "Cambiar al perfil %(role_name)s"
 
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133
+#: views/user.py:283
 msgid "Email"
 msgstr "Email"
 
@@ -1141,9 +1180,7 @@
 #: templates/site/user_mass_add.html:26
 #: templates/site/user_mass_add_text.html:29
 msgid "The users will receive an email invitation to join the workspace."
-msgstr ""
-"Los usuarios recibirán una invitación por correo electrónico para unirse al "
-"espacio de trabajo."
+msgstr "Los usuarios recibirán una invitación por correo electrónico para unirse al espacio de trabajo."
 
 #: templates/site/layout/base_text.html:16
 #: templates/site/layout/base_workspace.html:20
@@ -1218,9 +1255,7 @@
 msgstr "por %(name)s en %(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?"
+msgid "You have attempted to leave this page. Unsaved changes will be lost. Are you sure you want to exit this page?"
 msgstr ""
 
 #: templates/site/macros/text_meta.html:6
@@ -1263,21 +1298,15 @@
 
 #: templates/site/macros/user_actions.html:38
 msgid "Are you sure you want to suspend this user's access to the workspace?"
-msgstr ""
-"¿Está seguro/a de querer anular el acceso de este usuario al espacio de "
-"trabajo?"
+msgstr "¿Está seguro/a de querer anular el acceso de este usuario al espacio de trabajo?"
 
 #: templates/site/macros/user_actions.html:47
 msgid "Are you sure you want to enable this user's access to the workspace?"
-msgstr ""
-"¿Está seguro/a de querer activar el acceso de este usuario al espacio de "
-"trabajo?"
+msgstr "¿Está seguro/a de querer activar el acceso de este usuario al espacio de trabajo?"
 
 #: templates/site/macros/user_actions.html:56
 msgid "Are you sure you want to send this user an invitation to the workspace?"
-msgstr ""
-"¿Está seguro/a de querer enviar una invitación para el espacio de trabajo a "
-"este usuario?"
+msgstr "¿Está seguro/a de querer enviar una invitación para el espacio de trabajo a este usuario?"
 
 #: templates/site/macros/user_moderation.html:3
 msgid "Approve"
@@ -1300,11 +1329,8 @@
 msgstr "Subir archivo (opcional)"
 
 #: views/create.py:27
-msgid ""
-"Upload a file from your computer instead of using the direct input above"
-msgstr ""
-"Subir un archivo desde su equipo en lugar de usar la entrada directa de la "
-"parte superior"
+msgid "Upload a file from your computer instead of using the direct input above"
+msgstr "Subir un archivo desde su equipo en lugar de usar la entrada directa de la parte superior"
 
 #: views/create.py:38
 msgid "You should specify a file to upload."
@@ -1314,53 +1340,54 @@
 msgid "The title of your text"
 msgstr "El título de su texto"
 
-#: views/create.py:70 views/create.py:107
+#: views/create.py:70
+#: views/create.py:107
 #, python-format
 msgid "Text \"%(text_title)s\" has been created"
 msgstr "El texto \"%(text_title)s\" ha sido creado"
 
-#: views/feeds.py:26
+#: views/feeds.py:25
 #, python-format
 msgid "%(workspace_name)s's public feed"
 msgstr "Respuesta pública del espacio %(workspace_name)s"
 
-#: views/feeds.py:27
+#: views/feeds.py:26
 #, python-format
 msgid "Workspace %(workspace_name)s public activity feed"
-msgstr ""
-"Respuesta de la actividad pública del espacio de trabajo %(workspace_name)s"
+msgstr "Respuesta de la actividad pública del espacio de trabajo %(workspace_name)s"
 
-#: views/feeds.py:37
+#: views/feeds.py:36
 #, python-format
 msgid "%(workspace_name)s's private feed"
 msgstr "Respuesta privada de %(workspace_name)s"
 
-#: views/feeds.py:38
+#: views/feeds.py:37
 #, python-format
 msgid "Workspace %(workspace_name)s private feed"
 msgstr "Respuesta privada del espacio %(workspace_name)s"
 
-#: views/feeds.py:73
+#: views/feeds.py:72
 #, python-format
 msgid "Text %(text_title)s's public feed"
 msgstr "Respuesta pública del texto %(text_title)s"
 
-#: views/feeds.py:74
+#: views/feeds.py:73
 #, python-format
 msgid "Public activity feed for text %(text_title)s"
 msgstr "Respuesta de la actividad pública del texto %(text_title)s"
 
-#: views/feeds.py:85
+#: views/feeds.py:84
 #, python-format
 msgid "Text %(text_title)s's private feed"
 msgstr "Respuesta privada del texto %(text_title)s"
 
-#: views/feeds.py:86
+#: views/feeds.py:85
 #, python-format
 msgid "Private activity feed for text %(text_title)s"
 msgstr "Respuesta de actividad privada para el texto %(text_title)s"
 
-#: views/followup.py:31 views/followup.py:80
+#: views/followup.py:31
+#: views/followup.py:80
 msgid "Private feed activated."
 msgstr "Respuesta privada activada"
 
@@ -1369,12 +1396,12 @@
 msgstr "Respuesta privada reiniciada"
 
 #: views/followup.py:52
-msgid "This notification has already been desactivated."
+msgid "This notification has already been deactivated."
 msgstr "Este aviso ya ha sido desactivado."
 
 #: views/followup.py:58
-msgid "Notification desactivated."
-msgstr "Aviso desactivado"
+msgid "Notification deactivated."
+msgstr "Aviso desactivado."
 
 #: views/followup.py:62
 msgid "Desactivate notification?"
@@ -1384,7 +1411,9 @@
 msgid "Private notifications feed reseted."
 msgstr "Respuesta de avisos privados reiniciada"
 
-#: views/site.py:81 views/texts.py:129 views/user.py:525
+#: views/site.py:81
+#: views/texts.py:129
+#: views/user.py:525
 msgid "You're logged in!"
 msgstr "¡Se ha conectado!"
 
@@ -1429,13 +1458,8 @@
 msgstr "Registro del espacio de trabajo"
 
 #: views/site.py:175
-msgid ""
-"Can users register themselves into the workspace? (if not, only invitations "
-"by managers can create new users)"
-msgstr ""
-"¿Se permite a los usuarios registrarse en el espacio de trabajo? (En caso "
-"contrario, sólo se podrán usar las invitaciones enviadas por los "
-"administradores para crear nuevos usuarios)"
+msgid "Can users register themselves into the workspace? (if not, only invitations by managers can create new users)"
+msgstr "¿Se permite a los usuarios registrarse en el espacio de trabajo? (En caso contrario, sólo se podrán usar las invitaciones enviadas por los administradores para crear nuevos usuarios)"
 
 #: views/site.py:179
 msgid "Workspace registration moderation"
@@ -1443,11 +1467,8 @@
 
 #: views/site.py:180
 #, fuzzy
-msgid ""
-"Should new users be moderated (registration will require manager's approval)?"
-msgstr ""
-"¿Deben moderarse los usuarios nuevos? (el registro requerirá la aprobación "
-"del administrador)"
+msgid "Should new users be moderated (registration will require manager's approval)?"
+msgstr "¿Deben moderarse los usuarios nuevos? (el registro requerirá la aprobación del administrador)"
 
 #: views/site.py:184
 msgid "Role model"
@@ -1457,7 +1478,10 @@
 msgid "Change the roles available in the workspace"
 msgstr "Cambiar los perfiles disponibles en el espacio de trabajo"
 
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:200
+#: views/site.py:206
+#: views/site.py:234
+#: views/site.py:243
 msgid "Settings saved"
 msgstr "Ajustes guardados"
 
@@ -1472,9 +1496,7 @@
 msgstr "Perfil del espacio de trabajo"
 
 #: views/site.py:217
-msgid ""
-"Add stylesheets etc. Warning: this code will be added to the workspace code, "
-"make sure you know what you're doing before adding something here."
+msgid "Add stylesheets etc. Warning: this code will be added to the workspace code, make sure you know what you're doing before adding something here."
 msgstr ""
 
 #: views/texts.py:162
@@ -1529,7 +1551,9 @@
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr "Se ha creado una nueva versión (copiada de la versión %(version_id)s)"
 
-#: views/texts.py:839 views/user.py:79 views/user.py:99
+#: views/texts.py:839
+#: views/user.py:79
+#: views/user.py:99
 #, python-format
 msgid "%(count)i user(s) role modified"
 msgstr "Perfil del/de los usuario(s) %(count)i modificado(s)"
@@ -1562,23 +1586,15 @@
 
 #: views/user.py:164
 msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
-msgstr ""
-"Añadir múltiples direcciones de correo electrónico por línea (o separadas "
-"por \",\" o \";\")"
+msgstr "Añadir múltiples direcciones de correo electrónico por línea (o separadas por \",\" o \";\")"
 
 #: views/user.py:181
 msgid "Workspace level role"
 msgstr "Nivel del perfil del espacio de trabajo"
 
 #: 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 ""
-"Este perfil se aplicará a cada texto del espacio de trabajo. Para compartir "
-"sólo (algunos) textos con este usuario, puede dejar este campo en blanco y "
-"realizar la delegación de perfiles en los textos."
+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 "Este perfil se aplicará a cada texto del espacio de trabajo. Para compartir sólo (algunos) textos con este usuario, puede dejar este campo en blanco y realizar la delegación de perfiles en los textos."
 
 #: views/user.py:198
 msgid "Text level role"
@@ -1607,11 +1623,10 @@
 
 #: views/user.py:299
 msgid "This username is already in use. Please supply a different username."
-msgstr ""
-"Este nombre de usuario ya está siendo usado por otra persona. Por favor, "
-"introduzca un nombre de usuario diferente."
+msgstr "Este nombre de usuario ya está siendo usado por otra persona. Por favor, introduzca un nombre de usuario diferente."
 
-#: views/user.py:320 views/user.py:336
+#: views/user.py:320
+#: views/user.py:336
 msgid "Your account has been activated. You're now logged-in."
 msgstr "Su cuenta ha sido creada. Ahora está contectado/a"
 
@@ -1678,48 +1693,33 @@
 
 #: views/user.py:519
 msgid "This account is suspended, contact the workspace administrator."
-msgstr ""
-"Esta cuenta está suspendida. Contacte con el administrador del espacio de "
-"trabajo"
+msgstr "Esta cuenta está suspendida. Contacte con el administrador del espacio de trabajo"
 
 #: views/user.py:550
 msgid "You've been logged out."
 msgstr "Se ha desconectado."
 
 #: views/user.py:566
-msgid ""
-"You've been registered, you will receive a confirmation mail once a "
-"moderator has approved your membership."
-msgstr ""
-"Se ha registrado. Recibirá una confirmación por correo electrónico una vez "
-"que el moderador apruebe su inscripción."
+msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
+msgstr "Se ha registrado. Recibirá una confirmación por correo electrónico una vez que el moderador apruebe su inscripción."
 
 #: views/user.py:569
-msgid ""
-"You've been registered, please check your email for the confirm message."
-msgstr ""
-"Se ha registrado. Por favor, compruebe que ha recibido el mensaje de "
-"confirmación en su correo electrónico."
+msgid "You've been registered, please check your email for the confirm message."
+msgstr "Se ha registrado. Por favor, compruebe que ha recibido el mensaje de confirmación en su correo electrónico."
 
 #, fuzzy
 #~ msgid "Design"
 #~ msgstr "Versiones"
-
 #~ msgid "%(workspace_name)s's workspace"
 #~ msgstr "espacio de trabajo %(workspace_name)s"
-
 #~ msgid "Versions:"
 #~ msgstr "Versiones:"
-
 #~ msgid "version #%(v1number)s"
 #~ msgstr "versión #%(v1number)s"
-
 #~ msgid "by %(v1name)s"
 #~ msgstr "por %(v1name)s"
-
 #~ msgid "created %(v1created)s"
 #~ msgstr "creado %(v1created)s"
-
 #~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
 #~ msgstr "Diferencias entre las versiones #%(v1_nid)s y #%(v2_nid)s"
 
@@ -1728,77 +1728,59 @@
 #~ msgstr ""
 #~ "La versión #%(version_number)s, titulada \"%(title)s\", y creada en %"
 #~ "(date)s:"
-
 #~ msgid "You've been invited to join the workspace %(workspace_name)s."
 #~ msgstr ""
 #~ "Se le ha invitado a unirse al espacio de trabajo %(workspace_name)s."
-
 #~ msgid ""
 #~ "Click the following link to complete your registration and access the "
 #~ "workspace:"
 #~ msgstr ""
 #~ "Haga clic en el siguiente enlace para completar su registro y acceder al "
 #~ "espacio de trabajo:"
-
 #~ msgid ""
 #~ "If you'd like to unsubscribe from this notification, click the following "
 #~ "link: %(SITE_URL)s%(desactivate_notification_url)s."
 #~ msgstr ""
 #~ "Si desea dar de baja este aviso, haga clic en el siguiente enlace: %"
 #~ "(SITE_URL)s%(desactivate_notification_url)s."
-
 #~ msgid "Contact from user: %(name)s / %(email)s"
 #~ msgstr "Contacto del usuario: %(name)s / %(email)s"
-
 #~ msgid "Your text \"%(title)s\" has been created."
 #~ msgstr "Su texto \"%(title)s\" se ha creado"
-
 #~ msgid "To publish it click on the following link:"
 #~ msgstr "Para publicarlo, haga clic en el siguiente enlace"
-
 #~ msgid "Notifications"
 #~ msgstr "Avisos"
-
 #~ msgid "%(title)s"
 #~ msgstr "%(title)s"
-
 #~ msgid "Preview text"
 #~ msgstr "Previsualizar texto"
-
 #~ 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} comentario(s) se eliminará(n) debido a que al texto al que "
 #~ "pertenecen se ha cambiado.¿Desea continuar?"
-
 #~ msgid "{nb_comments} comment(s) will be lost, do you want to continue?"
 #~ msgstr "{nb_comments} comentario(s) se perderá(n).¿Desea continuar?"
-
 #~ msgid "We suggest you create a new version"
 #~ msgstr "Le sugerimos que cree una nueva versión"
-
 #~ msgid ""
 #~ "Since you chose not to create a new version all comments will be deleted, "
 #~ "do you want to continue?"
 #~ msgstr ""
 #~ "Ya que ha elegido no crear una nueva versión, todos los comentarios serán "
 #~ "eliminados. ¿Desea continuar?"
-
 #~ msgid "Authors:"
 #~ msgstr "Autores"
-
 #~ msgid "authors"
 #~ msgstr "autores"
-
 #~ msgid "Actions:"
 #~ msgstr "Acciones:"
-
 #~ msgid "created %(date)s"
 #~ msgstr "creado en %(date)s"
-
 #~ msgid "Local role"
 #~ msgstr "Perfil local"
-
 #~ msgid "Add user"
 #~ msgstr "Añadir usuario"
+
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po	Fri Feb 12 15:54:48 2010 +0100
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 13:10+0100\n"
-"PO-Revision-Date: 2010-02-12 13:08+0100\n"
+"POT-Creation-Date: 2010-02-12 15:51+0100\n"
+"PO-Revision-Date: 2010-02-12 15:52+0100\n"
 "Last-Translator: dev <dev@sopinspace.com>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,8 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #: client.py:25
-msgid ""
-"A selection is required. Select in the text the part your comment applies to."
-msgstr ""
-"Une portée est obligatoire. Sélectionner dans le texte la partie sur "
-"laquelle porte votre commentaire."
+msgid "A selection is required. Select in the text the part your comment applies to."
+msgstr "Une portée est obligatoire. Sélectionner dans le texte la partie sur laquelle porte votre commentaire."
 
 #: client.py:134
 msgid "name is required"
@@ -48,7 +45,8 @@
 msgid "comment removed"
 msgstr "commentaire supprimé"
 
-#: client.py:209 client.py:274
+#: client.py:209
+#: client.py:274
 msgid "comment saved"
 msgstr "commentaire sauvé"
 
@@ -60,8 +58,11 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "La longueur des tags est limitée à 250 caractères."
 
-#: models.py:176 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:591
+#: models.py:176
+#: templates/site/text_history.html:79
+#: views/create.py:30
+#: views/create.py:45
+#: views/texts.py:591
 msgid "Title"
 msgstr "Titre"
 
@@ -69,15 +70,18 @@
 msgid "Format"
 msgstr "Format"
 
-#: models.py:178 views/texts.py:682
+#: models.py:178
+#: views/texts.py:682
 msgid "Content"
 msgstr "Texte"
 
-#: models.py:179 models.py:637
+#: models.py:179
+#: models.py:637
 msgid "Tags"
 msgstr "Tags"
 
-#: models.py:181 views/user.py:223
+#: models.py:181
+#: views/user.py:223
 msgid "Note"
 msgstr "Note"
 
@@ -103,8 +107,7 @@
 
 #: models.py:631
 msgid "Allow email messages from other users"
-msgstr ""
-"Autoriser les participants de l'espace de travail à vous envoyer un email"
+msgstr "Autoriser les participants de l'espace de travail à vous envoyer un email"
 
 #: models.py:632
 msgid "Preferred language"
@@ -190,7 +193,8 @@
 msgid "User %(username)s has activated his account"
 msgstr "L'utilisateur %(username)s a activé son compte"
 
-#: models.py:816 models.py:824
+#: models.py:816
+#: models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "par \"%(username)s\""
@@ -240,7 +244,8 @@
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: static_i18n.py:6 static_i18n.py:11
+#: static_i18n.py:6
+#: static_i18n.py:11
 msgid "Observer"
 msgstr "Observateur"
 
@@ -352,7 +357,8 @@
 msgid "An error has occurred."
 msgstr "Une erreur s'est produite."
 
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
+#: templates/site/activate.html:10
+#: templates/site/user_activate.html:10
 #: views/user.py:330
 msgid "Activate your account"
 msgstr "Activer votre compte"
@@ -361,7 +367,8 @@
 msgid "Activate"
 msgstr "Activer"
 
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6
+#: templates/site/layout/footer.html:9
 #: templates/site/macros/user_actions.html:20
 msgid "Contact"
 msgstr "Contact"
@@ -372,16 +379,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_design.html:29
+#: templates/site/settings.html:29
+#: templates/site/settings_design.html:29
 #: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/text_create_upload.html:42
+#: templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38
+#: templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29
+#: templates/site/user_mass_add.html:34
 #: templates/site/user_mass_add_text.html:38
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+#: templates/site/dashboard.html:12
+#: templates/site/macros/main_tabs.html:10
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
@@ -389,16 +401,20 @@
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/dashboard.html:48
+#: templates/site/text_create_content.html:4
 #: templates/site/text_create_content.html:28
-#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/text_create_upload.html:26
+#: templates/site/text_list.html:40
 #: templates/site/layout/header.html:10
 msgid "Write a text"
 msgstr "Ecrire un texte"
 
-#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/dashboard.html:49
+#: templates/site/text_create_content.html:30
 #: templates/site/text_create_upload.html:4
-#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/text_create_upload.html:28
+#: templates/site/text_list.html:42
 #: templates/site/layout/header.html:11
 msgid "Upload a text"
 msgstr "Charger un texte"
@@ -428,11 +444,13 @@
 msgid "user %(user)s awaits approval"
 msgstr "l'utilisateur %(user)s est en attente d'approbation"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "approve"
 msgstr "accepter"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "refuse"
 msgstr "refuser"
 
@@ -442,26 +460,21 @@
 
 #: templates/site/dashboard.html:85
 #: templates/site/macros/user_moderation.html:8
-msgid ""
-"Are you sure you want to approve this user's membership to the workspace?"
-msgstr ""
-"Etes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de "
-"travail ?"
+msgid "Are you sure you want to approve this user's membership to the workspace?"
+msgstr "Etes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de travail ?"
 
 #: templates/site/dashboard.html:94
 #: templates/site/macros/user_moderation.html:17
-msgid ""
-"Are you sure you want to refuse this user's membership to the workspace?"
-msgstr ""
-"Etes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de "
-"travail ?"
+msgid "Are you sure you want to refuse this user's membership to the workspace?"
+msgstr "Etes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de travail ?"
 
 #: templates/site/dashboard.html:106
 #, python-format
 msgid "registered %(duration)s ago"
 msgstr "enregistré il y a %(duration)s"
 
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:120
+#: templates/site/dashboard.html.py:126
 msgid "comment"
 msgstr "commentaire"
 
@@ -486,7 +499,8 @@
 msgid "Are you sure you want to refuse this comment?"
 msgstr "Etes vous sûr de vouloir refuser ce commentaire ?"
 
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168
+#: templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "modifié il y a %(duration)s"
@@ -495,7 +509,8 @@
 msgid "Recent texts"
 msgstr "Textes récents"
 
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186
+#: templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "tous"
 
@@ -506,7 +521,8 @@
 msgstr[0] "%(nb_comments)s commentaire"
 msgstr[1] "%(nb_comments)s commentaires"
 
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206
+#: templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Aucun texte"
 
@@ -530,8 +546,10 @@
 msgid "Access"
 msgstr "Accès"
 
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/dashboard.html:233
+#: templates/site/dashboard.html.py:244
+#: templates/site/text_list.html:206
+#: templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Chargement ..."
@@ -577,21 +595,26 @@
 msgid "No comments yet"
 msgstr "Aucun commentaire"
 
-#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/followup.html:7
+#: templates/site/macros/main_tabs.html:16
 #: templates/site/macros/text_tabs.html:22
 msgid "Followup"
 msgstr "Suivi"
 
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20
+#: templates/site/text_followup.html:22
 msgid "Feeds"
 msgstr "Flux"
 
-#: templates/site/followup.html:22 templates/site/text_followup.html:24
+#: templates/site/followup.html:22
+#: templates/site/text_followup.html:24
 msgid "Public feed"
 msgstr "Flux public"
 
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
+#: templates/site/followup.html:22
+#: templates/site/followup.html.py:35
+#: templates/site/help.html:6
+#: templates/site/text_embed.html:27
 #: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
@@ -605,7 +628,8 @@
 msgid "This is the public feed for the workspace."
 msgstr "Ceci est le flux public de l'espace de travail."
 
-#: templates/site/followup.html:35 templates/site/text_followup.html:37
+#: templates/site/followup.html:35
+#: templates/site/text_followup.html:37
 msgid "Private feed"
 msgstr "Flux privé"
 
@@ -614,19 +638,16 @@
 msgstr "Flux privé de l'espace de travail"
 
 #: templates/site/followup.html:43
-msgid ""
-"This is the private feed for the workspace. Don't share this address with "
-"others unless you want them to see all activities on the workspace."
-msgstr ""
-"Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que "
-"si vous voulez que d'autres que vous-même puissent suivre toutes les "
-"activités de l'espace de travail."
+msgid "This is the private feed for the workspace. Don't share this address with others unless you want them to see all activities on the workspace."
+msgstr "Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités de l'espace de travail."
 
-#: templates/site/followup.html:45 templates/site/text_followup.html:47
+#: templates/site/followup.html:45
+#: templates/site/text_followup.html:47
 msgid "Reset private feed url"
 msgstr "Réinitialiser l'adresse du flux privé"
 
-#: templates/site/followup.html:49 templates/site/text_followup.html:51
+#: templates/site/followup.html:49
+#: templates/site/text_followup.html:51
 msgid "Activate private feed"
 msgstr "Activer le flux privé"
 
@@ -634,7 +655,8 @@
 msgid "The private feed for this workspace is not yet activated."
 msgstr "Le flux privé de cet espace de travail n'est pas encore activé."
 
-#: templates/site/followup.html:55 templates/site/text_followup.html:58
+#: templates/site/followup.html:55
+#: templates/site/text_followup.html:58
 msgid "Email notifications"
 msgstr "Notifications par email"
 
@@ -643,14 +665,11 @@
 msgstr "S'abonner aux notifications de l'espace de travail"
 
 #: templates/site/followup.html:62
-msgid ""
-"Subscribe to all replies notifications in discussions where you have "
-"participated"
-msgstr ""
-"S'abonner aux notifications concernant les commentaires ou réponses dans les "
-"discussions auxquelles vous avez participé"
+msgid "Subscribe to all replies notifications in discussions where you have participated"
+msgstr "S'abonner aux notifications concernant les commentaires ou réponses dans les discussions auxquelles vous avez participé"
 
-#: templates/site/login.html:8 templates/site/login_form.html:19
+#: templates/site/login.html:8
+#: templates/site/login_form.html:19
 #: templates/site/layout/header.html:17
 msgid "Login"
 msgstr "Se connecter"
@@ -660,7 +679,8 @@
 msgid "%(wname)s Login"
 msgstr "Se connecter à %(wname)s"
 
-#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/login_form.html:20
+#: templates/site/register.html:8
 #: templates/site/layout/header.html:18
 msgid "Register"
 msgstr "S'enregistrer"
@@ -682,18 +702,23 @@
 msgstr "Désactiver la notification"
 
 #: templates/site/notifications_desactivate.html:31
-msgid "Desactivate"
+msgid "Deactivate"
 msgstr "Désactiver"
 
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile.html:6
+#: templates/site/profile.html.py:14
 #, python-format
 msgid "Your profile (%(username)s)"
 msgstr "Votre profil (%(username)s)"
 
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
-#: templates/site/text_settings.html:23 templates/site/text_share.html:153
-#: templates/site/user_activate.html:27 templates/site/user_list.html:210
+#: templates/site/profile.html:26
+#: templates/site/text_create_content.html:45
+#: templates/site/text_create_upload.html:40
+#: templates/site/text_edit.html:36
+#: templates/site/text_settings.html:23
+#: templates/site/text_share.html:153
+#: templates/site/user_activate.html:27
+#: templates/site/user_list.html:210
 #: templates/site/layout/base_workspace_form.html:32
 msgid "Save"
 msgstr "Enregistrer"
@@ -703,34 +728,36 @@
 msgid "%(wname)s Registration"
 msgstr "S'enregistrer sur %(wname)s"
 
-#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5
+#: templates/site/settings_design.html:5
+#: templates/site/text_list.html:181
+#: templates/site/macros/main_tabs.html:14
 #: templates/site/macros/text_tabs.html:19
 msgid "Settings"
 msgstr "Paramètres"
 
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21
+#: templates/site/settings_design.html:21
 msgid "General"
 msgstr "Général"
 
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23
+#: templates/site/settings_design.html:23
 msgid "Appearance"
 msgstr "Apparence"
 
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
-msgid ""
-"Are you sure you want to change the role model? All roles (except managers) "
-"will be resetted!"
-msgstr ""
-"Etes-vous sur de vouloir modifier le modèle des rôles ? Tous les roles "
-"actifs (excepté les gestionnaires) seront remis à zéro !"
+#: templates/site/settings.html:38
+#: templates/site/settings_design.html:40
+msgid "Are you sure you want to change the role model? All roles (except managers) will be resetted!"
+msgstr "Etes-vous sur de vouloir modifier le modèle des rôles ? Tous les roles actifs (excepté les gestionnaires) seront remis à zéro !"
 
 #: templates/site/settings_design.html:31
 msgid "Delete logo"
 msgstr "Supprimer le logo"
 
 #: templates/site/text_create_content.html:26
-#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+#: templates/site/text_create_upload.html:24
+#: templates/site/text_list.html:37
 msgid "Text list"
 msgstr "Textes"
 
@@ -744,29 +771,19 @@
 
 #: templates/site/text_embed.html:26
 msgid "Copy this code into your site to display text with comments."
-msgstr ""
-"Copier ce code dans votre site pour afficher le texte et ses commentaires."
+msgstr "Copier ce code dans votre site pour afficher le texte et ses commentaires."
 
 #: templates/site/text_embed.html:26
-msgid ""
-"Users will also be able to add comments from your site depending on "
-"anonymous users' roles."
-msgstr ""
-" Les utilisateurs pourront ajouter leurs commentaires (si vous avez activé "
-"cette possiblité)."
+msgid "Users will also be able to add comments from your site depending on anonymous users' roles."
+msgstr " Les utilisateurs pourront ajouter leurs commentaires (si vous avez activé cette possiblité)."
 
 #: templates/site/text_embed.html:36
 msgid "Warning:"
 msgstr "Attention: "
 
 #: templates/site/text_embed.html:36
-msgid ""
-"You won't successfully embed the text before you give anonymous users a role "
-"allowing them to view the text."
-msgstr ""
-"Vous ne pourrez pas encapsuler votre texte dans un site externe si vous ne "
-"donnez pas aux utilisateurs anonymes un rôle leur permettant de voir le "
-"texte."
+msgid "You won't successfully embed the text before you give anonymous users a role allowing them to view the text."
+msgstr "Vous ne pourrez pas encapsuler votre texte dans un site externe si vous ne donnez pas aux utilisateurs anonymes un rôle leur permettant de voir le texte."
 
 #: templates/site/text_followup.html:7
 msgid "Text followup"
@@ -786,25 +803,16 @@
 msgstr "Flux privé du texte"
 
 #: templates/site/text_followup.html:45
-msgid ""
-"This is the private feed for the text. Don't share this address with others "
-"unless you want them to see all activities on this text."
-msgstr ""
-"Ceci est le flux privé du texte. Ne partagez cette adresse que si vous "
-"voulez que d'autres que vous-même puissent suivre toutes les activités du "
-"texte."
+msgid "This is the private feed for the text. Don't share this address with others unless you want them to see all activities on this text."
+msgstr "Ceci est le flux privé du texte. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités du texte."
 
 #: templates/site/text_followup.html:53
 msgid "The private feed for this text is not yet activated."
 msgstr "Le flux privé de ce texte n'est pas encore activé."
 
 #: templates/site/text_followup.html:61
-msgid ""
-"You will receive text notifications because you subscribed to notifications "
-"at the workspace level"
-msgstr ""
-"Vous recevrez les notifications de ce texte parce que vous vous êtes abonné "
-"aux notifications au niveau de l'espace de travail tout entier"
+msgid "You will receive text notifications because you subscribed to notifications at the workspace level"
+msgstr "Vous recevrez les notifications de ce texte parce que vous vous êtes abonné aux notifications au niveau de l'espace de travail tout entier"
 
 #: templates/site/text_followup.html:64
 msgid "Subscribe to all text notifications"
@@ -838,7 +846,8 @@
 msgid "Selection"
 msgstr "Sélection"
 
-#: templates/site/text_history.html:80 templates/site/text_list.html:137
+#: templates/site/text_history.html:80
+#: templates/site/text_list.html:137
 msgid "Author"
 msgstr "Auteur"
 
@@ -846,11 +855,13 @@
 msgid "Created"
 msgstr "Crée"
 
-#: templates/site/text_history.html:82 templates/site/text_list.html:139
+#: templates/site/text_history.html:82
+#: templates/site/text_list.html:139
 msgid "# comments"
 msgstr "nb. de commentaires"
 
-#: templates/site/text_history.html:102 templates/site/text_list.html:159
+#: templates/site/text_history.html:102
+#: templates/site/text_list.html:159
 msgid "View"
 msgstr "Voir"
 
@@ -863,7 +874,8 @@
 msgid "Revert to this version"
 msgstr "Revenir à cette version"
 
-#: templates/site/text_history.html:105 templates/site/text_list.html:80
+#: templates/site/text_history.html:105
+#: templates/site/text_list.html:80
 #: templates/site/text_list.html.py:161
 msgid "Delete"
 msgstr "Supprimer"
@@ -881,11 +893,8 @@
 
 #: templates/site/text_history_compare.html:32
 #, python-format
-msgid ""
-"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
-msgstr ""
-"Différences entre les versions n°%(version_1_number)s et n°%"
-"(version_2_number)s"
+msgid "Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgstr "Différences entre les versions n°%(version_1_number)s et n°%(version_2_number)s"
 
 #: templates/site/text_history_compare.html:43
 msgid "No differences"
@@ -899,35 +908,44 @@
 msgid "Texts"
 msgstr "Textes"
 
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
+#: templates/site/text_list.html:47
+#: templates/site/text_share.html:35
+#: templates/site/user_list.html:7
+#: templates/site/user_list.html.py:32
+#: templates/site/user_list.html:40
+#: templates/site/user_list.html.py:116
 msgid "People' list"
 msgstr "Liste des utilisateurs"
 
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:50
+#: templates/site/text_share.html:40
 #: templates/site/user_list.html:45
 msgid "Filter by tag:"
 msgstr "Filtrer avec le mot-clé"
 
-#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:52
+#: templates/site/text_share.html:42
 #: templates/site/user_list.html:47
 msgid "All"
 msgstr "Tous"
 
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:79
+#: templates/site/user_list.html:72
 msgid "Bulk Actions"
 msgstr "Actions multiples"
 
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:83
+#: templates/site/user_list.html:81
 msgid "Apply"
 msgstr "Appliquer"
 
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:104
+#: templates/site/user_list.html:102
 msgid "Are you sure?"
 msgstr "Etes vous sûr ?"
 
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:136
+#: templates/site/macros/text_tabs.html:10
 msgid "Text"
 msgstr "Texte"
 
@@ -935,7 +953,8 @@
 msgid "Modified"
 msgstr "Modifié"
 
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:140
+#: templates/site/user_list.html:136
 msgid "Last week activity"
 msgstr "Activités de la dernière semaine"
 
@@ -950,7 +969,8 @@
 msgid "Filter by tag: %(tag_name)s"
 msgstr "Filtrer avec le mot-clé : %(tag_name)s"
 
-#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:160
+#: templates/site/macros/text_tabs.html:12
 #: templates/site/macros/user_actions.html:19
 msgid "Edit"
 msgstr "Editer"
@@ -967,51 +987,58 @@
 msgid "Edit user"
 msgstr "Editer l'utilisateur"
 
-#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/text_share.html:27
+#: templates/site/user_add.html:20
+#: templates/site/user_add_text.html:23
+#: templates/site/user_contact.html:19
+#: templates/site/user_edit.html:20
+#: templates/site/user_mass_add.html:20
 #: templates/site/user_mass_add_text.html:23
 msgid "Users' list"
 msgstr "Liste des utilisateurs"
 
-#: templates/site/text_share.html:29 templates/site/user_add.html:6
-#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:22 templates/site/user_list.html:34
+#: templates/site/text_share.html:29
+#: templates/site/user_add.html:6
+#: templates/site/user_add.html.py:22
+#: templates/site/user_add_text.html:6
+#: templates/site/user_add_text.html:25
+#: templates/site/user_contact.html:19
+#: templates/site/user_edit.html:22
+#: templates/site/user_list.html:34
 #: templates/site/user_mass_add.html:22
 #: templates/site/user_mass_add_text.html:6
 #: templates/site/user_mass_add_text.html:25
 msgid "Add a new user"
 msgstr "Ajouter un utilisateur"
 
-#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/text_share.html:31
+#: templates/site/user_add.html:24
+#: templates/site/user_add_text.html:27
+#: templates/site/user_list.html:36
+#: templates/site/user_mass_add.html:6
+#: templates/site/user_mass_add.html:24
 #: templates/site/user_mass_add_text.html:27
 msgid "Add users in bulk"
 msgstr "Ajouter des utilisateurs en masse"
 
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
+#: templates/site/text_share.html:38
+#: templates/site/user_list.html:43
 msgid "Hide suspended users"
 msgstr "Masquer les utilisateurs désactivés"
 
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
+#: templates/site/text_share.html:38
+#: templates/site/user_list.html:43
 msgid "Display suspended users"
 msgstr "Afficher les utilisateurs désactivés"
 
-#: templates/site/text_share.html:86 templates/site/user_list.html:132
+#: templates/site/text_share.html:86
+#: templates/site/user_list.html:132
 msgid "User"
 msgstr "Utilisateur"
 
 #: templates/site/text_share.html:87
-msgid ""
-"The 'Workspace role' is the global role that applies to every text, you can "
-"give a user a particular role on this text using the 'text role' column on "
-"the right"
-msgstr ""
-"Le 'rôle dans l'espace de travail' est le rôle global qui s'applique à tous "
-"les textes. Vous pouvez donner à un utilisateur particulier un rôle "
-"différent sur ce texte via la colonne 'rôle sur le texte' à droite"
+msgid "The 'Workspace role' is the global role that applies to every text, you can give a user a particular role on this text using the 'text role' column on the right"
+msgstr "Le 'rôle dans l'espace de travail' est le rôle global qui s'applique à tous les textes. Vous pouvez donner à un utilisateur particulier un rôle différent sur ce texte via la colonne 'rôle sur le texte' à droite"
 
 #: templates/site/text_share.html:87
 msgid "Workspace role"
@@ -1026,12 +1053,15 @@
 msgid "This role has been overriden on this text by a text role: %(rolename)s"
 msgstr "Ce rôle a été surchargé par un rôle sur le texte : %(rolename)s"
 
-#: templates/site/text_share.html:128 templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
+#: templates/site/text_share.html:128
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
+#: templates/site/user_list.html:177
 msgid "Edit anonymous users"
 msgstr "Editer 'l'utilisateur anonyme'"
 
-#: templates/site/text_share.html:128 templates/site/user_list.html:177
+#: templates/site/text_share.html:128
+#: templates/site/user_list.html:177
 msgid "Anonymous users"
 msgstr "Utilisateurs anonymes"
 
@@ -1072,20 +1102,18 @@
 "The user will receive an email invitation to join the workspace.\n"
 "You can customize the email sent by using the 'Note' field bellow."
 msgstr ""
-"L'utilisateur recevra un email d'invitation à rejoindre l'espace de "
-"travail.\n"
+"L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail.\n"
 "Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
 
 #: templates/site/user_add_text.html:29
 msgid "The user will receive an email invitation to join the workspace."
-msgstr ""
-"L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail."
+msgstr "L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail."
 
-#: templates/site/user_add_text.html:30 templates/site/user_mass_add.html:27
+#: templates/site/user_add_text.html:30
+#: templates/site/user_mass_add.html:27
 #: templates/site/user_mass_add_text.html:30
 msgid "You can customize the email sent by using the 'Note' field bellow."
-msgstr ""
-"Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
+msgstr "Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
 
 #: templates/site/user_contact.html:6
 msgid "Contact user"
@@ -1096,16 +1124,19 @@
 msgid "Contact user %(username)s"
 msgstr "Contacter l'utilisateur %(username)s"
 
-#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
 #, python-format
 msgid "Edit user %(username)s"
 msgstr "Editer l'utilisateur %(username)s"
 
-#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+#: templates/site/user_list.html:73
+#: templates/site/macros/user_actions.html:28
 msgid "Suspend access"
 msgstr "Désactiver l'accès"
 
-#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+#: templates/site/user_list.html:74
+#: templates/site/macros/user_actions.html:23
 msgid "Enable access"
 msgstr "Activer l'accès"
 
@@ -1114,7 +1145,8 @@
 msgid "Change role to %(role_name)s"
 msgstr "Modifier le rôle en %(role_name)s"
 
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133
+#: views/user.py:283
 msgid "Email"
 msgstr "Email"
 
@@ -1129,9 +1161,7 @@
 #: templates/site/user_mass_add.html:26
 #: templates/site/user_mass_add_text.html:29
 msgid "The users will receive an email invitation to join the workspace."
-msgstr ""
-"Les utilisateurs recevront un email d'invitation à rejoindre l'espace de "
-"travail."
+msgstr "Les utilisateurs recevront un email d'invitation à rejoindre l'espace de travail."
 
 #: templates/site/layout/base_text.html:16
 #: templates/site/layout/base_workspace.html:20
@@ -1205,12 +1235,8 @@
 msgstr "par %(name)s le %(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 ""
-"Vous avez tenté de quitter la page. Les modifications non sauvegardées "
-"seront perdues. Etes vous sûr de vouloir quitter cette page ?"
+msgid "You have attempted to leave this page. Unsaved changes will be lost. Are you sure you want to exit this page?"
+msgstr "Vous avez tenté de quitter la page. Les modifications non sauvegardées seront perdues. Etes vous sûr de vouloir quitter cette page ?"
 
 #: templates/site/macros/text_meta.html:6
 #, python-format
@@ -1252,21 +1278,15 @@
 
 #: templates/site/macros/user_actions.html:38
 msgid "Are you sure you want to suspend this user's access to the workspace?"
-msgstr ""
-"Etes vous sûr de vouloir désactiver l'accès de cet utilisateur à l'espace de "
-"travail ?"
+msgstr "Etes vous sûr de vouloir désactiver l'accès de cet utilisateur à l'espace de travail ?"
 
 #: templates/site/macros/user_actions.html:47
 msgid "Are you sure you want to enable this user's access to the workspace?"
-msgstr ""
-"Etes vous sûr de vouloir activer l'accès de cet utilisateur à l'espace de "
-"travail ?"
+msgstr "Etes vous sûr de vouloir activer l'accès de cet utilisateur à l'espace de travail ?"
 
 #: templates/site/macros/user_actions.html:56
 msgid "Are you sure you want to send this user an invitation to the workspace?"
-msgstr ""
-"Etes vous sûr de vouloir envoyer à cet utilisateur une invitation à "
-"rejoindre l'espace de travail ?"
+msgstr "Etes vous sûr de vouloir envoyer à cet utilisateur une invitation à rejoindre l'espace de travail ?"
 
 #: templates/site/macros/user_moderation.html:3
 msgid "Approve"
@@ -1289,11 +1309,8 @@
 msgstr "Charger un fichier (optionnel)"
 
 #: views/create.py:27
-msgid ""
-"Upload a file from your computer instead of using the direct input above"
-msgstr ""
-"Charger un fichier de votre ordinateur plutôt que d'utiliser le champ de "
-"saisie ci-dessus"
+msgid "Upload a file from your computer instead of using the direct input above"
+msgstr "Charger un fichier de votre ordinateur plutôt que d'utiliser le champ de saisie ci-dessus"
 
 #: views/create.py:38
 msgid "You should specify a file to upload."
@@ -1303,52 +1320,54 @@
 msgid "The title of your text"
 msgstr "Le titre de votre texte"
 
-#: views/create.py:70 views/create.py:107
+#: views/create.py:70
+#: views/create.py:107
 #, python-format
 msgid "Text \"%(text_title)s\" has been created"
 msgstr "Le texte \"%(text_title)s\" a été créé"
 
-#: views/feeds.py:26
+#: views/feeds.py:25
 #, python-format
 msgid "%(workspace_name)s's public feed"
 msgstr "Flux public pour %(workspace_name)s"
 
-#: views/feeds.py:27
+#: views/feeds.py:26
 #, python-format
 msgid "Workspace %(workspace_name)s public activity feed"
 msgstr "Flux public de l'espace de travail %(workspace_name)s"
 
-#: views/feeds.py:37
+#: views/feeds.py:36
 #, python-format
 msgid "%(workspace_name)s's private feed"
 msgstr "Flux privé pour %(workspace_name)s"
 
-#: views/feeds.py:38
+#: views/feeds.py:37
 #, python-format
 msgid "Workspace %(workspace_name)s private feed"
 msgstr "Flux privé de l'espace de travail %(workspace_name)s"
 
-#: views/feeds.py:73
+#: views/feeds.py:72
 #, python-format
 msgid "Text %(text_title)s's public feed"
 msgstr "Flux public du texte %(text_title)s"
 
-#: views/feeds.py:74
+#: views/feeds.py:73
 #, python-format
 msgid "Public activity feed for text %(text_title)s"
 msgstr "Flux public pour le texte %(text_title)s"
 
-#: views/feeds.py:85
+#: views/feeds.py:84
 #, python-format
 msgid "Text %(text_title)s's private feed"
 msgstr "Flux privé du texte %(text_title)s"
 
-#: views/feeds.py:86
+#: views/feeds.py:85
 #, python-format
 msgid "Private activity feed for text %(text_title)s"
 msgstr "Flux public pour le texte %(text_title)s"
 
-#: views/followup.py:31 views/followup.py:80
+#: views/followup.py:31
+#: views/followup.py:80
 msgid "Private feed activated."
 msgstr "Flux privé activé."
 
@@ -1357,11 +1376,11 @@
 msgstr "Flux privé réinitialisé."
 
 #: views/followup.py:52
-msgid "This notification has already been desactivated."
+msgid "This notification has already been deactivated."
 msgstr "Cette notification a été désactivée."
 
 #: views/followup.py:58
-msgid "Notification desactivated."
+msgid "Notification deactivated."
 msgstr "Notification désactivée."
 
 #: views/followup.py:62
@@ -1372,7 +1391,9 @@
 msgid "Private notifications feed reseted."
 msgstr "Flux privé réinitialisé."
 
-#: views/site.py:81 views/texts.py:129 views/user.py:525
+#: views/site.py:81
+#: views/texts.py:129
+#: views/user.py:525
 msgid "You're logged in!"
 msgstr "Vous êtes connecté !"
 
@@ -1417,24 +1438,16 @@
 msgstr "S'enregistrer sur l'espace de travail"
 
 #: views/site.py:175
-msgid ""
-"Can users register themselves into the workspace? (if not, only invitations "
-"by managers can create new users)"
-msgstr ""
-"Les utilisateurs peuvent-ils s'enregistrer sur l'espace de travail ? (dans "
-"le cas contraire l'ajout d'utilisateurs à l'espace de travail peut seulement "
-"se faire par l'envoi d'invitations par les gestionnaires)"
+msgid "Can users register themselves into the workspace? (if not, only invitations by managers can create new users)"
+msgstr "Les utilisateurs peuvent-ils s'enregistrer sur l'espace de travail ? (dans le cas contraire l'ajout d'utilisateurs à l'espace de travail peut seulement se faire par l'envoi d'invitations par les gestionnaires)"
 
 #: views/site.py:179
 msgid "Workspace registration moderation"
 msgstr "Modération de l'enregistrement sur l'espace de travail"
 
 #: views/site.py:180
-msgid ""
-"Should new users be moderated (registration will require manager's approval)?"
-msgstr ""
-"Les nouveaux utilisateurs doivent-ils être modérés (l'enregistrement exigera "
-"alors l'approbation par un gestionnaire) ?"
+msgid "Should new users be moderated (registration will require manager's approval)?"
+msgstr "Les nouveaux utilisateurs doivent-ils être modérés (l'enregistrement exigera alors l'approbation par un gestionnaire) ?"
 
 #: views/site.py:184
 msgid "Role model"
@@ -1444,7 +1457,10 @@
 msgid "Change the roles available in the workspace"
 msgstr "Modifie les rôles disponibles dans l'espace de travail"
 
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:200
+#: views/site.py:206
+#: views/site.py:234
+#: views/site.py:243
 msgid "Settings saved"
 msgstr "Paramètres sauvegardés"
 
@@ -1457,12 +1473,8 @@
 msgstr "Code html de l'espace de travail"
 
 #: views/site.py:217
-msgid ""
-"Add stylesheets etc. Warning: this code will be added to the workspace code, "
-"make sure you know what you're doing before adding something here."
-msgstr ""
-"Ajouter des feuilles de style etc.. Attention : ce code sera ajouté à celui "
-"de l'espace de travail, à manipuler avec prudence."
+msgid "Add stylesheets etc. Warning: this code will be added to the workspace code, make sure you know what you're doing before adding something here."
+msgstr "Ajouter des feuilles de style etc.. Attention : ce code sera ajouté à celui de l'espace de travail, à manipuler avec prudence."
 
 #: views/texts.py:162
 #, python-format
@@ -1501,8 +1513,7 @@
 
 #: views/texts.py:617
 msgid "Keep comments (if not affected by the edit)"
-msgstr ""
-"Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
+msgstr "Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
 
 #: views/texts.py:680
 msgid "Name (optional)"
@@ -1515,10 +1526,11 @@
 #: views/texts.py:731
 #, python-format
 msgid "A new version (copied from version %(version_title)s) has been created"
-msgstr ""
-"Une nouvelle version (copiée depuis la version %(version_title)s) a été créée"
+msgstr "Une nouvelle version (copiée depuis la version %(version_title)s) a été créée"
 
-#: views/texts.py:839 views/user.py:79 views/user.py:99
+#: views/texts.py:839
+#: 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)"
@@ -1551,23 +1563,15 @@
 
 #: views/user.py:164
 msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
-msgstr ""
-"Ajouter des emails multiples (un par ligne ou séparés par \",\" or \";\")"
+msgstr "Ajouter des emails multiples (un par ligne ou séparés par \",\" or \";\")"
 
 #: views/user.py:181
 msgid "Workspace level role"
 msgstr "Rôle dans l'espace de travail"
 
 #: views/user.py:182
-msgid ""
-"This role will apply to every text in the workspace. To share only a (few) "
-"texts with this user, you can leave this blank and delegate roles on texts "
-"once the user is created."
-msgstr ""
-"Ce rôle s'appliquera à tous les textes dans l'espace de travail. Pour "
-"partager seulement quelques textes avec cet utilisateur, vous pouvez laisser "
-"ce champ vide et déléguer les rôles sur les textes une fois l'utilisateur "
-"créé."
+msgid "This role will apply to every text in the workspace. To share only a (few) texts with this user, you can leave this blank and delegate roles on texts once the user is created."
+msgstr "Ce rôle s'appliquera à tous les textes dans l'espace de travail. Pour partager seulement quelques textes avec cet utilisateur, vous pouvez laisser ce champ vide et déléguer les rôles sur les textes une fois l'utilisateur créé."
 
 #: views/user.py:198
 msgid "Text level role"
@@ -1598,7 +1602,8 @@
 msgid "This username is already in use. Please supply a different username."
 msgstr "Ce nom d'utilisateur est déjà utilisé. Merci d'en fournir un autre."
 
-#: views/user.py:320 views/user.py:336
+#: views/user.py:320
+#: views/user.py:336
 msgid "Your account has been activated. You're now logged-in."
 msgstr "Votre compte a été activé. Vous êtes maintenant connecté."
 
@@ -1665,53 +1670,38 @@
 
 #: views/user.py:519
 msgid "This account is suspended, contact the workspace administrator."
-msgstr ""
-"Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de "
-"travail."
+msgstr "Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de travail."
 
 #: views/user.py:550
 msgid "You've been logged out."
 msgstr "Vous êtes déconnecté."
 
 #: views/user.py:566
-msgid ""
-"You've been registered, you will receive a confirmation mail once a "
-"moderator has approved your membership."
-msgstr ""
-"Enregistrement réussi, vous recevrez un message de confirmation quand un "
-"gestionnaire de l'espace de travail aura activé votre compte."
+msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
+msgstr "Enregistrement réussi, vous recevrez un message de confirmation quand un gestionnaire de l'espace de travail aura activé votre compte."
 
 #: views/user.py:569
-msgid ""
-"You've been registered, please check your email for the confirm message."
+msgid "You've been registered, please check your email for the confirm message."
 msgstr "Enregistrement réussi, un message de confirmation vous a été envoyé"
 
 #~ msgid "Design"
 #~ msgstr "Design"
-
 #~ msgid "%(workspace_name)s's workspace"
 #~ msgstr "espace de travail : %(workspace_name)s"
-
 #~ msgid "Versions:"
 #~ msgstr "Versions :"
-
 #~ msgid "by %(v1name)s"
 #~ msgstr "par %(v1name)s"
-
 #~ msgid "created %(v1created)s"
 #~ msgstr "créé le %(v1created)s"
-
 #~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
 #~ msgstr "Différences entre les versions n°%(v1_nid)s et n°%(v2_nid)s :"
-
 #~ msgid "Version #%(version_number)s created on %(date)s"
 #~ msgstr "Version n°%(version_number)s créée le %(date)s :"
-
 #~ msgid "Contact from user: %(name)s / %(email)s"
 #~ msgstr "Contact de l'utilisateur %(name)s / %(email)s"
-
 #~ msgid "Your text \"%(title)s\" has been created."
 #~ msgstr "Votre texte \"%(title)s\" a été créé."
-
 #~ msgid "%(title)s"
 #~ msgstr "%(title)s"
+
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/django.po	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po	Fri Feb 12 15:54:48 2010 +0100
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 13:09+0100\n"
-"PO-Revision-Date: 2010-02-12 12:25+0100\n"
-"Last-Translator: Kirill Miazine <km@krot.org>\n"
-"Language-Team: <no@li.org>\n"
+"POT-Creation-Date: 2010-02-12 15:50+0100\n"
+"PO-Revision-Date: 2010-02-12 15:52+0100\n"
+"Last-Translator: dev <dev@sopinspace.com>\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"
@@ -18,11 +18,8 @@
 "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"
+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:134
 msgid "name is required"
@@ -48,7 +45,8 @@
 msgid "comment removed"
 msgstr "merknad slettet"
 
-#: client.py:209 client.py:274
+#: client.py:209
+#: client.py:274
 msgid "comment saved"
 msgstr "merknad lagret"
 
@@ -60,8 +58,11 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn."
 
-#: models.py:176 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:591
+#: models.py:176
+#: templates/site/text_history.html:79
+#: views/create.py:30
+#: views/create.py:45
+#: views/texts.py:591
 msgid "Title"
 msgstr "Overskrift"
 
@@ -69,15 +70,18 @@
 msgid "Format"
 msgstr "Format"
 
-#: models.py:178 views/texts.py:682
+#: models.py:178
+#: views/texts.py:682
 msgid "Content"
 msgstr "Innhold"
 
-#: models.py:179 models.py:637
+#: models.py:179
+#: models.py:637
 msgid "Tags"
 msgstr "Etiketter"
 
-#: models.py:181 views/user.py:223
+#: models.py:181
+#: views/user.py:223
 msgid "Note"
 msgstr "Kommentar"
 
@@ -189,7 +193,8 @@
 msgid "User %(username)s has activated his account"
 msgstr "Bruker %(username)s har aktivert kontoen"
 
-#: models.py:816 models.py:824
+#: models.py:816
+#: models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "av %(username)s"
@@ -239,7 +244,8 @@
 msgid "Spanish"
 msgstr "Spansk"
 
-#: static_i18n.py:6 static_i18n.py:11
+#: static_i18n.py:6
+#: static_i18n.py:11
 msgid "Observer"
 msgstr "Observatør"
 
@@ -351,7 +357,8 @@
 msgid "An error has occurred."
 msgstr "En feil har oppstått."
 
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
+#: templates/site/activate.html:10
+#: templates/site/user_activate.html:10
 #: views/user.py:330
 msgid "Activate your account"
 msgstr "Aktiver din konto"
@@ -360,7 +367,8 @@
 msgid "Activate"
 msgstr "Aktiver"
 
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6
+#: templates/site/layout/footer.html:9
 #: templates/site/macros/user_actions.html:20
 msgid "Contact"
 msgstr "Kontakt"
@@ -371,16 +379,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_design.html:29
+#: templates/site/settings.html:29
+#: templates/site/settings_design.html:29
 #: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/text_create_upload.html:42
+#: templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38
+#: templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29
+#: templates/site/user_mass_add.html:34
 #: templates/site/user_mass_add_text.html:38
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+#: templates/site/dashboard.html:12
+#: templates/site/macros/main_tabs.html:10
 msgid "Dashboard"
 msgstr "Kontrollpanell"
 
@@ -388,16 +401,20 @@
 msgid "Actions"
 msgstr "Handlinger"
 
-#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/dashboard.html:48
+#: templates/site/text_create_content.html:4
 #: templates/site/text_create_content.html:28
-#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/text_create_upload.html:26
+#: templates/site/text_list.html:40
 #: templates/site/layout/header.html:10
 msgid "Write a text"
 msgstr "Skriv tekst"
 
-#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/dashboard.html:49
+#: templates/site/text_create_content.html:30
 #: templates/site/text_create_upload.html:4
-#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/text_create_upload.html:28
+#: templates/site/text_list.html:42
 #: templates/site/layout/header.html:11
 msgid "Upload a text"
 msgstr "Last opp tekst"
@@ -427,11 +444,13 @@
 msgid "user %(user)s awaits approval"
 msgstr "bruker %(user)s venter på godkjenning"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "approve"
 msgstr "godkjenne"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "refuse"
 msgstr "nekte godkjenning"
 
@@ -441,14 +460,12 @@
 
 #: 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?"
+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?"
+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
@@ -456,7 +473,8 @@
 msgid "registered %(duration)s ago"
 msgstr "registrert for %(duration)s siden"
 
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:120
+#: templates/site/dashboard.html.py:126
 msgid "comment"
 msgstr "merknad"
 
@@ -481,7 +499,8 @@
 msgid "Are you sure you want to refuse this comment?"
 msgstr "Ønsker du å nekte å godkjenne denne merknaden?"
 
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168
+#: templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "endret for %(duration)s siden"
@@ -490,7 +509,8 @@
 msgid "Recent texts"
 msgstr "Nye tekster"
 
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186
+#: templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "alle"
 
@@ -501,7 +521,8 @@
 msgstr[0] "%(nb_comments)s merknad"
 msgstr[1] "%(nb_comments)s merknader"
 
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206
+#: templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Ingen tekster ennå"
 
@@ -525,8 +546,10 @@
 msgid "Access"
 msgstr "Tilgang"
 
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/dashboard.html:233
+#: templates/site/dashboard.html.py:244
+#: templates/site/text_list.html:206
+#: templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Laster..."
@@ -572,21 +595,26 @@
 msgid "No comments yet"
 msgstr "Ingen merknader ennå"
 
-#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/followup.html:7
+#: templates/site/macros/main_tabs.html:16
 #: templates/site/macros/text_tabs.html:22
 msgid "Followup"
 msgstr "Oppfølgning"
 
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: 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
+#: 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:27
+#: templates/site/followup.html:22
+#: templates/site/followup.html.py:35
+#: templates/site/help.html:6
+#: templates/site/text_embed.html:27
 #: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
@@ -600,7 +628,8 @@
 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
+#: templates/site/followup.html:35
+#: templates/site/text_followup.html:37
 msgid "Private feed"
 msgstr "Privat strøm"
 
@@ -609,19 +638,16 @@
 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."
+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
+#: 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
+#: templates/site/followup.html:49
+#: templates/site/text_followup.html:51
 msgid "Activate private feed"
 msgstr "Aktiver privat strøm"
 
@@ -629,7 +655,8 @@
 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
+#: templates/site/followup.html:55
+#: templates/site/text_followup.html:58
 msgid "Email notifications"
 msgstr "Epostvarsler"
 
@@ -638,12 +665,11 @@
 msgstr "Abonner på varsler for arbeidsområdet"
 
 #: templates/site/followup.html:62
-msgid ""
-"Subscribe to all replies notifications in discussions where you have "
-"participated"
+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/login.html:8
+#: templates/site/login_form.html:19
 #: templates/site/layout/header.html:17
 msgid "Login"
 msgstr "Logg inn"
@@ -653,7 +679,8 @@
 msgid "%(wname)s Login"
 msgstr "Innlogging til %(wname)s"
 
-#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/login_form.html:20
+#: templates/site/register.html:8
 #: templates/site/layout/header.html:18
 msgid "Register"
 msgstr "Registrer"
@@ -675,18 +702,23 @@
 msgstr "Stopp varsler"
 
 #: templates/site/notifications_desactivate.html:31
-msgid "Desactivate"
+msgid "Deactivate"
 msgstr "Stopp"
 
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile.html:6
+#: templates/site/profile.html.py:14
 #, python-format
 msgid "Your profile (%(username)s)"
 msgstr "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:36
-#: templates/site/text_settings.html:23 templates/site/text_share.html:153
-#: templates/site/user_activate.html:27 templates/site/user_list.html:210
+#: templates/site/profile.html:26
+#: templates/site/text_create_content.html:45
+#: templates/site/text_create_upload.html:40
+#: templates/site/text_edit.html:36
+#: templates/site/text_settings.html:23
+#: templates/site/text_share.html:153
+#: templates/site/user_activate.html:27
+#: templates/site/user_list.html:210
 #: templates/site/layout/base_workspace_form.html:32
 msgid "Save"
 msgstr "Lagre"
@@ -696,35 +728,37 @@
 msgid "%(wname)s Registration"
 msgstr "Registrering på %(wname)s"
 
-#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5
+#: templates/site/settings_design.html:5
+#: templates/site/text_list.html:181
+#: templates/site/macros/main_tabs.html:14
 #: templates/site/macros/text_tabs.html:19
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21
+#: templates/site/settings_design.html:21
 #, fuzzy
 msgid "General"
 msgstr "Generell"
 
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23
+#: templates/site/settings_design.html:23
 msgid "Appearance"
 msgstr ""
 
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
-msgid ""
-"Are you sure you want to change the role model? All roles (except managers) "
-"will be resetted!"
-msgstr ""
-"Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli "
-"nullstilt!"
+#: templates/site/settings.html:38
+#: templates/site/settings_design.html:40
+msgid "Are you sure you want to change the role model? All roles (except managers) will be resetted!"
+msgstr "Ønsker du å endre rollemodellen? Alle roller (untatt administrator) vil bli nullstilt!"
 
 #: templates/site/settings_design.html:31
 msgid "Delete logo"
 msgstr "Slett logo"
 
 #: templates/site/text_create_content.html:26
-#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+#: templates/site/text_create_upload.html:24
+#: templates/site/text_list.html:37
 msgid "Text list"
 msgstr "Tekster"
 
@@ -741,24 +775,16 @@
 msgstr "Kopier denne koden til din side for å vise tekst med merknader."
 
 #: templates/site/text_embed.html:26
-msgid ""
-"Users will also be able to add comments from your site depending on "
-"anonymous users' roles."
-msgstr ""
-"Avhengig av rettighetene til anonyme brukere, vil andre muligens også kunne "
-"kommentere teksten direkte fra din side."
+msgid "Users will also be able to add comments from your site depending on anonymous users' roles."
+msgstr "Avhengig av rettighetene til anonyme brukere, vil andre muligens også kunne kommentere teksten direkte fra din side."
 
 #: templates/site/text_embed.html:36
 msgid "Warning:"
 msgstr "Advarsel:"
 
 #: templates/site/text_embed.html:36
-msgid ""
-"You won't successfully embed the text before you give anonymous users a role "
-"allowing them to view the text."
-msgstr ""
-"Du vil ikke kunne integrere teksten før du har gitt anonyme brukere en "
-"rolle, som tillater dem å se teksten."
+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"
@@ -778,24 +804,16 @@
 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."
+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"
+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"
@@ -829,7 +847,8 @@
 msgid "Selection"
 msgstr "Tekstområde"
 
-#: templates/site/text_history.html:80 templates/site/text_list.html:137
+#: templates/site/text_history.html:80
+#: templates/site/text_list.html:137
 msgid "Author"
 msgstr "Forfatter"
 
@@ -837,11 +856,13 @@
 msgid "Created"
 msgstr "Opprettet"
 
-#: templates/site/text_history.html:82 templates/site/text_list.html:139
+#: templates/site/text_history.html:82
+#: templates/site/text_list.html:139
 msgid "# comments"
 msgstr "# merknader"
 
-#: templates/site/text_history.html:102 templates/site/text_list.html:159
+#: templates/site/text_history.html:102
+#: templates/site/text_list.html:159
 msgid "View"
 msgstr "Se"
 
@@ -854,7 +875,8 @@
 msgid "Revert to this version"
 msgstr "Still tilbake til denne versjonen"
 
-#: templates/site/text_history.html:105 templates/site/text_list.html:80
+#: templates/site/text_history.html:105
+#: templates/site/text_list.html:80
 #: templates/site/text_list.html.py:161
 msgid "Delete"
 msgstr "Slett"
@@ -872,10 +894,8 @@
 
 #: templates/site/text_history_compare.html:32
 #, python-format
-msgid ""
-"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
-msgstr ""
-"Sammenlikning mellom versjoner #%(version_1_number)s og #%(version_2_number)s"
+msgid "Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgstr "Sammenlikning mellom versjoner #%(version_1_number)s og #%(version_2_number)s"
 
 #: templates/site/text_history_compare.html:43
 msgid "No differences"
@@ -889,35 +909,44 @@
 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
+#: templates/site/text_list.html:47
+#: templates/site/text_share.html:35
+#: templates/site/user_list.html:7
+#: templates/site/user_list.html.py:32
+#: templates/site/user_list.html:40
+#: templates/site/user_list.html.py:116
 msgid "People' list"
 msgstr "Personer"
 
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html: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/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
+#: templates/site/text_list.html:79
+#: templates/site/user_list.html:72
 msgid "Bulk Actions"
 msgstr "Handlinger"
 
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:83
+#: templates/site/user_list.html:81
 msgid "Apply"
 msgstr "Utfør"
 
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html: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
+#: templates/site/text_list.html:136
+#: templates/site/macros/text_tabs.html:10
 msgid "Text"
 msgstr "Tekst"
 
@@ -925,7 +954,8 @@
 msgid "Modified"
 msgstr "Endret"
 
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:140
+#: templates/site/user_list.html:136
 msgid "Last week activity"
 msgstr "Aktivitet siste uke"
 
@@ -940,7 +970,8 @@
 msgid "Filter by tag: %(tag_name)s"
 msgstr "Filtrer etter etikett: %(tag_name)s"
 
-#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:160
+#: templates/site/macros/text_tabs.html:12
 #: templates/site/macros/user_actions.html:19
 msgid "Edit"
 msgstr "Rediger"
@@ -957,51 +988,58 @@
 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/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/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/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
+#: 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
+#: 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
+#: templates/site/text_share.html:86
+#: templates/site/user_list.html:132
 msgid "User"
 msgstr "Bruker"
 
 #: templates/site/text_share.html:87
-msgid ""
-"The 'Workspace role' is the global role that applies to every text, you can "
-"give a user a particular role on this text using the 'text role' column on "
-"the right"
-msgstr ""
-"Rollen 'Rolle for arbeidsområde' er en global rolle, som vil anvendes på "
-"alle tekster. Du kan gi en bruker en særskilt rolle for denne teksten ved å "
-"velge en passende rolle i kolonnen Tekstrolle til høyre."
+msgid "The 'Workspace role' is the global role that applies to every text, you can give a user a particular role on this text using the 'text role' column on the right"
+msgstr "Rollen 'Rolle for arbeidsområde' er en global rolle, som vil anvendes på alle tekster. Du kan gi en bruker en særskilt rolle for denne teksten ved å velge en passende rolle i kolonnen Tekstrolle til høyre."
 
 #: templates/site/text_share.html:87
 msgid "Workspace role"
@@ -1016,12 +1054,15 @@
 msgid "This role has been overriden on this text by a text role: %(rolename)s"
 msgstr "Denne rollen viker for en lokal rolle for teksten: %(rolename)s"
 
-#: templates/site/text_share.html:128 templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
+#: 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
+#: templates/site/text_share.html:128
+#: templates/site/user_list.html:177
 msgid "Anonymous users"
 msgstr "Anonyme brukere"
 
@@ -1063,19 +1104,17 @@
 "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."
+"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_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."
+msgstr "Du kan tilpasse eposten som skal sendes ved å bruke feltet 'Kommentar' nedenfor."
 
 #: templates/site/user_contact.html:6
 msgid "Contact user"
@@ -1086,16 +1125,19 @@
 msgid "Contact user %(username)s"
 msgstr "Kontakt bruker %(username)s"
 
-#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
 #, python-format
 msgid "Edit user %(username)s"
 msgstr "Endre bruker %(username)s"
 
-#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+#: templates/site/user_list.html:73
+#: templates/site/macros/user_actions.html:28
 msgid "Suspend access"
 msgstr "Sperr tilgang"
 
-#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+#: templates/site/user_list.html:74
+#: templates/site/macros/user_actions.html:23
 msgid "Enable access"
 msgstr "Åpne tilgang"
 
@@ -1104,7 +1146,8 @@
 msgid "Change role to %(role_name)s"
 msgstr "Endre rollen til %(role_name)s"
 
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133
+#: views/user.py:283
 msgid "Email"
 msgstr "Epostadresse"
 
@@ -1193,12 +1236,8 @@
 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?"
+msgid "You have attempted to leave this page. Unsaved changes will be lost. Are you sure you want to exit this page?"
+msgstr "Du har forsøkt å forlate denne siden. Endringer som ikke er lagret vil bli tapt. Ønsker du å forlate denne siden?"
 
 #: templates/site/macros/text_meta.html:6
 #, python-format
@@ -1271,8 +1310,7 @@
 msgstr "Last opp fil"
 
 #: views/create.py:27
-msgid ""
-"Upload a file from your computer instead of using the direct input above"
+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
@@ -1283,52 +1321,54 @@
 msgid "The title of your text"
 msgstr "Overskriften for din tekst"
 
-#: views/create.py:70 views/create.py:107
+#: views/create.py:70
+#: views/create.py:107
 #, python-format
 msgid "Text \"%(text_title)s\" has been created"
 msgstr "Teksten %(text_title)s har blitt opprettet"
 
-#: views/feeds.py:26
+#: views/feeds.py:25
 #, python-format
 msgid "%(workspace_name)s's public feed"
 msgstr "Offentlig strøm for %(workspace_name)s"
 
-#: views/feeds.py:27
+#: views/feeds.py:26
 #, python-format
 msgid "Workspace %(workspace_name)s public activity feed"
 msgstr "Offentlig strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
 
-#: views/feeds.py:37
+#: views/feeds.py:36
 #, python-format
 msgid "%(workspace_name)s's private feed"
 msgstr "Privat strøm for %(workspace_name)s"
 
-#: views/feeds.py:38
+#: views/feeds.py:37
 #, python-format
 msgid "Workspace %(workspace_name)s private feed"
 msgstr "Privat strøm for aktiviteter på arbeidsområdet %(workspace_name)s"
 
-#: views/feeds.py:73
+#: views/feeds.py:72
 #, python-format
 msgid "Text %(text_title)s's public feed"
 msgstr "Offentlig strøm for teksten %(text_title)s"
 
-#: views/feeds.py:74
+#: views/feeds.py:73
 #, python-format
 msgid "Public activity feed for text %(text_title)s"
 msgstr "Offentlig strøm for aktiviteter på teksten %(text_title)s"
 
-#: views/feeds.py:85
+#: views/feeds.py:84
 #, python-format
 msgid "Text %(text_title)s's private feed"
 msgstr "Privat strøm for teksten %(text_title)s"
 
-#: views/feeds.py:86
+#: views/feeds.py:85
 #, python-format
 msgid "Private activity feed for text %(text_title)s"
 msgstr "Privat strøm for aktiviteter på teksten %(text_title)s"
 
-#: views/followup.py:31 views/followup.py:80
+#: views/followup.py:31
+#: views/followup.py:80
 msgid "Private feed activated."
 msgstr "Privat strøm aktivert."
 
@@ -1337,11 +1377,11 @@
 msgstr "Privat strøm nullstilt."
 
 #: views/followup.py:52
-msgid "This notification has already been desactivated."
+msgid "This notification has already been deactivated."
 msgstr "Dette varselet har allerede blitt stoppet."
 
 #: views/followup.py:58
-msgid "Notification desactivated."
+msgid "Notification deactivated."
 msgstr "Varsel stoppet."
 
 #: views/followup.py:62
@@ -1352,7 +1392,9 @@
 msgid "Private notifications feed reseted."
 msgstr "Strøm for private varsler nullstilt."
 
-#: views/site.py:81 views/texts.py:129 views/user.py:525
+#: views/site.py:81
+#: views/texts.py:129
+#: views/user.py:525
 msgid "You're logged in!"
 msgstr "Du er logget inn!"
 
@@ -1382,8 +1424,7 @@
 
 #: 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."
+msgstr "Eposten er blitt sendt. Vi vil komme tilbake til deg så raskt som mulig."
 
 #: views/site.py:164
 msgid "Workspace name"
@@ -1398,23 +1439,16 @@
 msgstr "Registering på arbeidsområde"
 
 #: views/site.py:175
-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.)"
+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:179
 msgid "Workspace registration moderation"
 msgstr "Godkjenning av registreringer på arbeidsområde"
 
 #: views/site.py:180
-msgid ""
-"Should new users be moderated (registration will require manager's approval)?"
-msgstr ""
-"Skal nye brukere godkjennes (registrering vil kreve administratorens "
-"godkjenning)"
+msgid "Should new users be moderated (registration will require manager's approval)?"
+msgstr "Skal nye brukere godkjennes (registrering vil kreve administratorens godkjenning)"
 
 #: views/site.py:184
 msgid "Role model"
@@ -1424,7 +1458,10 @@
 msgid "Change the roles available in the workspace"
 msgstr "Endre roller i arbeidsområdet"
 
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:200
+#: views/site.py:206
+#: views/site.py:234
+#: views/site.py:243
 msgid "Settings saved"
 msgstr "Innstillinger lagret"
 
@@ -1438,9 +1475,7 @@
 msgstr "Rolle for arbeidsområde"
 
 #: views/site.py:217
-msgid ""
-"Add stylesheets etc. Warning: this code will be added to the workspace code, "
-"make sure you know what you're doing before adding something here."
+msgid "Add stylesheets etc. Warning: this code will be added to the workspace code, make sure you know what you're doing before adding something here."
 msgstr ""
 
 #: views/texts.py:162
@@ -1495,7 +1530,9 @@
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr "Ny versjon (kopiert fra versjon %(version_title)s) har blitt opprettet"
 
-#: views/texts.py:839 views/user.py:79 views/user.py:99
+#: views/texts.py:839
+#: 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"
@@ -1528,22 +1565,15 @@
 
 #: 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 ';')"
+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."
+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"
@@ -1572,10 +1602,10 @@
 
 #: views/user.py:299
 msgid "This username is already in use. Please supply a different username."
-msgstr ""
-"Dette brukernavnet er allerde registrert. Vennligst velg et annet brukernavn."
+msgstr "Dette brukernavnet er allerde registrert. Vennligst velg et annet brukernavn."
 
-#: views/user.py:320 views/user.py:336
+#: views/user.py:320
+#: views/user.py:336
 msgid "Your account has been activated. You're now logged-in."
 msgstr "Din brukerkonto er blitt aktivert. Du er nå logged inn."
 
@@ -1642,45 +1672,33 @@
 
 #: views/user.py:519
 msgid "This account is suspended, contact the workspace administrator."
-msgstr ""
-"Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
+msgstr "Denne kontoen er sperret, ta kontakt med administrator for arbeidsområdet."
 
 #: views/user.py:550
 msgid "You've been logged out."
 msgstr "Du er logget ut."
 
 #: views/user.py:566
-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."
+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:569
-msgid ""
-"You've been registered, please check your email for the confirm message."
+msgid "You've been registered, please check your email for the confirm message."
 msgstr "Du er blitt registert. Se din epost for en melding med bekreftelsen."
 
 #, fuzzy
 #~ msgid "Design"
 #~ msgstr "Versjon"
-
 #~ msgid "%(workspace_name)s's workspace"
 #~ msgstr "Arbeidsområde til %(workspace_name)s"
-
 #~ msgid "Versions:"
 #~ msgstr "Versjoner:"
-
 #~ msgid "by %(v1name)s"
 #~ msgstr "av %(v1name)s"
-
 #~ msgid "created %(v1created)s"
 #~ msgstr "opprettet %(v1created)s"
-
 #~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
 #~ msgstr "Forskjeller mellom versjon #%(v1_nid)s og versjon #%(v2_nid)s:"
-
 #~ msgid "Version #%(version_number)s created on %(date)s"
 #~ msgstr "Versjon #%(version_number)s opprettet %(date)s"
 
@@ -1691,9 +1709,8 @@
 #, fuzzy
 #~ msgid "Your text \"%(title)s\" has been created."
 #~ msgstr "Teksten %(text_title)s har blitt opprettet"
-
 #~ msgid "%(title)s"
 #~ msgstr "%(title)s"
-
 #~ msgid "Local role"
 #~ msgstr "Tekstrolle"
+
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Fri Feb 12 15:54:48 2010 +0100
@@ -1,22 +1,20 @@
 # COMT pt_BR translation
 # Paulo Rená da Silva Santarém <pbrss@yahoo.com.br>, 2010.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 13:08+0100\n"
-"PO-Revision-Date: 2010-01-23 12:00-0300\n"
-"Last-Translator: Paulo Rená da Silva Santarém <pbrss@yahoo.com.br>\n"
+"POT-Creation-Date: 2010-02-12 15:49+0100\n"
+"PO-Revision-Date: 2010-02-12 15:53+0100\n"
+"Last-Translator: dev <dev@sopinspace.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: client.py:25
-msgid ""
-"A selection is required. Select in the text the part your comment applies to."
+msgid "A selection is required. Select in the text the part your comment applies to."
 msgstr "Favor selecionar no texto o trecho ao qual se refere o seu comentário."
 
 #: client.py:134
@@ -43,7 +41,8 @@
 msgid "comment removed"
 msgstr "Conteúdo removido"
 
-#: client.py:209 client.py:274
+#: client.py:209
+#: client.py:274
 msgid "comment saved"
 msgstr "comentário salvo"
 
@@ -55,8 +54,11 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "Palavras-chave não pode exceder 250 caracteres."
 
-#: models.py:176 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:591
+#: models.py:176
+#: templates/site/text_history.html:79
+#: views/create.py:30
+#: views/create.py:45
+#: views/texts.py:591
 msgid "Title"
 msgstr "Título"
 
@@ -64,15 +66,18 @@
 msgid "Format"
 msgstr "Formatar"
 
-#: models.py:178 views/texts.py:682
+#: models.py:178
+#: views/texts.py:682
 msgid "Content"
 msgstr "Conteúdo"
 
-#: models.py:179 models.py:637
+#: models.py:179
+#: models.py:637
 msgid "Tags"
 msgstr "Palavras-chave"
 
-#: models.py:181 views/user.py:223
+#: models.py:181
+#: views/user.py:223
 msgid "Note"
 msgstr "Observação"
 
@@ -184,7 +189,8 @@
 msgid "User %(username)s has activated his account"
 msgstr "O usuário %(username)s ativou sua conta"
 
-#: models.py:816 models.py:824
+#: models.py:816
+#: models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "por \"%(username)s\""
@@ -234,7 +240,8 @@
 msgid "Spanish"
 msgstr ""
 
-#: static_i18n.py:6 static_i18n.py:11
+#: static_i18n.py:6
+#: static_i18n.py:11
 msgid "Observer"
 msgstr "Observador"
 
@@ -346,7 +353,8 @@
 msgid "An error has occurred."
 msgstr "Ocorreu um erro."
 
-#: templates/site/activate.html:10 templates/site/user_activate.html:10
+#: templates/site/activate.html:10
+#: templates/site/user_activate.html:10
 #: views/user.py:330
 msgid "Activate your account"
 msgstr "Ativar sua conta"
@@ -355,7 +363,8 @@
 msgid "Activate"
 msgstr "Ativar"
 
-#: templates/site/contact.html:6 templates/site/layout/footer.html:9
+#: templates/site/contact.html:6
+#: templates/site/layout/footer.html:9
 #: templates/site/macros/user_actions.html:20
 msgid "Contact"
 msgstr "Contato"
@@ -366,16 +375,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:29 templates/site/settings_design.html:29
+#: templates/site/settings.html:29
+#: templates/site/settings_design.html:29
 #: templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/text_create_upload.html:42
+#: templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38
+#: templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29
+#: templates/site/user_mass_add.html:34
 #: templates/site/user_mass_add_text.html:38
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
+#: templates/site/dashboard.html:12
+#: templates/site/macros/main_tabs.html:10
 msgid "Dashboard"
 msgstr "Painel"
 
@@ -383,16 +397,20 @@
 msgid "Actions"
 msgstr "Ações"
 
-#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
+#: templates/site/dashboard.html:48
+#: templates/site/text_create_content.html:4
 #: templates/site/text_create_content.html:28
-#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
+#: templates/site/text_create_upload.html:26
+#: templates/site/text_list.html:40
 #: templates/site/layout/header.html:10
 msgid "Write a text"
 msgstr "Escrever um texto"
 
-#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
+#: templates/site/dashboard.html:49
+#: templates/site/text_create_content.html:30
 #: templates/site/text_create_upload.html:4
-#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
+#: templates/site/text_create_upload.html:28
+#: templates/site/text_list.html:42
 #: templates/site/layout/header.html:11
 msgid "Upload a text"
 msgstr "Carregar um texto"
@@ -422,11 +440,13 @@
 msgid "user %(user)s awaits approval"
 msgstr "usuário %(user)s aguarda aprovação"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "approve"
 msgstr "aprovar"
 
-#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80
+#: templates/site/dashboard.html.py:126
 msgid "refuse"
 msgstr "rejeitar"
 
@@ -436,14 +456,12 @@
 
 #: 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?"
+msgid "Are you sure you want to approve this user's membership to the workspace?"
 msgstr "Confirmar aprovação da participação do usuário na área de trabalho?"
 
 #: templates/site/dashboard.html:94
 #: templates/site/macros/user_moderation.html:17
-msgid ""
-"Are you sure you want to refuse this user's membership to the workspace?"
+msgid "Are you sure you want to refuse this user's membership to the workspace?"
 msgstr "Confirmar rejeição da participação do usuário na área de trabalho?"
 
 #: templates/site/dashboard.html:106
@@ -451,7 +469,8 @@
 msgid "registered %(duration)s ago"
 msgstr "inscrito há %(duration)s"
 
-#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:120
+#: templates/site/dashboard.html.py:126
 msgid "comment"
 msgstr "comentar"
 
@@ -476,7 +495,8 @@
 msgid "Are you sure you want to refuse this comment?"
 msgstr "Confirmar rejeição desse comentário?"
 
-#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168
+#: templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "modificado há %(duration)s"
@@ -485,7 +505,8 @@
 msgid "Recent texts"
 msgstr "Textos recentes"
 
-#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186
+#: templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "todos"
 
@@ -496,7 +517,8 @@
 msgstr[0] "%(nb_comments)s commentário"
 msgstr[1] "%(nb_comments)s commentárioss"
 
-#: templates/site/dashboard.html:206 templates/site/text_list.html:221
+#: templates/site/dashboard.html:206
+#: templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Sem textos ainda"
 
@@ -520,8 +542,10 @@
 msgid "Access"
 msgstr "Acessar"
 
-#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
-#: templates/site/text_list.html:206 templates/site/user_list.html:158
+#: templates/site/dashboard.html:233
+#: templates/site/dashboard.html.py:244
+#: templates/site/text_list.html:206
+#: templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Carregando"
@@ -567,21 +591,26 @@
 msgid "No comments yet"
 msgstr "Sem comentários ainda"
 
-#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
+#: templates/site/followup.html:7
+#: templates/site/macros/main_tabs.html:16
 #: templates/site/macros/text_tabs.html:22
 msgid "Followup"
 msgstr "Acompanhamento"
 
-#: templates/site/followup.html:20 templates/site/text_followup.html:22
+#: templates/site/followup.html:20
+#: templates/site/text_followup.html:22
 msgid "Feeds"
 msgstr "Feeds"
 
-#: templates/site/followup.html:22 templates/site/text_followup.html:24
+#: templates/site/followup.html:22
+#: templates/site/text_followup.html:24
 msgid "Public feed"
 msgstr "Feed público"
 
-#: templates/site/followup.html:22 templates/site/followup.html.py:35
-#: templates/site/help.html:6 templates/site/text_embed.html:27
+#: templates/site/followup.html:22
+#: templates/site/followup.html.py:35
+#: templates/site/help.html:6
+#: templates/site/text_embed.html:27
 #: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
@@ -595,7 +624,8 @@
 msgid "This is the public feed for the workspace."
 msgstr "Essa é o feed público para a área de trabalho"
 
-#: templates/site/followup.html:35 templates/site/text_followup.html:37
+#: templates/site/followup.html:35
+#: templates/site/text_followup.html:37
 msgid "Private feed"
 msgstr "Feed privado"
 
@@ -604,19 +634,16 @@
 msgstr "Feed privado para a área de trabalho"
 
 #: 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 ""
-"Essa é o feed privado para a área de trabalho. Não compartilhe esse endereço "
-"com outros a menos que você deseje que eles vejam todas as atividades nessa "
-"área de trabalho."
+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 "Essa é o feed privado para a área de trabalho. Não compartilhe esse endereço com outros a menos que você deseje que eles vejam todas as atividades nessa área de trabalho."
 
-#: templates/site/followup.html:45 templates/site/text_followup.html:47
+#: templates/site/followup.html:45
+#: templates/site/text_followup.html:47
 msgid "Reset private feed url"
 msgstr "Restabelecer endereço do feed privado"
 
-#: templates/site/followup.html:49 templates/site/text_followup.html:51
+#: templates/site/followup.html:49
+#: templates/site/text_followup.html:51
 msgid "Activate private feed"
 msgstr "Ativar feed privado"
 
@@ -624,7 +651,8 @@
 msgid "The private feed for this workspace is not yet activated."
 msgstr "O feed privado para essa área de trabalho ainda não foi ativado."
 
-#: templates/site/followup.html:55 templates/site/text_followup.html:58
+#: templates/site/followup.html:55
+#: templates/site/text_followup.html:58
 msgid "Email notifications"
 msgstr "Aviso de email"
 
@@ -633,13 +661,11 @@
 msgstr "Receber avisos da área de trabalho"
 
 #: templates/site/followup.html:62
-msgid ""
-"Subscribe to all replies notifications in discussions where you have "
-"participated"
-msgstr ""
-"Receber todas os avisos de resposta em discussões nas quais você participou"
+msgid "Subscribe to all replies notifications in discussions where you have participated"
+msgstr "Receber todas os avisos de resposta em discussões nas quais você participou"
 
-#: templates/site/login.html:8 templates/site/login_form.html:19
+#: templates/site/login.html:8
+#: templates/site/login_form.html:19
 #: templates/site/layout/header.html:17
 msgid "Login"
 msgstr "Entrar"
@@ -649,7 +675,8 @@
 msgid "%(wname)s Login"
 msgstr "%(wname)s Entrar"
 
-#: templates/site/login_form.html:20 templates/site/register.html:8
+#: templates/site/login_form.html:20
+#: templates/site/register.html:8
 #: templates/site/layout/header.html:18
 msgid "Register"
 msgstr "Inscrever-se"
@@ -671,18 +698,23 @@
 msgstr "Desativar notificação"
 
 #: templates/site/notifications_desactivate.html:31
-msgid "Desactivate"
+msgid "Deactivate"
 msgstr "Desativar"
 
-#: templates/site/profile.html:6 templates/site/profile.html.py:14
+#: templates/site/profile.html:6
+#: templates/site/profile.html.py:14
 #, python-format
 msgid "Your profile (%(username)s)"
 msgstr "Seu perfil (%(username)s)"
 
-#: templates/site/profile.html:26 templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
-#: templates/site/text_settings.html:23 templates/site/text_share.html:153
-#: templates/site/user_activate.html:27 templates/site/user_list.html:210
+#: templates/site/profile.html:26
+#: templates/site/text_create_content.html:45
+#: templates/site/text_create_upload.html:40
+#: templates/site/text_edit.html:36
+#: templates/site/text_settings.html:23
+#: templates/site/text_share.html:153
+#: templates/site/user_activate.html:27
+#: templates/site/user_list.html:210
 #: templates/site/layout/base_workspace_form.html:32
 msgid "Save"
 msgstr "Salvar"
@@ -692,25 +724,28 @@
 msgid "%(wname)s Registration"
 msgstr "%(wname)s Inscrição"
 
-#: templates/site/settings.html:5 templates/site/settings_design.html:5
-#: templates/site/text_list.html:181 templates/site/macros/main_tabs.html:14
+#: templates/site/settings.html:5
+#: templates/site/settings_design.html:5
+#: templates/site/text_list.html:181
+#: templates/site/macros/main_tabs.html:14
 #: templates/site/macros/text_tabs.html:19
 msgid "Settings"
 msgstr "Configurações"
 
-#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#: templates/site/settings.html:21
+#: templates/site/settings_design.html:21
 #, fuzzy
 msgid "General"
 msgstr "Genérico"
 
-#: templates/site/settings.html:23 templates/site/settings_design.html:23
+#: templates/site/settings.html:23
+#: templates/site/settings_design.html:23
 msgid "Appearance"
 msgstr ""
 
-#: templates/site/settings.html:38 templates/site/settings_design.html:40
-msgid ""
-"Are you sure you want to change the role model? All roles (except managers) "
-"will be resetted!"
+#: templates/site/settings.html:38
+#: templates/site/settings_design.html:40
+msgid "Are you sure you want to change the role model? All roles (except managers) will be resetted!"
 msgstr "Confirmar alteração de "
 
 #: templates/site/settings_design.html:31
@@ -719,7 +754,8 @@
 msgstr "Apagar"
 
 #: templates/site/text_create_content.html:26
-#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
+#: templates/site/text_create_upload.html:24
+#: templates/site/text_list.html:37
 msgid "Text list"
 msgstr "Lista de textos"
 
@@ -737,25 +773,16 @@
 
 #: templates/site/text_embed.html:26
 #, fuzzy
-msgid ""
-"Users will also be able to add comments from your site depending on "
-"anonymous users' roles."
-msgstr ""
-"Copiar esse código para o seu site para exibir o texto com comentários. "
-"Usuários poderão adicionar comentários pelo seu site de acordo com as "
-"funções de um usuário anônimo."
+msgid "Users will also be able to add comments from your site depending on anonymous users' roles."
+msgstr "Copiar esse código para o seu site para exibir o texto com comentários. Usuários poderão adicionar comentários pelo seu site de acordo com as funções de um usuário anônimo."
 
 #: templates/site/text_embed.html:36
 msgid "Warning:"
 msgstr "Atenção:"
 
 #: templates/site/text_embed.html:36
-msgid ""
-"You won't successfully embed the text before you give anonymous users a role "
-"allowing them to view the text."
-msgstr ""
-"Você não embutirá devidamente o texto antes de conceder aos usuários "
-"anonimos uma função que lhes permita ver o texto."
+msgid "You won't successfully embed the text before you give anonymous users a role allowing them to view the text."
+msgstr "Você não embutirá devidamente o texto antes de conceder aos usuários anonimos uma função que lhes permita ver o texto."
 
 #: templates/site/text_followup.html:7
 msgid "Text followup"
@@ -775,24 +802,16 @@
 msgstr "Feed privado para o texto"
 
 #: 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 ""
-"Esse é o feed privado para o texto. Não compartilhe esse endereço com outros "
-"a menos que você deseje que eles vejam todas as atividades nesse texto."
+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 "Esse é o feed privado para o texto. Não compartilhe esse endereço com outros a menos que você deseje que eles vejam todas as atividades nesse texto."
 
 #: templates/site/text_followup.html:53
 msgid "The private feed for this text is not yet activated."
 msgstr "Esse feed privado para o texto ainda não foi ativada."
 
 #: templates/site/text_followup.html:61
-msgid ""
-"You will receive text notifications because you subscribed to notifications "
-"at the workspace level"
-msgstr ""
-"Você receberá avisos de texto porque optou por receber avisos da área de "
-"trabalho."
+msgid "You will receive text notifications because you subscribed to notifications at the workspace level"
+msgstr "Você receberá avisos de texto porque optou por receber avisos da área de trabalho."
 
 #: templates/site/text_followup.html:64
 msgid "Subscribe to all text notifications"
@@ -829,7 +848,8 @@
 msgid "Selection"
 msgstr "Ações"
 
-#: templates/site/text_history.html:80 templates/site/text_list.html:137
+#: templates/site/text_history.html:80
+#: templates/site/text_list.html:137
 msgid "Author"
 msgstr "Autor"
 
@@ -837,12 +857,14 @@
 msgid "Created"
 msgstr ""
 
-#: templates/site/text_history.html:82 templates/site/text_list.html:139
+#: templates/site/text_history.html:82
+#: templates/site/text_list.html:139
 #, fuzzy
 msgid "# comments"
 msgstr "comentários"
 
-#: templates/site/text_history.html:102 templates/site/text_list.html:159
+#: templates/site/text_history.html:102
+#: templates/site/text_list.html:159
 msgid "View"
 msgstr "Ver"
 
@@ -856,7 +878,8 @@
 msgid "Revert to this version"
 msgstr "Reverter para a versão #%(v1_nid)s"
 
-#: templates/site/text_history.html:105 templates/site/text_list.html:80
+#: templates/site/text_history.html:105
+#: templates/site/text_list.html:80
 #: templates/site/text_list.html.py:161
 msgid "Delete"
 msgstr "Apagar"
@@ -875,8 +898,7 @@
 
 #: templates/site/text_history_compare.html:32
 #, fuzzy, python-format
-msgid ""
-"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgid "Comparison between version #%(version_1_number)s and #%(version_2_number)s"
 msgstr "diferenças entre a versão #%(v1number)s e a versão #%(v2number)s"
 
 #: templates/site/text_history_compare.html:43
@@ -891,35 +913,44 @@
 msgid "Texts"
 msgstr "Textos"
 
-#: templates/site/text_list.html:47 templates/site/text_share.html:35
-#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
+#: templates/site/text_list.html:47
+#: templates/site/text_share.html:35
+#: templates/site/user_list.html:7
+#: templates/site/user_list.html.py:32
+#: templates/site/user_list.html:40
+#: templates/site/user_list.html.py:116
 msgid "People' list"
 msgstr "Lista de pessoas"
 
-#: templates/site/text_list.html:50 templates/site/text_share.html:40
+#: templates/site/text_list.html:50
+#: templates/site/text_share.html:40
 #: templates/site/user_list.html:45
 msgid "Filter by tag:"
 msgstr "Filtrar por palavra-chave:"
 
-#: templates/site/text_list.html:52 templates/site/text_share.html:42
+#: templates/site/text_list.html:52
+#: templates/site/text_share.html:42
 #: templates/site/user_list.html:47
 msgid "All"
 msgstr "Todas"
 
-#: templates/site/text_list.html:79 templates/site/user_list.html:72
+#: templates/site/text_list.html:79
+#: templates/site/user_list.html:72
 msgid "Bulk Actions"
 msgstr "Ações em massa"
 
-#: templates/site/text_list.html:83 templates/site/user_list.html:81
+#: templates/site/text_list.html:83
+#: templates/site/user_list.html:81
 msgid "Apply"
 msgstr "Aplicar"
 
-#: templates/site/text_list.html:104 templates/site/user_list.html:102
+#: templates/site/text_list.html:104
+#: templates/site/user_list.html:102
 msgid "Are you sure?"
 msgstr "Confirma?"
 
-#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:136
+#: templates/site/macros/text_tabs.html:10
 msgid "Text"
 msgstr "Texto"
 
@@ -927,7 +958,8 @@
 msgid "Modified"
 msgstr "Modificar"
 
-#: templates/site/text_list.html:140 templates/site/user_list.html:136
+#: templates/site/text_list.html:140
+#: templates/site/user_list.html:136
 msgid "Last week activity"
 msgstr "Atividade da última semana"
 
@@ -942,7 +974,8 @@
 msgid "Filter by tag: %(tag_name)s"
 msgstr "Filtrar por palavra chave: %(tag_name)s"
 
-#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:160
+#: templates/site/macros/text_tabs.html:12
 #: templates/site/macros/user_actions.html:19
 msgid "Edit"
 msgstr "Editar"
@@ -959,51 +992,58 @@
 msgid "Edit user"
 msgstr "Editar usuários"
 
-#: templates/site/text_share.html:27 templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
+#: templates/site/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 "Lista de usuários"
 
-#: templates/site/text_share.html:29 templates/site/user_add.html:6
-#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
-#: templates/site/user_edit.html:22 templates/site/user_list.html:34
+#: templates/site/text_share.html:29
+#: templates/site/user_add.html:6
+#: templates/site/user_add.html.py:22
+#: templates/site/user_add_text.html:6
+#: templates/site/user_add_text.html:25
+#: templates/site/user_contact.html:19
+#: templates/site/user_edit.html:22
+#: templates/site/user_list.html:34
 #: templates/site/user_mass_add.html:22
 #: templates/site/user_mass_add_text.html:6
 #: templates/site/user_mass_add_text.html:25
 msgid "Add a new user"
 msgstr "Adicionar um novo usuários"
 
-#: templates/site/text_share.html:31 templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
+#: templates/site/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 "Adicionar usuários em massa"
 
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
+#: templates/site/text_share.html:38
+#: templates/site/user_list.html:43
 msgid "Hide suspended users"
 msgstr "Ocultar usuários suspensos"
 
-#: templates/site/text_share.html:38 templates/site/user_list.html:43
+#: templates/site/text_share.html:38
+#: templates/site/user_list.html:43
 msgid "Display suspended users"
 msgstr "Mostrar usuários suspensos"
 
-#: templates/site/text_share.html:86 templates/site/user_list.html:132
+#: templates/site/text_share.html:86
+#: templates/site/user_list.html:132
 msgid "User"
 msgstr "Usuário"
 
 #: templates/site/text_share.html:87
-msgid ""
-"The 'Workspace role' is the global role that applies to every text, you can "
-"give a user a particular role on this text using the 'text role' column on "
-"the right"
-msgstr ""
-"A \"função da área de trabalho\" é a função global que se aplica a todos os "
-"textos. Você pode atribuir a um usuário uma função particular usando a "
-"coluna \"função do texto\" à direita"
+msgid "The 'Workspace role' is the global role that applies to every text, you can give a user a particular role on this text using the 'text role' column on the right"
+msgstr "A \"função da área de trabalho\" é a função global que se aplica a todos os textos. Você pode atribuir a um usuário uma função particular usando a coluna \"função do texto\" à direita"
 
 #: templates/site/text_share.html:87
 msgid "Workspace role"
@@ -1018,12 +1058,15 @@
 msgid "This role has been overriden on this text by a text role: %(rolename)s"
 msgstr "Essa função foi sobreposta no texto pela função do texto: %(rolename)s"
 
-#: templates/site/text_share.html:128 templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
+#: templates/site/text_share.html:128
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
+#: templates/site/user_list.html:177
 msgid "Edit anonymous users"
 msgstr "Editar usuários anônimos"
 
-#: templates/site/text_share.html:128 templates/site/user_list.html:177
+#: templates/site/text_share.html:128
+#: templates/site/user_list.html:177
 msgid "Anonymous users"
 msgstr "Usuários anônimos"
 
@@ -1069,14 +1112,13 @@
 
 #: templates/site/user_add_text.html:29
 msgid "The user will receive an email invitation to join the workspace."
-msgstr ""
-"Esse usuário receberá um convite por email para entrar na área de trabalho."
+msgstr "Esse usuário receberá um convite por email para entrar na área de trabalho."
 
-#: templates/site/user_add_text.html:30 templates/site/user_mass_add.html:27
+#: templates/site/user_add_text.html:30
+#: templates/site/user_mass_add.html:27
 #: templates/site/user_mass_add_text.html:30
 msgid "You can customize the email sent by using the 'Note' field bellow."
-msgstr ""
-"Você pode personalizar o email enviado usando o campo \"Observação\" abaixo."
+msgstr "Você pode personalizar o email enviado usando o campo \"Observação\" abaixo."
 
 #: templates/site/user_contact.html:6
 msgid "Contact user"
@@ -1087,16 +1129,19 @@
 msgid "Contact user %(username)s"
 msgstr "Contatar usuário %(username)s"
 
-#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
+#: templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24
 #, python-format
 msgid "Edit user %(username)s"
 msgstr "Editar usuário %(username)s"
 
-#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
+#: templates/site/user_list.html:73
+#: templates/site/macros/user_actions.html:28
 msgid "Suspend access"
 msgstr "Suspender acesso"
 
-#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
+#: templates/site/user_list.html:74
+#: templates/site/macros/user_actions.html:23
 msgid "Enable access"
 msgstr "Permitir acesso"
 
@@ -1105,7 +1150,8 @@
 msgid "Change role to %(role_name)s"
 msgstr "Alterar a função para %(role_name)s"
 
-#: templates/site/user_list.html:133 views/user.py:283
+#: templates/site/user_list.html:133
+#: views/user.py:283
 msgid "Email"
 msgstr "Email"
 
@@ -1120,8 +1166,7 @@
 #: templates/site/user_mass_add.html:26
 #: templates/site/user_mass_add_text.html:29
 msgid "The users will receive an email invitation to join the workspace."
-msgstr ""
-"Os usuários receberão um convite por email para entrar na área de trabalho."
+msgstr "Os usuários receberão um convite por email para entrar na área de trabalho."
 
 #: templates/site/layout/base_text.html:16
 #: templates/site/layout/base_workspace.html:20
@@ -1196,12 +1241,8 @@
 msgstr "por %(name)s em %(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 ""
-"Você tentou sair dessa página. Alterações não salvas serão perdidas. "
-"Confirmar?"
+msgid "You have attempted to leave this page. Unsaved changes will be lost. Are you sure you want to exit this page?"
+msgstr "Você tentou sair dessa página. Alterações não salvas serão perdidas. Confirmar?"
 
 #: templates/site/macros/text_meta.html:6
 #, fuzzy, python-format
@@ -1275,10 +1316,8 @@
 msgstr "Carregar arquivo (opcional)"
 
 #: views/create.py:27
-msgid ""
-"Upload a file from your computer instead of using the direct input above"
-msgstr ""
-"Carregar arquivo do seu computador em vez de usar a inclusão direta acima"
+msgid "Upload a file from your computer instead of using the direct input above"
+msgstr "Carregar arquivo do seu computador em vez de usar a inclusão direta acima"
 
 #: views/create.py:38
 msgid "You should specify a file to upload."
@@ -1288,52 +1327,54 @@
 msgid "The title of your text"
 msgstr "O título do seu texto"
 
-#: views/create.py:70 views/create.py:107
+#: views/create.py:70
+#: views/create.py:107
 #, python-format
 msgid "Text \"%(text_title)s\" has been created"
 msgstr "O texto \"%(text_title)s\" foi criado"
 
-#: views/feeds.py:26
+#: views/feeds.py:25
 #, python-format
 msgid "%(workspace_name)s's public feed"
 msgstr "Feed público de %(workspace_name)s"
 
-#: views/feeds.py:27
+#: views/feeds.py:26
 #, python-format
 msgid "Workspace %(workspace_name)s public activity feed"
 msgstr "Feed público das atividades da área de trabalho %(workspace_name)s"
 
-#: views/feeds.py:37
+#: views/feeds.py:36
 #, python-format
 msgid "%(workspace_name)s's private feed"
 msgstr "Feed privado de %(workspace_name)s"
 
-#: views/feeds.py:38
+#: views/feeds.py:37
 #, python-format
 msgid "Workspace %(workspace_name)s private feed"
 msgstr "Feed privado da área de trabalho %(workspace_name)s"
 
-#: views/feeds.py:73
+#: views/feeds.py:72
 #, python-format
 msgid "Text %(text_title)s's public feed"
 msgstr "Feed público do texto %(text_title)s"
 
-#: views/feeds.py:74
+#: views/feeds.py:73
 #, python-format
 msgid "Public activity feed for text %(text_title)s"
 msgstr "Feed público das atividades do texto %(text_title)s"
 
-#: views/feeds.py:85
+#: views/feeds.py:84
 #, python-format
 msgid "Text %(text_title)s's private feed"
 msgstr "Feed privado do texto %(text_title)s"
 
-#: views/feeds.py:86
+#: views/feeds.py:85
 #, python-format
 msgid "Private activity feed for text %(text_title)s"
 msgstr "Feed privado das atividades do texto %(text_title)s"
 
-#: views/followup.py:31 views/followup.py:80
+#: views/followup.py:31
+#: views/followup.py:80
 msgid "Private feed activated."
 msgstr "Feed privado ativado."
 
@@ -1342,11 +1383,11 @@
 msgstr "Feed privado restabelecido."
 
 #: views/followup.py:52
-msgid "This notification has already been desactivated."
+msgid "This notification has already been deactivated."
 msgstr "Esse aviso já foi desativado."
 
 #: views/followup.py:58
-msgid "Notification desactivated."
+msgid "Notification deactivated."
 msgstr "Aviso desativado."
 
 #: views/followup.py:62
@@ -1357,7 +1398,9 @@
 msgid "Private notifications feed reseted."
 msgstr "Feed privado de avisos restabelecido."
 
-#: views/site.py:81 views/texts.py:129 views/user.py:525
+#: views/site.py:81
+#: views/texts.py:129
+#: views/user.py:525
 msgid "You're logged in!"
 msgstr "Você entrou!"
 
@@ -1402,12 +1445,8 @@
 msgstr "Registro da área de trabalho"
 
 #: views/site.py:175
-msgid ""
-"Can users register themselves into the workspace? (if not, only invitations "
-"by managers can create new users)"
-msgstr ""
-"Usuários podem se inscrever na área de trabalho? (se não, apenas convites "
-"por gerentes podem criar novos usuários)"
+msgid "Can users register themselves into the workspace? (if not, only invitations by managers can create new users)"
+msgstr "Usuários podem se inscrever na área de trabalho? (se não, apenas convites por gerentes podem criar novos usuários)"
 
 #: views/site.py:179
 msgid "Workspace registration moderation"
@@ -1415,10 +1454,8 @@
 
 #: views/site.py:180
 #, fuzzy
-msgid ""
-"Should new users be moderated (registration will require manager's approval)?"
-msgstr ""
-"Novos usuários devem ser moderados? (registro exigirá aprovação de gerente) "
+msgid "Should new users be moderated (registration will require manager's approval)?"
+msgstr "Novos usuários devem ser moderados? (registro exigirá aprovação de gerente) "
 
 #: views/site.py:184
 msgid "Role model"
@@ -1428,7 +1465,10 @@
 msgid "Change the roles available in the workspace"
 msgstr "Alterar as funções disponível na área de trabalho"
 
-#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
+#: views/site.py:200
+#: views/site.py:206
+#: views/site.py:234
+#: views/site.py:243
 msgid "Settings saved"
 msgstr "Configurações salvas"
 
@@ -1443,9 +1483,7 @@
 msgstr "Função da área de trabalho"
 
 #: views/site.py:217
-msgid ""
-"Add stylesheets etc. Warning: this code will be added to the workspace code, "
-"make sure you know what you're doing before adding something here."
+msgid "Add stylesheets etc. Warning: this code will be added to the workspace code, make sure you know what you're doing before adding something here."
 msgstr ""
 
 #: views/texts.py:162
@@ -1500,7 +1538,9 @@
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr "Uma mova versão (copiada da versão %(version_id)s) foi criada"
 
-#: views/texts.py:839 views/user.py:79 views/user.py:99
+#: views/texts.py:839
+#: views/user.py:79
+#: views/user.py:99
 #, python-format
 msgid "%(count)i user(s) role modified"
 msgstr "%(count)i função do(s) usuário(s) modificada"
@@ -1533,22 +1573,15 @@
 
 #: views/user.py:164
 msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
-msgstr ""
-"Adicionar múltiplos emails um por linha (ou separados por \",\" or \";\")"
+msgstr "Adicionar múltiplos emails um por linha (ou separados por \",\" or \";\")"
 
 #: views/user.py:181
 msgid "Workspace level role"
 msgstr "Função da Área de trabalho"
 
 #: 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 ""
-"Essa função se aplicará a todos textos na área de trabalho. Para "
-"compartilhar apenas um ou mais textos com esse usuários, deixe esse espaço "
-"em branco e delegue funções nos textos após criar o usuário."
+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 "Essa função se aplicará a todos textos na área de trabalho. Para compartilhar apenas um ou mais textos com esse usuários, deixe esse espaço em branco e delegue funções nos textos após criar o usuário."
 
 #: views/user.py:198
 msgid "Text level role"
@@ -1577,11 +1610,10 @@
 
 #: views/user.py:299
 msgid "This username is already in use. Please supply a different username."
-msgstr ""
-"Esse nome de usuário já está em uso. Por favor tente um nome de usuário "
-"diferente."
+msgstr "Esse nome de usuário já está em uso. Por favor tente um nome de usuário diferente."
 
-#: views/user.py:320 views/user.py:336
+#: views/user.py:320
+#: views/user.py:336
 msgid "Your account has been activated. You're now logged-in."
 msgstr "Sua conta foi ativada. Você entrou."
 
@@ -1648,56 +1680,41 @@
 
 #: views/user.py:519
 msgid "This account is suspended, contact the workspace administrator."
-msgstr ""
-"Essa conta estpa suspensa, entre em contato com o administrador da área de "
-"trabalho."
+msgstr "Essa conta estpa suspensa, entre em contato com o administrador da área de trabalho."
 
 #: views/user.py:550
 msgid "You've been logged out."
 msgstr "Você saiu."
 
 #: views/user.py:566
-msgid ""
-"You've been registered, you will receive a confirmation mail once a "
-"moderator has approved your membership."
-msgstr ""
-"Você se inscreveu. Você receberá um email de confirmação quando o moderador "
-"aprovar sua participação."
+msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
+msgstr "Você se inscreveu. Você receberá um email de confirmação quando o moderador aprovar sua participação."
 
 #: views/user.py:569
-msgid ""
-"You've been registered, please check your email for the confirm message."
-msgstr ""
-"Você se inscreveu. Favor verifique em seu email a mensagem de confirmação."
+msgid "You've been registered, please check your email for the confirm message."
+msgstr "Você se inscreveu. Favor verifique em seu email a mensagem de confirmação."
 
 #, fuzzy
 #~ msgid "Design"
 #~ msgstr "Versões"
-
 #~ msgid "%(workspace_name)s's workspace"
 #~ msgstr "%(workspace_name)s da área de trabalho"
-
 #~ msgid "Versions:"
 #~ msgstr "Versões:"
-
 #~ msgid "by %(v1name)s"
 #~ msgstr "por %(v1name)s"
-
 #~ msgid "created %(v1created)s"
 #~ msgstr "criado %(v1created)s"
-
 #~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
 #~ msgstr "Diferenças entre a versão #%(v1_nid)s e a versão #%(v2_nid)s:"
-
 #~ msgid "Version #%(version_number)s created on %(date)s"
 #~ msgstr "Versão #%(version_number)s criada em %(date)s"
-
 #~ msgid "%(title)s"
 #~ msgstr "%(title)s"
 
 #, fuzzy
 #~ msgid "Contact from user: %(name)s / %(email)s"
 #~ msgstr "Ajouter un utilisateur"
-
 #~ msgid "Add user"
 #~ msgstr "Ajouter un utilisateur"
+
--- a/src/cm/templates/site/notifications_desactivate.html	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/templates/site/notifications_desactivate.html	Fri Feb 12 15:54:48 2010 +0100
@@ -28,7 +28,7 @@
         </td>
         <td>
             <label></label>
-            <input name="desactivate" type="submit" value="{% blocktrans %}Desactivate{% endblocktrans %}" />
+            <input name="desactivate" type="submit" value="{% blocktrans %}Deactivate{% endblocktrans %}" />
 		    <input name="cancel" type="button" id="cancel_button" value="{% blocktrans %}Cancel{% endblocktrans %}" />
 			<input type="hidden" name="adminkey" value="{{ notification.adminkey }}">		    
 		    <script type="text/javascript">
--- a/src/cm/urls.py	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/urls.py	Fri Feb 12 15:54:48 2010 +0100
@@ -94,7 +94,7 @@
      # notifications
      ## workspace followup
      url(r'^followup/$', followup, name="followup"),
-     url(r'^followup/(?P<adminkey>\w*)/desactivate/$', desactivate_notification, name="desactivate-notification"),
+     url(r'^followup/(?P<adminkey>\w*)/deactivate/$', desactivate_notification, name="desactivate-notification"),
      ## text notifications
      url(r'^text/(?P<key>\w*)/followup/$', text_followup, name="text-followup"),
      ## embed
--- a/src/cm/views/followup.py	Fri Feb 12 13:47:47 2010 +0100
+++ b/src/cm/views/followup.py	Fri Feb 12 15:54:48 2010 +0100
@@ -49,13 +49,13 @@
     try:
         notification = Notification.objects.get(adminkey=adminkey)
     except Notification.DoesNotExist:        
-        display_message(request, _(u"This notification has already been desactivated."))
+        display_message(request, _(u"This notification has already been deactivated."))
         return HttpResponseRedirect(reverse('index'))
     
     if request.method == 'POST':
         if request.POST['adminkey'] == adminkey:
             notification.desactivate()
-            display_message(request, _(u"Notification desactivated."))                
+            display_message(request, _(u"Notification deactivated."))                
             return HttpResponseRedirect(reverse('index'))
     return render_to_response('site/notifications_desactivate.html', 
                               {'notification' : notification,