Mercurial Mercurial > comt / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo fix / i18n update (fr)
authorraph
Fri, 12 Feb 2010 13:13:46 +0100
changeset 167 0444040c4877
parent 166 fc7e95de5319
child 168 3b1990e52198
typo fix / i18n update (fr)
src/cm/locale/en/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/cm/locale/en/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/cm/locale/es/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/cm/locale/es/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/cm/locale/fr/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/cm/locale/fr/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/cm/locale/no/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/cm/locale/no/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/cm/locale/pt_BR/LC_MESSAGES/django.mo file | annotate | diff | comparison | revisions
src/cm/locale/pt_BR/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/cm/templates/site/settings_design.html file | annotate | diff | comparison | revisions 
Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/en/LC_MESSAGES/django.po	Fri Feb 12 12:25:57 2010 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po	Fri Feb 12 13:13:46 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 13:10+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
@@ -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"
@@ -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"
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/es/LC_MESSAGES/django.po	Fri Feb 12 12:25:57 2010 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po	Fri Feb 12 13:13:46 2010 +0100
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 17:11+0100\n"
+"POT-Creation-Date: 2010-02-12 13:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alejandro Martin Ortin <alejandromartinortin@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,7 +366,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
@@ -700,18 +701,22 @@
 msgid "%(wname)s Registration"
 msgstr "Registro de %(wname)s"
 
-#: 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 "Ajustes"
 
-#: templates/site/settings.html:25
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
 #, fuzzy
-msgid "Delete logo"
-msgstr "Borrar"
+msgid "General"
+msgstr "Genérico"
 
-#: 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!"
@@ -719,6 +724,11 @@
 "¿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/text_create_content.html:26
 #: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
 msgid "Text list"
@@ -1406,24 +1416,19 @@
 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
-#, fuzzy
-msgid "Workspace logo"
-msgstr "Perfil del espacio de trabajo"
-
-#: views/site.py:161
+#: views/site.py:174
 msgid "Workspace registration"
 msgstr "Registro del espacio de trabajo"
 
-#: 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)"
@@ -1432,11 +1437,11 @@
 "contrario, sólo se podrán usar las invitaciones enviadas por los "
 "administradores para crear nuevos usuarios)"
 
-#: views/site.py:166
+#: views/site.py:179
 msgid "Workspace registration moderation"
 msgstr "Moderación del registro del espacio de trabajo"
 
-#: views/site.py:167
+#: views/site.py:180
 #, fuzzy
 msgid ""
 "Should new users be moderated (registration will require manager's approval)?"
@@ -1444,18 +1449,34 @@
 "¿Deben moderarse los usuarios nuevos? (el registro requerirá la aprobación "
 "del administrador)"
 
-#: views/site.py:171
+#: views/site.py:184
 msgid "Role model"
 msgstr "Modelo de perfiles"
 
-#: views/site.py:172
+#: 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: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 "Ajustes guardados"
 
+#: views/site.py:214
+#, fuzzy
+msgid "Workspace logo"
+msgstr "Perfil del espacio de trabajo"
+
+#: views/site.py:216
+#, fuzzy
+msgid "Workspace html code"
+msgstr "Perfil del espacio de trabajo"
+
+#: views/site.py:217
+msgid ""
+"Add stylesheets etc. Warning: this code will be added to the workspace code, "
+"make sure you know what you're doing before adding something here."
+msgstr ""
+
 #: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
@@ -1680,6 +1701,10 @@
 "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"
 
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/fr/LC_MESSAGES/django.po	Fri Feb 12 12:25:57 2010 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po	Fri Feb 12 13:13:46 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 13:10+0100\n"
+"PO-Revision-Date: 2010-02-12 13:08+0100\n"
 "Last-Translator: dev <dev@sopinspace.com>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #: client.py:25
-msgid "A selection is required. Select in the text the part your comment applies to."
-msgstr "Une portée est obligatoire. Sélectionner dans le texte la partie sur laquelle porte votre commentaire."
+msgid ""
+"A selection is required. Select in the text the part your comment applies to."
+msgstr ""
+"Une portée est obligatoire. Sélectionner dans le texte la partie sur "
+"laquelle porte votre commentaire."
 
 #: client.py:134
 msgid "name is required"
@@ -45,8 +48,7 @@
 msgid "comment removed"
 msgstr "commentaire supprimé"
 
-#: client.py:209
-#: client.py:274
+#: client.py:209 client.py:274
 msgid "comment saved"
 msgstr "commentaire sauvé"
 
@@ -58,11 +60,8 @@
 msgid "Tags input must be no longer than 250 characters."
 msgstr "La longueur des tags est limitée à 250 caractères."
 
-#: models.py:176
-#: templates/site/text_history.html:79
-#: views/create.py:30
-#: views/create.py:45
-#: views/texts.py:591
+#: models.py:176 templates/site/text_history.html:79 views/create.py:30
+#: views/create.py:45 views/texts.py:591
 msgid "Title"
 msgstr "Titre"
 
@@ -70,18 +69,15 @@
 msgid "Format"
 msgstr "Format"
 
-#: models.py:178
-#: views/texts.py:682
+#: models.py:178 views/texts.py:682
 msgid "Content"
 msgstr "Texte"
 
-#: models.py:179
-#: models.py:637
+#: models.py:179 models.py:637
 msgid "Tags"
 msgstr "Tags"
 
-#: models.py:181
-#: views/user.py:223
+#: models.py:181 views/user.py:223
 msgid "Note"
 msgstr "Note"
 
@@ -107,7 +103,8 @@
 
 #: models.py:631
 msgid "Allow email messages from other users"
-msgstr "Autoriser les participants de l'espace de travail à vous envoyer un email"
+msgstr ""
+"Autoriser les participants de l'espace de travail à vous envoyer un email"
 
 #: models.py:632
 msgid "Preferred language"
