# HG changeset patch # User rougeronj # Date 1425986990 -3600 # Node ID 4d641dc5e7e6e37cc1d4aebfa1bcbc11cd7ccaa4 # Parent 2729d4978aa2cf8b9c88cadae9f69a4c5b675bcc rename "profile" in "compte" and add translations diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -391,7 +391,7 @@ "de ressources du portail Histoire des Arts." msgstr "" -#: templates/index.html:76 +#: templates/index.html:76 templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." @@ -424,11 +424,11 @@ msgstr "" #: templates/profile_home.html:7 -msgid "Profil utilisateur" +msgid "Compte utilisateur" msgstr "" #: templates/profile_home.html:30 -msgid "Mon profil" +msgid "Mon compte" msgstr "" #: templates/profile_home.html:34 @@ -459,54 +459,54 @@ msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 +#: templates/profile_home.html:53 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" #: templates/profile_home.html:55 templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" #: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filter:" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" #: templates/profile_home.html:59 templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" #: templates/profile_home.html:60 templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/profile_home.html:60 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/profile_home.html:61 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" @@ -533,17 +533,17 @@ msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/profile_home.html:71 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/profile_home.html:72 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/profile_home.html:79 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" @@ -556,7 +556,7 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:76 +#: templates/profile_home.html:105 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -616,12 +616,12 @@ msgid "Marked Renkans list" msgstr "" -#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -57,7 +57,9 @@ msgid "rejected_state" msgstr "rejected" -#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/a_propos.html:5 +#: templates/base.html:43 +#: templates/base.html.py:75 #: templates/base.html:97 msgid "A Propos" msgstr "About" @@ -66,23 +68,29 @@ msgid "Accueil" msgstr "Home" -#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44 +#: templates/base.html:39 +#: templates/base.html.py:92 +#: templates/index.html:44 msgid "Recherche" msgstr "Tag search" -#: templates/base.html:40 templates/base.html.py:93 +#: templates/base.html:40 +#: templates/base.html.py:93 msgid "Domaines Artistiques" msgstr "Artistic discipline" -#: templates/base.html:41 templates/base.html.py:94 +#: templates/base.html:41 +#: templates/base.html.py:94 msgid "Thésaurus" msgstr "Thesaurus" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 +#: templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "Log out" -#: templates/base.html:52 templates/registration/activate.html:16 +#: templates/base.html:52 +#: templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" @@ -96,7 +104,8 @@ msgid "Mentions légales" msgstr "Legal Notices" -#: templates/base.html:78 templates/envelope/contact.html:6 +#: templates/base.html:78 +#: templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:16 msgid "Contact" msgstr "Contact" @@ -113,7 +122,8 @@ msgid "Liens" msgstr "Links" -#: templates/categories.html:5 templates/thesaurus.html:33 +#: templates/categories.html:5 +#: templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Tree search" @@ -133,7 +143,8 @@ msgid "Credits" msgstr "Credits" -#: templates/facettes.html:5 templates/facettes.html.py:46 +#: templates/facettes.html:5 +#: templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Faceted search" @@ -294,8 +305,7 @@ msgid "" "En cliquant sur l’icone à gauche vous pouvez ouvrir le panel de recherche " "pour retrouver des ressources du site HDA ou Wikipédia." -msgstr "" -"Clicking the icon on the left will show the search panel to find resources " +msgstr "Clicking the icon on the left will show the search panel to find resources " "onthe HDA website or Wikipedia." #: templates/help_popup.html:65 @@ -373,8 +383,7 @@ "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " "À la fois critères " -msgstr "" -"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +msgstr "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " "À la fois critères " @@ -382,8 +391,7 @@ msgid "" "de recherche et modes de visualisation des résultats, ces différentes " "facettes se mettent à jour au fur et à mesure de vos recherches." -msgstr "" -"de recherche et modes de visualisation des résultats, ces différentes " +msgstr "de recherche et modes de visualisation des résultats, ces différentes " "facettes se mettent à jour au fur et à mesure de vos recherches." #: templates/index.html:59 @@ -394,16 +402,15 @@ msgid "" "Explorez 9 grands domaines artistiques à travers des arborescences enrichies " "de ressources du portail Histoire des Arts." -msgstr "" -"Explore 9 great artistic domains through trees of enriched resources from " +msgstr "Explore 9 great artistic domains through trees of enriched resources from " "the portal \"Histoire des Arts\"." #: templates/index.html:76 +#: templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." -msgstr "" -"Build your knowledge map from resources from \"Histoire des Arts\" and " +msgstr "Build your knowledge map from resources from \"Histoire des Arts\" and " "Wikipedia." #: templates/index.html:91 @@ -414,8 +421,7 @@ msgid "" "Naviguez autrement à travers les 5000 ressources du Portail Histoire des " "arts :" -msgstr "" -"A new way to navigate through the 5000 resources from \"Histoire des Arts\" " +msgstr "A new way to navigate through the 5000 resources from \"Histoire des Arts\" " "website:" #: templates/index.html:95 @@ -435,12 +441,13 @@ msgstr "Legal Notices" #: templates/profile_home.html:7 -msgid "Profil utilisateur" -msgstr "User profile" +#, fuzzy +msgid "Compte utilisateur" +msgstr "Username" #: templates/profile_home.html:30 -msgid "Mon profil" -msgstr "My profile" +msgid "Mon compte" +msgstr "My account" #: templates/profile_home.html:34 msgid "Adminsitration du Site" @@ -471,58 +478,72 @@ msgstr "manage my Renkan" #: templates/profile_home.html:53 +#: templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "New renkan" -#: templates/profile_home.html:55 templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/profile_home.html:55 +#: templates/profile_home.html.py:124 +#: templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "Previous" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/profile_home.html:56 +#: templates/profile_home.html.py:125 +#: templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "Next" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 +#: templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filter" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 +#: templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "Advanced search" -#: templates/profile_home.html:59 templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/profile_home.html:59 +#: templates/profile_home.html.py:77 +#: templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "Title" -#: templates/profile_home.html:60 templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/profile_home.html:60 +#: templates/profile_home.html.py:81 +#: templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "Modification date" -#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/profile_home.html:60 +#: templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "Begin" -#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/profile_home.html:61 +#: templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "End" -#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/profile_home.html:62 +#: templates/profile_home.html.py:84 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" @@ -532,42 +553,51 @@ msgid "Edition" msgstr "Edition" -#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:66 +#: templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "Moderated" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:67 +#: templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "Published" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:68 +#: templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rejected" -#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/profile_home.html:71 +#: templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "Favorite" -#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/profile_home.html:72 +#: templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Search" -#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/profile_home.html:79 +#: templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "Fav." -#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:83 +#: templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "Preview" -#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:86 +#: templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:105 templates/renkan_list.html:76 +#: templates/profile_home.html:105 +#: templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "Are you sure you want to copy this renkan ?" @@ -578,10 +608,10 @@ #: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." -msgstr "" -"Are you sure you want to delete this renkan ? You cannot undo this action." +msgstr "Are you sure you want to delete this renkan ? You cannot undo this action." -#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:115 +#: templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publish renkan" @@ -589,7 +619,8 @@ msgid "Are you sure you want to ask to publish this renkan ?" msgstr "Are you sure you want to ask to publish this renkan ?" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:116 +#: templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "unpublish renkan" @@ -609,31 +640,37 @@ msgid "(Indisponible si modification du RENKAN)" msgstr "(Not allowed if renkan has been modified)" -#: templates/renkan_edit.html:200 templates/renkan_edit.html.py:204 +#: templates/renkan_edit.html:200 +#: templates/renkan_edit.html.py:204 #: templates/renkan_edit.html:208 msgid "View graph in column" msgstr "View graph in column" -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 +#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html.py:205 #: templates/renkan_edit.html:209 msgid "View graph in line" msgstr "View graph in line" -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html.py:206 #: templates/renkan_edit.html:210 msgid "View graph in circle" msgstr "View graph in circle" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 +#: templates/renkan_list.html.py:29 msgid "Marked Renkans list" msgstr "Liste des Renkan repères" -#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 +#: templates/renkan_list.html:46 +#: templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "Username" -#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 +#: templates/editorial/manage_renkans.html:64 msgid "User" msgstr "User" @@ -662,7 +699,8 @@ msgstr "Cancel" #: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:32 +#: templates/registration/login.html:5 +#: templates/registration/login.html:32 msgid "Login" msgstr "Login" @@ -703,8 +741,7 @@ "p>\n" "

