# HG changeset patch
# User raph
# Date 1265904813 -3600
# Node ID b87f018a53f9290545102aa7ad78609615db11ff
# Parent  5f30378c79a43fab2ebd4f2b2c1f1b4a5f4028e8
i18n generate / fr update

diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/en/LC_MESSAGES/django.mo
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/en/LC_MESSAGES/django.po
--- a/src/cm/locale/en/LC_MESSAGES/django.po	Thu Feb 11 16:38:39 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po	Thu Feb 11 17:13:33 2010 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-05 15:11+0100\n"
+"POT-Creation-Date: 2010-02-11 17:11+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"
@@ -57,145 +57,141 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr ""
 
-#: diff.py:53
-msgid "unknown"
-msgstr ""
-
-#: models.py:175 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:612
+#: models.py:176 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:591
 msgid "Title"
 msgstr ""
 
-#: models.py:176
+#: models.py:177
 msgid "Format"
 msgstr ""
 
-#: models.py:177 views/texts.py:703
+#: models.py:178 views/texts.py:682
 msgid "Content"
 msgstr ""
 
-#: models.py:178 models.py:615
+#: models.py:179 models.py:637
 msgid "Tags"
 msgstr ""
 
-#: models.py:180 views/user.py:223
+#: models.py:181 views/user.py:223
 msgid "Note"
 msgstr ""
 
-#: models.py:182
+#: models.py:183
 msgid "Moderation a posteriori?"
 msgstr ""
 
-#: models.py:300
+#: models.py:305
 msgid "Format:"
 msgstr ""
 
-#: models.py:518
+#: models.py:540
 msgid "name"
 msgstr ""
 
-#: models.py:519
+#: models.py:541
 msgid "description"
 msgstr ""
 
-#: models.py:609
+#: models.py:631
 msgid "Allow contact"
 msgstr ""
 
-#: models.py:609
+#: models.py:631
 msgid "Allow email messages from other users"
 msgstr ""
 
-#: models.py:610
+#: models.py:632
 msgid "Preferred language"
 msgstr ""
 
-#: models.py:613
+#: models.py:635
 msgid "Suspended access"
 msgstr ""
 
-#: models.py:637
+#: models.py:659
 msgid "suspended"
 msgstr ""
 
-#: models.py:639
+#: models.py:661
 msgid "waiting approval"
 msgstr ""
 
-#: models.py:645
+#: models.py:667
 msgid "pending"
 msgstr ""
 
-#: models.py:660
+#: models.py:682
 msgid "Invitation"
 msgstr ""
 
-#: models.py:728
+#: models.py:750
 #, python-format
 msgid "Text %(link_to_text)s edited"
 msgstr ""
 
-#: models.py:729
+#: models.py:751
 #, python-format
 msgid "Text %(link_to_text)s edited (new version created)"
 msgstr ""
 
-#: models.py:730
+#: models.py:752
 #, python-format
 msgid "Text %(link_to_text)s added"
 msgstr ""
 
-#: models.py:731
+#: models.py:753
 #, python-format
 msgid "Text %(link_to_text)s removed"
 msgstr ""
 
-#: models.py:732
+#: models.py:754
 #, python-format
 msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
 msgstr ""
 
-#: models.py:733
+#: models.py:755
 #, python-format
 msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
 msgstr ""
 
-#: models.py:734
+#: models.py:756
 #, python-format
 msgid "User %(username)s added"
 msgstr ""
 
-#: models.py:735
+#: models.py:757
 #, python-format
 msgid "User %(username)s access to workspace enabled"
 msgstr ""
 
-#: models.py:736
+#: models.py:758
 #, python-format
 msgid "User %(username)s access to workspace refused"
 msgstr ""
 
-#: models.py:737
+#: models.py:759
 #, python-format
 msgid "User %(username)s access to workspace suspended"
 msgstr ""
 
-#: models.py:738
+#: models.py:760
 #, python-format
 msgid "User %(username)s access to workspace activated"
 msgstr ""
 
-#: models.py:739
+#: models.py:761
 #, python-format
 msgid "User %(username)s has activated his account"
 msgstr ""
 
-#: models.py:794 models.py:802
+#: models.py:816 models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr ""
 
-#: models.py:796
+#: models.py:818
 #, python-format
 msgid "%(time_since)s ago"
 msgstr ""
@@ -535,23 +531,23 @@
 msgid "Commenting"
 msgstr ""
 
-#: templates/site/dashboard.html:260
+#: templates/site/dashboard.html:262
 msgid "Activities"
 msgstr ""
 
-#: templates/site/dashboard.html:263
+#: templates/site/dashboard.html:265
 msgid "texts"
 msgstr ""
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "comments"
 msgstr ""
 
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
 msgid "users"
 msgstr ""
 
-#: templates/site/dashboard.html:306
+#: templates/site/dashboard.html:308
 msgid "No activities"
 msgstr ""
 
@@ -587,7 +583,7 @@
 
 #: 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:26
+#: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
 msgstr ""
@@ -699,7 +695,11 @@
 msgid "Settings"
 msgstr ""
 
-#: templates/site/settings.html:32
+#: templates/site/settings.html:25
+msgid "Delete logo"
+msgstr ""
+
+#: templates/site/settings.html:34
 msgid ""
 "Are you sure you want to change the role model? All roles (except managers) "
 "will be resetted!"
@@ -1087,18 +1087,18 @@
 msgstr ""
 
 #: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:14
+#: templates/site/layout/base_workspace.html:20
 msgid "back to workspace"
 msgstr ""
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_texts)s text"
 msgid_plural "%(nb_texts)s texts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_users)s user"
 msgid_plural "%(nb_users)s users"
@@ -1225,6 +1225,10 @@
 msgid "%Y-%m-%d %H:%M"
 msgstr ""
 
+#: utils/diff.py:53
+msgid "unknown"
+msgstr ""
+
 #: views/create.py:26
 msgid "Upload file (optional)"
 msgstr ""
@@ -1311,7 +1315,7 @@
 msgid "Private notifications feed reseted."
 msgstr ""
 
-#: views/site.py:81 views/texts.py:132 views/user.py:525
+#: views/site.py:81 views/texts.py:129 views/user.py:525
 msgid "You're logged in!"
 msgstr ""
 
@@ -1352,94 +1356,98 @@
 msgstr ""
 
 #: views/site.py:159
+msgid "Workspace logo"
+msgstr ""
+
+#: views/site.py:161
 msgid "Workspace registration"
 msgstr ""
 
