# HG changeset patch
# User rbernard
# Date 1266058994 -3600
# Node ID 07019190bfe33d164593a42b92713b8265bb263b
# Parent  4f072edc51a1b71c0c2afb6e272015ef9bd062e7# Parent  31288d47e729413cc06c94b80ae87ea326904762
Merge with null

diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/en/LC_MESSAGES/django.mo
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/en/LC_MESSAGES/django.po
--- a/src/cm/locale/en/LC_MESSAGES/django.po	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po	Sat Feb 13 12:03:14 2010 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 17:11+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"
@@ -368,7 +368,8 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:23 templates/site/text_create_content.html:47
+#: templates/site/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
@@ -668,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
@@ -689,22 +690,30 @@
 msgid "%(wname)s Registration"
 msgstr ""
 
-#: templates/site/settings.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 ""
 
-#: templates/site/settings.html:25
-msgid "Delete logo"
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
+msgid "General"
 msgstr ""
 
-#: templates/site/settings.html:34
+#: 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 ""
 
+#: templates/site/settings_design.html:31
+msgid "Delete logo"
+msgstr ""
+
 #: templates/site/text_create_content.html:26
 #: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
 msgid "Text list"
@@ -1251,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 ""
@@ -1300,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
@@ -1347,49 +1356,59 @@
 msgid "Email sent. We will get back to you as quickly as possible."
 msgstr ""
 
-#: views/site.py:149
+#: views/site.py:164
 msgid "Workspace name"
 msgstr ""
 
-#: views/site.py:154
+#: views/site.py:169
 msgid "Workspace tagline"
 msgstr ""
 
-#: views/site.py:159
-msgid "Workspace logo"
-msgstr ""
-
-#: views/site.py:161
+#: views/site.py:174
 msgid "Workspace registration"
 msgstr ""
 
-#: views/site.py:162
+#: views/site.py:175
 msgid ""
 "Can users register themselves into the workspace? (if not, only invitations "
 "by managers can create new users)"
 msgstr ""
 
-#: views/site.py:166
+#: views/site.py:179
 msgid "Workspace registration moderation"
 msgstr ""
 
-#: views/site.py:167
+#: views/site.py:180
 msgid ""
 "Should new users be moderated (registration will require manager's approval)?"
 msgstr ""
 
-#: views/site.py:171
+#: views/site.py:184
 msgid "Role model"
 msgstr ""
 
-#: views/site.py:172
+#: views/site.py:185
 msgid "Change the roles available in the workspace"
 msgstr ""
 
-#: views/site.py:202 views/site.py:211
+#: views/site.py:200 views/site.py:206 views/site.py:234 views/site.py:243
 msgid "Settings saved"
 msgstr ""
 
+#: views/site.py:214
+msgid "Workspace logo"
+msgstr ""
+
+#: views/site.py:216
+msgid "Workspace html code"
+msgstr ""
+
+#: 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 ""
+
 #: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/es/LC_MESSAGES/django.mo
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/es/LC_MESSAGES/django.po
--- a/src/cm/locale/es/LC_MESSAGES/django.po	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po	Sat Feb 13 12:03:14 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-11 17:11+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,15 +374,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:23 templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/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/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"
 
@@ -382,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"
@@ -422,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"
 
@@ -436,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"
 
@@ -480,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"
@@ -489,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"
 
@@ -500,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"
 
@@ -524,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..."
@@ -572,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"
@@ -600,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"
 
@@ -609,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"
 
@@ -640,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"
@@ -657,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"
@@ -679,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"
@@ -700,27 +726,38 @@
 msgid "%(wname)s Registration"
 msgstr "Registro de %(wname)s"
 
-#: templates/site/settings.html:5 templates/site/text_list.html:181
+#: 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:25
+#: 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
+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_design.html:31
 #, 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!"
-msgstr ""
-"¿Está seguro/a de querer cambiar el modelo de perfiles? ¡Todos los roles "
-"(excepto los administradores) se reiniciarán!"
-
 #: 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"
 
@@ -738,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
@@ -748,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
@@ -771,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
@@ -824,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"
 