Remplissez le formulaire suivant :

\n" " " -msgstr "" -"\n" +msgstr "\n" "

You wish to ask something about Histoire des arts' Lab ?

\n" "

Fill the following form:

\n" " " @@ -744,8 +781,7 @@ "\n" "You have created an account at %(sitename)s with the user name " "%(username)s.\n" -msgstr "" -"\n" +msgstr "\n" "You have created an account at %(sitename)s with the user name " "%(username)s.\n" @@ -875,6 +911,8 @@ msgid "Plus de Ressources" msgstr "More Resources" -#: views/profile.py:448 views/profile.py:527 +#: views/profile.py:448 +#: views/profile.py:527 msgid "Period" msgstr "Period" + diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -214,8 +214,8 @@ "collections de ressources du portail histoire des arts avec d’autres sites " "Web.

\n" "\t\t\t\t\t\t\tÀ partir de l’onglet \"recherche\", cliquez sur le logo " -msgstr "Esta erramienta se permite representar, y organisar grupos de " -"recursos del portal \"Histoire des arts\" con otras parginas web.

\n" +msgstr "Esta erramienta se permite representar, y organisar grupos de recursos del " +"portal \"Histoire des arts\" con otras parginas web.

\n" "\t\t\t\t\t\t\tDesde la pestaña \"búsqueda\", haga clic en el logo" #: templates/help_popup.html:13 @@ -388,15 +388,15 @@ "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " "À la fois critères " msgstr "Intuitivo, la búsqueda de Histoire des Arts'Lab propone diferentes " -"criterios: país, periodos historicos, diciplinas artisticas, y plabaras claves." -"A la vez criterios " +"criterios: país, periodos historicos, diciplinas artisticas, y plabaras " +"claves.A la vez criterios " #: templates/index.html:48 msgid "" "de recherche et modes de visualisation des résultats, ces différentes " "facettes se mettent à jour au fur et à mesure de vos recherches." -msgstr "de búsqueda y modos de visualización de los resultos, todo se" -"actualisa al mismo tiempo que su investigación" +msgstr "de búsqueda y modos de visualización de los resultos, todo seactualisa al " +"mismo tiempo que su investigación" #: templates/index.html:59 msgid "Navigation à travers les Arts " @@ -406,15 +406,16 @@ msgid "" "Explorez 9 grands domaines artistiques à travers des arborescences enrichies " "de ressources du portail Histoire des Arts." -msgstr "Exploa 9 grandes temas artisticos a traves de arborescencias de recursos " -"del portal de Histoire des Arts." +msgstr "Exploa 9 grandes temas artisticos a traves de arborescencias de recursos del " +"portal de Histoire des Arts." #: templates/index.html:76 +#: templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." -msgstr "Constuye su mapa de conocimientos desde los recursos de Histoire des Arts " -"y Wikipedia." +msgstr "Constuye su mapa de conocimientos desde los recursos de Histoire des Arts y " +"Wikipedia." #: templates/index.html:91 msgid "Bienvenue sur Histoire des arts‘Lab !" @@ -424,8 +425,8 @@ msgid "" "Naviguez autrement à travers les 5000 ressources du Portail Histoire des " "arts :" -msgstr "Navega de una nueva forma a traves de los 5000 recursos del portal de" -"Histoire des Arts:" +msgstr "Navega de una nueva forma a traves de los 5000 recursos del portal " +"deHistoire des Arts:" #: templates/index.html:95 msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" @@ -444,12 +445,13 @@ msgstr "Aviso Legal" #: templates/profile_home.html:7 -msgid "Profil utilisateur" -msgstr "Perfil del usuario" +#, fuzzy +msgid "Compte utilisateur" +msgstr "Nombre de usuario" #: templates/profile_home.html:30 -msgid "Mon profil" -msgstr "Mi perfil" +msgid "Mon compte" +msgstr "mi cuenta" #: templates/profile_home.html:34 msgid "Adminsitration du Site" @@ -480,13 +482,14 @@ msgstr "Gestionar mis Renkan" #: templates/profile_home.html:53 +#: templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "Nuevo Renkan" #: templates/profile_home.html:55 #: templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 -#: templates/renkan_list.html.py:84 +#: templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" @@ -494,29 +497,29 @@ #: templates/profile_home.html:56 #: templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 -#: templates/renkan_list.html.py:85 +#: templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "Siguiente" #: templates/profile_home.html:57 -#: templates/renkan_list.html:34 +#: templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filtro" #: templates/profile_home.html:57 -#: templates/renkan_list.html:34 +#: templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "Búsqueda avanzada" #: templates/profile_home.html:59 #: templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 -#: templates/renkan_list.html.py:48 +#: templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" @@ -524,21 +527,21 @@ #: templates/profile_home.html:60 #: templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 -#: templates/renkan_list.html.py:56 +#: templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "Modificar la fecha" #: templates/profile_home.html:60 -#: templates/renkan_list.html:37 +#: templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "inicio" #: templates/profile_home.html:61 -#: templates/renkan_list.html:38 +#: templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "fin" @@ -570,19 +573,19 @@ msgstr "Rechazado" #: templates/profile_home.html:71 -#: templates/renkan_list.html:41 +#: templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "Favorito" #: templates/profile_home.html:72 -#: templates/renkan_list.html:43 +#: templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Buscar" #: templates/profile_home.html:79 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" @@ -598,7 +601,7 @@ msgstr "Acciones " #: templates/profile_home.html:105 -#: templates/renkan_list.html:76 +#: templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "¿ Esta seguro que desea copiar este Renkan ?" @@ -664,13 +667,13 @@ msgid "Marked Renkans list" msgstr "Lista de Renkan marcados" -#: templates/renkan_list.html:39 +#: templates/renkan_list.html:46 #: templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "Nombre de Usuario" -#: templates/renkan_list.html:54 +#: templates/renkan_list.html:61 #: templates/editorial/manage_renkans.html:64 msgid "User" msgstr "Usuario" @@ -743,8 +746,7 @@ "