-#: views/site.py:160
+#: views/site.py:162
 msgid ""
 "Can users register themselves into the workspace? (if not, only invitations "
 "by managers can create new users)"
 msgstr ""
 
-#: views/site.py:164
+#: views/site.py:166
 msgid "Workspace registration moderation"
 msgstr ""
 
-#: views/site.py:165
+#: views/site.py:167
 msgid ""
-"Should new users be moderated (registration will require manager's approval)"
+"Should new users be moderated (registration will require manager's approval)?"
 msgstr ""
 
-#: views/site.py:169
+#: views/site.py:171
 msgid "Role model"
 msgstr ""
 
-#: views/site.py:170
+#: views/site.py:172
 msgid "Change the roles available in the workspace"
 msgstr ""
 
-#: views/site.py:195
+#: views/site.py:202 views/site.py:211
 msgid "Settings saved"
 msgstr ""
 
-#: views/texts.py:165
+#: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
 msgstr ""
 
-#: views/texts.py:210
+#: views/texts.py:207
 #, python-format
 msgid "Text %(text_title)s deleted"
 msgstr ""
 
-#: views/texts.py:221
+#: views/texts.py:218
 #, python-format
 msgid "Text version %(text_version_title)s deleted"
 msgstr ""
 
-#: views/texts.py:616
+#: views/texts.py:595
 msgid "Note (optional)"
 msgstr ""
 
-#: views/texts.py:619
+#: views/texts.py:598
 msgid "Add a note to explain the modifications made to the text"
 msgstr ""
 
-#: views/texts.py:629
+#: views/texts.py:608
 msgid "New version (optional)"
 msgstr ""
 
-#: views/texts.py:632
+#: views/texts.py:611
 msgid "Create a new version of this text (recommended)"
 msgstr ""
 
-#: views/texts.py:635
+#: views/texts.py:614
 msgid "Keep comments (optional)"
 msgstr ""
 
-#: views/texts.py:638
+#: views/texts.py:617
 msgid "Keep comments (if not affected by the edit)"
 msgstr ""
 
-#: views/texts.py:701
+#: views/texts.py:680
 msgid "Name (optional)"
 msgstr ""
 
-#: views/texts.py:702
+#: views/texts.py:681
 msgid "Email (optional)"
 msgstr ""
 
-#: views/texts.py:752
+#: views/texts.py:731
 #, python-format
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr ""
 
-#: views/texts.py:860 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 ""
 
-#: views/texts.py:918
+#: views/texts.py:897
 msgid "Text settings updated"
 msgstr ""
 
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/es/LC_MESSAGES/django.mo
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/es/LC_MESSAGES/django.po
--- a/src/cm/locale/es/LC_MESSAGES/django.po	Thu Feb 11 16:38:39 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po	Thu Feb 11 17:13:33 2010 +0100
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-05 15:10+0100\n"
+"POT-Creation-Date: 2010-02-11 17:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alejandro Martin Ortin <alejandromartinortin@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,145 +55,141 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "El contenido de las etiquetas no debe exceder los 250 caracteres"
 
-#: diff.py:53
-msgid "unknown"
-msgstr "desconocido"
-
-#: models.py:175 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:612
+#: 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"
 
-#: models.py:176
+#: models.py:177
 msgid "Format"
 msgstr "Formato"
 
-#: models.py:177 views/texts.py:703
+#: models.py:178 views/texts.py:682
 msgid "Content"
 msgstr "Contenido"
 
-#: models.py:178 models.py:615
+#: models.py:179 models.py:637
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: models.py:180 views/user.py:223
+#: models.py:181 views/user.py:223
 msgid "Note"
 msgstr "Nota"
 
-#: models.py:182
+#: models.py:183
 msgid "Moderation a posteriori?"
 msgstr "¿Moderar a posteriori?"
 
-#: models.py:300
+#: models.py:305
 msgid "Format:"
 msgstr "Formato:"
 
-#: models.py:518
+#: models.py:540
 msgid "name"
 msgstr "nombre"
 
-#: models.py:519
+#: models.py:541
 msgid "description"
 msgstr "descripción"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow contact"
 msgstr "Permitir contacto"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow email messages from other users"
 msgstr "Permitir correos electrónicos de otros usuarios"
 
-#: models.py:610
+#: models.py:632
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: models.py:613
+#: models.py:635
 msgid "Suspended access"
 msgstr "Acceso anulado"
 
-#: models.py:637
+#: models.py:659
 msgid "suspended"
 msgstr "anulado"
 
-#: models.py:639
+#: models.py:661
 msgid "waiting approval"
 msgstr "esperando aprobación"
 
-#: models.py:645
+#: models.py:667
 msgid "pending"
 msgstr "pendiente"
 
-#: models.py:660
+#: models.py:682
 msgid "Invitation"
 msgstr "Invitación"
 
-#: models.py:728
+#: models.py:750
 #, python-format
 msgid "Text %(link_to_text)s edited"
 msgstr "Texto %(link_to_text)s editado "
 
-#: models.py:729
+#: models.py:751
 #, python-format
 msgid "Text %(link_to_text)s edited (new version created)"
 msgstr "Texto %(link_to_text)s editado (se ha creado una nueva versión)"
 
-#: models.py:730
+#: models.py:752
 #, python-format
 msgid "Text %(link_to_text)s added"
 msgstr "Texto %(link_to_text)s añadido"
 
-#: models.py:731
+#: models.py:753
 #, python-format
 msgid "Text %(link_to_text)s removed"
 msgstr "Texto %(link_to_text)s eliminado"
 
-#: models.py:732
+#: models.py:754
 #, python-format
 msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
 msgstr "Comentario %(link_to_comment)s añadido al texto %(link_to_text)s"
 
-#: models.py:733
+#: models.py:755
 #, python-format
 msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
 msgstr "Comentario %(link_to_comment)s eliminado del texto %(link_to_text)s"
 
-#: models.py:734
+#: models.py:756
 #, python-format
 msgid "User %(username)s added"
 msgstr "Usuario %(username)s añadido"
 
-#: models.py:735
+#: models.py:757
 #, python-format
 msgid "User %(username)s access to workspace enabled"
 msgstr "Permitido acceso de Usuario %(username)s a espacio de trabajo"
 
-#: models.py:736
+#: models.py:758
 #, python-format
 msgid "User %(username)s access to workspace refused"
 msgstr "Denegado el acceso del Usuario %(username)s al espacio de trabajo"
 
-#: models.py:737
+#: models.py:759
 #, python-format
 msgid "User %(username)s access to workspace suspended"
 msgstr "Anulado el acceso del Usuario %(username)s al espacio de trabajo"
 