@@ -832,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"
 
@@ -851,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"
@@ -870,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
@@ -887,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"
 
@@ -924,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"
 
@@ -940,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"
@@ -960,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
@@ -978,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"
@@ -1024,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"
 
@@ -1071,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"
@@ -1098,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"
 
@@ -1116,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"
 
@@ -1131,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
@@ -1208,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
@@ -1253,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"
@@ -1290,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."
@@ -1304,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"
 
@@ -1359,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?"
@@ -1374,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!"
 
@@ -1406,55 +1445,59 @@
 msgid "Email sent. We will get back to you as quickly as possible."
 msgstr "Correo enviado. Se lo devolveremos tan pronto como sea posible."
 
-#: views/site.py:149
+#: views/site.py:164
 msgid "Workspace name"
 msgstr "Nombre del espacio de trabajo"
 
-#: views/site.py:154
+#: views/site.py:169
 msgid "Workspace tagline"
 msgstr "Etiqueta del espacio de trabajo"
 
-#: views/site.py:159
+#: views/site.py:174
+msgid "Workspace registration"
+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)"
+
+#: views/site.py:179
+msgid "Workspace registration moderation"
+msgstr "Moderación del registro del espacio de trabajo"
+
+#: 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)"
+
+#: views/site.py:184
+msgid "Role model"
+msgstr "Modelo de perfiles"
+
+#: views/site.py:185
+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
+msgid "Settings saved"
+msgstr "Ajustes guardados"
+
+#: views/site.py:214
 #, 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:162
-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:166
-msgid "Workspace registration moderation"
-msgstr "Moderación del registro del espacio de trabajo"
+#: views/site.py:216
+#, fuzzy
+msgid "Workspace html code"
+msgstr "Perfil del espacio de trabajo"
 
-#: views/site.py:167
-#, fuzzy
-msgid ""
-"Should new users be moderated (registration will require manager's approval)?"
+#: 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 ""
-"¿Deben moderarse los usuarios nuevos? (el registro requerirá la aprobación "
-"del administrador)"
-
-#: views/site.py:171
-msgid "Role model"
-msgstr "Modelo de perfiles"
-
-#: 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:202 views/site.py:211
-msgid "Settings saved"
-msgstr "Ajustes guardados"
 
 #: views/texts.py:162
 #, python-format
@@ -1508,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)"
@@ -1541,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"
@@ -1586,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"
 
@@ -1657,44 +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"
 
@@ -1703,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"
+
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/fr/LC_MESSAGES/django.mo
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/fr/LC_MESSAGES/django.po
--- a/src/cm/locale/fr/LC_MESSAGES/django.po	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po	Sat Feb 13 12:03:14 2010 +0100
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 17:12+0100\n"
-"PO-Revision-Date: 2010-02-11 17:13+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"
@@ -379,7 +379,8 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:23
+#: 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
@@ -701,7 +702,7 @@
 msgstr "Désactiver la notification"
 
 #: templates/site/notifications_desactivate.html:31
-msgid "Desactivate"
+msgid "Deactivate"
 msgstr "Désactiver"
 
 #: templates/site/profile.html:6
@@ -728,20 +729,32 @@
 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/macros/text_tabs.html:19
 msgid "Settings"
 msgstr "Paramètres"
 
-#: templates/site/settings.html:25
+#: 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
+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_design.html:31
 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 !"
-
 #: templates/site/text_create_content.html:26
 #: templates/site/text_create_upload.html:24
 #: templates/site/text_list.html:37
@@ -1313,42 +1326,42 @@
 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"
@@ -1363,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
@@ -1412,47 +1425,57 @@
 msgid "Email sent. We will get back to you as quickly as possible."
 msgstr "Message envoyé. Nous vous répondrons dans les meilleurs délais."
 
-#: views/site.py:149
+#: views/site.py:164
 msgid "Workspace name"
 msgstr "Nom de l'espace de travail"
 
-#: views/site.py:154
+#: views/site.py:169
 msgid "Workspace tagline"
 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