@@ -193,8 +190,7 @@
 msgid "User %(username)s has activated his account"
 msgstr "L'utilisateur %(username)s a activé son compte"
 
-#: models.py:816
-#: models.py:824
+#: models.py:816 models.py:824
 #, python-format
 msgid "by \"%(username)s\""
 msgstr "par \"%(username)s\""
@@ -244,8 +240,7 @@
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: static_i18n.py:6
-#: static_i18n.py:11
+#: static_i18n.py:6 static_i18n.py:11
 msgid "Observer"
 msgstr "Observateur"
 
@@ -357,8 +352,7 @@
 msgid "An error has occurred."
 msgstr "Une erreur s'est produite."
 
-#: templates/site/activate.html:10
-#: templates/site/user_activate.html:10
+#: templates/site/activate.html:10 templates/site/user_activate.html:10
 #: views/user.py:330
 msgid "Activate your account"
 msgstr "Activer votre compte"
@@ -367,8 +361,7 @@
 msgid "Activate"
 msgstr "Activer"
 
-#: templates/site/contact.html:6
-#: templates/site/layout/footer.html:9
+#: templates/site/contact.html:6 templates/site/layout/footer.html:9
 #: templates/site/macros/user_actions.html:20
 msgid "Contact"
 msgstr "Contact"
@@ -379,20 +372,16 @@
 
 #: 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
-#: templates/site/user_add_text.html:38
-#: templates/site/user_contact.html:25
-#: templates/site/user_edit.html:29
-#: templates/site/user_mass_add.html:34
+#: templates/site/text_create_upload.html:42 templates/site/user_add.html:34
+#: templates/site/user_add_text.html:38 templates/site/user_contact.html:25
+#: templates/site/user_edit.html:29 templates/site/user_mass_add.html:34
 #: templates/site/user_mass_add_text.html:38
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/site/dashboard.html:12
-#: templates/site/macros/main_tabs.html:10
+#: templates/site/dashboard.html:12 templates/site/macros/main_tabs.html:10
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
@@ -400,20 +389,16 @@
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/site/dashboard.html:48
-#: templates/site/text_create_content.html:4
+#: templates/site/dashboard.html:48 templates/site/text_create_content.html:4
 #: templates/site/text_create_content.html:28
-#: templates/site/text_create_upload.html:26
-#: templates/site/text_list.html:40
+#: templates/site/text_create_upload.html:26 templates/site/text_list.html:40
 #: templates/site/layout/header.html:10
 msgid "Write a text"
 msgstr "Ecrire un texte"
 
-#: templates/site/dashboard.html:49
-#: templates/site/text_create_content.html:30
+#: templates/site/dashboard.html:49 templates/site/text_create_content.html:30
 #: templates/site/text_create_upload.html:4
-#: templates/site/text_create_upload.html:28
-#: templates/site/text_list.html:42
+#: templates/site/text_create_upload.html:28 templates/site/text_list.html:42
 #: templates/site/layout/header.html:11
 msgid "Upload a text"
 msgstr "Charger un texte"
@@ -443,13 +428,11 @@
 msgid "user %(user)s awaits approval"
 msgstr "l'utilisateur %(user)s est en attente d'approbation"
 
-#: templates/site/dashboard.html:80
-#: templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
 msgid "approve"
 msgstr "accepter"
 
-#: templates/site/dashboard.html:80
-#: templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:80 templates/site/dashboard.html.py:126
 msgid "refuse"
 msgstr "refuser"
 
@@ -459,21 +442,26 @@
 
 #: templates/site/dashboard.html:85
 #: templates/site/macros/user_moderation.html:8
-msgid "Are you sure you want to approve this user's membership to the workspace?"
-msgstr "Etes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de travail ?"
+msgid ""
+"Are you sure you want to approve this user's membership to the workspace?"
+msgstr ""
+"Etes-vous sûr de vouloir accepter l'accès de cet utilisateur à l'espace de "
+"travail ?"
 
 #: templates/site/dashboard.html:94
 #: templates/site/macros/user_moderation.html:17
-msgid "Are you sure you want to refuse this user's membership to the workspace?"
-msgstr "Etes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de travail ?"
+msgid ""
+"Are you sure you want to refuse this user's membership to the workspace?"
+msgstr ""
+"Etes-vous sûr de vouloir refuser l'accès de cet utilisateur à l'espace de "
+"travail ?"
 
 #: templates/site/dashboard.html:106
 #, python-format
 msgid "registered %(duration)s ago"
 msgstr "enregistré il y a %(duration)s"
 
-#: templates/site/dashboard.html:120
-#: templates/site/dashboard.html.py:126
+#: templates/site/dashboard.html:120 templates/site/dashboard.html.py:126
 msgid "comment"
 msgstr "commentaire"
 
@@ -498,8 +486,7 @@
 msgid "Are you sure you want to refuse this comment?"
 msgstr "Etes vous sûr de vouloir refuser ce commentaire ?"
 
-#: templates/site/dashboard.html:168
-#: templates/site/dashboard.html.py:201
+#: templates/site/dashboard.html:168 templates/site/dashboard.html.py:201
 #, python-format
 msgid "modified %(duration)s ago"
 msgstr "modifié il y a %(duration)s"
@@ -508,8 +495,7 @@
 msgid "Recent texts"
 msgstr "Textes récents"
 
-#: templates/site/dashboard.html:186
-#: templates/site/macros/paginator.html:9
+#: templates/site/dashboard.html:186 templates/site/macros/paginator.html:9
 msgid "all"
 msgstr "tous"
 
@@ -520,8 +506,7 @@
 msgstr[0] "%(nb_comments)s commentaire"
 msgstr[1] "%(nb_comments)s commentaires"
 
-#: templates/site/dashboard.html:206
-#: templates/site/text_list.html:221
+#: templates/site/dashboard.html:206 templates/site/text_list.html:221
 msgid "No texts yet"
 msgstr "Aucun texte"
 