-#: models.py:738
+#: models.py:760
 #, python-format
 msgid "User %(username)s access to workspace activated"
 msgstr "Activado el acceso del Usuario %(username)s al espacio de trabajo"
 
-#: models.py:739
+#: models.py:761
 #, python-format
 msgid "User %(username)s has activated his account"
 msgstr "El usuario %(username)s ha activado su cuenta"
 
-#: models.py:794 models.py:802
+#: models.py:816 models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "por \"%(username)s\""
 
-#: models.py:796
+#: models.py:818
 #, python-format
 msgid "%(time_since)s ago"
 msgstr "hace %(time_since)s"
@@ -538,24 +534,24 @@
 msgid "Commenting"
 msgstr "Comentando"
 
-#: templates/site/dashboard.html:260
+#: templates/site/dashboard.html:262
 msgid "Activities"
 msgstr "Actividades"
 
-#: templates/site/dashboard.html:263
+#: templates/site/dashboard.html:265
 msgid "texts"
 msgstr "textos"
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
 #, fuzzy
 msgid "users"
 msgstr "usuarios"
 
-#: templates/site/dashboard.html:306
+#: templates/site/dashboard.html:308
 msgid "No activities"
 msgstr "Sin actividad"
 
@@ -591,7 +587,7 @@
 
 #: 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:26
+#: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
 msgstr "Ayuda"
@@ -710,7 +706,12 @@
 msgid "Settings"
 msgstr "Ajustes"
 
-#: templates/site/settings.html:32
+#: templates/site/settings.html:25
+#, fuzzy
+msgid "Delete logo"
+msgstr "Borrar"
+
+#: templates/site/settings.html:34
 msgid ""
 "Are you sure you want to change the role model? All roles (except managers) "
 "will be resetted!"
@@ -1135,18 +1136,18 @@
 "espacio de trabajo."
 
 #: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:14
+#: templates/site/layout/base_workspace.html:20
 msgid "back to workspace"
 msgstr "volver al espacio de trabajo"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_texts)s text"
 msgid_plural "%(nb_texts)s texts"
 msgstr[0] "%(nb_texts)s texto"
 msgstr[1] "%(nb_texts)s textos"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_users)s user"
 msgid_plural "%(nb_users)s users"
@@ -1280,6 +1281,10 @@
 msgid "%Y-%m-%d %H:%M"
 msgstr "%A-%m_%d %H:%M"
 
+#: utils/diff.py:53
+msgid "unknown"
+msgstr "desconocido"
+
 #: views/create.py:26
 msgid "Upload file (optional)"
 msgstr "Subir archivo (opcional)"
@@ -1369,7 +1374,7 @@
 msgid "Private notifications feed reseted."
 msgstr "Respuesta de avisos privados reiniciada"
 
-#: views/site.py:81 views/texts.py:132 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!"
 
@@ -1410,10 +1415,15 @@
 msgstr "Etiqueta del espacio de trabajo"
 
 #: views/site.py:159
+#, fuzzy
+msgid "Workspace logo"
+msgstr "Perfil del espacio de trabajo"
+
+#: views/site.py:161
 msgid "Workspace registration"
 msgstr "Registro del espacio de trabajo"
 
-#: views/site.py:160
+#: views/site.py:162
 msgid ""
 "Can users register themselves into the workspace? (if not, only invitations "
 "by managers can create new users)"
@@ -1422,87 +1432,88 @@
 "contrario, sólo se podrán usar las invitaciones enviadas por los "
 "administradores para crear nuevos usuarios)"
 
-#: views/site.py:164
+#: views/site.py:166
 msgid "Workspace registration moderation"
 msgstr "Moderación del registro del espacio de trabajo"
 
-#: views/site.py:165
+#: views/site.py:167
+#, fuzzy
 msgid ""
-"Should new users be moderated (registration will require manager's approval)"
+"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:169
+#: views/site.py:171
 msgid "Role model"
 msgstr "Modelo de perfiles"
 
-#: views/site.py:170
+#: views/site.py:172
 msgid "Change the roles available in the workspace"
 msgstr "Cambiar los perfiles disponibles en el espacio de trabajo"
 
-#: views/site.py:195
+#: views/site.py:202 views/site.py:211
 msgid "Settings saved"
 msgstr "Ajustes guardados"
 
-#: views/texts.py:165
+#: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
 msgstr "%(nb_texts)i texto(s) borrado(s)"
 
-#: views/texts.py:210
+#: views/texts.py:207
 #, python-format
 msgid "Text %(text_title)s deleted"
 msgstr "El texto %(text_title)s ha sido borrado"
 
-#: views/texts.py:221
+#: views/texts.py:218
 #, fuzzy, python-format
 msgid "Text version %(text_version_title)s deleted"
 msgstr "El texto %(text_title)s ha sido borrado"
 
-#: views/texts.py:616
+#: views/texts.py:595
 msgid "Note (optional)"
 msgstr "Nota (opcional)"
 
-#: views/texts.py:619
+#: views/texts.py:598
 msgid "Add a note to explain the modifications made to the text"
 msgstr "Añadir una nota para explicar las modificaciones realizadas al texto"
 
-#: views/texts.py:629
+#: views/texts.py:608
 msgid "New version (optional)"
 msgstr "Nueva versión (opcional)"
 
-#: views/texts.py:632
+#: views/texts.py:611
 msgid "Create a new version of this text (recommended)"
 msgstr "Crear una nueva versión de este texto (recomendado)"
 
-#: views/texts.py:635
+#: views/texts.py:614
 msgid "Keep comments (optional)"
 msgstr "mantener los comentarios (opcional)"
 
-#: views/texts.py:638
+#: views/texts.py:617
 msgid "Keep comments (if not affected by the edit)"
 msgstr "mantener los comentarios (si no son afectados por la edición)"
 
-#: views/texts.py:701
+#: views/texts.py:680
 msgid "Name (optional)"
 msgstr "Nombre (opcional)"
 
-#: views/texts.py:702
+#: views/texts.py:681
 msgid "Email (optional)"
 msgstr "Email (opcional)"
 
-#: views/texts.py:752
+#: views/texts.py:731
 #, fuzzy, python-format
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr "Se ha creado una nueva versión (copiada de la versión %(version_id)s)"
 
-#: views/texts.py:860 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)"
 