Remplissez le formulaire suivant :

\n" " " msgstr "\n" -"

Quiere preguntar algo a Histoire des arts'Lab ?\n" +"

Quiere preguntar algo a Histoire des arts'Lab ?

\n" "

Rellena el formulario siguiente :

\n" " " diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,7 +57,9 @@ msgid "rejected_state" msgstr "rejeté" -#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 +#: templates/a_propos.html:5 +#: templates/base.html:43 +#: templates/base.html.py:75 #: templates/base.html:97 msgid "A Propos" msgstr "À Propos" @@ -66,23 +68,29 @@ msgid "Accueil" msgstr "" -#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44 +#: templates/base.html:39 +#: templates/base.html.py:92 +#: templates/index.html:44 msgid "Recherche" msgstr "Recherche" -#: templates/base.html:40 templates/base.html.py:93 +#: templates/base.html:40 +#: templates/base.html.py:93 msgid "Domaines Artistiques" msgstr "Disciplines artistiques" -#: templates/base.html:41 templates/base.html.py:94 +#: templates/base.html:41 +#: templates/base.html.py:94 msgid "Thésaurus" msgstr "" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 +#: templates/base.html:50 +#: templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" msgstr "Déconnexion" -#: templates/base.html:52 templates/registration/activate.html:16 +#: templates/base.html:52 +#: templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" @@ -96,7 +104,8 @@ msgid "Mentions légales" msgstr "Mentions légales" -#: templates/base.html:78 templates/envelope/contact.html:6 +#: templates/base.html:78 +#: templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:16 msgid "Contact" msgstr "" @@ -113,7 +122,8 @@ msgid "Liens" msgstr "Liens" -#: templates/categories.html:5 templates/thesaurus.html:33 +#: templates/categories.html:5 +#: templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Recherche par arbre" @@ -133,7 +143,8 @@ msgid "Credits" msgstr "Crédits" -#: templates/facettes.html:5 templates/facettes.html.py:46 +#: templates/facettes.html:5 +#: templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Recherche par facettes" @@ -371,8 +382,7 @@ "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " "À la fois critères " -msgstr "" -"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +msgstr "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " "À la fois critères " @@ -380,8 +390,7 @@ msgid "" "de recherche et modes de visualisation des résultats, ces différentes " "facettes se mettent à jour au fur et à mesure de vos recherches." -msgstr "" -"de recherche et modes de visualisation des résultats, ces différentes " +msgstr "de recherche et modes de visualisation des résultats, ces différentes " "facettes se mettent à jour au fur et à mesure de vos recherches." #: templates/index.html:59 @@ -395,6 +404,7 @@ msgstr "" #: templates/index.html:76 +#: templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." @@ -408,8 +418,7 @@ msgid "" "Naviguez autrement à travers les 5000 ressources du Portail Histoire des " "arts :" -msgstr "" -"Naviguez autrement à travers les 5000 ressources du Portail Histoire des " +msgstr "Naviguez autrement à travers les 5000 ressources du Portail Histoire des " "arts :" #: templates/index.html:95 @@ -429,12 +438,12 @@ msgstr "Mentions légales" #: templates/profile_home.html:7 -msgid "Profil utilisateur" -msgstr "Profil utilisateur" +msgid "Compte utilisateur" +msgstr "" #: templates/profile_home.html:30 -msgid "Mon profil" -msgstr "Mon profil" +msgid "Mon compte" +msgstr "" #: templates/profile_home.html:34 msgid "Adminsitration du Site" @@ -465,58 +474,72 @@ msgstr "Gérer mes Renkan" #: templates/profile_home.html:53 +#: templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "Nouveau Renkan" -#: templates/profile_home.html:55 templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/profile_home.html:55 +#: templates/profile_home.html.py:124 +#: templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "Précédent" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/profile_home.html:56 +#: templates/profile_home.html.py:125 +#: templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "Suivant" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 +#: templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filtrer" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 +#: templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "Recherche avancée" -#: templates/profile_home.html:59 templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/profile_home.html:59 +#: templates/profile_home.html.py:77 +#: templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "Titre" -#: templates/profile_home.html:60 templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/profile_home.html:60 +#: templates/profile_home.html.py:81 +#: templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "Date de modification" -#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/profile_home.html:60 +#: templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "début" -#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/profile_home.html:61 +#: templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "fin" -#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/profile_home.html:62 +#: templates/profile_home.html.py:84 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" @@ -526,42 +549,51 @@ msgid "Edition" msgstr "Édition" -#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:66 +#: templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "Modéré" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:67 +#: templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "Publié" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:68 +#: templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rejeté" -#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/profile_home.html:71 +#: templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "Favoris" -#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/profile_home.html:72 +#: templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Rechercher" -#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/profile_home.html:79 +#: templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "Fav." -#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:83 +#: templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "Prévisualisation" -#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:86 +#: templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:105 templates/renkan_list.html:76 +#: templates/profile_home.html:105 +#: templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?" @@ -572,11 +604,11 @@ #: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." -msgstr "" -"Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas " +msgstr "Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas " "annuler cette action." -#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:115 +#: templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publier renkan" @@ -584,7 +616,8 @@ msgid "Are you sure you want to ask to publish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir demander la publication de ce Renkan ?" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:116 +#: templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "dépublier renkan" @@ -604,31 +637,37 @@ msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible si le RENKAN est modifié)" -#: templates/renkan_edit.html:200 templates/renkan_edit.html.py:204 +#: templates/renkan_edit.html:200 +#: templates/renkan_edit.html.py:204 #: templates/renkan_edit.html:208 msgid "View graph in column" msgstr "Voir le graphe en colonne" -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 +#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html.py:205 #: templates/renkan_edit.html:209 msgid "View graph in line" msgstr "Voir le graphe en ligne" -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html.py:206 #: templates/renkan_edit.html:210 msgid "View graph in circle" msgstr "Voir le graphe en cercle" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 +#: templates/renkan_list.html.py:29 msgid "Marked Renkans list" msgstr "Liste des renkans repères" -#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 +#: templates/renkan_list.html:46 +#: templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "Nom d'utilisateur" -#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 +#: templates/editorial/manage_renkans.html:64 msgid "User" msgstr "Utilisateur" @@ -640,8 +679,7 @@ #: templates/registration/login.html:18 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." -msgstr "" -"Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides." +msgstr "Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides." #: templates/ajax_identification/ajax_login.html:15 #: templates/registration/registration_form.html:24 @@ -658,7 +696,8 @@ msgstr "Annuler" #: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:32 +#: templates/registration/login.html:5 +#: templates/registration/login.html:32 msgid "Login" msgstr "Connexion" @@ -699,8 +738,7 @@ "p>\n" "