@@ -545,10 +530,8 @@
 msgid "Access"
 msgstr "Accès"
 
-#: templates/site/dashboard.html:233
-#: templates/site/dashboard.html.py:244
-#: templates/site/text_list.html:206
-#: templates/site/user_list.html:158
+#: templates/site/dashboard.html:233 templates/site/dashboard.html.py:244
+#: templates/site/text_list.html:206 templates/site/user_list.html:158
 #: templates/site/user_list.html.py:188
 msgid "Loading..."
 msgstr "Chargement ..."
@@ -594,26 +577,21 @@
 msgid "No comments yet"
 msgstr "Aucun commentaire"
 
-#: templates/site/followup.html:7
-#: templates/site/macros/main_tabs.html:16
+#: templates/site/followup.html:7 templates/site/macros/main_tabs.html:16
 #: templates/site/macros/text_tabs.html:22
 msgid "Followup"
 msgstr "Suivi"
 
-#: templates/site/followup.html:20
-#: templates/site/text_followup.html:22
+#: templates/site/followup.html:20 templates/site/text_followup.html:22
 msgid "Feeds"
 msgstr "Flux"
 
-#: templates/site/followup.html:22
-#: templates/site/text_followup.html:24
+#: templates/site/followup.html:22 templates/site/text_followup.html:24
 msgid "Public feed"
 msgstr "Flux public"
 
-#: templates/site/followup.html:22
-#: templates/site/followup.html.py:35
-#: templates/site/help.html:6
-#: templates/site/text_embed.html:27
+#: templates/site/followup.html:22 templates/site/followup.html.py:35
+#: templates/site/help.html:6 templates/site/text_embed.html:27
 #: templates/site/layout/footer.html:13
 #: templates/site/macros/form_fields.html:15
 msgid "Help"
@@ -627,8 +605,7 @@
 msgid "This is the public feed for the workspace."
 msgstr "Ceci est le flux public de l'espace de travail."
 
-#: templates/site/followup.html:35
-#: templates/site/text_followup.html:37
+#: templates/site/followup.html:35 templates/site/text_followup.html:37
 msgid "Private feed"
 msgstr "Flux privé"
 
@@ -637,16 +614,19 @@
 msgstr "Flux privé de l'espace de travail"
 
 #: templates/site/followup.html:43
-msgid "This is the private feed for the workspace. Don't share this address with others unless you want them to see all activities on the workspace."
-msgstr "Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités de l'espace de travail."
+msgid ""
+"This is the private feed for the workspace. Don't share this address with "
+"others unless you want them to see all activities on the workspace."
+msgstr ""
+"Ceci est le flux privé de l'espace de travail. Ne partagez cette adresse que "
+"si vous voulez que d'autres que vous-même puissent suivre toutes les "
+"activités de l'espace de travail."
 
-#: templates/site/followup.html:45
-#: templates/site/text_followup.html:47
+#: templates/site/followup.html:45 templates/site/text_followup.html:47
 msgid "Reset private feed url"
 msgstr "Réinitialiser l'adresse du flux privé"
 
-#: templates/site/followup.html:49
-#: templates/site/text_followup.html:51
+#: templates/site/followup.html:49 templates/site/text_followup.html:51
 msgid "Activate private feed"
 msgstr "Activer le flux privé"
 
@@ -654,8 +634,7 @@
 msgid "The private feed for this workspace is not yet activated."
 msgstr "Le flux privé de cet espace de travail n'est pas encore activé."
 
-#: templates/site/followup.html:55
-#: templates/site/text_followup.html:58
+#: templates/site/followup.html:55 templates/site/text_followup.html:58
 msgid "Email notifications"
 msgstr "Notifications par email"
 
@@ -664,11 +643,14 @@
 msgstr "S'abonner aux notifications de l'espace de travail"
 
 #: templates/site/followup.html:62
-msgid "Subscribe to all replies notifications in discussions where you have participated"
-msgstr "S'abonner aux notifications concernant les commentaires ou réponses dans les discussions auxquelles vous avez participé"
+msgid ""
+"Subscribe to all replies notifications in discussions where you have "
+"participated"
+msgstr ""
+"S'abonner aux notifications concernant les commentaires ou réponses dans les "
+"discussions auxquelles vous avez participé"
 
-#: templates/site/login.html:8
-#: templates/site/login_form.html:19
+#: templates/site/login.html:8 templates/site/login_form.html:19
 #: templates/site/layout/header.html:17
 msgid "Login"
 msgstr "Se connecter"
@@ -678,8 +660,7 @@
 msgid "%(wname)s Login"
 msgstr "Se connecter à %(wname)s"
 
-#: templates/site/login_form.html:20
-#: templates/site/register.html:8
+#: templates/site/login_form.html:20 templates/site/register.html:8
 #: templates/site/layout/header.html:18
 msgid "Register"
 msgstr "S'enregistrer"
@@ -704,20 +685,15 @@
 msgid "Desactivate"
 msgstr "Désactiver"
 
-#: templates/site/profile.html:6
-#: templates/site/profile.html.py:14
+#: templates/site/profile.html:6 templates/site/profile.html.py:14
 #, python-format
 msgid "Your profile (%(username)s)"
 msgstr "Votre profil (%(username)s)"
 
-#: templates/site/profile.html:26
-#: templates/site/text_create_content.html:45
-#: templates/site/text_create_upload.html:40
-#: templates/site/text_edit.html:36
-#: templates/site/text_settings.html:23
-#: templates/site/text_share.html:153
-#: templates/site/user_activate.html:27
-#: templates/site/user_list.html:210
+#: templates/site/profile.html:26 templates/site/text_create_content.html:45
+#: templates/site/text_create_upload.html:40 templates/site/text_edit.html:36
+#: templates/site/text_settings.html:23 templates/site/text_share.html:153
+#: templates/site/user_activate.html:27 templates/site/user_list.html:210
 #: templates/site/layout/base_workspace_form.html:32
 msgid "Save"
 msgstr "Enregistrer"