-#: views/texts.py:918
+#: views/texts.py:897
 msgid "Text settings updated"
 msgstr "Ajustes del texto actualizados"
 
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/fr/LC_MESSAGES/django.mo
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/fr/LC_MESSAGES/django.po
--- a/src/cm/locale/fr/LC_MESSAGES/django.po	Thu Feb 11 16:38:39 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po	Thu Feb 11 17:13:33 2010 +0100
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-05 15:11+0100\n"
-"PO-Revision-Date: 2010-02-05 15:14+0100\n"
+"POT-Creation-Date: 2010-02-11 17:12+0100\n"
+"PO-Revision-Date: 2010-02-11 17:13+0100\n"
 "Last-Translator: dev <dev@sopinspace.com>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,152 +58,148 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "La longueur des tags est limitée à 250 caractères."
 
-#: diff.py:53
-msgid "unknown"
-msgstr "inconnu"
-
-#: models.py:175
+#: models.py:176
 #: templates/site/text_history.html:79
 #: views/create.py:30
 #: views/create.py:45
-#: views/texts.py:612
+#: views/texts.py:591
 msgid "Title"
 msgstr "Titre"
 
-#: models.py:176
+#: models.py:177
 msgid "Format"
 msgstr "Format"
 
-#: models.py:177
-#: views/texts.py:703
+#: models.py:178
+#: views/texts.py:682
 msgid "Content"
 msgstr "Texte"
 
-#: models.py:178
-#: models.py:615
+#: models.py:179
+#: models.py:637
 msgid "Tags"
 msgstr "Tags"
 
-#: models.py:180
+#: models.py:181
 #: views/user.py:223
 msgid "Note"
 msgstr "Note"
 
-#: models.py:182
+#: models.py:183
 msgid "Moderation a posteriori?"
 msgstr "Modération a posteriori ?"
 
-#: models.py:300
+#: models.py:305
 msgid "Format:"
 msgstr "Format :"
 
-#: models.py:518
+#: models.py:540
 msgid "name"
 msgstr "nom"
 
-#: models.py:519
+#: models.py:541
 msgid "description"
 msgstr "description"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow contact"
 msgstr "Autorise à être contacté"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow email messages from other users"
 msgstr "Autoriser les participants de l'espace de travail à vous envoyer un email"
 
-#: models.py:610
+#: models.py:632
 msgid "Preferred language"
 msgstr "Langage de préférence"
 
-#: models.py:613
+#: models.py:635
 msgid "Suspended access"
 msgstr "Accès désactivé"
 
-#: models.py:637
+#: models.py:659
 msgid "suspended"
 msgstr "désactivé"
 
-#: models.py:639
+#: models.py:661
 msgid "waiting approval"
 msgstr "en attente d'approbation"
 
-#: models.py:645
+#: models.py:667
 msgid "pending"
 msgstr "en attente"
 
-#: models.py:660
+#: models.py:682
 msgid "Invitation"
 msgstr "Invitation"
 
-#: models.py:728
+#: models.py:750
 #, python-format
 msgid "Text %(link_to_text)s edited"
 msgstr "Le texte %(link_to_text)s a été édité"
 
-#: models.py:729
+#: models.py:751
 #, python-format
 msgid "Text %(link_to_text)s edited (new version created)"
 msgstr "Le texte %(link_to_text)s a été édité (nouvelle version créée)"
 
-#: models.py:730
+#: models.py:752
 #, python-format
 msgid "Text %(link_to_text)s added"
 msgstr "Le texte %(link_to_text)s a été ajouté"
 
-#: models.py:731
+#: models.py:753
 #, python-format
 msgid "Text %(link_to_text)s removed"
 msgstr "Le texte %(link_to_text)s a été supprimé"
 
-#: models.py:732
+#: models.py:754
 #, python-format
 msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
 msgstr "Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s"
 
-#: models.py:733
+#: models.py:755
 #, python-format
 msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
 msgstr "Commentaire %(link_to_comment)s supprimé du texte %(link_to_text)s"
 
-#: models.py:734
+#: models.py:756
 #, python-format
 msgid "User %(username)s added"
 msgstr "L'utilisateur %(username)s a été ajouté"
 
-#: models.py:735
+#: models.py:757
 #, python-format
 msgid "User %(username)s access to workspace enabled"
 msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
 
-#: models.py:736
+#: models.py:758
 #, python-format
 msgid "User %(username)s access to workspace refused"
 msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
 
-#: models.py:737
+#: models.py:759
 #, python-format
 msgid "User %(username)s access to workspace suspended"
 msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu"
 
-#: models.py:738
+#: models.py:760
 #, python-format
 msgid "User %(username)s access to workspace activated"
 msgstr "Accès de utilisateur %(username)s à l'espace de travail activé"
 
-#: models.py:739
+#: models.py:761
 #, python-format
 msgid "User %(username)s has activated his account"
 msgstr "L'utilisateur %(username)s a activé son compte"
 
-#: models.py:794
-#: models.py:802
+#: models.py:816
+#: models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "par \"%(username)s\""
 
-#: models.py:796
+#: models.py:818
 #, python-format
 msgid "%(time_since)s ago"
 msgstr "il y a %(time_since)s"
@@ -561,23 +557,23 @@
 msgid "Commenting"
 msgstr "Commentaires"
 
-#: templates/site/dashboard.html:260
+#: templates/site/dashboard.html:262
 msgid "Activities"
 msgstr "Activités"
 
-#: templates/site/dashboard.html:263
+#: templates/site/dashboard.html:265
 msgid "texts"
 msgstr "textes"
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "comments"
 msgstr "commentaires"
 
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
 msgid "users"
 msgstr "utilisateurs"
 
-#: templates/site/dashboard.html:306
+#: templates/site/dashboard.html:308
 msgid "No activities"
 msgstr "Pas d'activités"
 
@@ -618,7 +614,7 @@
 #: templates/site/followup.html.py:35
 #: templates/site/help.html:6
 #: templates/site/text_embed.html:27
-#: templates/site/layout/footer.html:26
+#: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
 msgstr "Aide"
@@ -738,7 +734,11 @@
 msgid "Settings"
 msgstr "Paramètres"
 
-#: templates/site/settings.html:32
+#: templates/site/settings.html:25
+msgid "Delete logo"
+msgstr "Supprimer le logo"
+
+#: templates/site/settings.html:34
 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 !"
 
@@ -1151,18 +1151,18 @@
 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:14
+#: templates/site/layout/base_workspace.html:20
 msgid "back to workspace"
 msgstr "retour à l'espace de travail"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_texts)s text"
 msgid_plural "%(nb_texts)s texts"
 msgstr[0] "%(nb_texts)s texte"
 msgstr[1] "%(nb_texts)s textes"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_users)s user"
 msgid_plural "%(nb_users)s users"