+#: views/site.py:174
 msgid "Workspace registration"
 msgstr "S'enregistrer sur l'espace de travail"
 
-#: views/site.py:162
+#: 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)"
 
-#: views/site.py:166
+#: views/site.py:179
 msgid "Workspace registration moderation"
 msgstr "Modération de l'enregistrement sur l'espace de travail"
 
-#: views/site.py:167
+#: 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) ?"
 
-#: views/site.py:171
+#: views/site.py:184
 msgid "Role model"
 msgstr "Modèle des rôles"
 
-#: views/site.py:172
+#: views/site.py:185
 msgid "Change the roles available in the workspace"
 msgstr "Modifie les rôles disponibles dans l'espace de travail"
 
-#: views/site.py:202
-#: views/site.py:211
+#: views/site.py:200
+#: views/site.py:206
+#: views/site.py:234
+#: views/site.py:243
 msgid "Settings saved"
 msgstr "Paramètres sauvegardés"
 
+#: views/site.py:214
+msgid "Workspace logo"
+msgstr "Logo de l'espace de travail"
+
+#: views/site.py:216
+msgid "Workspace html code"
+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."
+
 #: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
@@ -1661,6 +1684,8 @@
 msgid "You've been registered, please check your email for the confirm message."
 msgstr "Enregistrement réussi, un message de confirmation vous a été envoyé"
 
+#~ msgid "Design"
+#~ msgstr "Design"
 #~ msgid "%(workspace_name)s's workspace"
 #~ msgstr "espace de travail : %(workspace_name)s"
 #~ msgid "Versions:"
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/no/LC_MESSAGES/django.mo
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/no/LC_MESSAGES/django.po
--- a/src/cm/locale/no/LC_MESSAGES/django.po	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po	Sat Feb 13 12:03:14 2010 +0100
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \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"
+"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,15 +379,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:23 templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/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/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"
 
@@ -387,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"
@@ -426,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"
 
@@ -440,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
@@ -455,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"
 
@@ -480,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"
@@ -489,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"
 
@@ -500,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å"
 
@@ -524,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..."
@@ -571,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"
@@ -599,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"
 
@@ -608,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"
 
@@ -628,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"
 
@@ -637,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"
@@ -652,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"
@@ -674,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"
@@ -695,27 +728,37 @@
 msgid "%(wname)s Registration"
 msgstr "Registrering på %(wname)s"
 
-#: templates/site/settings.html:5 templates/site/text_list.html:181
+#: 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:25
+#: templates/site/settings.html:21
+#: templates/site/settings_design.html:21
 #, fuzzy
-msgid "Delete logo"
-msgstr "Slett"
+msgid "General"
+msgstr "Generell"
 
-#: templates/site/settings.html:34
-msgid ""
-"Are you sure you want to change the role model? All roles (except managers) "
-"will be resetted!"
+#: templates/site/settings.html:23
+#: templates/site/settings_design.html:23
+msgid "Appearance"
 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"
 
@@ -732,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"
@@ -769,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"
@@ -820,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"
 
@@ -828,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"
 
@@ -845,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"
@@ -863,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"
@@ -880,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"
 
@@ -916,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"
 
@@ -931,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"
@@ -948,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"
@@ -1007,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"
 
@@ -1054,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"
@@ -1077,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"
 
@@ -1095,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"
 
@@ -1184,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
@@ -1262,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
@@ -1274,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."
 
@@ -1328,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
@@ -1343,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!"
 
@@ -1373,58 +1424,60 @@
 
 #: 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:149
+#: views/site.py:164
 msgid "Workspace name"
 msgstr "Navn for arbeidsområde"
 
-#: views/site.py:154
+#: views/site.py:169
 msgid "Workspace tagline"
 msgstr "Beskrivelse av arbeidsområde"
 
-#: views/site.py:159
-#, fuzzy
-msgid "Workspace logo"
-msgstr "Rolle for arbeidsområde"
-
-#: views/site.py:161
+#: views/site.py:174
 msgid "Workspace registration"
 msgstr "Registering på arbeidsområde"
 
-#: views/site.py:162
-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: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.)"
 