@@ -727,24 +703,34 @@
 msgid "%(wname)s Registration"
 msgstr "S'enregistrer sur %(wname)s"
 
-#: 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 "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
+#: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
 msgid "Text list"
 msgstr "Textes"
 
@@ -758,19 +744,29 @@
 
 #: templates/site/text_embed.html:26
 msgid "Copy this code into your site to display text with comments."
-msgstr "Copier ce code dans votre site pour afficher le texte et ses commentaires."
+msgstr ""
+"Copier ce code dans votre site pour afficher le texte et ses commentaires."
 
 #: templates/site/text_embed.html:26
-msgid "Users will also be able to add comments from your site depending on anonymous users' roles."
-msgstr " Les utilisateurs pourront ajouter leurs commentaires (si vous avez activé cette possiblité)."
+msgid ""
+"Users will also be able to add comments from your site depending on "
+"anonymous users' roles."
+msgstr ""
+" Les utilisateurs pourront ajouter leurs commentaires (si vous avez activé "
+"cette possiblité)."
 
 #: templates/site/text_embed.html:36
 msgid "Warning:"
 msgstr "Attention: "
 
 #: templates/site/text_embed.html:36
-msgid "You won't successfully embed the text before you give anonymous users a role allowing them to view the text."
-msgstr "Vous ne pourrez pas encapsuler votre texte dans un site externe si vous ne donnez pas aux utilisateurs anonymes un rôle leur permettant de voir le texte."
+msgid ""
+"You won't successfully embed the text before you give anonymous users a role "
+"allowing them to view the text."
+msgstr ""
+"Vous ne pourrez pas encapsuler votre texte dans un site externe si vous ne "
+"donnez pas aux utilisateurs anonymes un rôle leur permettant de voir le "
+"texte."
 
 #: templates/site/text_followup.html:7
 msgid "Text followup"
@@ -790,16 +786,25 @@
 msgstr "Flux privé du texte"
 
 #: templates/site/text_followup.html:45
-msgid "This is the private feed for the text. Don't share this address with others unless you want them to see all activities on this text."
-msgstr "Ceci est le flux privé du texte. Ne partagez cette adresse que si vous voulez que d'autres que vous-même puissent suivre toutes les activités du texte."
+msgid ""
+"This is the private feed for the text. Don't share this address with others "
+"unless you want them to see all activities on this text."
+msgstr ""
+"Ceci est le flux privé du texte. Ne partagez cette adresse que si vous "
+"voulez que d'autres que vous-même puissent suivre toutes les activités du "
+"texte."
 
 #: templates/site/text_followup.html:53
 msgid "The private feed for this text is not yet activated."
 msgstr "Le flux privé de ce texte n'est pas encore activé."
 
 #: templates/site/text_followup.html:61
-msgid "You will receive text notifications because you subscribed to notifications at the workspace level"
-msgstr "Vous recevrez les notifications de ce texte parce que vous vous êtes abonné aux notifications au niveau de l'espace de travail tout entier"
+msgid ""
+"You will receive text notifications because you subscribed to notifications "
+"at the workspace level"
+msgstr ""
+"Vous recevrez les notifications de ce texte parce que vous vous êtes abonné "
+"aux notifications au niveau de l'espace de travail tout entier"
 
 #: templates/site/text_followup.html:64
 msgid "Subscribe to all text notifications"
@@ -833,8 +838,7 @@
 msgid "Selection"
 msgstr "Sélection"
 
-#: templates/site/text_history.html:80
-#: templates/site/text_list.html:137
+#: templates/site/text_history.html:80 templates/site/text_list.html:137
 msgid "Author"
 msgstr "Auteur"
 
@@ -842,13 +846,11 @@
 msgid "Created"
 msgstr "Crée"
 
-#: templates/site/text_history.html:82
-#: templates/site/text_list.html:139
+#: templates/site/text_history.html:82 templates/site/text_list.html:139
 msgid "# comments"
 msgstr "nb. de commentaires"
 
-#: templates/site/text_history.html:102
-#: templates/site/text_list.html:159
+#: templates/site/text_history.html:102 templates/site/text_list.html:159
 msgid "View"
 msgstr "Voir"
 
@@ -861,8 +863,7 @@
 msgid "Revert to this version"
 msgstr "Revenir à cette version"
 
-#: templates/site/text_history.html:105
-#: templates/site/text_list.html:80
+#: templates/site/text_history.html:105 templates/site/text_list.html:80
 #: templates/site/text_list.html.py:161
 msgid "Delete"
 msgstr "Supprimer"
@@ -880,8 +881,11 @@
 
 #: templates/site/text_history_compare.html:32
 #, python-format
-msgid "Comparison between version #%(version_1_number)s and #%(version_2_number)s"
-msgstr "Différences entre les versions n°%(version_1_number)s et n°%(version_2_number)s"
+msgid ""
+"Comparison between version #%(version_1_number)s and #%(version_2_number)s"
+msgstr ""
+"Différences entre les versions n°%(version_1_number)s et n°%"
+"(version_2_number)s"
 
 #: templates/site/text_history_compare.html:43
 msgid "No differences"
@@ -895,44 +899,35 @@
 msgid "Texts"
 msgstr "Textes"
 
-#: templates/site/text_list.html:47
-#: templates/site/text_share.html:35
-#: templates/site/user_list.html:7
-#: templates/site/user_list.html.py:32
-#: templates/site/user_list.html:40
-#: templates/site/user_list.html.py:116
+#: templates/site/text_list.html:47 templates/site/text_share.html:35
+#: templates/site/user_list.html:7 templates/site/user_list.html.py:32
+#: templates/site/user_list.html:40 templates/site/user_list.html.py:116
 msgid "People' list"
 msgstr "Liste des utilisateurs"
 