@@ -1287,6 +1287,10 @@
 msgid "%Y-%m-%d %H:%M"
 msgstr "%d-%m-%Y %H:%M"
 
+#: utils/diff.py:53
+msgid "unknown"
+msgstr "inconnu"
+
 #: views/create.py:26
 msgid "Upload file (optional)"
 msgstr "Charger un fichier (optionnel)"
@@ -1375,7 +1379,7 @@
 msgstr "Flux privé réinitialisé."
 
 #: views/site.py:81
-#: views/texts.py:132
+#: views/texts.py:129
 #: views/user.py:525
 msgid "You're logged in!"
 msgstr "Vous êtes connecté !"
@@ -1417,93 +1421,98 @@
 msgstr "Slogan de l'espace de travail"
 
 #: views/site.py:159
+msgid "Workspace logo"
+msgstr "Logo de l'espace de travail"
+
+#: views/site.py:161
 msgid "Workspace registration"
 msgstr "S'enregistrer sur l'espace de travail"
 
-#: views/site.py:160
+#: views/site.py:162
 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:164
+#: views/site.py:166
 msgid "Workspace registration moderation"
 msgstr "Modération de l'enregistrement sur l'espace de travail"
 
-#: views/site.py:165
-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:167
+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:169
+#: views/site.py:171
 msgid "Role model"
 msgstr "Modèle des rôles"
 
-#: views/site.py:170
+#: views/site.py:172
 msgid "Change the roles available in the workspace"
 msgstr "Modifie les rôles disponibles dans l'espace de travail"
 
-#: views/site.py:195
+#: views/site.py:202
+#: views/site.py:211
 msgid "Settings saved"
 msgstr "Paramètres sauvegardés"
 
-#: views/texts.py:165
+#: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
 msgstr "%(nb_texts)i texte(s) supprimés"
 
-#: views/texts.py:210
+#: views/texts.py:207
 #, python-format
 msgid "Text %(text_title)s deleted"
 msgstr "texte %(text_title)s supprimé"
 
-#: views/texts.py:221
+#: views/texts.py:218
 #, python-format
 msgid "Text version %(text_version_title)s deleted"
 msgstr "Version %(text_version_title)s supprimée"
 
-#: views/texts.py:616
+#: views/texts.py:595
 msgid "Note (optional)"
 msgstr "Note (facultative)"
 
-#: views/texts.py:619
+#: views/texts.py:598
 msgid "Add a note to explain the modifications made to the text"
 msgstr "Ajouter une note pour expliquer les modifications apportées au texte"
 
-#: views/texts.py:629
+#: views/texts.py:608
 msgid "New version (optional)"
 msgstr "Nouvelle version (facultative)"
 
-#: views/texts.py:632
+#: views/texts.py:611
 msgid "Create a new version of this text (recommended)"
 msgstr "créér une nouvelle version de ce texte (recommandé)"
 
-#: views/texts.py:635
+#: views/texts.py:614
 msgid "Keep comments (optional)"
 msgstr "Conserver les commentaires (facultatif)"
 
-#: views/texts.py:638
+#: 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"
 
-#: views/texts.py:701
+#: views/texts.py:680
 msgid "Name (optional)"
 msgstr "Nom (facultatif)"
 
-#: views/texts.py:702
+#: views/texts.py:681
 msgid "Email (optional)"
 msgstr "Email (facultatif)"
 
-#: views/texts.py:752
+#: 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"
 
-#: views/texts.py:860
+#: 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)"
 
-#: views/texts.py:918
+#: views/texts.py:897
 msgid "Text settings updated"
 msgstr "Paramètres mis à jour"
 
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/no/LC_MESSAGES/django.mo
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/no/LC_MESSAGES/django.po
--- a/src/cm/locale/no/LC_MESSAGES/django.po	Thu Feb 11 16:38:39 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po	Thu Feb 11 17:13:33 2010 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-05 15:11+0100\n"
+"POT-Creation-Date: 2010-02-11 17:11+0100\n"
 "PO-Revision-Date: 2010-01-16 18:00+0100\n"
 "Last-Translator: Kirill Miazine <km@krot.org>\n"
 "Language-Team: <no@li.org>\n"
@@ -60,145 +60,141 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn."
 
-#: diff.py:53
-msgid "unknown"
-msgstr "ukjent"
-
-#: models.py:175 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:612
+#: 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"
 
-#: models.py:176
+#: models.py:177
 msgid "Format"
 msgstr "Format"
 
-#: models.py:177 views/texts.py:703
+#: models.py:178 views/texts.py:682
 msgid "Content"
 msgstr "Innhold"
 
-#: models.py:178 models.py:615
+#: models.py:179 models.py:637
 msgid "Tags"
 msgstr "Etiketter"
 
-#: models.py:180 views/user.py:223
+#: models.py:181 views/user.py:223
 msgid "Note"
 msgstr "Kommentar"
 
-#: models.py:182
+#: models.py:183
 msgid "Moderation a posteriori?"
 msgstr "Godkjenning i ettertid?"
 
-#: models.py:300
+#: models.py:305
 msgid "Format:"
 msgstr "Format:"
 
-#: models.py:518
+#: models.py:540
 msgid "name"
 msgstr "navn"
 
-#: models.py:519
+#: models.py:541
 msgid "description"
 msgstr "beskrivelse"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow contact"
 msgstr "Tillatt kontakt"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow email messages from other users"
 msgstr "Motta epost fra andre brukere"
 
-#: models.py:610
+#: models.py:632
 msgid "Preferred language"
 msgstr "Foretrukket språk"
 
-#: models.py:613
+#: models.py:635
 msgid "Suspended access"
 msgstr "Sperret tilgang"
 
-#: models.py:637
+#: models.py:659
 msgid "suspended"
 msgstr "sperret"
 
-#: models.py:639
+#: models.py:661
 msgid "waiting approval"
 msgstr "venter på godkjenning"
 
-#: models.py:645
+#: models.py:667
 msgid "pending"
 msgstr "pågående"
 
-#: models.py:660
+#: models.py:682
 msgid "Invitation"
 msgstr "Invitasjon"
 
-#: models.py:728
+#: models.py:750
 #, python-format
 msgid "Text %(link_to_text)s edited"
 msgstr "Tekst %(link_to_text)s endret"
 
-#: models.py:729
+#: models.py:751
 #, python-format
 msgid "Text %(link_to_text)s edited (new version created)"
 msgstr "Tekst %(link_to_text)s endret (ny versjon opprettet)"
 