-#: views/site.py:166
+#: views/site.py:179
 msgid "Workspace registration moderation"
 msgstr "Godkjenning av registreringer på arbeidsområde"
 
-#: views/site.py:167
-#, fuzzy
-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:180
+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:171
+#: views/site.py:184
 msgid "Role model"
 msgstr "Rollemodell"
 
-#: views/site.py:172
+#: views/site.py:185
 msgid "Change the roles available in the workspace"
 msgstr "Endre roller i arbeidsområdet"
 
-#: views/site.py:202 views/site.py:211
+#: views/site.py:200
+#: views/site.py:206
+#: views/site.py:234
+#: views/site.py:243
 msgid "Settings saved"
 msgstr "Innstillinger lagret"
 
+#: views/site.py:214
+msgid "Workspace logo"
+msgstr "Logo for arbeidsområde"
+
+#: views/site.py:216
+#, fuzzy
+msgid "Workspace html code"
+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."
+msgstr ""
+
 #: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
@@ -1477,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"
@@ -1510,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"
@@ -1554,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."
 
@@ -1624,41 +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"
 
@@ -1669,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"
+
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/pt_BR/LC_MESSAGES/django.mo
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/locale/pt_BR/LC_MESSAGES/django.po
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Sat Feb 13 12:03:14 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-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"
+"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,15 +375,21 @@
 
 #: templates/site/contact.html:26
 #: templates/site/notifications_desactivate.html:32
-#: templates/site/settings.html:23 templates/site/text_create_content.html:47
-#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
-#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
+#: templates/site/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/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"
 
@@ -382,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"
@@ -421,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"
 
@@ -435,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
@@ -450,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"
 
@@ -475,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"
@@ -484,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"
 
@@ -495,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"
 
@@ -519,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"
@@ -566,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"
@@ -594,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"
 
@@ -603,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"
 
@@ -623,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"
 
@@ -632,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"
@@ -648,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"
@@ -670,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"
@@ -691,25 +724,38 @@
 msgid "%(wname)s Registration"
 msgstr "%(wname)s Inscrição"
 
-#: templates/site/settings.html:5 templates/site/text_list.html:181
+#: 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:25
+#: 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
+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 "Confirmar alteração de "
+
+#: templates/site/settings_design.html:31
 #, 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!"
-msgstr "Confirmar alteração de "
-
 #: 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"
 
@@ -727,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"
@@ -765,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"
@@ -819,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"
 
@@ -827,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"
 
@@ -846,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"
@@ -865,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
@@ -881,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"
 
@@ -917,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"
 
@@ -932,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"
@@ -949,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"
@@ -1008,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"
 
@@ -1059,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"
@@ -1077,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"
 
@@ -1095,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"
 
@@ -1110,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
@@ -1186,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
@@ -1265,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."
@@ -1278,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."
 
@@ -1332,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
@@ -1347,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!"
 
@@ -1379,53 +1432,59 @@
 msgid "Email sent. We will get back to you as quickly as possible."
 msgstr "Email enviado. Retornaremos assim que possível."
 
-#: views/site.py:149
+#: views/site.py:164
 msgid "Workspace name"
 msgstr "Nome da área de trabalho"
 
-#: views/site.py:154
+#: views/site.py:169
 msgid "Workspace tagline"
 msgstr "Slogan da área de trabalho"
 
-#: views/site.py:159
+#: views/site.py:174
+msgid "Workspace registration"
+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)"
+
+#: views/site.py:179
+msgid "Workspace registration moderation"
+msgstr "Moderação de registro da área de trabalho"
+
+#: 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) "
+
+#: views/site.py:184
+msgid "Role model"
+msgstr "Função modelo"
+
+#: views/site.py:185
+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
+msgid "Settings saved"
+msgstr "Configurações salvas"
+
+#: views/site.py:214
 #, 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:162
-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:166
-msgid "Workspace registration moderation"
-msgstr "Moderação de registro da área de trabalho"
+#: views/site.py:216
+#, fuzzy
+msgid "Workspace html code"
+msgstr "Função da área de trabalho"
 