-#: templates/site/text_list.html:50
-#: templates/site/text_share.html:40
+#: templates/site/text_list.html:50 templates/site/text_share.html:40
 #: templates/site/user_list.html:45
 msgid "Filter by tag:"
 msgstr "Filtrer avec le mot-clé"
 
-#: templates/site/text_list.html:52
-#: templates/site/text_share.html:42
+#: templates/site/text_list.html:52 templates/site/text_share.html:42
 #: templates/site/user_list.html:47
 msgid "All"
 msgstr "Tous"
 
-#: templates/site/text_list.html:79
-#: templates/site/user_list.html:72
+#: templates/site/text_list.html:79 templates/site/user_list.html:72
 msgid "Bulk Actions"
 msgstr "Actions multiples"
 
-#: templates/site/text_list.html:83
-#: templates/site/user_list.html:81
+#: templates/site/text_list.html:83 templates/site/user_list.html:81
 msgid "Apply"
 msgstr "Appliquer"
 
-#: templates/site/text_list.html:104
-#: templates/site/user_list.html:102
+#: templates/site/text_list.html:104 templates/site/user_list.html:102
 msgid "Are you sure?"
 msgstr "Etes vous sûr ?"
 
-#: templates/site/text_list.html:136
-#: templates/site/macros/text_tabs.html:10
+#: templates/site/text_list.html:136 templates/site/macros/text_tabs.html:10
 msgid "Text"
 msgstr "Texte"
 
@@ -940,8 +935,7 @@
 msgid "Modified"
 msgstr "Modifié"
 
-#: templates/site/text_list.html:140
-#: templates/site/user_list.html:136
+#: templates/site/text_list.html:140 templates/site/user_list.html:136
 msgid "Last week activity"
 msgstr "Activités de la dernière semaine"
 
@@ -956,8 +950,7 @@
 msgid "Filter by tag: %(tag_name)s"
 msgstr "Filtrer avec le mot-clé : %(tag_name)s"
 
-#: templates/site/text_list.html:160
-#: templates/site/macros/text_tabs.html:12
+#: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12
 #: templates/site/macros/user_actions.html:19
 msgid "Edit"
 msgstr "Editer"
@@ -974,58 +967,51 @@
 msgid "Edit user"
 msgstr "Editer l'utilisateur"
 
-#: templates/site/text_share.html:27
-#: templates/site/user_add.html:20
-#: templates/site/user_add_text.html:23
-#: templates/site/user_contact.html:19
-#: templates/site/user_edit.html:20
-#: templates/site/user_mass_add.html:20
+#: templates/site/text_share.html:27 templates/site/user_add.html:20
+#: templates/site/user_add_text.html:23 templates/site/user_contact.html:19
+#: templates/site/user_edit.html:20 templates/site/user_mass_add.html:20
 #: templates/site/user_mass_add_text.html:23
 msgid "Users' list"
 msgstr "Liste des utilisateurs"
 
-#: templates/site/text_share.html:29
-#: templates/site/user_add.html:6
-#: templates/site/user_add.html.py:22
-#: templates/site/user_add_text.html:6
-#: templates/site/user_add_text.html:25
-#: templates/site/user_contact.html:19
-#: templates/site/user_edit.html:22
-#: templates/site/user_list.html:34
+#: templates/site/text_share.html:29 templates/site/user_add.html:6
+#: templates/site/user_add.html.py:22 templates/site/user_add_text.html:6
+#: templates/site/user_add_text.html:25 templates/site/user_contact.html:19
+#: templates/site/user_edit.html:22 templates/site/user_list.html:34
 #: templates/site/user_mass_add.html:22
 #: templates/site/user_mass_add_text.html:6
 #: templates/site/user_mass_add_text.html:25
 msgid "Add a new user"
 msgstr "Ajouter un utilisateur"
 
-#: templates/site/text_share.html:31
-#: templates/site/user_add.html:24
-#: templates/site/user_add_text.html:27
-#: templates/site/user_list.html:36
-#: templates/site/user_mass_add.html:6
-#: templates/site/user_mass_add.html:24
+#: templates/site/text_share.html:31 templates/site/user_add.html:24
+#: templates/site/user_add_text.html:27 templates/site/user_list.html:36
+#: templates/site/user_mass_add.html:6 templates/site/user_mass_add.html:24
 #: templates/site/user_mass_add_text.html:27
 msgid "Add users in bulk"
 msgstr "Ajouter des utilisateurs en masse"
 
-#: templates/site/text_share.html:38
-#: templates/site/user_list.html:43
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
 msgid "Hide suspended users"
 msgstr "Masquer les utilisateurs désactivés"
 
-#: templates/site/text_share.html:38
-#: templates/site/user_list.html:43
+#: templates/site/text_share.html:38 templates/site/user_list.html:43
 msgid "Display suspended users"
 msgstr "Afficher les utilisateurs désactivés"
 
-#: templates/site/text_share.html:86
-#: templates/site/user_list.html:132
+#: templates/site/text_share.html:86 templates/site/user_list.html:132
 msgid "User"
 msgstr "Utilisateur"
 
 #: templates/site/text_share.html:87
-msgid "The 'Workspace role' is the global role that applies to every text, you can give a user a particular role on this text using the 'text role' column on the right"
-msgstr "Le 'rôle dans l'espace de travail' est le rôle global qui s'applique à tous les textes. Vous pouvez donner à un utilisateur particulier un rôle différent sur ce texte via la colonne 'rôle sur le texte' à droite"
+msgid ""
+"The 'Workspace role' is the global role that applies to every text, you can "
+"give a user a particular role on this text using the 'text role' column on "
+"the right"
+msgstr ""
+"Le 'rôle dans l'espace de travail' est le rôle global qui s'applique à tous "
+"les textes. Vous pouvez donner à un utilisateur particulier un rôle "
+"différent sur ce texte via la colonne 'rôle sur le texte' à droite"
 
 #: templates/site/text_share.html:87
 msgid "Workspace role"