-#: models.py:730
+#: models.py:752
 #, python-format
 msgid "Text %(link_to_text)s added"
 msgstr "Tekst %(link_to_text)s lagt til"
 
-#: models.py:731
+#: models.py:753
 #, python-format
 msgid "Text %(link_to_text)s removed"
 msgstr "Tekst %(link_to_text)s slettet"
 
-#: models.py:732
+#: models.py:754
 #, python-format
 msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
 msgstr "Merknad %(link_to_comment)s lagt til teksten %(link_to_text)s"
 
-#: models.py:733
+#: models.py:755
 #, python-format
 msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
 msgstr "Merknad %(link_to_comment)s slettet fra teksten %(link_to_text)s"
 
-#: models.py:734
+#: models.py:756
 #, python-format
 msgid "User %(username)s added"
 msgstr "Bruker %(username)s opprettet"
 
-#: models.py:735
+#: models.py:757
 #, python-format
 msgid "User %(username)s access to workspace enabled"
 msgstr "Aktivert tilgang for brukeren %(username)s"
 
-#: models.py:736
+#: models.py:758
 #, python-format
 msgid "User %(username)s access to workspace refused"
 msgstr "Nektet tilgang for brukeren %(username)s"
 
-#: models.py:737
+#: models.py:759
 #, python-format
 msgid "User %(username)s access to workspace suspended"
 msgstr "Stoppet tilgang for brukeren %(username)s"
 
-#: models.py:738
+#: models.py:760
 #, python-format
 msgid "User %(username)s access to workspace activated"
 msgstr "Aktivert tilgang for brukeren %(username)s"
 
-#: models.py:739
+#: models.py:761
 #, python-format
 msgid "User %(username)s has activated his account"
 msgstr "Bruker %(username)s har aktivert kontoen"
 
-#: models.py:794 models.py:802
+#: models.py:816 models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "av %(username)s"
 
-#: models.py:796
+#: models.py:818
 #, python-format
 msgid "%(time_since)s ago"
 msgstr "for %(time_since)s siden"
@@ -538,23 +534,23 @@
 msgid "Commenting"
 msgstr "Kommentering"
 
-#: templates/site/dashboard.html:260
+#: templates/site/dashboard.html:262
 msgid "Activities"
 msgstr "Aktivitetsjournal"
 
-#: templates/site/dashboard.html:263
+#: templates/site/dashboard.html:265
 msgid "texts"
 msgstr "tekster"
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "comments"
 msgstr "merknader"
 
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
 msgid "users"
 msgstr "brukere"
 
-#: templates/site/dashboard.html:306
+#: templates/site/dashboard.html:308
 msgid "No activities"
 msgstr "Ingen aktiviteter"
 
@@ -590,7 +586,7 @@
 
 #: 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:26
+#: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
 msgstr "Hjelp"
@@ -705,7 +701,12 @@
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: templates/site/settings.html:32
+#: templates/site/settings.html:25
+#, fuzzy
+msgid "Delete logo"
+msgstr "Slett"
+
+#: templates/site/settings.html:34
 msgid ""
 "Are you sure you want to change the role model? All roles (except managers) "
 "will be resetted!"
@@ -864,7 +865,8 @@
 #, 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"
+msgstr ""
+"Sammenlikning mellom versjoner #%(version_1_number)s og #%(version_2_number)s"
 
 #: templates/site/text_history_compare.html:43
 msgid "No differences"
@@ -1111,18 +1113,18 @@
 msgstr "Brukere vil bli invitert til å slutte seg til arbeidsområdet."
 
 #: templates/site/layout/base_text.html:16
-#: templates/site/layout/base_workspace.html:14
+#: templates/site/layout/base_workspace.html:20
 msgid "back to workspace"
 msgstr "tilbake til arbeidsområde"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_texts)s text"
 msgid_plural "%(nb_texts)s texts"
 msgstr[0] "%(nb_texts)s tekst"
 msgstr[1] "%(nb_texts)s tekster"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_users)s user"
 msgid_plural "%(nb_users)s users"
@@ -1251,6 +1253,10 @@
 msgid "%Y-%m-%d %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
+#: utils/diff.py:53
+msgid "unknown"
+msgstr "ukjent"
+
 #: views/create.py:26
 msgid "Upload file (optional)"
 msgstr "Last opp fil"
@@ -1337,7 +1343,7 @@
 msgid "Private notifications feed reseted."
 msgstr "Strøm for private varsler nullstilt."
 
-#: views/site.py:81 views/texts.py:132 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!"
 
@@ -1379,10 +1385,15 @@
 msgstr "Beskrivelse av arbeidsområde"
 
 #: views/site.py:159
+#, fuzzy
+msgid "Workspace logo"
+msgstr "Rolle for arbeidsområde"
+
+#: views/site.py:161
 msgid "Workspace registration"
 msgstr "Registering på arbeidsområde"
 
-#: views/site.py:160
+#: views/site.py:162
 msgid ""
 "Can users register themselves into the workspace? (if not, only invitations "
 "by managers can create new users)"
@@ -1390,87 +1401,88 @@
 "Skal brukere kunne registrere seg på arbeidsområdet? (Hvis ikke, må brukere "
 "inviteres av en administrator.)"
 
-#: views/site.py:164
+#: views/site.py:166
 msgid "Workspace registration moderation"
 msgstr "Godkjenning av registreringer på arbeidsområde"
 
-#: views/site.py:165
+#: views/site.py:167
+#, fuzzy
 msgid ""
-"Should new users be moderated (registration will require manager's approval)"
+"Should new users be moderated (registration will require manager's approval)?"
 msgstr ""
 "Skal nye brukere godkjennes (registrering vil kreve administratorens "
 "godkjenning)"
 
-#: views/site.py:169
+#: views/site.py:171
 msgid "Role model"
 msgstr "Rollemodell"
 
-#: views/site.py:170
+#: views/site.py:172
 msgid "Change the roles available in the workspace"
 msgstr "Endre roller i arbeidsområdet"
 
-#: views/site.py:195
+#: views/site.py:202 views/site.py:211
 msgid "Settings saved"
 msgstr "Innstillinger lagret"
 
-#: views/texts.py:165
+#: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
 msgstr "%(nb_texts)i tekst(er) slettet"
 
-#: views/texts.py:210
+#: views/texts.py:207
 #, python-format
 msgid "Text %(text_title)s deleted"
 msgstr "Tekstet %(text_title)s slettet"
 