-#: views/site.py:167
-#, fuzzy
-msgid ""
-"Should new users be moderated (registration will require manager's approval)?"
+#: 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 ""
-"Novos usuários devem ser moderados? (registro exigirá aprovação de gerente) "
-
-#: views/site.py:171
-msgid "Role model"
-msgstr "Função modelo"
-
-#: 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:202 views/site.py:211
-msgid "Settings saved"
-msgstr "Configurações salvas"
 
 #: views/texts.py:162
 #, python-format
@@ -1479,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"
@@ -1512,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"
@@ -1556,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."
 
@@ -1627,52 +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"
+
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/media/css/base.css
--- a/src/cm/media/css/base.css	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/media/css/base.css	Sat Feb 13 12:03:14 2010 +0100
@@ -409,6 +409,8 @@
 	margin-top:10px;
 	border-top:1px solid #DDDDDD;
 	line-height: 0.6em;
+	background-color: #FFF;
+	padding-bottom:10px;
 }
 
 #footer ul {
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/templates/site/layout/base.html
--- a/src/cm/templates/site/layout/base.html	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/templates/site/layout/base.html	Sat Feb 13 12:03:14 2010 +0100
@@ -44,6 +44,12 @@
       -->
       </script>
   
+    {% if CONF.workspace_code %}
+    	{% autoescape off %}
+    	{{ CONF.workspace_code }}
+    	{% endautoescape %}
+    {% endif %}
+    	
     {% block head_base %}
     {% endblock %}
     {% block head %}
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/templates/site/notifications_desactivate.html
--- a/src/cm/templates/site/notifications_desactivate.html	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/templates/site/notifications_desactivate.html	Sat Feb 13 12:03:14 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">
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/templates/site/settings.html
--- a/src/cm/templates/site/settings.html	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/templates/site/settings.html	Sat Feb 13 12:03:14 2010 +0100
@@ -17,12 +17,16 @@
 
 <div id="settings" class="tab-meta">   
 
+<ul class="sub_list">
+    <li class="active_sub">{% blocktrans %}General{% endblocktrans %}</li>
+    <li> / </li>
+    <li><a href="{% url settings-design %}">{% blocktrans %}Appearance{% endblocktrans %}</a></li>
+</ul>
+
 {% endblock %}
 
 {% block buttons %}
     <input name="cancel" type="button" id="cancel_button" value="{% blocktrans %}Cancel{% endblocktrans %}"/>
-    &nbsp;|&nbsp; 
-    <input name="delete_logo" type="submit" id="delete_logo_button" value="{% blocktrans %}Delete logo{% endblocktrans %}"/>
     <script type="text/javascript">
     <!--
 
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/templates/site/settings_design.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/templates/site/settings_design.html	Sat Feb 13 12:03:14 2010 +0100
@@ -0,0 +1,58 @@
+{% extends "site/layout/base_workspace_form.html" %}
+{% load i18n %}
+{% load com %}
+
+{% block title %}{% blocktrans %}Settings{% endblocktrans %}{% endblock %}
+
+{% block head %}
+{% endblock %}
+
+{% block pre_form %}
+
+<script type="text/javascript">
+<!--
+tb_conf['current_tab'] = 'settings';
+-->
+</script>
+
+<div id="settings" class="tab-meta">   
+
+<ul class="sub_list">
+    <li><a href="{% url settings %}">{% blocktrans %}General{% endblocktrans %}</a></li>
+    <li> / </li>
+    <li class="active_sub">{% blocktrans %}Appearance{% endblocktrans %}</li>
+</ul>
+
+{% endblock %}
+
+{% block buttons %}
+    <input name="cancel" type="button" id="cancel_button" value="{% blocktrans %}Cancel{% endblocktrans %}"/>
+    &nbsp;|&nbsp; 
+    <input name="delete_logo" type="submit" id="delete_logo_button" value="{% blocktrans %}Delete logo{% endblocktrans %}"/>
+    <script type="text/javascript">
+    <!--
+
+    
+    $(document).ready(function(){
+        old_state = $("#id_workspace_role_model").attr('value');
+        
+        $("#id_workspace_role_model").change(function (e) { 
+            question = "{% blocktrans %}Are you sure you want to change the role model? All roles (except managers) will be resetted!{% endblocktrans %}";
+            if (!confirm(question)) {
+            	$("#id_workspace_role_model").attr('value',old_state);
+            }
+          });
+        
+        $("#cancel_button").click(function (e) { 
+            window.location = "{% url index %}";
+            e.stopPropagation(); 
+          });                
+    }) ;
+    -->
+    </script>
+{% endblock %}
+
+{% block post_form %}
+</div>
+{% endblock %}
+
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/templates/site/text_view_frame.html
--- a/src/cm/templates/site/text_view_frame.html	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/templates/site/text_view_frame.html	Sat Feb 13 12:03:14 2010 +0100
@@ -60,7 +60,7 @@
 </head>
 <BODY>
     <DIV id="add_comment_btn" class="initially_hidden"> 
