# HG changeset patch # User raph # Date 1265369965 -3600 # Node ID 286863e6e2c1cdfdb788800c29ce54db9db13838 # Parent 51c34f5970c216d87ff69d9288f44e4be8964488 typo + i18n update (fr) diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/en/LC_MESSAGES/django.mo Binary file src/cm/locale/en/LC_MESSAGES/django.mo has changed diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/en/LC_MESSAGES/django.po --- a/src/cm/locale/en/LC_MESSAGES/django.po Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/locale/en/LC_MESSAGES/django.po Fri Feb 05 12:39:25 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-02 16:41+0100\n" +"POT-Creation-Date: 2010-02-05 12:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,39 +21,39 @@ "A selection is required. Select in the text the part your comment applies to." msgstr "" -#: client.py:133 +#: client.py:134 msgid "name is required" msgstr "" -#: client.py:136 +#: client.py:137 msgid "email is required" msgstr "" -#: client.py:138 +#: client.py:139 msgid "invalid email" msgstr "" -#: client.py:140 +#: client.py:141 msgid "title is required" msgstr "" -#: client.py:142 +#: client.py:143 msgid "content is required" msgstr "" -#: client.py:157 +#: client.py:158 msgid "comment removed" msgstr "" -#: client.py:208 client.py:273 +#: client.py:209 client.py:274 msgid "comment saved" msgstr "" -#: client.py:275 +#: client.py:276 msgid "comment saved, it is being held for moderation" msgstr "" -#: client.py:336 +#: client.py:337 msgid "Tags input must be no longer than 250 characters." msgstr "" @@ -61,7 +61,8 @@ msgid "unknown" msgstr "" -#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617 +#: models.py:175 templates/site/text_history.html:77 views/create.py:30 +#: views/create.py:45 views/texts.py:612 msgid "Title" msgstr "" @@ -69,11 +70,11 @@ msgid "Format" msgstr "" -#: models.py:177 views/texts.py:708 +#: models.py:177 views/texts.py:703 msgid "Content" msgstr "" -#: models.py:178 models.py:599 +#: models.py:178 models.py:615 msgid "Tags" msgstr "" @@ -85,121 +86,116 @@ msgid "Moderation a posteriori?" msgstr "" -#: models.py:285 +#: models.py:300 msgid "Format:" msgstr "" -#: models.py:361 -#, python-format -msgid "%(workspace_name)s's workspace" -msgstr "" - -#: models.py:502 +#: models.py:518 msgid "name" msgstr "" -#: models.py:503 +#: models.py:519 msgid "description" msgstr "" -#: models.py:593 +#: models.py:609 msgid "Allow contact" msgstr "" -#: models.py:593 +#: models.py:609 msgid "Allow email messages from other users" msgstr "" -#: models.py:594 +#: models.py:610 msgid "Preferred language" msgstr "" -#: models.py:597 +#: models.py:613 msgid "Suspended access" msgstr "" -#: models.py:621 +#: models.py:637 msgid "suspended" msgstr "" -#: models.py:623 +#: models.py:639 msgid "waiting approval" msgstr "" -#: models.py:629 +#: models.py:645 msgid "pending" msgstr "" -#: models.py:644 +#: models.py:660 msgid "Invitation" msgstr "" -#: models.py:712 +#: models.py:728 #, python-format msgid "Text %(link_to_text)s edited" msgstr "" -#: models.py:713 +#: models.py:729 #, python-format msgid "Text %(link_to_text)s edited (new version created)" msgstr "" -#: models.py:714 +#: models.py:730 #, python-format msgid "Text %(link_to_text)s added" msgstr "" -#: models.py:715 +#: models.py:731 #, python-format msgid "Text %(link_to_text)s removed" msgstr "" -#: models.py:716 +#: models.py:732 #, python-format msgid "Comment %(link_to_comment)s added on text %(link_to_text)s" msgstr "" -#: models.py:717 +#: models.py:733 #, python-format msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s" msgstr "" -#: models.py:718 +#: models.py:734 #, python-format msgid "User %(username)s added" msgstr "" -#: models.py:719 +#: models.py:735 #, python-format msgid "User %(username)s access to workspace enabled" msgstr "" -#: models.py:720 +#: models.py:736 #, python-format msgid "User %(username)s access to workspace refused" msgstr "" -#: models.py:721 +#: models.py:737 #, python-format msgid "User %(username)s access to workspace suspended" msgstr "" -#: models.py:722 +#: models.py:738 #, python-format msgid "User %(username)s access to workspace activated" msgstr "" -#: models.py:723 +#: models.py:739 #, python-format msgid "User %(username)s has activated his account" msgstr "" -#: models.py:778 models.py:786 +#: models.py:794 models.py:802 #, python-format msgid "by \"%(username)s\"" msgstr "" -#: models.py:780 +#: models.py:796 #, python-format msgid "%(time_since)s ago" msgstr "" @@ -547,7 +543,7 @@ msgid "texts" msgstr "" -#: templates/site/dashboard.html:264 templates/site/text_list.html:139 +#: templates/site/dashboard.html:264 msgid "comments" msgstr "" @@ -779,50 +775,83 @@ msgid "Subscribe to all text notifications" msgstr "" -#: templates/site/text_history.html:38 -msgid "Versions:" -msgstr "" - -#: templates/site/text_history.html:46 -#, python-format -msgid "version #%(v1number)s" +#: templates/site/text_history.html:56 +#: templates/site/text_history_compare.html:28 +#: templates/site/text_history_version.html:28 +msgid "Version list" msgstr "" -#: templates/site/text_history.html:46 -#, python-format -msgid "by %(v1name)s" +#: templates/site/text_history.html:59 +msgid "Compare last two versions" msgstr "" -#: templates/site/text_history.html:46 -#, python-format -msgid "created %(v1created)s" +#: templates/site/text_history.html:65 +msgid "Compare selected versions" +msgstr "" + +#: templates/site/text_history.html:75 +msgid "Version" msgstr "" -#: templates/site/text_history.html:54 -#, python-format -msgid "differences between version #%(v1number)s and #%(v2number)s" +#: templates/site/text_history.html:76 +msgid "Selection" msgstr "" -#: templates/site/text_history.html:66 -#, python-format -msgid "Revert to version #%(v1_nid)s" +#: templates/site/text_history.html:78 templates/site/text_list.html:137 +msgid "Author" msgstr "" -#: templates/site/text_history.html:70 -#, python-format -msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:" +#: templates/site/text_history.html:79 +msgid "Created" msgstr "" -#: templates/site/text_history.html:73 templates/site/text_history.html:85 -#: templates/site/text_history.html:91 -#, python-format -msgid "Version #%(version_number)s created on %(date)s" +#: templates/site/text_history.html:80 templates/site/text_list.html:139 +msgid "# comments" +msgstr "" + +#: templates/site/text_history.html:100 templates/site/text_list.html:159 +msgid "View" msgstr "" #: templates/site/text_history.html:101 +#: templates/site/text_history_version.html:33 +msgid "Compare with previous version" +msgstr "" + +#: templates/site/text_history.html:102 +msgid "Revert to this version" +msgstr "" + +#: templates/site/text_history.html:103 templates/site/text_list.html:80 +#: templates/site/text_list.html.py:161 +msgid "Delete" +msgstr "" + +#: templates/site/text_history.html:109 +msgid "Are you sure you want to delete this version?" +msgstr "" + +#: templates/site/text_history_compare.html:30 +#: templates/site/text_history_compare.html:34 +#: templates/site/text_history_version.html:30 +#, python-format +msgid "Version %(version_number)s" +msgstr "" + +#: templates/site/text_history_compare.html:32 +#, python-format +msgid "" +"Comparison between version #%(version_1_number)s and #%(version_2_number)s" +msgstr "" + +#: templates/site/text_history_compare.html:42 msgid "No differences" msgstr "" +#: templates/site/text_history_version.html:37 +msgid "Compare with next version" +msgstr "" + #: templates/site/text_list.html:12 msgid "Texts" msgstr "" @@ -847,10 +876,6 @@ msgid "Bulk Actions" msgstr "" -#: templates/site/text_list.html:80 templates/site/text_list.html.py:161 -msgid "Delete" -msgstr "" - #: templates/site/text_list.html:83 templates/site/user_list.html:81 msgid "Apply" msgstr "" @@ -863,10 +888,6 @@ msgid "Text" msgstr "" -#: templates/site/text_list.html:137 -msgid "Author" -msgstr "" - #: templates/site/text_list.html:138 msgid "Modified" msgstr "" @@ -886,10 +907,6 @@ msgid "Filter by tag: %(tag_name)s" msgstr "" -#: templates/site/text_list.html:159 -msgid "View" -msgstr "" - #: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12 #: templates/site/macros/user_actions.html:19 msgid "Edit" @@ -1369,49 +1386,54 @@ msgid "Text %(text_title)s deleted" msgstr "" -#: views/texts.py:621 +#: views/texts.py:221 +#, python-format +msgid "Text version %(text_version_title)s deleted" +msgstr "" + +#: views/texts.py:616 msgid "Note (optional)" msgstr "" -#: views/texts.py:624 +#: views/texts.py:619 msgid "Add a note to explain the modifications made to the text" msgstr "" -#: views/texts.py:634 +#: views/texts.py:629 msgid "New version (optional)" msgstr "" -#: views/texts.py:637 +#: views/texts.py:632 msgid "Create a new version of this text (recommended)" msgstr "" -#: views/texts.py:640 +#: views/texts.py:635 msgid "Keep comments (optional)" msgstr "" -#: views/texts.py:643 +#: views/texts.py:638 msgid "Keep comments (if not affected by the edit)" msgstr "" -#: views/texts.py:706 +#: views/texts.py:701 msgid "Name (optional)" msgstr "" -#: views/texts.py:707 +#: views/texts.py:702 msgid "Email (optional)" msgstr "" -#: views/texts.py:757 +#: views/texts.py:752 #, python-format -msgid "A new version (copied from version %(version_id)s) has been created" +msgid "A new version (copied from version %(version_title)s) has been created" msgstr "" -#: views/texts.py:865 views/user.py:79 views/user.py:99 +#: views/texts.py:860 views/user.py:79 views/user.py:99 #, python-format msgid "%(count)i user(s) role modified" msgstr "" -#: views/texts.py:923 +#: views/texts.py:918 msgid "Text settings updated" msgstr "" diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/es/LC_MESSAGES/django.mo Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/es/LC_MESSAGES/django.po --- a/src/cm/locale/es/LC_MESSAGES/django.po Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/locale/es/LC_MESSAGES/django.po Fri Feb 05 12:39:25 2010 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: COMT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-02 16:41+0100\n" +"POT-Creation-Date: 2010-02-05 12:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Alejandro Martin Ortin \n" "Language-Team: LANGUAGE \n" @@ -19,39 +19,39 @@ msgstr "" "Se necesita una selección. Seleccione el texto cuya parte desee comentar." -#: client.py:133 +#: client.py:134 msgid "name is required" msgstr "el nombre es obligatorio" -#: client.py:136 +#: client.py:137 msgid "email is required" msgstr "el email es obligatorio" -#: client.py:138 +#: client.py:139 msgid "invalid email" msgstr "dirección de correo electrónico no válida" -#: client.py:140 +#: client.py:141 msgid "title is required" msgstr "el título es obligatorio" -#: client.py:142 +#: client.py:143 msgid "content is required" msgstr "el contenido es obligatorio" -#: client.py:157 +#: client.py:158 msgid "comment removed" msgstr "comentario borrado" -#: client.py:208 client.py:273 +#: client.py:209 client.py:274 msgid "comment saved" msgstr "comentario guardado" -#: client.py:275 +#: client.py:276 msgid "comment saved, it is being held for moderation" msgstr "comentario guardado, se reserva para moderación" -#: client.py:336 +#: client.py:337 msgid "Tags input must be no longer than 250 characters." msgstr "El contenido de las etiquetas no debe exceder los 250 caracteres" @@ -59,7 +59,8 @@ msgid "unknown" msgstr "desconocido" -#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617 +#: models.py:175 templates/site/text_history.html:77 views/create.py:30 +#: views/create.py:45 views/texts.py:612 msgid "Title" msgstr "Título" @@ -67,11 +68,11 @@ msgid "Format" msgstr "Formato" -#: models.py:177 views/texts.py:708 +#: models.py:177 views/texts.py:703 msgid "Content" msgstr "Contenido" -#: models.py:178 models.py:599 +#: models.py:178 models.py:615 msgid "Tags" msgstr "Etiquetas" @@ -83,121 +84,116 @@ msgid "Moderation a posteriori?" msgstr "¿Moderar a posteriori?" -#: models.py:285 +#: models.py:300 msgid "Format:" msgstr "Formato:" -#: models.py:361 -#, python-format -msgid "%(workspace_name)s's workspace" -msgstr "espacio de trabajo %(workspace_name)s" - -#: models.py:502 +#: models.py:518 msgid "name" msgstr "nombre" -#: models.py:503 +#: models.py:519 msgid "description" msgstr "descripción" -#: models.py:593 +#: models.py:609 msgid "Allow contact" msgstr "Permitir contacto" -#: models.py:593 +#: models.py:609 msgid "Allow email messages from other users" msgstr "Permitir correos electrónicos de otros usuarios" -#: models.py:594 +#: models.py:610 msgid "Preferred language" msgstr "Idioma preferido" -#: models.py:597 +#: models.py:613 msgid "Suspended access" msgstr "Acceso anulado" -#: models.py:621 +#: models.py:637 msgid "suspended" msgstr "anulado" -#: models.py:623 +#: models.py:639 msgid "waiting approval" msgstr "esperando aprobación" -#: models.py:629 +#: models.py:645 msgid "pending" msgstr "pendiente" -#: models.py:644 +#: models.py:660 msgid "Invitation" msgstr "Invitación" -#: models.py:712 +#: models.py:728 #, python-format msgid "Text %(link_to_text)s edited" msgstr "Texto %(link_to_text)s editado " -#: models.py:713 +#: models.py:729 #, python-format msgid "Text %(link_to_text)s edited (new version created)" msgstr "Texto %(link_to_text)s editado (se ha creado una nueva versión)" -#: models.py:714 +#: models.py:730 #, python-format msgid "Text %(link_to_text)s added" msgstr "Texto %(link_to_text)s añadido" -#: models.py:715 +#: models.py:731 #, python-format msgid "Text %(link_to_text)s removed" msgstr "Texto %(link_to_text)s eliminado" -#: models.py:716 +#: models.py:732 #, python-format msgid "Comment %(link_to_comment)s added on text %(link_to_text)s" msgstr "Comentario %(link_to_comment)s añadido al texto %(link_to_text)s" -#: models.py:717 +#: models.py:733 #, python-format msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s" msgstr "Comentario %(link_to_comment)s eliminado del texto %(link_to_text)s" -#: models.py:718 +#: models.py:734 #, python-format msgid "User %(username)s added" msgstr "Usuario %(username)s añadido" -#: models.py:719 +#: models.py:735 #, python-format msgid "User %(username)s access to workspace enabled" msgstr "Permitido acceso de Usuario %(username)s a espacio de trabajo" -#: models.py:720 +#: models.py:736 #, python-format msgid "User %(username)s access to workspace refused" msgstr "Denegado el acceso del Usuario %(username)s al espacio de trabajo" -#: models.py:721 +#: models.py:737 #, python-format msgid "User %(username)s access to workspace suspended" msgstr "Anulado el acceso del Usuario %(username)s al espacio de trabajo" -#: models.py:722 +#: models.py:738 #, python-format msgid "User %(username)s access to workspace activated" msgstr "Activado el acceso del Usuario %(username)s al espacio de trabajo" -#: models.py:723 +#: models.py:739 #, python-format msgid "User %(username)s has activated his account" msgstr "El usuario %(username)s ha activado su cuenta" -#: models.py:778 models.py:786 +#: models.py:794 models.py:802 #, python-format msgid "by \"%(username)s\"" msgstr "por \"%(username)s\"" -#: models.py:780 +#: models.py:796 #, python-format msgid "%(time_since)s ago" msgstr "hace %(time_since)s" @@ -550,7 +546,7 @@ msgid "texts" msgstr "textos" -#: templates/site/dashboard.html:264 templates/site/text_list.html:139 +#: templates/site/dashboard.html:264 msgid "comments" msgstr "comentarios" @@ -796,52 +792,90 @@ msgid "Subscribe to all text notifications" msgstr "Suscribirse a todas las notificaciones del texto" -#: templates/site/text_history.html:38 -msgid "Versions:" -msgstr "Versiones:" +#: templates/site/text_history.html:56 +#: templates/site/text_history_compare.html:28 +#: templates/site/text_history_version.html:28 +#, fuzzy +msgid "Version list" +msgstr "Versiones" + +#: templates/site/text_history.html:59 +msgid "Compare last two versions" +msgstr "" + +#: templates/site/text_history.html:65 +msgid "Compare selected versions" +msgstr "" -#: templates/site/text_history.html:46 -#, python-format -msgid "version #%(v1number)s" -msgstr "versión #%(v1number)s" +#: templates/site/text_history.html:75 +#, fuzzy +msgid "Version" +msgstr "Versiones" + +#: templates/site/text_history.html:76 +#, fuzzy +msgid "Selection" +msgstr "Acciones" + +#: templates/site/text_history.html:78 templates/site/text_list.html:137 +msgid "Author" +msgstr "Autor" + +#: templates/site/text_history.html:79 +msgid "Created" +msgstr "" -#: templates/site/text_history.html:46 -#, python-format -msgid "by %(v1name)s" -msgstr "por %(v1name)s" +#: templates/site/text_history.html:80 templates/site/text_list.html:139 +#, fuzzy +msgid "# comments" +msgstr "comentarios" + +#: templates/site/text_history.html:100 templates/site/text_list.html:159 +msgid "View" +msgstr "Visualizar" + +#: templates/site/text_history.html:101 +#: templates/site/text_history_version.html:33 +msgid "Compare with previous version" +msgstr "" + +#: templates/site/text_history.html:102 +#, fuzzy +msgid "Revert to this version" +msgstr "Volver a la versión #%(v1_nid)s:" -#: templates/site/text_history.html:46 -#, python-format -msgid "created %(v1created)s" -msgstr "creado %(v1created)s" +#: templates/site/text_history.html:103 templates/site/text_list.html:80 +#: templates/site/text_list.html.py:161 +msgid "Delete" +msgstr "Borrar" + +#: templates/site/text_history.html:109 +#, fuzzy +msgid "Are you sure you want to delete this version?" +msgstr "¿Está seguro/a de que desea borrar este texto?" -#: templates/site/text_history.html:54 -#, python-format -msgid "differences between version #%(v1number)s and #%(v2number)s" +#: templates/site/text_history_compare.html:30 +#: templates/site/text_history_compare.html:34 +#: templates/site/text_history_version.html:30 +#, fuzzy, python-format +msgid "Version %(version_number)s" +msgstr "version %(title)s / #%(version_number)s" + +#: templates/site/text_history_compare.html:32 +#, fuzzy, python-format +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.html:66 -#, fuzzy, python-format -msgid "Revert to version #%(v1_nid)s" -msgstr "Volver a la versión #%(v1_nid)s:" - -#: templates/site/text_history.html:70 -#, python-format -msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:" -msgstr "Diferencias entre las versiones #%(v1_nid)s y #%(v2_nid)s" - -#: templates/site/text_history.html:73 templates/site/text_history.html:85 -#: templates/site/text_history.html:91 -#, fuzzy, python-format -msgid "Version #%(version_number)s created on %(date)s" -msgstr "" -"La versión #%(version_number)s, titulada \"%(title)s\", y creada en %(date)s:" - -#: templates/site/text_history.html:101 +#: templates/site/text_history_compare.html:42 #, fuzzy msgid "No differences" msgstr "Preferencias" +#: templates/site/text_history_version.html:37 +msgid "Compare with next version" +msgstr "" + #: templates/site/text_list.html:12 msgid "Texts" msgstr "Textos" @@ -867,10 +901,6 @@ msgid "Bulk Actions" msgstr "Acciones masivas" -#: templates/site/text_list.html:80 templates/site/text_list.html.py:161 -msgid "Delete" -msgstr "Borrar" - #: templates/site/text_list.html:83 templates/site/user_list.html:81 msgid "Apply" msgstr "Aplicar" @@ -883,10 +913,6 @@ msgid "Text" msgstr "Texto" -#: templates/site/text_list.html:137 -msgid "Author" -msgstr "Autor" - #: templates/site/text_list.html:138 msgid "Modified" msgstr "Modificado" @@ -907,10 +933,6 @@ msgid "Filter by tag: %(tag_name)s" msgstr "" -#: templates/site/text_list.html:159 -msgid "View" -msgstr "Visualizar" - #: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12 #: templates/site/macros/user_actions.html:19 #, fuzzy @@ -1427,49 +1449,54 @@ msgid "Text %(text_title)s deleted" msgstr "El texto %(text_title)s ha sido borrado" -#: views/texts.py:621 +#: views/texts.py:221 +#, fuzzy, python-format +msgid "Text version %(text_version_title)s deleted" +msgstr "El texto %(text_title)s ha sido borrado" + +#: views/texts.py:616 msgid "Note (optional)" msgstr "Nota (opcional)" -#: views/texts.py:624 +#: views/texts.py:619 msgid "Add a note to explain the modifications made to the text" msgstr "Añadir una nota para explicar las modificaciones realizadas al texto" -#: views/texts.py:634 +#: views/texts.py:629 msgid "New version (optional)" msgstr "Nueva versión (opcional)" -#: views/texts.py:637 +#: views/texts.py:632 msgid "Create a new version of this text (recommended)" msgstr "Crear una nueva versión de este texto (recomendado)" -#: views/texts.py:640 +#: views/texts.py:635 msgid "Keep comments (optional)" msgstr "mantener los comentarios (opcional)" -#: views/texts.py:643 +#: views/texts.py:638 msgid "Keep comments (if not affected by the edit)" msgstr "mantener los comentarios (si no son afectados por la edición)" -#: views/texts.py:706 +#: views/texts.py:701 msgid "Name (optional)" msgstr "Nombre (opcional)" -#: views/texts.py:707 +#: views/texts.py:702 msgid "Email (optional)" msgstr "Email (opcional)" -#: views/texts.py:757 -#, python-format -msgid "A new version (copied from version %(version_id)s) has been created" +#: views/texts.py:752 +#, fuzzy, python-format +msgid "A new version (copied from version %(version_title)s) has been created" msgstr "Se ha creado una nueva versión (copiada de la versión %(version_id)s)" -#: views/texts.py:865 views/user.py:79 views/user.py:99 +#: views/texts.py:860 views/user.py:79 views/user.py:99 #, python-format msgid "%(count)i user(s) role modified" msgstr "Perfil del/de los usuario(s) %(count)i modificado(s)" -#: views/texts.py:923 +#: views/texts.py:918 msgid "Text settings updated" msgstr "Ajustes del texto actualizados" @@ -1636,6 +1663,30 @@ "Se ha registrado. Por favor, compruebe que ha recibido el mensaje de " "confirmación en su correo electrónico." +#~ 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" + +#, fuzzy +#~ msgid "Version #%(version_number)s created on %(date)s" +#~ 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." @@ -1701,9 +1752,6 @@ #~ msgid "Actions:" #~ msgstr "Acciones:" -#~ msgid "%(title)s / version #%(version_number)s" -#~ msgstr "version %(title)s / #%(version_number)s" - #~ msgid "created %(date)s" #~ msgstr "creado en %(date)s" diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/fr/LC_MESSAGES/django.mo Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/fr/LC_MESSAGES/django.po --- a/src/cm/locale/fr/LC_MESSAGES/django.po Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/locale/fr/LC_MESSAGES/django.po Fri Feb 05 12:39:25 2010 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-02 16:42+0100\n" -"PO-Revision-Date: 2010-01-26 17:28+0100\n" +"POT-Creation-Date: 2010-02-05 12:38+0100\n" +"PO-Revision-Date: 2010-02-05 12:33+0100\n" "Last-Translator: dev \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -24,39 +24,39 @@ "Une portée est obligatoire. Sélectionner dans le texte la partie sur " "laquelle porte votre commentaire." -#: client.py:133 +#: client.py:134 msgid "name is required" msgstr "le nom est obligatoire" -#: client.py:136 +#: client.py:137 msgid "email is required" msgstr "l'email est obligatoire" -#: client.py:138 +#: client.py:139 msgid "invalid email" msgstr "l'email est invalide" -#: client.py:140 +#: client.py:141 msgid "title is required" msgstr "le titre est obligatoire" -#: client.py:142 +#: client.py:143 msgid "content is required" msgstr "le texte est obligatoire" -#: client.py:157 +#: client.py:158 msgid "comment removed" msgstr "commentaire supprimé" -#: client.py:208 client.py:273 +#: client.py:209 client.py:274 msgid "comment saved" msgstr "commentaire sauvé" -#: client.py:275 +#: client.py:276 msgid "comment saved, it is being held for moderation" msgstr "commentaire sauvé, en attente de modération" -#: client.py:336 +#: client.py:337 msgid "Tags input must be no longer than 250 characters." msgstr "La longueur des tags est limitée à 250 caractères." @@ -64,7 +64,8 @@ msgid "unknown" msgstr "inconnu" -#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617 +#: models.py:175 templates/site/text_history.html:77 views/create.py:30 +#: views/create.py:45 views/texts.py:612 msgid "Title" msgstr "Titre" @@ -72,11 +73,11 @@ msgid "Format" msgstr "Format" -#: models.py:177 views/texts.py:708 +#: models.py:177 views/texts.py:703 msgid "Content" msgstr "Texte" -#: models.py:178 models.py:599 +#: models.py:178 models.py:615 msgid "Tags" msgstr "Tags" @@ -88,122 +89,117 @@ msgid "Moderation a posteriori?" msgstr "Modération a posteriori ?" -#: models.py:285 +#: models.py:300 msgid "Format:" msgstr "Format :" -#: models.py:361 -#, python-format -msgid "%(workspace_name)s's workspace" -msgstr "espace de travail : %(workspace_name)s" - -#: models.py:502 +#: models.py:518 msgid "name" msgstr "nom" -#: models.py:503 +#: models.py:519 msgid "description" msgstr "description" -#: models.py:593 +#: models.py:609 msgid "Allow contact" msgstr "Autorise à être contacté" -#: models.py:593 +#: models.py:609 msgid "Allow email messages from other users" msgstr "" "Autoriser les participants de l'espace de travail à vous envoyer un email" -#: models.py:594 +#: models.py:610 msgid "Preferred language" msgstr "Langage de préférence" -#: models.py:597 +#: models.py:613 msgid "Suspended access" msgstr "Accès désactivé" -#: models.py:621 +#: models.py:637 msgid "suspended" msgstr "désactivé" -#: models.py:623 +#: models.py:639 msgid "waiting approval" msgstr "en attente d'approbation" -#: models.py:629 +#: models.py:645 msgid "pending" msgstr "en attente" -#: models.py:644 +#: models.py:660 msgid "Invitation" msgstr "Invitation" -#: models.py:712 +#: models.py:728 #, python-format msgid "Text %(link_to_text)s edited" msgstr "Le texte %(link_to_text)s a été édité" -#: models.py:713 +#: models.py:729 #, python-format msgid "Text %(link_to_text)s edited (new version created)" msgstr "Le texte %(link_to_text)s a été édité (nouvelle version créée)" -#: models.py:714 +#: models.py:730 #, python-format msgid "Text %(link_to_text)s added" msgstr "Le texte %(link_to_text)s a été ajouté" -#: models.py:715 +#: models.py:731 #, python-format msgid "Text %(link_to_text)s removed" msgstr "Le texte %(link_to_text)s a été supprimé" -#: models.py:716 +#: models.py:732 #, python-format msgid "Comment %(link_to_comment)s added on text %(link_to_text)s" msgstr "Commentaire %(link_to_comment)s ajouté sur le texte %(link_to_text)s" -#: models.py:717 +#: models.py:733 #, python-format msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s" msgstr "Commentaire %(link_to_comment)s supprimé du texte %(link_to_text)s" -#: models.py:718 +#: models.py:734 #, python-format msgid "User %(username)s added" msgstr "L'utilisateur %(username)s a été ajouté" -#: models.py:719 +#: models.py:735 #, python-format msgid "User %(username)s access to workspace enabled" msgstr "Accès de utilisateur %(username)s à l'espace de travail activé" -#: models.py:720 +#: models.py:736 #, python-format msgid "User %(username)s access to workspace refused" msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu" -#: models.py:721 +#: models.py:737 #, python-format msgid "User %(username)s access to workspace suspended" msgstr "Accès de utilisateur %(username)s à l'espace de travail suspendu" -#: models.py:722 +#: models.py:738 #, python-format msgid "User %(username)s access to workspace activated" msgstr "Accès de utilisateur %(username)s à l'espace de travail activé" -#: models.py:723 +#: models.py:739 #, python-format msgid "User %(username)s has activated his account" msgstr "L'utilisateur %(username)s a activé son compte" -#: models.py:778 models.py:786 +#: models.py:794 models.py:802 #, python-format msgid "by \"%(username)s\"" msgstr "par \"%(username)s\"" -#: models.py:780 +#: models.py:796 #, python-format msgid "%(time_since)s ago" msgstr "il y a %(time_since)s" @@ -246,7 +242,7 @@ #: settings.py:109 msgid "Spanish" -msgstr "" +msgstr "Espagnol" #: static_i18n.py:6 static_i18n.py:11 msgid "Observer" @@ -555,7 +551,7 @@ msgid "texts" msgstr "textes" -#: templates/site/dashboard.html:264 templates/site/text_list.html:139 +#: templates/site/dashboard.html:264 msgid "comments" msgstr "commentaires" @@ -743,7 +739,6 @@ "Copier ce code dans votre site pour afficher le texte et ses commentaires." #: templates/site/text_embed.html:26 -#, fuzzy msgid "" "Users will also be able to add comments from your site depending on " "anonymous users' roles." @@ -806,50 +801,85 @@ msgid "Subscribe to all text notifications" msgstr "S'abonner aux notifications du texte" -#: templates/site/text_history.html:38 -msgid "Versions:" -msgstr "Versions :" - -#: templates/site/text_history.html:46 -#, python-format -msgid "version #%(v1number)s" -msgstr "version n°%(v1number)s" +#: templates/site/text_history.html:56 +#: templates/site/text_history_compare.html:28 +#: templates/site/text_history_version.html:28 +msgid "Version list" +msgstr "List des versions" -#: templates/site/text_history.html:46 -#, python-format -msgid "by %(v1name)s" -msgstr "par %(v1name)s" +#: templates/site/text_history.html:59 +msgid "Compare last two versions" +msgstr "Comparer les deux dernières versions" -#: templates/site/text_history.html:46 -#, python-format -msgid "created %(v1created)s" -msgstr "créé le %(v1created)s" +#: templates/site/text_history.html:65 +msgid "Compare selected versions" +msgstr "Comparer les versions selectionnées" + +#: templates/site/text_history.html:75 +msgid "Version" +msgstr "Version" -#: templates/site/text_history.html:54 -#, python-format -msgid "differences between version #%(v1number)s and #%(v2number)s" -msgstr "différences entre les versions n°%(v1number)s et n°%(v2number)s :" +#: templates/site/text_history.html:76 +msgid "Selection" +msgstr "Sélection" -#: templates/site/text_history.html:66 -#, python-format -msgid "Revert to version #%(v1_nid)s" -msgstr "Revenir à la version n°%(v1_nid)s" +#: templates/site/text_history.html:78 templates/site/text_list.html:137 +msgid "Author" +msgstr "Auteur" -#: templates/site/text_history.html:70 -#, python-format -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 :" +#: templates/site/text_history.html:79 +msgid "Created" +msgstr "Crée" -#: templates/site/text_history.html:73 templates/site/text_history.html:85 -#: templates/site/text_history.html:91 -#, python-format -msgid "Version #%(version_number)s created on %(date)s" -msgstr "Version n°%(version_number)s créée le %(date)s :" +#: templates/site/text_history.html:80 templates/site/text_list.html:139 +msgid "# comments" +msgstr "nb. de commentaires" + +#: templates/site/text_history.html:100 templates/site/text_list.html:159 +msgid "View" +msgstr "Voir" #: templates/site/text_history.html:101 +#: templates/site/text_history_version.html:33 +msgid "Compare with previous version" +msgstr "Comparer avec la version précédente" + +#: templates/site/text_history.html:102 +msgid "Revert to this version" +msgstr "Revenir à cette version" + +#: templates/site/text_history.html:103 templates/site/text_list.html:80 +#: templates/site/text_list.html.py:161 +msgid "Delete" +msgstr "Supprimer" + +#: templates/site/text_history.html:109 +msgid "Are you sure you want to delete this version?" +msgstr "Etes-vous sûr de vouloir supprimer cette version ?" + +#: templates/site/text_history_compare.html:30 +#: templates/site/text_history_compare.html:34 +#: templates/site/text_history_version.html:30 +#, python-format +msgid "Version %(version_number)s" +msgstr "Version n°%(version_number)s" + +#: 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 and n°%" +"(version_2_number)s" + +#: templates/site/text_history_compare.html:42 msgid "No differences" msgstr "Pas de différences" +#: templates/site/text_history_version.html:37 +msgid "Compare with next version" +msgstr "Comparer avec la version suivante" + #: templates/site/text_list.html:12 msgid "Texts" msgstr "Textes" @@ -874,10 +904,6 @@ msgid "Bulk Actions" msgstr "Actions multiples" -#: templates/site/text_list.html:80 templates/site/text_list.html.py:161 -msgid "Delete" -msgstr "Supprimer" - #: templates/site/text_list.html:83 templates/site/user_list.html:81 msgid "Apply" msgstr "Appliquer" @@ -890,10 +916,6 @@ msgid "Text" msgstr "Texte" -#: templates/site/text_list.html:137 -msgid "Author" -msgstr "Auteur" - #: templates/site/text_list.html:138 msgid "Modified" msgstr "Modifié" @@ -913,10 +935,6 @@ msgid "Filter by tag: %(tag_name)s" msgstr "Filtrer avec le mot-clé : %(tag_name)s" -#: templates/site/text_list.html:159 -msgid "View" -msgstr "Voir" - #: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12 #: templates/site/macros/user_actions.html:19 msgid "Edit" @@ -1421,51 +1439,56 @@ msgid "Text %(text_title)s deleted" msgstr "texte %(text_title)s supprimé" -#: views/texts.py:621 +#: views/texts.py:221 +#, python-format +msgid "Text version %(text_version_title)s deleted" +msgstr "Version %(text_version_title)s supprimée" + +#: views/texts.py:616 msgid "Note (optional)" msgstr "Note (facultative)" -#: views/texts.py:624 +#: views/texts.py:619 msgid "Add a note to explain the modifications made to the text" msgstr "Ajouter une note pour expliquer les modifications apportées au texte" -#: views/texts.py:634 +#: views/texts.py:629 msgid "New version (optional)" msgstr "Nouvelle version (facultative)" -#: views/texts.py:637 +#: views/texts.py:632 msgid "Create a new version of this text (recommended)" msgstr "créér une nouvelle version de ce texte (recommandé)" -#: views/texts.py:640 +#: views/texts.py:635 msgid "Keep comments (optional)" msgstr "Conserver les commentaires (facultatif)" -#: views/texts.py:643 +#: views/texts.py:638 msgid "Keep comments (if not affected by the edit)" msgstr "" "Conserver les commentaires dont la portée n'a pas été affectée par l'édition" -#: views/texts.py:706 +#: views/texts.py:701 msgid "Name (optional)" msgstr "Nom (facultatif)" -#: views/texts.py:707 +#: views/texts.py:702 msgid "Email (optional)" msgstr "Email (facultatif)" -#: views/texts.py:757 +#: views/texts.py:752 #, python-format -msgid "A new version (copied from version %(version_id)s) has been created" +msgid "A new version (copied from version %(version_title)s) has been created" msgstr "" -"Une nouvelle version (copiée depuis la version %(version_id)s) a été créée" +"Une nouvelle version (copiée depuis la version %(version_title)s) a été créée" -#: views/texts.py:865 views/user.py:79 views/user.py:99 +#: views/texts.py:860 views/user.py:79 views/user.py:99 #, python-format msgid "%(count)i user(s) role modified" msgstr "%(count)i rôle(s) d'utilisateur modifié(s)" -#: views/texts.py:923 +#: views/texts.py:918 msgid "Text settings updated" msgstr "Paramètres mis à jour" @@ -1628,6 +1651,24 @@ "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 "%(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" diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/no/LC_MESSAGES/django.mo Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/no/LC_MESSAGES/django.po --- a/src/cm/locale/no/LC_MESSAGES/django.po Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/locale/no/LC_MESSAGES/django.po Fri Feb 05 12:39:25 2010 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: COMT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-02 16:41+0100\n" +"POT-Creation-Date: 2010-02-05 12:37+0100\n" "PO-Revision-Date: 2010-01-16 18:00+0100\n" "Last-Translator: Kirill Miazine \n" "Language-Team: \n" @@ -24,39 +24,39 @@ "Et område i teksten må merkes. Merk et område i teksten som din merknad skal " "gjelde" -#: client.py:133 +#: client.py:134 msgid "name is required" msgstr "navn må angis" -#: client.py:136 +#: client.py:137 msgid "email is required" msgstr "epost må angis" -#: client.py:138 +#: client.py:139 msgid "invalid email" msgstr "ugyldig epost" -#: client.py:140 +#: client.py:141 msgid "title is required" msgstr "overskriften må angis" -#: client.py:142 +#: client.py:143 msgid "content is required" msgstr "teksten må fylles ut" -#: client.py:157 +#: client.py:158 msgid "comment removed" msgstr "merknad slettet" -#: client.py:208 client.py:273 +#: client.py:209 client.py:274 msgid "comment saved" msgstr "merknad lagret" -#: client.py:275 +#: client.py:276 msgid "comment saved, it is being held for moderation" msgstr "merknad lagret og holdes tilbake for godkjenning" -#: client.py:336 +#: client.py:337 msgid "Tags input must be no longer than 250 characters." msgstr "Samlet lengde på etiketter kan ikke overstige 250 tegn." @@ -64,7 +64,8 @@ msgid "unknown" msgstr "ukjent" -#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617 +#: models.py:175 templates/site/text_history.html:77 views/create.py:30 +#: views/create.py:45 views/texts.py:612 msgid "Title" msgstr "Overskrift" @@ -72,11 +73,11 @@ msgid "Format" msgstr "Format" -#: models.py:177 views/texts.py:708 +#: models.py:177 views/texts.py:703 msgid "Content" msgstr "Innhold" -#: models.py:178 models.py:599 +#: models.py:178 models.py:615 msgid "Tags" msgstr "Etiketter" @@ -88,121 +89,116 @@ msgid "Moderation a posteriori?" msgstr "Godkjenning i ettertid?" -#: models.py:285 +#: models.py:300 msgid "Format:" msgstr "Format:" -#: models.py:361 -#, python-format -msgid "%(workspace_name)s's workspace" -msgstr "Arbeidsområde til %(workspace_name)s" - -#: models.py:502 +#: models.py:518 msgid "name" msgstr "navn" -#: models.py:503 +#: models.py:519 msgid "description" msgstr "beskrivelse" -#: models.py:593 +#: models.py:609 msgid "Allow contact" msgstr "Tillatt kontakt" -#: models.py:593 +#: models.py:609 msgid "Allow email messages from other users" msgstr "Motta epost fra andre brukere" -#: models.py:594 +#: models.py:610 msgid "Preferred language" msgstr "Foretrukket språk" -#: models.py:597 +#: models.py:613 msgid "Suspended access" msgstr "Sperret tilgang" -#: models.py:621 +#: models.py:637 msgid "suspended" msgstr "sperret" -#: models.py:623 +#: models.py:639 msgid "waiting approval" msgstr "venter på godkjenning" -#: models.py:629 +#: models.py:645 msgid "pending" msgstr "pågående" -#: models.py:644 +#: models.py:660 msgid "Invitation" msgstr "Invitasjon" -#: models.py:712 +#: models.py:728 #, python-format msgid "Text %(link_to_text)s edited" msgstr "Tekst %(link_to_text)s endret" -#: models.py:713 +#: models.py:729 #, python-format msgid "Text %(link_to_text)s edited (new version created)" msgstr "Tekst %(link_to_text)s endret (ny versjon opprettet)" -#: models.py:714 +#: models.py:730 #, python-format msgid "Text %(link_to_text)s added" msgstr "Tekst %(link_to_text)s lagt til" -#: models.py:715 +#: models.py:731 #, python-format msgid "Text %(link_to_text)s removed" msgstr "Tekst %(link_to_text)s slettet" -#: models.py:716 +#: models.py:732 #, python-format msgid "Comment %(link_to_comment)s added on text %(link_to_text)s" msgstr "Merknad %(link_to_comment)s lagt til teksten %(link_to_text)s" -#: models.py:717 +#: models.py:733 #, python-format msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s" msgstr "Merknad %(link_to_comment)s slettet fra teksten %(link_to_text)s" -#: models.py:718 +#: models.py:734 #, python-format msgid "User %(username)s added" msgstr "Bruker %(username)s opprettet" -#: models.py:719 +#: models.py:735 #, python-format msgid "User %(username)s access to workspace enabled" msgstr "Aktivert tilgang for brukeren %(username)s" -#: models.py:720 +#: models.py:736 #, python-format msgid "User %(username)s access to workspace refused" msgstr "Nektet tilgang for brukeren %(username)s" -#: models.py:721 +#: models.py:737 #, python-format msgid "User %(username)s access to workspace suspended" msgstr "Stoppet tilgang for brukeren %(username)s" -#: models.py:722 +#: models.py:738 #, python-format msgid "User %(username)s access to workspace activated" msgstr "Aktivert tilgang for brukeren %(username)s" -#: models.py:723 +#: models.py:739 #, python-format msgid "User %(username)s has activated his account" msgstr "Bruker %(username)s har aktivert kontoen" -#: models.py:778 models.py:786 +#: models.py:794 models.py:802 #, python-format msgid "by \"%(username)s\"" msgstr "av %(username)s" -#: models.py:780 +#: models.py:796 #, python-format msgid "%(time_since)s ago" msgstr "for %(time_since)s siden" @@ -550,7 +546,7 @@ msgid "texts" msgstr "tekster" -#: templates/site/dashboard.html:264 templates/site/text_list.html:139 +#: templates/site/dashboard.html:264 msgid "comments" msgstr "merknader" @@ -797,50 +793,89 @@ msgid "Subscribe to all text notifications" msgstr "Abonner på alle varsler for teksten" -#: templates/site/text_history.html:38 -msgid "Versions:" -msgstr "Versjoner:" +#: templates/site/text_history.html:56 +#: templates/site/text_history_compare.html:28 +#: templates/site/text_history_version.html:28 +#, fuzzy +msgid "Version list" +msgstr "Versjoner" + +#: templates/site/text_history.html:59 +msgid "Compare last two versions" +msgstr "" + +#: templates/site/text_history.html:65 +msgid "Compare selected versions" +msgstr "" + +#: templates/site/text_history.html:75 +#, fuzzy +msgid "Version" +msgstr "Versjoner" + +#: templates/site/text_history.html:76 +#, fuzzy +msgid "Selection" +msgstr "Handlinger" + +#: templates/site/text_history.html:78 templates/site/text_list.html:137 +msgid "Author" +msgstr "Forfatter" + +#: templates/site/text_history.html:79 +msgid "Created" +msgstr "" -#: templates/site/text_history.html:46 -#, python-format -msgid "version #%(v1number)s" +#: templates/site/text_history.html:80 templates/site/text_list.html:139 +#, fuzzy +msgid "# comments" +msgstr "merknader" + +#: templates/site/text_history.html:100 templates/site/text_list.html:159 +msgid "View" +msgstr "Se" + +#: templates/site/text_history.html:101 +#: templates/site/text_history_version.html:33 +msgid "Compare with previous version" +msgstr "" + +#: templates/site/text_history.html:102 +#, fuzzy +msgid "Revert to this version" +msgstr "Still tilbake til versjonen #%(v1_nid)s" + +#: templates/site/text_history.html:103 templates/site/text_list.html:80 +#: templates/site/text_list.html.py:161 +msgid "Delete" +msgstr "Slett" + +#: templates/site/text_history.html:109 +#, fuzzy +msgid "Are you sure you want to delete this version?" +msgstr "Ønsker du å slette denne teksten?" + +#: templates/site/text_history_compare.html:30 +#: templates/site/text_history_compare.html:34 +#: templates/site/text_history_version.html:30 +#, fuzzy, python-format +msgid "Version %(version_number)s" msgstr "versjon #%(v1number)s" -#: templates/site/text_history.html:46 -#, python-format -msgid "by %(v1name)s" -msgstr "av %(v1name)s" - -#: templates/site/text_history.html:46 -#, python-format -msgid "created %(v1created)s" -msgstr "opprettet %(v1created)s" - -#: templates/site/text_history.html:54 -#, python-format -msgid "differences between version #%(v1number)s and #%(v2number)s" +#: templates/site/text_history_compare.html:32 +#, fuzzy, python-format +msgid "" +"Comparison between version #%(version_1_number)s and #%(version_2_number)s" msgstr "forskjeller mellom versjonene #%(v1number)s og #%(v2number)s" -#: templates/site/text_history.html:66 -#, python-format -msgid "Revert to version #%(v1_nid)s" -msgstr "Still tilbake til versjonen #%(v1_nid)s" - -#: templates/site/text_history.html:70 -#, python-format -msgid "Differences between version #%(v1_nid)s and version #%(v2_nid)s:" -msgstr "Forskjeller mellom versjon #%(v1_nid)s og versjon #%(v2_nid)s:" - -#: templates/site/text_history.html:73 templates/site/text_history.html:85 -#: templates/site/text_history.html:91 -#, python-format -msgid "Version #%(version_number)s created on %(date)s" -msgstr "Versjon #%(version_number)s opprettet %(date)s" - -#: templates/site/text_history.html:101 +#: templates/site/text_history_compare.html:42 msgid "No differences" msgstr "Ingen forskjeller" +#: templates/site/text_history_version.html:37 +msgid "Compare with next version" +msgstr "" + #: templates/site/text_list.html:12 msgid "Texts" msgstr "Tekster" @@ -865,10 +900,6 @@ msgid "Bulk Actions" msgstr "Handlinger" -#: templates/site/text_list.html:80 templates/site/text_list.html.py:161 -msgid "Delete" -msgstr "Slett" - #: templates/site/text_list.html:83 templates/site/user_list.html:81 msgid "Apply" msgstr "Utfør" @@ -881,10 +912,6 @@ msgid "Text" msgstr "Tekst" -#: templates/site/text_list.html:137 -msgid "Author" -msgstr "Forfatter" - #: templates/site/text_list.html:138 msgid "Modified" msgstr "Endret" @@ -904,10 +931,6 @@ msgid "Filter by tag: %(tag_name)s" msgstr "Filtrer etter etikett: %(tag_name)s" -#: templates/site/text_list.html:159 -msgid "View" -msgstr "Se" - #: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12 #: templates/site/macros/user_actions.html:19 msgid "Edit" @@ -1402,49 +1425,54 @@ msgid "Text %(text_title)s deleted" msgstr "Tekstet %(text_title)s slettet" -#: views/texts.py:621 +#: views/texts.py:221 +#, fuzzy, python-format +msgid "Text version %(text_version_title)s deleted" +msgstr "Tekstet %(text_title)s slettet" + +#: views/texts.py:616 msgid "Note (optional)" msgstr "Kommentar (valgfritt)" -#: views/texts.py:624 +#: views/texts.py:619 msgid "Add a note to explain the modifications made to the text" msgstr "Legg til en kommentar for å beskrive foretatte endringer i teksten" -#: views/texts.py:634 +#: views/texts.py:629 msgid "New version (optional)" msgstr "Ny versjon (valgfritt)" -#: views/texts.py:637 +#: views/texts.py:632 msgid "Create a new version of this text (recommended)" msgstr "Opprett ny versjon av teksten (anbefales)" -#: views/texts.py:640 +#: views/texts.py:635 msgid "Keep comments (optional)" msgstr "Behold merknader (valgfritt)" -#: views/texts.py:643 +#: views/texts.py:638 msgid "Keep comments (if not affected by the edit)" msgstr "Behold merknadene (dersom de ikke er påvirket av endringene i teksten)" -#: views/texts.py:706 +#: views/texts.py:701 msgid "Name (optional)" msgstr "Navn (valgfritt)" -#: views/texts.py:707 +#: views/texts.py:702 msgid "Email (optional)" msgstr "Epost (valgfritt)" -#: views/texts.py:757 -#, python-format -msgid "A new version (copied from version %(version_id)s) has been created" +#: views/texts.py:752 +#, fuzzy, python-format +msgid "A new version (copied from version %(version_title)s) has been created" msgstr "Ny versjon (kopiert fra versjon %(version_id)s) har blitt opprettet" -#: views/texts.py:865 views/user.py:79 views/user.py:99 +#: views/texts.py:860 views/user.py:79 views/user.py:99 #, python-format msgid "%(count)i user(s) role modified" msgstr "Roller for %(count)i bruker(e) endret" -#: views/texts.py:923 +#: views/texts.py:918 msgid "Text settings updated" msgstr "Tekstinnstillinger oppdatert" @@ -1606,6 +1634,24 @@ "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." +#~ 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" + #, fuzzy #~ msgid "Contact from user: %(name)s / %(email)s" #~ msgstr "Kontakt bruker %(username)s" diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/pt_BR/LC_MESSAGES/django.mo Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/locale/pt_BR/LC_MESSAGES/django.po --- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po Fri Feb 05 12:39:25 2010 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: COMT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-02 16:40+0100\n" +"POT-Creation-Date: 2010-02-05 12:36+0100\n" "PO-Revision-Date: 2010-01-23 12:00-0300\n" "Last-Translator: Paulo Rená da Silva Santarém \n" "Language-Team: LANGUAGE \n" @@ -19,39 +19,39 @@ "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:133 +#: client.py:134 msgid "name is required" msgstr "Favor preencher o nome" -#: client.py:136 +#: client.py:137 msgid "email is required" msgstr "Favor preencher email" -#: client.py:138 +#: client.py:139 msgid "invalid email" msgstr "Email inválido" -#: client.py:140 +#: client.py:141 msgid "title is required" msgstr "Favor preencher título" -#: client.py:142 +#: client.py:143 msgid "content is required" msgstr "Favor preencher conteúdo" -#: client.py:157 +#: client.py:158 msgid "comment removed" msgstr "Conteúdo removido" -#: client.py:208 client.py:273 +#: client.py:209 client.py:274 msgid "comment saved" msgstr "comentário salvo" -#: client.py:275 +#: client.py:276 msgid "comment saved, it is being held for moderation" msgstr "comentário salvo, aguarda moderação" -#: client.py:336 +#: client.py:337 msgid "Tags input must be no longer than 250 characters." msgstr "Palavras-chave não pode exceder 250 caracteres." @@ -59,7 +59,8 @@ msgid "unknown" msgstr "desconhecido" -#: models.py:175 views/create.py:30 views/create.py:45 views/texts.py:617 +#: models.py:175 templates/site/text_history.html:77 views/create.py:30 +#: views/create.py:45 views/texts.py:612 msgid "Title" msgstr "Título" @@ -67,11 +68,11 @@ msgid "Format" msgstr "Formatar" -#: models.py:177 views/texts.py:708 +#: models.py:177 views/texts.py:703 msgid "Content" msgstr "Conteúdo" -#: models.py:178 models.py:599 +#: models.py:178 models.py:615 msgid "Tags" msgstr "Palavras-chave" @@ -83,121 +84,116 @@ msgid "Moderation a posteriori?" msgstr "Moderação a posteriori?" -#: models.py:285 +#: models.py:300 msgid "Format:" msgstr "Formatar:" -#: models.py:361 -#, python-format -msgid "%(workspace_name)s's workspace" -msgstr "%(workspace_name)s da área de trabalho" - -#: models.py:502 +#: models.py:518 msgid "name" msgstr "nome" -#: models.py:503 +#: models.py:519 msgid "description" msgstr "descrição" -#: models.py:593 +#: models.py:609 msgid "Allow contact" msgstr "Permitir contato" -#: models.py:593 +#: models.py:609 msgid "Allow email messages from other users" msgstr "Permitir mensagens de email de outros usuários" -#: models.py:594 +#: models.py:610 msgid "Preferred language" msgstr "Idioma preferido" -#: models.py:597 +#: models.py:613 msgid "Suspended access" msgstr "Suspender acesso" -#: models.py:621 +#: models.py:637 msgid "suspended" msgstr "suspenso" -#: models.py:623 +#: models.py:639 msgid "waiting approval" msgstr "aguardando aprovação" -#: models.py:629 +#: models.py:645 msgid "pending" msgstr "pendente" -#: models.py:644 +#: models.py:660 msgid "Invitation" msgstr "Convite" -#: models.py:712 +#: models.py:728 #, python-format msgid "Text %(link_to_text)s edited" msgstr "Texto %(link_to_text)s editado" -#: models.py:713 +#: models.py:729 #, python-format msgid "Text %(link_to_text)s edited (new version created)" msgstr "Texto %(link_to_text)s editado (criada nova versão)" -#: models.py:714 +#: models.py:730 #, python-format msgid "Text %(link_to_text)s added" msgstr "Texto %(link_to_text)s adicionado" -#: models.py:715 +#: models.py:731 #, python-format msgid "Text %(link_to_text)s removed" msgstr "Texto %(link_to_text)s removido" -#: models.py:716 +#: models.py:732 #, python-format msgid "Comment %(link_to_comment)s added on text %(link_to_text)s" msgstr "Comentário %(link_to_comment)s adicionado ao texto %(link_to_text)s " -#: models.py:717 +#: models.py:733 #, python-format msgid "Comment %(link_to_comment)s removed from text %(link_to_text)s" msgstr "Comentário %(link_to_comment)s removido do texto %(link_to_text)s" -#: models.py:718 +#: models.py:734 #, python-format msgid "User %(username)s added" msgstr "Usuário %(username)s adicionado" -#: models.py:719 +#: models.py:735 #, python-format msgid "User %(username)s access to workspace enabled" msgstr "Acesso do usuário %(username)s à área de trabalho permitido" -#: models.py:720 +#: models.py:736 #, python-format msgid "User %(username)s access to workspace refused" msgstr "Acesso do usuário %(username)s à área de trabalho recusado" -#: models.py:721 +#: models.py:737 #, python-format msgid "User %(username)s access to workspace suspended" msgstr "Acesso do usuário %(username)s à área de trabalho suspenso" -#: models.py:722 +#: models.py:738 #, python-format msgid "User %(username)s access to workspace activated" msgstr "Acesso do usuário %(username)s à área de trabalho ativado" -#: models.py:723 +#: models.py:739 #, python-format msgid "User %(username)s has activated his account" msgstr "O usuário %(username)s ativou sua conta" -#: models.py:778 models.py:786 +#: models.py:794 models.py:802 #, python-format msgid "by \"%(username)s\"" msgstr "por \"%(username)s\"" -#: models.py:780 +#: models.py:796 #, python-format msgid "%(time_since)s ago" msgstr "há %(time_since)s" @@ -545,7 +541,7 @@ msgid "texts" msgstr "textos" -#: templates/site/dashboard.html:264 templates/site/text_list.html:139 +#: templates/site/dashboard.html:264 msgid "comments" msgstr "comentários" @@ -791,50 +787,89 @@ msgid "Subscribe to all text notifications" msgstr "Receber todas as notificações" -#: templates/site/text_history.html:38 -msgid "Versions:" -msgstr "Versões:" +#: templates/site/text_history.html:56 +#: templates/site/text_history_compare.html:28 +#: templates/site/text_history_version.html:28 +#, fuzzy +msgid "Version list" +msgstr "Versões" + +#: templates/site/text_history.html:59 +msgid "Compare last two versions" +msgstr "" + +#: templates/site/text_history.html:65 +msgid "Compare selected versions" +msgstr "" + +#: templates/site/text_history.html:75 +#, fuzzy +msgid "Version" +msgstr "Versões" + +#: templates/site/text_history.html:76 +#, fuzzy +msgid "Selection" +msgstr "Ações" + +#: templates/site/text_history.html:78 templates/site/text_list.html:137 +msgid "Author" +msgstr "Autor" + +#: templates/site/text_history.html:79 +msgid "Created" +msgstr "" -#: templates/site/text_history.html:46 -#, python-format -msgid "version #%(v1number)s" +#: templates/site/text_history.html:80 templates/site/text_list.html:139 +#, fuzzy +msgid "# comments" +msgstr "comentários" + +#: templates/site/text_history.html:100 templates/site/text_list.html:159 +msgid "View" +msgstr "Ver" + +#: templates/site/text_history.html:101 +#: templates/site/text_history_version.html:33 +msgid "Compare with previous version" +msgstr "" + +#: templates/site/text_history.html:102 +#, fuzzy +msgid "Revert to this version" +msgstr "Reverter para a versão #%(v1_nid)s" + +#: templates/site/text_history.html:103 templates/site/text_list.html:80 +#: templates/site/text_list.html.py:161 +msgid "Delete" +msgstr "Apagar" + +#: templates/site/text_history.html:109 +#, fuzzy +msgid "Are you sure you want to delete this version?" +msgstr "Confirmar a exclusão desse texto?" + +#: templates/site/text_history_compare.html:30 +#: templates/site/text_history_compare.html:34 +#: templates/site/text_history_version.html:30 +#, fuzzy, python-format +msgid "Version %(version_number)s" msgstr "versão #%(v1number)s" -#: templates/site/text_history.html:46 -#, python-format -msgid "by %(v1name)s" -msgstr "por %(v1name)s" - -#: templates/site/text_history.html:46 -#, python-format -msgid "created %(v1created)s" -msgstr "criado %(v1created)s" - -#: templates/site/text_history.html:54 -#, python-format -msgid "differences between version #%(v1number)s and #%(v2number)s" +#: templates/site/text_history_compare.html:32 +#, fuzzy, python-format +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.html:66 -#, python-format -msgid "Revert to version #%(v1_nid)s" -msgstr "Reverter para a versão #%(v1_nid)s" - -#: templates/site/text_history.html:70 -#, python-format -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:" - -#: templates/site/text_history.html:73 templates/site/text_history.html:85 -#: templates/site/text_history.html:91 -#, python-format -msgid "Version #%(version_number)s created on %(date)s" -msgstr "Versão #%(version_number)s criada em %(date)s" - -#: templates/site/text_history.html:101 +#: templates/site/text_history_compare.html:42 msgid "No differences" msgstr "Sem diferenças" +#: templates/site/text_history_version.html:37 +msgid "Compare with next version" +msgstr "" + #: templates/site/text_list.html:12 msgid "Texts" msgstr "Textos" @@ -859,10 +894,6 @@ msgid "Bulk Actions" msgstr "Ações em massa" -#: templates/site/text_list.html:80 templates/site/text_list.html.py:161 -msgid "Delete" -msgstr "Apagar" - #: templates/site/text_list.html:83 templates/site/user_list.html:81 msgid "Apply" msgstr "Aplicar" @@ -875,10 +906,6 @@ msgid "Text" msgstr "Texto" -#: templates/site/text_list.html:137 -msgid "Author" -msgstr "Autor" - #: templates/site/text_list.html:138 msgid "Modified" msgstr "Modificar" @@ -898,10 +925,6 @@ msgid "Filter by tag: %(tag_name)s" msgstr "Filtrar por palavra chave: %(tag_name)s" -#: templates/site/text_list.html:159 -msgid "View" -msgstr "Ver" - #: templates/site/text_list.html:160 templates/site/macros/text_tabs.html:12 #: templates/site/macros/user_actions.html:19 msgid "Edit" @@ -1397,49 +1420,54 @@ msgid "Text %(text_title)s deleted" msgstr "Texto %(text_title)s apagado" -#: views/texts.py:621 +#: views/texts.py:221 +#, fuzzy, python-format +msgid "Text version %(text_version_title)s deleted" +msgstr "Texto %(text_title)s apagado" + +#: views/texts.py:616 msgid "Note (optional)" msgstr "Observação (opcional)" -#: views/texts.py:624 +#: views/texts.py:619 msgid "Add a note to explain the modifications made to the text" msgstr "Adicionar uma observação para explicar as mudanças feitas no texto" -#: views/texts.py:634 +#: views/texts.py:629 msgid "New version (optional)" msgstr "Nova versão (opcional)" -#: views/texts.py:637 +#: views/texts.py:632 msgid "Create a new version of this text (recommended)" msgstr "Criar uma nova versão desse texto (recomendado)" -#: views/texts.py:640 +#: views/texts.py:635 msgid "Keep comments (optional)" msgstr "Manter comentários (opcional)" -#: views/texts.py:643 +#: views/texts.py:638 msgid "Keep comments (if not affected by the edit)" msgstr "Manter comentários (se não afetados pela edição)" -#: views/texts.py:706 +#: views/texts.py:701 msgid "Name (optional)" msgstr "Nome (opcional)" -#: views/texts.py:707 +#: views/texts.py:702 msgid "Email (optional)" msgstr "Email (opcional)" -#: views/texts.py:757 -#, python-format -msgid "A new version (copied from version %(version_id)s) has been created" +#: views/texts.py:752 +#, fuzzy, python-format +msgid "A new version (copied from version %(version_title)s) has been created" msgstr "Uma mova versão (copiada da versão %(version_id)s) foi criada" -#: views/texts.py:865 views/user.py:79 views/user.py:99 +#: views/texts.py:860 views/user.py:79 views/user.py:99 #, python-format msgid "%(count)i user(s) role modified" msgstr "%(count)i função do(s) usuário(s) modificada" -#: views/texts.py:923 +#: views/texts.py:918 msgid "Text settings updated" msgstr "Configurações do texto atualizadas" @@ -1604,6 +1632,24 @@ msgstr "" "Você se inscreveu. Favor verifique em seu email a mensagem de confirmação." +#~ 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" diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/templates/site/text_history_compare.html --- a/src/cm/templates/site/text_history_compare.html Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/templates/site/text_history_compare.html Fri Feb 05 12:39:25 2010 +0100 @@ -29,7 +29,7 @@
  • /
  • {% blocktrans with v1.get_version_number as version_number %}Version {{ version_number }}{% endblocktrans %}
  • /
    • -
  • {% blocktrans with v1.get_version_number as version_1_number and v2.get_version_number as version_2_number %}Comparison beetween version #{{ version_1_number }} and #{{ version_2_number }}{% endblocktrans %}
    • +
  • {% blocktrans with v1.get_version_number as version_1_number and v2.get_version_number as version_2_number %}Comparison between version #{{ version_1_number }} and #{{ version_2_number }}{% endblocktrans %}
  • /
  • {% blocktrans with v2.get_version_number as version_number %}Version {{ version_number }}{% endblocktrans %}
    • diff -r 51c34f5970c2 -r 286863e6e2c1 src/cm/templates/site/text_list.html --- a/src/cm/templates/site/text_list.html Fri Feb 05 12:24:06 2010 +0100 +++ b/src/cm/templates/site/text_list.html Fri Feb 05 12:39:25 2010 +0100 @@ -136,7 +136,7 @@ {% up_down title %}{% blocktrans %}Text{% endblocktrans %}{% endup_down %} {% blocktrans %}Author{% endblocktrans %} {% up_down -modified %}{% blocktrans %}Modified{% endblocktrans %}{% endup_down %} - # {% blocktrans %}comments{% endblocktrans %} + {% blocktrans %}# comments{% endblocktrans %} {% if can_manage_workspace %}{% blocktrans %}Last week activity{% endblocktrans %}{% endif %}