-#: views/texts.py:221
+#: views/texts.py:218
 #, python-format
 msgid "Text version %(text_version_title)s deleted"
 msgstr "Tekstversjon %(text_version_title)s slettet"
 
-#: views/texts.py:616
+#: views/texts.py:595
 msgid "Note (optional)"
 msgstr "Kommentar (valgfritt)"
 
-#: views/texts.py:619
+#: views/texts.py:598
 msgid "Add a note to explain the modifications made to the text"
 msgstr "Legg til en kommentar for å beskrive foretatte endringer i teksten"
 
-#: views/texts.py:629
+#: views/texts.py:608
 msgid "New version (optional)"
 msgstr "Ny versjon (valgfritt)"
 
-#: views/texts.py:632
+#: views/texts.py:611
 msgid "Create a new version of this text (recommended)"
 msgstr "Opprett ny versjon av teksten (anbefales)"
 
-#: views/texts.py:635
+#: views/texts.py:614
 msgid "Keep comments (optional)"
 msgstr "Behold merknader (valgfritt)"
 
-#: views/texts.py:638
+#: views/texts.py:617
 msgid "Keep comments (if not affected by the edit)"
 msgstr "Behold merknadene (dersom de ikke er påvirket av endringene i teksten)"
 
-#: views/texts.py:701
+#: views/texts.py:680
 msgid "Name (optional)"
 msgstr "Navn (valgfritt)"
 
-#: views/texts.py:702
+#: views/texts.py:681
 msgid "Email (optional)"
 msgstr "Epost (valgfritt)"
 
-#: views/texts.py:752
+#: views/texts.py:731
 #, python-format
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr "Ny versjon (kopiert fra versjon %(version_title)s) har blitt opprettet"
 
-#: views/texts.py:860 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"
 
-#: views/texts.py:918
+#: views/texts.py:897
 msgid "Text settings updated"
 msgstr "Tekstinnstillinger oppdatert"
 
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/pt_BR/LC_MESSAGES/django.mo
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
diff -r 5f30378c79a4 -r b87f018a53f9 src/cm/locale/pt_BR/LC_MESSAGES/django.po
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Thu Feb 11 16:38:39 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Thu Feb 11 17:13:33 2010 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-05 15:10+0100\n"
+"POT-Creation-Date: 2010-02-11 17:10+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"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,145 +55,141 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "Palavras-chave não pode exceder 250 caracteres."
 
-#: diff.py:53
-msgid "unknown"
-msgstr "desconhecido"
-
-#: models.py:175 templates/site/text_history.html:79 views/create.py:30
-#: views/create.py:45 views/texts.py:612
+#: 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"
 
-#: models.py:176
+#: models.py:177
 msgid "Format"
 msgstr "Formatar"
 
-#: models.py:177 views/texts.py:703
+#: models.py:178 views/texts.py:682
 msgid "Content"
 msgstr "Conteúdo"
 
-#: models.py:178 models.py:615
+#: models.py:179 models.py:637
 msgid "Tags"
 msgstr "Palavras-chave"
 
-#: models.py:180 views/user.py:223
+#: models.py:181 views/user.py:223
 msgid "Note"
 msgstr "Observação"
 
-#: models.py:182
+#: models.py:183
 msgid "Moderation a posteriori?"
 msgstr "Moderação a posteriori?"
 
-#: models.py:300
+#: models.py:305
 msgid "Format:"
 msgstr "Formatar:"
 
-#: models.py:518
+#: models.py:540
 msgid "name"
 msgstr "nome"
 
-#: models.py:519
+#: models.py:541
 msgid "description"
 msgstr "descrição"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow contact"
 msgstr "Permitir contato"
 
-#: models.py:609
+#: models.py:631
 msgid "Allow email messages from other users"
 msgstr "Permitir mensagens de email de outros usuários"
 
-#: models.py:610
+#: models.py:632
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: models.py:613
+#: models.py:635
 msgid "Suspended access"
 msgstr "Suspender acesso"
 
-#: models.py:637
+#: models.py:659
 msgid "suspended"
 msgstr "suspenso"
 
-#: models.py:639
+#: models.py:661
 msgid "waiting approval"
 msgstr "aguardando aprovação"
 
-#: models.py:645
+#: models.py:667
 msgid "pending"
 msgstr "pendente"
 
-#: models.py:660
+#: models.py:682
 msgid "Invitation"
 msgstr "Convite"
 
-#: models.py:728
+#: models.py:750
 #, python-format
 msgid "Text %(link_to_text)s edited"
 msgstr "Texto %(link_to_text)s editado"
 
-#: models.py:729
+#: models.py:751
 #, python-format
 msgid "Text %(link_to_text)s edited (new version created)"
 msgstr "Texto %(link_to_text)s editado (criada nova versão)"
 
-#: models.py:730
+#: models.py:752
 #, python-format
 msgid "Text %(link_to_text)s added"
 msgstr "Texto %(link_to_text)s adicionado"
 
-#: models.py:731
+#: models.py:753
 #, python-format
 msgid "Text %(link_to_text)s removed"
 msgstr "Texto %(link_to_text)s removido"
 
-#: models.py:732
+#: models.py:754
 #, python-format
 msgid "Comment %(link_to_comment)s added on text %(link_to_text)s"
 msgstr "Comentário %(link_to_comment)s adicionado ao texto %(link_to_text)s "
 
-#: models.py:733
+#: models.py:755
 #, python-format
 msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s"
 msgstr "Comentário %(link_to_comment)s removido do texto %(link_to_text)s"
 
-#: models.py:734
+#: models.py:756
 #, python-format
 msgid "User %(username)s added"
 msgstr "Usuário %(username)s adicionado"
 
-#: models.py:735
+#: models.py:757
 #, python-format
 msgid "User %(username)s access to workspace enabled"
 msgstr "Acesso do usuário %(username)s à área de trabalho permitido"
 
-#: models.py:736
+#: models.py:758
 #, python-format
 msgid "User %(username)s access to workspace refused"
 msgstr "Acesso do usuário %(username)s à área de trabalho recusado"
 
-#: models.py:737
+#: models.py:759
 #, python-format
 msgid "User %(username)s access to workspace suspended"
 msgstr "Acesso do usuário %(username)s à área de trabalho suspenso"
 
-#: models.py:738
+#: models.py:760
 #, python-format
 msgid "User %(username)s access to workspace activated"
 msgstr "Acesso do usuário %(username)s à área de trabalho ativado"
 
-#: models.py:739
+#: models.py:761
 #, python-format
 msgid "User %(username)s has activated his account"
 msgstr "O usuário %(username)s ativou sua conta"
 