-		<img align="middle" src="/site_media/img/note_add_sop_mid.gif" alt="{% blocktrans %}add a comment{% endblocktrans %}" title="{% blocktrans %}add a comment{% endblocktrans %}"/>
+		<img align="middle" src="{{ CM_MEDIA_PREFIX }}img/note_add_sop_mid.gif" alt="{% blocktrans %}add a comment{% endblocktrans %}" title="{% blocktrans %}add a comment{% endblocktrans %}"/>
     </DIV>
 	<!-- cf.http://layout.jquery-dev.net/download/example.html -->
 	<!-- TODO check height 600 ... -->
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/urls.py
--- a/src/cm/urls.py	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/urls.py	Sat Feb 13 12:03:14 2010 +0100
@@ -21,6 +21,7 @@
      url(r'^$', dashboard, name="index"),
      url(r'^text/$', text_list, name="text"),
      url(r'^settings/$', settingss, name="settings"),
+     url(r'^settings/design/$', settings_design, name="settings-design"),
 
      # system pages
      url(r'^i18n/setlang/(?P<lang_code>\w+)/$', i18n.set_language, name="setlang"),
@@ -93,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
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/views/feeds.py
--- a/src/cm/views/feeds.py	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/views/feeds.py	Sat Feb 13 12:03:14 2010 +0100
@@ -12,14 +12,13 @@
 import time
 from cm.exception import UnauthorizedException
 import re
+from urlparse import urlparse
 # taken from django's feedgenerator.py and changed to support multiple posts in minute
 def get_tag_uri(url, date):
     "Creates a TagURI. See http://diveintomark.org/archives/2004/05/28/howto-atom-id"
-    tag = re.sub('^http://', '', url)
-    if date is not None:
-        tag = re.sub('/', ',%s:/' % time.mktime(date.timetuple()), tag, 1)
-    tag = re.sub('#', '/', tag)
-    return u'tag:' + tag
+    parsed_url = urlparse(url)
+    time_stp = time.mktime(date.timetuple()) if date is not None else ''
+    return u'tag:%s,%s:%s' %(parsed_url.hostname, time_stp, parsed_url.path) # + '/' + parsed_url.fragment
 
 
 def public_feed(request):
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/views/followup.py
--- a/src/cm/views/followup.py	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/views/followup.py	Sat Feb 13 12:03:14 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,
diff -r 4f072edc51a1 -r 07019190bfe3 src/cm/views/site.py
--- a/src/cm/views/site.py	Sat Feb 13 12:02:23 2010 +0100
+++ b/src/cm/views/site.py	Sat Feb 13 12:03:14 2010 +0100
@@ -145,7 +145,22 @@
 from cm.role_models import role_models_choices
 from django.utils.safestring import mark_safe
 