@@ -1040,15 +1026,12 @@
 msgid "This role has been overriden on this text by a text role: %(rolename)s"
 msgstr "Ce rôle a été surchargé par un rôle sur le texte : %(rolename)s"
 
-#: templates/site/text_share.html:128
-#: templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24
-#: templates/site/user_list.html:177
+#: templates/site/text_share.html:128 templates/site/user_edit.html:6
+#: templates/site/user_edit.html.py:24 templates/site/user_list.html:177
 msgid "Edit anonymous users"
 msgstr "Editer 'l'utilisateur anonyme'"
 
-#: templates/site/text_share.html:128
-#: templates/site/user_list.html:177
+#: templates/site/text_share.html:128 templates/site/user_list.html:177
 msgid "Anonymous users"
 msgstr "Utilisateurs anonymes"
 
@@ -1089,18 +1072,20 @@
 "The user will receive an email invitation to join the workspace.\n"
 "You can customize the email sent by using the 'Note' field bellow."
 msgstr ""
-"L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail.\n"
+"L'utilisateur recevra un email d'invitation à rejoindre l'espace de "
+"travail.\n"
 "Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
 
 #: templates/site/user_add_text.html:29
 msgid "The user will receive an email invitation to join the workspace."
-msgstr "L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail."
+msgstr ""
+"L'utilisateur recevra un email d'invitation à rejoindre l'espace de travail."
 
-#: templates/site/user_add_text.html:30
-#: templates/site/user_mass_add.html:27
+#: templates/site/user_add_text.html:30 templates/site/user_mass_add.html:27
 #: templates/site/user_mass_add_text.html:30
 msgid "You can customize the email sent by using the 'Note' field bellow."
-msgstr "Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
+msgstr ""
+"Vous pouvez personnaliser cet email en utilisant le champ 'Note' ci-dessous."
 
 #: templates/site/user_contact.html:6
 msgid "Contact user"
@@ -1111,19 +1096,16 @@
 msgid "Contact user %(username)s"
 msgstr "Contacter l'utilisateur %(username)s"
 
-#: templates/site/user_edit.html:6
-#: templates/site/user_edit.html.py:24
+#: templates/site/user_edit.html:6 templates/site/user_edit.html.py:24
 #, python-format
 msgid "Edit user %(username)s"
 msgstr "Editer l'utilisateur %(username)s"
 
-#: templates/site/user_list.html:73
-#: templates/site/macros/user_actions.html:28
+#: templates/site/user_list.html:73 templates/site/macros/user_actions.html:28
 msgid "Suspend access"
 msgstr "Désactiver l'accès"
 
-#: templates/site/user_list.html:74
-#: templates/site/macros/user_actions.html:23
+#: templates/site/user_list.html:74 templates/site/macros/user_actions.html:23
 msgid "Enable access"
 msgstr "Activer l'accès"
 
@@ -1132,8 +1114,7 @@
 msgid "Change role to %(role_name)s"
 msgstr "Modifier le rôle en %(role_name)s"
 
-#: templates/site/user_list.html:133
-#: views/user.py:283
+#: templates/site/user_list.html:133 views/user.py:283
 msgid "Email"
 msgstr "Email"
 
@@ -1148,7 +1129,9 @@
 #: templates/site/user_mass_add.html:26
 #: templates/site/user_mass_add_text.html:29
 msgid "The users will receive an email invitation to join the workspace."
-msgstr "Les utilisateurs recevront un email d'invitation à rejoindre l'espace de travail."
+msgstr ""
+"Les utilisateurs recevront un email d'invitation à rejoindre l'espace de "
+"travail."
 
 #: templates/site/layout/base_text.html:16
 #: templates/site/layout/base_workspace.html:20
@@ -1222,8 +1205,12 @@
 msgstr "par %(name)s le %(date)s"
 
 #: templates/site/macros/text_editor.html:38
-msgid "You have attempted to leave this page. Unsaved changes will be lost. Are you sure you want to exit this page?"
-msgstr "Vous avez tenté de quitter la page. Les modifications non sauvegardées seront perdues. Etes vous sûr de vouloir quitter cette page ?"
+msgid ""
+"You have attempted to leave this page. Unsaved changes will be lost. Are you "
+"sure you want to exit this page?"
+msgstr ""
+"Vous avez tenté de quitter la page. Les modifications non sauvegardées "
+"seront perdues. Etes vous sûr de vouloir quitter cette page ?"
 
 #: templates/site/macros/text_meta.html:6
 #, python-format
@@ -1265,15 +1252,21 @@
 
 #: templates/site/macros/user_actions.html:38
 msgid "Are you sure you want to suspend this user's access to the workspace?"
-msgstr "Etes vous sûr de vouloir désactiver l'accès de cet utilisateur à l'espace de travail ?"
+msgstr ""
+"Etes vous sûr de vouloir désactiver l'accès de cet utilisateur à l'espace de "
+"travail ?"
 
 #: templates/site/macros/user_actions.html:47
 msgid "Are you sure you want to enable this user's access to the workspace?"
-msgstr "Etes vous sûr de vouloir activer l'accès de cet utilisateur à l'espace de travail ?"
+msgstr ""
+"Etes vous sûr de vouloir activer l'accès de cet utilisateur à l'espace de "
+"travail ?"
 
 #: templates/site/macros/user_actions.html:56
 msgid "Are you sure you want to send this user an invitation to the workspace?"