-#: models.py:794 models.py:802
+#: models.py:816 models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "por \"%(username)s\""
 
-#: models.py:796
+#: models.py:818
 #, python-format
 msgid "%(time_since)s ago"
 msgstr "há %(time_since)s"
@@ -533,23 +529,23 @@
 msgid "Commenting"
 msgstr "Comentando"
 
-#: templates/site/dashboard.html:260
+#: templates/site/dashboard.html:262
 msgid "Activities"
 msgstr "Atividades"
 
-#: templates/site/dashboard.html:263
+#: templates/site/dashboard.html:265
 msgid "texts"
 msgstr "textos"
 
-#: templates/site/dashboard.html:264
+#: templates/site/dashboard.html:266
 msgid "comments"
 msgstr "comentários"
 
-#: templates/site/dashboard.html:266
+#: templates/site/dashboard.html:268
 msgid "users"
 msgstr "usuário"
 
-#: templates/site/dashboard.html:306
+#: templates/site/dashboard.html:308
 msgid "No activities"
 msgstr "Sem atividades"
 
@@ -585,7 +581,7 @@
 
 #: 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:26
+#: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
 msgstr "Ajuda"
@@ -701,7 +697,12 @@
 msgid "Settings"
 msgstr "Configurações"
 
-#: templates/site/settings.html:32
+#: templates/site/settings.html:25
+#, fuzzy
+msgid "Delete logo"
+msgstr "Apagar"
+
+#: templates/site/settings.html:34
 msgid ""
 "Are you sure you want to change the role model? All roles (except managers) "
 "will be resetted!"
@@ -1113,18 +1114,18 @@
 "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:14
+#: templates/site/layout/base_workspace.html:20
 msgid "back to workspace"
 msgstr "voltar para área de trabalho"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_texts)s text"
 msgid_plural "%(nb_texts)s texts"
 msgstr[0] "%(nb_texts)s texto"
 msgstr[1] "%(nb_texts)s textos"
 
-#: templates/site/layout/base_workspace.html:17
+#: templates/site/layout/base_workspace.html:30
 #, python-format
 msgid "%(nb_users)s user"
 msgid_plural "%(nb_users)s users"
@@ -1255,6 +1256,10 @@
 msgid "%Y-%m-%d %H:%M"
 msgstr "%Y-%m-%d %H:%M"
 
+#: utils/diff.py:53
+msgid "unknown"
+msgstr "desconhecido"
+
 #: views/create.py:26
 msgid "Upload file (optional)"
 msgstr "Carregar arquivo (opcional)"
@@ -1342,7 +1347,7 @@
 msgid "Private notifications feed reseted."
 msgstr "Feed privado de avisos restabelecido."
 
-#: views/site.py:81 views/texts.py:132 views/user.py:525
+#: views/site.py:81 views/texts.py:129 views/user.py:525
 msgid "You're logged in!"
 msgstr "Você entrou!"
 
@@ -1383,10 +1388,15 @@
 msgstr "Slogan da área de trabalho"
 
 #: views/site.py:159
+#, fuzzy
+msgid "Workspace logo"
+msgstr "Função da área de trabalho"
+
+#: views/site.py:161
 msgid "Workspace registration"
 msgstr "Registro da área de trabalho"
 
-#: views/site.py:160
+#: views/site.py:162
 msgid ""
 "Can users register themselves into the workspace? (if not, only invitations "
 "by managers can create new users)"
@@ -1394,86 +1404,87 @@
 "Usuários podem se inscrever na área de trabalho? (se não, apenas convites "
 "por gerentes podem criar novos usuários)"
 
-#: views/site.py:164
+#: views/site.py:166
 msgid "Workspace registration moderation"
 msgstr "Moderação de registro da área de trabalho"
 
-#: views/site.py:165
+#: views/site.py:167
+#, fuzzy
 msgid ""
-"Should new users be moderated (registration will require manager's approval)"
+"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:169
+#: views/site.py:171
 msgid "Role model"
 msgstr "Função modelo"
 
-#: views/site.py:170
+#: views/site.py:172
 msgid "Change the roles available in the workspace"
 msgstr "Alterar as funções disponível na área de trabalho"
 
-#: views/site.py:195
+#: views/site.py:202 views/site.py:211
 msgid "Settings saved"
 msgstr "Configurações salvas"
 
-#: views/texts.py:165
+#: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
 msgstr "%(nb_texts)i texto(s) apagado(s)"
 
-#: views/texts.py:210
+#: views/texts.py:207
 #, python-format
 msgid "Text %(text_title)s deleted"
 msgstr "Texto %(text_title)s apagado"
 
-#: views/texts.py:221
+#: views/texts.py:218
 #, fuzzy, python-format
 msgid "Text version %(text_version_title)s deleted"
 msgstr "Texto %(text_title)s apagado"
 
-#: views/texts.py:616
+#: views/texts.py:595
 msgid "Note (optional)"
 msgstr "Observação (opcional)"
 
-#: views/texts.py:619
+#: views/texts.py:598
 msgid "Add a note to explain the modifications made to the text"
 msgstr "Adicionar uma observação para explicar as mudanças feitas no texto"
 
-#: views/texts.py:629
+#: views/texts.py:608
 msgid "New version (optional)"
 msgstr "Nova versão (opcional)"
 
-#: views/texts.py:632
+#: views/texts.py:611
 msgid "Create a new version of this text (recommended)"
 msgstr "Criar uma nova versão desse texto (recomendado)"
 
-#: views/texts.py:635
+#: views/texts.py:614
 msgid "Keep comments (optional)"
 msgstr "Manter comentários (opcional)"
 
-#: views/texts.py:638
+#: views/texts.py:617
 msgid "Keep comments (if not affected by the edit)"
 msgstr "Manter comentários (se não afetados pela edição)"
 
-#: views/texts.py:701
+#: views/texts.py:680
 msgid "Name (optional)"
 msgstr "Nome (opcional)"
 
-#: views/texts.py:702
+#: views/texts.py:681
 msgid "Email (optional)"
 msgstr "Email (opcional)"
 
-#: views/texts.py:752
+#: views/texts.py:731
 #, fuzzy, python-format
 msgid "A new version (copied from version %(version_title)s) has been created"
 msgstr "Uma mova versão (copiada da versão %(version_id)s) foi criada"
 
-#: views/texts.py:860 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"
 
-#: views/texts.py:918
+#: views/texts.py:897
 msgid "Text settings updated"
 msgstr "Configurações do texto atualizadas"