Remplissez le formulaire suivant :

\n" " " -msgstr "" -"\n" +msgstr "\n" "

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" "

Remplissez le formulaire suivant :

\n" @@ -741,8 +779,7 @@ "\n" "You have created an account at %(sitename)s with the user name " "%(username)s.\n" -msgstr "" -"\n" +msgstr "\n" "Vous avez créé un compte sur le site %(sitename)s avec le nom d'utilisateur " "%(username)s.\n" @@ -830,8 +867,7 @@ #: templates/registration/password_reset_done.html:14 msgid "Email with password reset instructions has been sent." -msgstr "" -"L'email avec les instructions pour réinitialiser le mot de passe a été " +msgstr "L'email avec les instructions pour réinitialiser le mot de passe a été " "envoyé." #: templates/registration/password_reset_form.html:5 @@ -874,6 +910,8 @@ msgid "Plus de Ressources" msgstr "Plus de Ressources" -#: views/profile.py:448 views/profile.py:527 +#: views/profile.py:448 +#: views/profile.py:527 msgid "Period" msgstr "Période" + diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -396,7 +396,7 @@ "de ressources du portail Histoire des Arts." msgstr "" -#: templates/index.html:76 +#: templates/index.html:76 templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." @@ -429,11 +429,11 @@ msgstr "" #: templates/profile_home.html:7 -msgid "Profil utilisateur" +msgid "Compte utilisateur" msgstr "" #: templates/profile_home.html:30 -msgid "Mon profil" +msgid "Mon compte" msgstr "" #: templates/profile_home.html:34 @@ -464,55 +464,55 @@ msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 +#: templates/profile_home.html:53 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" #: templates/profile_home.html:55 templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" #: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "Filtri:" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" #: templates/profile_home.html:59 templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" #: templates/profile_home.html:60 templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/profile_home.html:60 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/profile_home.html:61 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" @@ -539,17 +539,17 @@ msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/profile_home.html:71 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/profile_home.html:72 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/profile_home.html:79 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" @@ -562,7 +562,7 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:76 +#: templates/profile_home.html:105 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -622,12 +622,12 @@ msgid "Marked Renkans list" msgstr "" -#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -397,7 +397,7 @@ "de ressources du portail Histoire des Arts." msgstr "" -#: templates/index.html:76 +#: templates/index.html:76 templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." @@ -430,11 +430,11 @@ msgstr "" #: templates/profile_home.html:7 -msgid "Profil utilisateur" +msgid "Compte utilisateur" msgstr "" #: templates/profile_home.html:30 -msgid "Mon profil" +msgid "Mon compte" msgstr "" #: templates/profile_home.html:34 @@ -465,55 +465,55 @@ msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 +#: templates/profile_home.html:53 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" #: templates/profile_home.html:55 templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" #: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "フィルター" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" #: templates/profile_home.html:59 templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" #: templates/profile_home.html:60 templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/profile_home.html:60 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/profile_home.html:61 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" @@ -540,17 +540,17 @@ msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/profile_home.html:71 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/profile_home.html:72 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/profile_home.html:79 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" @@ -563,7 +563,7 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:76 +#: templates/profile_home.html:105 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -623,12 +623,12 @@ msgid "Marked Renkans list" msgstr "" -#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Tue Mar 10 12:29:50 2015 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-09 17:03+0100\n" +"POT-Creation-Date: 2015-03-10 12:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -397,7 +397,7 @@ "de ressources du portail Histoire des Arts." msgstr "" -#: templates/index.html:76 +#: templates/index.html:76 templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." @@ -430,11 +430,11 @@ msgstr "" #: templates/profile_home.html:7 -msgid "Profil utilisateur" +msgid "Compte utilisateur" msgstr "" #: templates/profile_home.html:30 -msgid "Mon profil" +msgid "Mon compte" msgstr "" #: templates/profile_home.html:34 @@ -465,55 +465,55 @@ msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 +#: templates/profile_home.html:53 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" #: templates/profile_home.html:55 templates/profile_home.html.py:124 -#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 #: templates/editorial/manage_renkans.html:38 #: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" #: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 #: templates/editorial/manage_renkans.html:39 #: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "Filtres :" -#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/profile_home.html:57 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" #: templates/profile_home.html:59 templates/profile_home.html.py:77 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" #: templates/profile_home.html:60 templates/profile_home.html.py:81 -#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 #: templates/editorial/manage_renkans.html:43 #: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/profile_home.html:60 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/profile_home.html:61 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" @@ -540,17 +540,17 @@ msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/profile_home.html:71 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/profile_home.html:72 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/profile_home.html:79 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" @@ -563,7 +563,7 @@ msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:76 +#: templates/profile_home.html:105 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -623,12 +623,12 @@ msgid "Marked Renkans list" msgstr "" -#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" diff -r 2729d4978aa2 -r 4d641dc5e7e6 src/hdalab/templates/profile_home.html --- a/src/hdalab/templates/profile_home.html Tue Mar 10 12:28:27 2015 +0100 +++ b/src/hdalab/templates/profile_home.html Tue Mar 10 12:29:50 2015 +0100 @@ -4,7 +4,7 @@ {% load thumbnail %} {% load hdalab_tags %} -{% block title %}{{block.super}} > {% trans 'Profil utilisateur' %} : {{ user.username }}{% endblock %} +{% block title %}{{block.super}} > {% trans 'Compte utilisateur' %} : {{ user.username }}{% endblock %} {% block css_import %} {{block.super}} @@ -27,7 +27,7 @@ {% block main_content %}
-

{% trans 'Mon profil' %}

+

{% trans 'Mon compte' %}

{% if user.is_staff %}