-msgstr "Etes vous sûr de vouloir envoyer à cet utilisateur une invitation à rejoindre l'espace de travail ?"
+msgstr ""
+"Etes vous sûr de vouloir envoyer à cet utilisateur une invitation à "
+"rejoindre l'espace de travail ?"
 
 #: templates/site/macros/user_moderation.html:3
 msgid "Approve"
@@ -1296,8 +1289,11 @@
 msgstr "Charger un fichier (optionnel)"
 
 #: views/create.py:27
-msgid "Upload a file from your computer instead of using the direct input above"
-msgstr "Charger un fichier de votre ordinateur plutôt que d'utiliser le champ de saisie ci-dessus"
+msgid ""
+"Upload a file from your computer instead of using the direct input above"
+msgstr ""
+"Charger un fichier de votre ordinateur plutôt que d'utiliser le champ de "
+"saisie ci-dessus"
 
 #: views/create.py:38
 msgid "You should specify a file to upload."
@@ -1307,8 +1303,7 @@
 msgid "The title of your text"
 msgstr "Le titre de votre texte"
 
-#: views/create.py:70
-#: views/create.py:107
+#: views/create.py:70 views/create.py:107
 #, python-format
 msgid "Text \"%(text_title)s\" has been created"
 msgstr "Le texte \"%(text_title)s\" a été créé"
@@ -1353,8 +1348,7 @@
 msgid "Private activity feed for text %(text_title)s"
 msgstr "Flux public pour le texte %(text_title)s"
 
-#: views/followup.py:31
-#: views/followup.py:80
+#: views/followup.py:31 views/followup.py:80
 msgid "Private feed activated."
 msgstr "Flux privé activé."
 
@@ -1378,9 +1372,7 @@
 msgid "Private notifications feed reseted."
 msgstr "Flux privé réinitialisé."
 
-#: views/site.py:81
-#: views/texts.py:129
-#: views/user.py:525
+#: views/site.py:81 views/texts.py:129 views/user.py:525
 msgid "You're logged in!"
 msgstr "Vous êtes connecté !"
 
@@ -1412,47 +1404,66 @@
 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
-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: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
-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: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"
@@ -1490,7 +1501,8 @@
 
 #: views/texts.py:617
 msgid "Keep comments (if not affected by the edit)"
-msgstr "Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
+msgstr ""
+"Conserver les commentaires dont la portée n'a pas été affectée par l'édition"
 
 #: views/texts.py:680
 msgid "Name (optional)"
@@ -1503,11 +1515,10 @@
 #: views/texts.py:731
 #, python-format
 msgid "A new version (copied from version %(version_title)s) has been created"
-msgstr "Une nouvelle version (copiée depuis la version %(version_title)s) a été créée"
+msgstr ""
+"Une nouvelle version (copiée depuis la version %(version_title)s) a été créée"
 
-#: views/texts.py:839
-#: views/user.py:79
-#: views/user.py:99
+#: views/texts.py:839 views/user.py:79 views/user.py:99
 #, python-format
 msgid "%(count)i user(s) role modified"
 msgstr "%(count)i rôle(s) d'utilisateur modifié(s)"
@@ -1540,15 +1551,23 @@
 
 #: views/user.py:164
 msgid "Add multiples emails one per line (or separated by \",\" or \";\")"
-msgstr "Ajouter des emails multiples (un par ligne ou séparés par \",\" or \";\")"
+msgstr ""
+"Ajouter des emails multiples (un par ligne ou séparés par \",\" or \";\")"
 
 #: views/user.py:181
 msgid "Workspace level role"
 msgstr "Rôle dans l'espace de travail"
 
 #: views/user.py:182
-msgid "This role will apply to every text in the workspace. To share only a (few) texts with this user, you can leave this blank and delegate roles on texts once the user is created."
-msgstr "Ce rôle s'appliquera à tous les textes dans l'espace de travail. Pour partager seulement quelques textes avec cet utilisateur, vous pouvez laisser ce champ vide et déléguer les rôles sur les textes une fois l'utilisateur créé."
+msgid ""
+"This role will apply to every text in the workspace. To share only a (few) "
+"texts with this user, you can leave this blank and delegate roles on texts "
+"once the user is created."
+msgstr ""
+"Ce rôle s'appliquera à tous les textes dans l'espace de travail. Pour "
+"partager seulement quelques textes avec cet utilisateur, vous pouvez laisser "
+"ce champ vide et déléguer les rôles sur les textes une fois l'utilisateur "
+"créé."
 
 #: views/user.py:198
 msgid "Text level role"
@@ -1579,8 +1598,7 @@
 msgid "This username is already in use. Please supply a different username."
 msgstr "Ce nom d'utilisateur est déjà utilisé. Merci d'en fournir un autre."
 
-#: views/user.py:320
-#: views/user.py:336
+#: views/user.py:320 views/user.py:336
 msgid "Your account has been activated. You're now logged-in."
 msgstr "Votre compte a été activé. Vous êtes maintenant connecté."
 
@@ -1647,36 +1665,53 @@
 
 #: views/user.py:519
 msgid "This account is suspended, contact the workspace administrator."
-msgstr "Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de travail."
+msgstr ""
+"Ce compte est désactivé, veuillez contacter le gestionnaire de l'espace de "
+"travail."
 
 #: views/user.py:550
 msgid "You've been logged out."
 msgstr "Vous êtes déconnecté."
 
 #: views/user.py:566
-msgid "You've been registered, you will receive a confirmation mail once a moderator has approved your membership."
-msgstr "Enregistrement réussi, vous recevrez un message de confirmation quand un gestionnaire de l'espace de travail aura activé votre compte."
+msgid ""
+"You've been registered, you will receive a confirmation mail once a "
+"moderator has approved your membership."
+msgstr ""
+"Enregistrement réussi, vous recevrez un message de confirmation quand un "
+"gestionnaire de l'espace de travail aura activé votre compte."
 
 #: views/user.py:569