-class SettingsForm(forms.Form):
+class BaseSettingsForm(forms.Form):
+    def __init__(self, data=None, initial=None):
+        forms.Form.__init__(self, data=data, initial=initial)
+        for field in self.fields:
+            if field in self.conf_fields:
+                self.fields[field].initial = Configuration.objects.get_key(field)
+                
+                self.fields[field].initial = Configuration.objects.get_key(field)
+    
+    def save(self):
+        for field in self.fields:
+            if field in self.conf_fields:
+                val = self.cleaned_data[field]
+                Configuration.objects.set_key(field, val)
+                                    
+class SettingsForm(BaseSettingsForm):
     workspace_name = forms.CharField(label=ugettext_lazy("Workspace name"),
                                      widget=forms.TextInput,
                                      required=False,
@@ -156,8 +171,6 @@
                                         required=False,
                                         )
 
-    workspace_logo_file  = forms.FileField(label=ugettext_lazy("Workspace logo"),required=False)
-
     workspace_registration = forms.BooleanField(label=ugettext_lazy("Workspace registration"),
                                                 help_text=ugettext_lazy("Can users register themselves into the workspace? (if not, only invitations by managers can create new users)"),
                                                 required=False,
@@ -178,22 +191,7 @@
     # fields to save in the Configuration objects
     conf_fields = ['workspace_name', 'workspace_tagline', 'workspace_registration', 'workspace_registration_moderation', 'workspace_role_model']
 
-    def __init__(self, data=None, initial=None):
-        forms.Form.__init__(self, data=data, initial=initial)
-        for field in self.fields:
-            if field in self.conf_fields:
-                self.fields[field].initial = Configuration.objects.get_key(field)
-    
-    def save(self):
-        for field in self.fields:
-            if field in self.conf_fields:
-                val = self.cleaned_data[field]
-                Configuration.objects.set_key(field, val)
-        #handle_uploaded_file()
-    def save_file(self, logo_file):
-        attach = Attachment.objects.create_attachment(filename='wp_logo', data=logo_file.read(), text_version=None)
-        Configuration.objects.set_key('workspace_logo_file_key', attach.key)
-        
+
 @has_global_perm('can_manage_workspace')
 def settingss(request):
     if request.method == 'POST':
@@ -205,9 +203,6 @@
             form = SettingsForm(data=request.POST)
             if form.is_valid() :
                 form.save()
-                logo_file = request.FILES.get('workspace_logo_file',None)
-                if logo_file:
-                    form.save_file(logo_file)
                 display_message(request, _(u'Settings saved'))
                 return HttpResponseRedirect(reverse('index'))
     else:
@@ -215,6 +210,43 @@
     
     return render_to_response('site/settings.html', {'form' : form, 'help_links' : {'workspace_role_model':'role_model'}}, context_instance=RequestContext(request))
 
+class SettingsDesignForm(BaseSettingsForm):
+    workspace_logo_file  = forms.FileField(label=ugettext_lazy("Workspace logo"),required=False)
+    
+    workspace_code = forms.CharField(label=ugettext_lazy("Workspace html code"),
+                                     help_text=(ugettext_lazy("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.")),
+                                     widget=forms.Textarea,
+                                     required=False,
+                                     )
+
+    conf_fields = ['workspace_code']
+    
+    def save_file(self, logo_file):
+        attach = Attachment.objects.create_attachment(filename='wp_logo', data=logo_file.read(), text_version=None)
+        Configuration.objects.set_key('workspace_logo_file_key', attach.key)
+        
+    
+@has_global_perm('can_manage_workspace')
+def settings_design(request):
+    if request.method == 'POST':
+        if 'delete_logo' in request.POST:
+            Configuration.objects.del_key('workspace_logo_file_key')
+            display_message(request, _(u'Settings saved'))
+            return HttpResponseRedirect(reverse('index'))            
+        else:
+            form = SettingsDesignForm(data=request.POST)
+            if form.is_valid() :
+                form.save()
+                logo_file = request.FILES.get('workspace_logo_file',None)
+                if logo_file:
+                    form.save_file(logo_file)
+                display_message(request, _(u'Settings saved'))
+                return HttpResponseRedirect(reverse('index'))
+    else:
+        form = SettingsDesignForm()
+    
+    return render_to_response('site/settings_design.html', {'form' : form}, context_instance=RequestContext(request))
+    
 def help(request):
     return render_to_response('site/help.html', context_instance=RequestContext(request))