-msgid "You've been registered, please check your email for the confirm message."
+msgid ""
+"You've been registered, please check your email for the confirm message."
 msgstr "Enregistrement réussi, un message de confirmation vous a été envoyé"
 
+#~ msgid "Design"
+#~ msgstr "Design"
+
 #~ msgid "%(workspace_name)s's workspace"
 #~ msgstr "espace de travail : %(workspace_name)s"
+
 #~ msgid "Versions:"
 #~ msgstr "Versions :"
+
 #~ msgid "by %(v1name)s"
 #~ msgstr "par %(v1name)s"
+
 #~ msgid "created %(v1created)s"
 #~ msgstr "créé le %(v1created)s"
+
 #~ msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:"
 #~ msgstr "Différences entre les versions n°%(v1_nid)s et n°%(v2_nid)s :"
+
 #~ msgid "Version #%(version_number)s created on %(date)s"
 #~ msgstr "Version n°%(version_number)s créée le %(date)s :"
+
 #~ msgid "Contact from user: %(name)s / %(email)s"
 #~ msgstr "Contact de l'utilisateur %(name)s / %(email)s"
+
 #~ msgid "Your text \"%(title)s\" has been created."
 #~ msgstr "Votre texte \"%(title)s\" a été créé."
+
 #~ msgid "%(title)s"
 #~ msgstr "%(title)s"
-
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/no/LC_MESSAGES/django.po	Fri Feb 12 12:25:57 2010 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po	Fri Feb 12 13:13:46 2010 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 17:11+0100\n"
+"POT-Creation-Date: 2010-02-12 13:09+0100\n"
 "PO-Revision-Date: 2010-02-12 12:25+0100\n"
 "Last-Translator: Kirill Miazine <km@krot.org>\n"
 "Language-Team: <no@li.org>\n"
@@ -371,7 +371,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
@@ -695,17 +696,22 @@
 msgid "%(wname)s Registration"
 msgstr "Registrering på %(wname)s"
 
-#: templates/site/settings.html:5 templates/site/text_list.html:181
-#: templates/site/macros/main_tabs.html:14
+#: templates/site/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
-msgid "Delete logo"
-msgstr "Slett logo"
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
+#, fuzzy
+msgid "General"
+msgstr "Generell"
 
-#: 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!"
@@ -713,6 +719,10 @@
 "Ø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
 msgid "Text list"
@@ -1375,23 +1385,19 @@
 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
-msgid "Workspace logo"
-msgstr "Logo for arbeidsområde"
-
-#: views/site.py:161
+#: views/site.py:174
 msgid "Workspace registration"
 msgstr "Registering på arbeidsområde"
 
-#: 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)"
@@ -1399,29 +1405,44 @@
 "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
+#: 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"
@@ -1641,6 +1662,10 @@
 "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"
 
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Fri Feb 12 12:25:57 2010 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Fri Feb 12 13:13:46 2010 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: COMT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 17:10+0100\n"
+"POT-Creation-Date: 2010-02-12 13:08+0100\n"
 "PO-Revision-Date: 2010-01-23 12:00-0300\n"
 "Last-Translator: Paulo Rená da Silva Santarém <pbrss@yahoo.com.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,7 +366,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
@@ -691,23 +692,32 @@
 msgid "%(wname)s Registration"
 msgstr "%(wname)s Inscrição"
 
-#: 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 "Configurações"
 
-#: templates/site/settings.html:25
+#: templates/site/settings.html:21 templates/site/settings_design.html:21
 #, fuzzy
-msgid "Delete logo"
-msgstr "Apagar"
+msgid "General"
+msgstr "Genérico"
 
-#: 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 "Confirmar alteração de "
 
+#: templates/site/settings_design.html:31
+#, fuzzy
+msgid "Delete logo"
+msgstr "Apagar"
+
 #: templates/site/text_create_content.html:26
 #: templates/site/text_create_upload.html:24 templates/site/text_list.html:37
 msgid "Text list"
@@ -1379,24 +1389,19 @@
 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
-#, fuzzy
-msgid "Workspace logo"
-msgstr "Função da área de trabalho"
-
-#: views/site.py:161
+#: views/site.py:174
 msgid "Workspace registration"
 msgstr "Registro da área de trabalho"
 
-#: 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)"
@@ -1404,29 +1409,45 @@
 "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
+#: views/site.py:179
 msgid "Workspace registration moderation"
 msgstr "Moderação de registro da área de trabalho"
 
-#: views/site.py:167
+#: 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:171
+#: views/site.py:184
 msgid "Role model"
 msgstr "Função modelo"
 
-#: views/site.py:172
+#: 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: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 "Configurações salvas"
 
+#: views/site.py:214
+#, fuzzy
+msgid "Workspace logo"
+msgstr "Função da área de trabalho"
+
+#: views/site.py:216
+#, fuzzy
+msgid "Workspace html code"
+msgstr "Função da área de trabalho"
+
+#: views/site.py:217
+msgid ""
+"Add stylesheets etc. Warning: this code will be added to the workspace code, "
+"make sure you know what you're doing before adding something here."
+msgstr ""
+
 #: views/texts.py:162
 #, python-format
 msgid "%(nb_texts)i text(s) deleted"
@@ -1649,6 +1670,10 @@
 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"
 
--- a/src/cm/templates/site/settings_design.html	Fri Feb 12 12:25:57 2010 +0100
+++ b/src/cm/templates/site/settings_design.html	Fri Feb 12 13:13:46 2010 +0100
@@ -20,7 +20,7 @@
 <ul class="sub_list">
     <li><a href="{% url settings %}">{% blocktrans %}General{% endblocktrans %}</a></li>
     <li> / </li>
-    <li class="active_sub">{% blocktrans %}Design{% endblocktrans %}</li>
+    <li class="active_sub">{% blocktrans %}Appearance{% endblocktrans %}</li>
 </ul>
 
 {% endblock %}
comt