# HG changeset patch # User ymh # Date 1426093781 -3600 # Node ID 82758bd0ce10b5f161bdbb99b15322dabe58017c # Parent 5d3b4e1e5b3465b637970c6fdb9e3d0131f999c0 correct renkan list titles diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -97,7 +97,7 @@ msgstr "" #: templates/base.html:78 templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" @@ -455,133 +455,141 @@ msgid "Modifier mon profil" msgstr "" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +msgid "Modification du mot de passe" +msgstr "" + +#: templates/profile_home.html:47 +msgid "Modification des informations du compte" +msgstr "" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 templates/renkan_list.html:33 +#: templates/profile_home.html:54 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 #: 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/profile_home.html:57 templates/profile_home.html.py:126 #: 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:41 +#: templates/profile_home.html:58 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filter:" -#: templates/profile_home.html:57 templates/renkan_list.html:41 +#: templates/profile_home.html:58 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/profile_home.html:60 templates/profile_home.html.py:78 #: 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/profile_home.html:61 templates/profile_home.html.py:82 #: 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:44 +#: templates/profile_home.html:61 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:45 +#: templates/profile_home.html:62 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/profile_home.html:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:58 +#: templates/profile_home.html:80 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" -#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:83 +#: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" @@ -612,12 +620,12 @@ msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 views/profile.py:143 msgid "Marked Renkans list" msgstr "" #: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/registration/login.html:25 msgid "Username" msgstr "" @@ -630,18 +638,18 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." msgstr "" #: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:24 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -650,17 +658,17 @@ msgstr "" #: 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:33 msgid "Login" msgstr "" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" @@ -693,10 +701,33 @@ " " msgstr "" -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -743,11 +774,11 @@ msgid "Account activation on" msgstr "" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "" @@ -779,19 +810,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "" @@ -836,27 +854,31 @@ msgid "Registration" msgstr "" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:439 +#: views/profile.py:131 +msgid "Public Renkans list" +msgstr "" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:448 views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "" diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -57,9 +57,7 @@ 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" @@ -68,29 +66,23 @@ 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" @@ -104,9 +96,8 @@ msgid "Mentions légales" msgstr "Legal Notices" -#: templates/base.html:78 -#: templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/base.html:78 templates/envelope/contact.html:6 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "Contact" @@ -122,8 +113,7 @@ 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" @@ -143,8 +133,7 @@ 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" @@ -215,11 +204,10 @@ "Web.

\n" "\t\t\t\t\t\t\tÀ partir de l’onglet \"recherche\", cliquez sur le logo " msgstr "" -"This tool allows you to represent, arrange, and organise groups of " -"resources of the portal \"Histoire des Art\" with other websites.

\n" +"This tool allows you to represent, arrange, and organise groups of resources " +"of the portal \"Histoire des Art\" with other websites.

\n" "\t\t\t\t\t\t\tFrom the \"search\" tab, click on the icon " - #: templates/help_popup.html:13 msgid "" " pour créer votre RENKAN.

\n" @@ -227,9 +215,8 @@ "déplaçant votre curseur." msgstr "" " to create your RENKAN.

\n" -"\t\t\t\t\t\t\tYou can move each element by clicking on it and " -"moving your cursor." - +"\t\t\t\t\t\t\tYou can move each element by clicking on it and moving your " +"cursor." #: templates/help_popup.html:18 msgid "Légende" @@ -253,8 +240,8 @@ "éditer, supprimer, agrandir, rétrécir, modifier en utilisant le menu " "circulaire comme ci-dessous." msgstr "" -"By clicking on each node or link you can move, edit, delete, enlarge, shrink, " -"or modify them using the circular menu as you can see below." +"By clicking on each node or link you can move, edit, delete, enlarge, " +"shrink, or modify them using the circular menu as you can see below." #: templates/help_popup.html:30 msgid "Aide : Organiser, Ajouter !" @@ -274,8 +261,8 @@ "\t\t\t\t\t" msgstr "" "\n" -"\t\t \t\t\t\tBefore any modification you can change the arrangement " -"of your RENKAN: column, line or circle.

\n" +"\t\t \t\t\t\tBefore any modification you can change the arrangement of your " +"RENKAN: column, line or circle.

\n" "\t\t\t\t\t\tThe graph is laid out as a circle by default. the layout change " "is no longer available as soon as the RENKAN has been modified.\n" "\t\t\t\t\t" @@ -289,8 +276,8 @@ "Vous pouvez ajouter des ressources en faisant \"Glisser – déposer\" à partir " "de n’importe quelle fenêtre de navigation web." msgstr "" -"You'll be able to add resources dragging " -"and dropping any elements from any web page." +"You'll be able to add resources dragging and dropping any elements from any " +"web page." #: templates/help_popup.html:43 msgid "" @@ -302,8 +289,8 @@ "\t\t \t\t\t\t" msgstr "" "\n" -"\t\t \t\t\t\t\tMove this icon in your bookmark toolbar. Drag " -"elements from a website towrds the RENKAN tab until your graph appears
\n" +"\t\t \t\t\t\t\tMove this icon in your bookmark toolbar. Drag elements from " +"a website towrds the RENKAN tab until your graph appears
\n" "\t\t \t\t\t\t\tRelease on the graph, the link has been added.\n" "\t\t \t\t\t\t" @@ -316,11 +303,11 @@ "\t\t \t\t\t\t" msgstr "" "\n" -"\t\t \t\t\t\t\tThe icon opens a search panel allowing the search of resources from " -"the HDA website or Wikipedia. Also it allows to find additionnal resources related to your search.\n" +"\t\t \t\t\t\t\tThe icon opens a search panel allowing the search of " +"resources from the HDA website or Wikipedia. Also it allows to find " +"additionnal resources related to your search.\n" "\t\t \t\t\t\t" - #: templates/help_popup.html:57 msgid "" "\n" @@ -332,12 +319,12 @@ "\t\t\t\t\t\t\tDrag and drop the chosen resource, it is added to the graph.\n" " \t\t\t\t\t\t" - #: templates/help_popup.html:61 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 " "on the HDA website or Wikipedia." #: templates/help_popup.html:65 @@ -358,11 +345,11 @@ "\t \t\t\t" msgstr "" "\n" -"\t \t\t\t\tYou can edit each resource, tag, link: you can personalize the title, " -"description, size, color, image (URL) and form of these element with the circular menu.\n" +"\t \t\t\t\tYou can edit each resource, tag, link: you can personalize " +"the title, description, size, color, image (URL) and form of these element " +"with the circular menu.\n" "\t \t\t\t" - #: templates/help_popup.html:74 msgid "4. Enregistrer" msgstr "4. Save" @@ -382,7 +369,6 @@ "\t\t \t\t\t\tIt is ok if the disk is green.
\n" "\t\t\t\t\t" - #: templates/help_popup.html:82 msgid "5. Gérer mes RENKAN" msgstr "5. Manage my RENKAN" @@ -397,7 +383,6 @@ "\t\t \t\t\t\t\tYou can pusblish your RENKAN : click on the following icon\n" "\t\t \t\t\t\t" - #: templates/help_popup.html:91 msgid "" "\n" @@ -408,7 +393,6 @@ "\t\t \t\t\t\t\tTo modify a saved RENKAN, clik on\n" "\t\t \t\t\t\t" - #: templates/help_popup.html:98 msgid "Vous pouvez aussi :" msgstr "You can also:" @@ -433,15 +417,15 @@ msgid "" "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés." -msgstr "Intuitive, the search in \"Distoire des Arts'Labs\" let you choose different " +msgstr "" +"Intuitive, the search in \"Distoire des Arts'Labs\" let you choose different " "options: countries, historic periods, artistic fields, et keywords." #: templates/index.html:48 msgid "" "Ces différentes facettes se mettent à jour au fur et à mesure de vos " "recherches." -msgstr "These different facets are updated as and when you are " -"investigating" +msgstr "These different facets are updated as and when you are investigating" #: templates/index.html:59 msgid "Navigation à travers les Arts " @@ -451,15 +435,16 @@ 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 +#: 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 @@ -470,7 +455,8 @@ 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 @@ -521,158 +507,144 @@ msgid "Modifier mon profil" msgstr "Modify my profile" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +#, fuzzy +msgid "Modification du mot de passe" +msgstr "Password recovery" + +#: templates/profile_home.html:47 +#, fuzzy +msgid "Modification des informations du compte" +msgstr "Modification date" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" -msgstr "manage my Renkan" +msgstr "Manage my Renkan" -#: templates/profile_home.html:53 -#: templates/renkan_list.html:33 +#: templates/profile_home.html:54 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:39 -#: templates/renkan_list.html.py:91 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: 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:40 -#: templates/renkan_list.html.py:92 +#: templates/profile_home.html:57 templates/profile_home.html.py:126 +#: 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:41 +#: templates/profile_home.html:58 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filter" -#: templates/profile_home.html:57 -#: templates/renkan_list.html:41 +#: templates/profile_home.html:58 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:43 -#: templates/renkan_list.html.py:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:78 +#: 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:44 -#: templates/renkan_list.html.py:63 +#: templates/profile_home.html:61 templates/profile_home.html.py:82 +#: 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:44 +#: templates/profile_home.html:61 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "Begin" -#: templates/profile_home.html:61 -#: templates/renkan_list.html:45 +#: templates/profile_home.html:62 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:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "State" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "Edition" -#: templates/profile_home.html:66 -#: templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 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:68 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:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rejected" -#: templates/profile_home.html:71 -#: templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "Favorite" -#: templates/profile_home.html:72 -#: templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Search" -#: templates/profile_home.html:79 -#: templates/renkan_list.html:58 +#: templates/profile_home.html:80 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:84 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:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:105 -#: templates/renkan_list.html:83 +#: templates/profile_home.html:106 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 ?" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "Remove Renkan" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 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:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publish renkan" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 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:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "unpublish renkan" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Are you sure you want to ask to unpublish this renkan ?" @@ -688,37 +660,31 @@ msgid "(Indisponible si modification du RENKAN)" msgstr "(Not allowed if RENKAN has been modified)" -#: 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 column" msgstr "View graph in column" -#: 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 line" msgstr "View graph in line" -#: templates/renkan_edit.html:203 -#: templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 #: templates/renkan_edit.html:211 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 views/profile.py:143 msgid "Marked Renkans list" -msgstr "Liste des Renkan repères" +msgstr "Marked Renkan list" -#: templates/renkan_list.html:46 -#: templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 +#: templates/registration/login.html:25 msgid "Username" msgstr "Username" -#: templates/renkan_list.html:61 -#: templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "User" @@ -727,18 +693,18 @@ msgstr "Identifiers" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." msgstr "Sorry, that's not a valid username or password." #: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:24 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "Username" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Password" @@ -747,18 +713,17 @@ 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:33 msgid "Login" msgstr "Login" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "Forgot password?" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "Still not a user? Create an account" @@ -789,15 +754,40 @@ "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" " " -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "Send!" +#: templates/hdabo/user_update_form.html:6 +#, fuzzy +msgid "Profile change" +msgstr "Password change" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "Previous" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "Submit" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Registration - Activated" @@ -829,7 +819,8 @@ "\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" @@ -846,11 +837,11 @@ msgid "Account activation on" msgstr "Account activation on" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "Authentication" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "Password" @@ -882,19 +873,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "New password (verification)" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "Previous" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "Submit" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "Password Reset - Complete" @@ -939,28 +917,30 @@ msgid "Registration" msgstr "Registration" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "New user" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "There is a problem in the user information" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "Email" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "Password (verification)" -#: views/profile.py:439 +#: views/profile.py:131 +msgid "Public Renkans list" +msgstr "Public Renkan list" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "More Resources" -#: views/profile.py:448 -#: views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "Period" - diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,9 +57,7 @@ msgid "rejected_state" msgstr "estado_rechazado" -#: 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 "Acerca de Nosotros" @@ -68,29 +66,23 @@ msgid "Accueil" msgstr "Inicio" -#: 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 "Búsqueda" -#: templates/base.html:40 -#: templates/base.html.py:93 +#: templates/base.html:40 templates/base.html.py:93 msgid "Domaines Artistiques" msgstr "Disciplinas artísticas" -#: 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 "Cerrar sesión" -#: 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" @@ -104,9 +96,8 @@ msgid "Mentions légales" msgstr "Aviso Legal" -#: templates/base.html:78 -#: templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/base.html:78 templates/envelope/contact.html:6 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "Contactos" @@ -122,8 +113,7 @@ msgid "Liens" msgstr "Elaces" -#: templates/categories.html:5 -#: templates/thesaurus.html:33 +#: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Búsqueda por ramas" @@ -143,8 +133,7 @@ msgid "Credits" msgstr "Creditos" -#: templates/facettes.html:5 -#: templates/facettes.html.py:46 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Búsqueda por facetas" @@ -214,7 +203,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 " +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" @@ -246,7 +236,8 @@ "En cliquant sur chaque ressource, tag ou lien, vous pouvez les déplacer, " "éditer, supprimer, agrandir, rétrécir, modifier en utilisant le menu " "circulaire comme ci-dessous." -msgstr "Haciendo un clic en un nudo o un enlace, lo puede mover, editar, borrar," +msgstr "" +"Haciendo un clic en un nudo o un enlace, lo puede mover, editar, borrar," "ampliar, reducir, o modificar utilizando el menu circular como lo de abajo." #: templates/help_popup.html:30 @@ -275,7 +266,8 @@ msgid "" "Vous pouvez ajouter des ressources en faisant \"Glisser – déposer\" à partir " "de n’importe quelle fenêtre de navigation web." -msgstr "Despues de cerrar esta ayuda, puede añadir recursos haciendo un\"drag and " +msgstr "" +"Despues de cerrar esta ayuda, puede añadir recursos haciendo un\"drag and " "drop\" desde cualquier pagina Web." #: templates/help_popup.html:43 @@ -309,7 +301,8 @@ 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 "Haciendo un click en el icono de la izquierda, puede abrir un menu de " +msgstr "" +"Haciendo un click en el icono de la izquierda, puede abrir un menu de " "búsqueda para encontrar recursos en HDA o Wikipedia." #: templates/help_popup.html:65 @@ -386,7 +379,8 @@ msgid "" "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés." -msgstr "Intuitivo, la búsqueda de Histoire des Arts'Lab propone diferentes " +msgstr "" +"Intuitivo, la búsqueda de Histoire des Arts'Lab propone diferentes " "criterios: país, periodos historicos, diciplinas artisticas, y plabaras " "claves." @@ -404,15 +398,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 " +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 +#: 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 " +msgstr "" +"Constuye su mapa de conocimientos desde los recursos de Histoire des Arts y " "Wikipedia." #: templates/index.html:91 @@ -423,7 +418,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 " +msgstr "" +"Navega de una nueva forma a traves de los 5000 recursos del portal " "deHistoire des Arts:" #: templates/index.html:95 @@ -474,158 +470,144 @@ msgid "Modifier mon profil" msgstr "Modificar mi perfil" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +#, fuzzy +msgid "Modification du mot de passe" +msgstr "Recuperación de la contraseña" + +#: templates/profile_home.html:47 +#, fuzzy +msgid "Modification des informations du compte" +msgstr "Modificar la fecha" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" msgstr "Gestionar mis Renkan" -#: templates/profile_home.html:53 -#: templates/renkan_list.html:33 +#: templates/profile_home.html:54 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:39 -#: templates/renkan_list.html.py:91 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: 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 "Anterior" -#: templates/profile_home.html:56 -#: templates/profile_home.html.py:125 -#: templates/renkan_list.html:40 -#: templates/renkan_list.html.py:92 +#: templates/profile_home.html:57 templates/profile_home.html.py:126 +#: 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:41 +#: templates/profile_home.html:58 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filtro" -#: templates/profile_home.html:57 -#: templates/renkan_list.html:41 +#: templates/profile_home.html:58 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:43 -#: templates/renkan_list.html.py:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:78 +#: 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 "Titulo" -#: templates/profile_home.html:60 -#: templates/profile_home.html.py:81 -#: templates/renkan_list.html:44 -#: templates/renkan_list.html.py:63 +#: templates/profile_home.html:61 templates/profile_home.html.py:82 +#: 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:44 +#: templates/profile_home.html:61 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "inicio" -#: templates/profile_home.html:61 -#: templates/renkan_list.html:45 +#: templates/profile_home.html:62 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:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "Estado" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "Edición" -#: templates/profile_home.html:66 -#: templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "Administrado" -#: templates/profile_home.html:67 -#: templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "Publicado" -#: templates/profile_home.html:68 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rechazado" -#: templates/profile_home.html:71 -#: templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "Favorito" -#: templates/profile_home.html:72 -#: templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Buscar" -#: templates/profile_home.html:79 -#: templates/renkan_list.html:58 +#: templates/profile_home.html:80 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" -#: templates/profile_home.html:83 -#: templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "Vista previa" -#: templates/profile_home.html:86 -#: templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Acciones " -#: templates/profile_home.html:105 -#: templates/renkan_list.html:83 +#: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "¿ Esta seguro que desea copiar este Renkan ?" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "Borrar un Renkan" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." -msgstr "¿ Esta seguro que desea borrar este Renkan ? Esta acción es irreversible" +msgstr "" +"¿ Esta seguro que desea borrar este Renkan ? Esta acción es irreversible" -#: templates/profile_home.html:115 -#: templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publicar un Renkan" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "¿ Esta seguro que desea pedir la publicación de este Renkan ?" -#: templates/profile_home.html:116 -#: templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "Renkan no publicados" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "¿ Esta seguro que desea restringir la publicación de este Renkan ?" @@ -641,37 +623,31 @@ msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible despues de modificar el RENKAN)" -#: 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 column" msgstr "Vista del gráfico en columnas" -#: 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 line" msgstr "Vista del gráfico en lineas" -#: templates/renkan_edit.html:203 -#: templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 #: templates/renkan_edit.html:211 msgid "View graph in circle" msgstr "Vista del gráfico en círculo" -#: templates/renkan_list.html:6 -#: templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 views/profile.py:143 msgid "Marked Renkans list" msgstr "Lista de Renkan marcados" -#: templates/renkan_list.html:46 -#: templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 +#: templates/registration/login.html:25 msgid "Username" msgstr "Nombre de Usuario" -#: templates/renkan_list.html:61 -#: templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "Usuario" @@ -680,18 +656,18 @@ msgstr "Datos de usuario" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." msgstr "El usuario o la contraseña no es valido" #: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:24 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "Nombre de usuario" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Contraseña" @@ -700,18 +676,17 @@ msgstr "Cancelar" #: 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:33 msgid "Login" msgstr "Iniciar Sesión" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "Contraseña perdida ?" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "No tiene usuario ? Crear una cuenta" @@ -742,15 +717,40 @@ "p>\n" "

Remplissez le formulaire suivant :

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

Quiere preguntar algo a Histoire des arts'Lab ?

\n" "

Rellena el formulario siguiente :

\n" " " -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "¡Enviar!" +#: templates/hdabo/user_update_form.html:6 +#, fuzzy +msgid "Profile change" +msgstr "Cambiar la contraseña" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "Volver" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "Entregar" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Inscriptición - Activada" @@ -797,11 +797,11 @@ msgid "Account activation on" msgstr "Activación de cuenta en" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "Identificarse" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "Contraseña" @@ -833,19 +833,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "Nueva contraseña (verificación)" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "Volver" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "Entregar" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "Reiniciar la Contraseña - Completo" @@ -890,28 +877,31 @@ msgid "Registration" msgstr "Identificación" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "Nuevo Usuario" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "Ups ! Hay un probema con los datos del nuevo usuario" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "Correo electrónico" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "Contraseña (verificación)" -#: views/profile.py:439 +#: views/profile.py:131 +#, fuzzy +msgid "Public Renkans list" +msgstr "Lista de Renkan marcados" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "Mas recursos" -#: views/profile.py:448 -#: views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "Periodo" - diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,9 +57,7 @@ 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" @@ -68,29 +66,23 @@ msgid "Accueil" msgstr "Accueil" -#: 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 "Domaines Artistiques" -#: templates/base.html:41 -#: templates/base.html.py:94 +#: templates/base.html:41 templates/base.html.py:94 msgid "Thésaurus" msgstr "Thésaurus" -#: 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" @@ -104,9 +96,8 @@ msgid "Mentions légales" msgstr "Mentions légales" -#: templates/base.html:78 -#: templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/base.html:78 templates/envelope/contact.html:6 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "Contact" @@ -122,8 +113,7 @@ 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" @@ -143,8 +133,7 @@ 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" @@ -230,7 +219,6 @@ "\t\t\t\t\t\t\tVous pouvez déplacer chaque élément en cliquant dessus et en " "déplaçant votre curseur." - #: templates/help_popup.html:18 msgid "Légende" msgstr "Légende" @@ -257,7 +245,6 @@ "éditer, supprimer, agrandir, rétrécir, modifier en utilisant le menu " "circulaire comme ci-dessous." - #: templates/help_popup.html:30 msgid "Aide : Organiser, Ajouter !" msgstr "Aide : Organiser, Ajouter !" @@ -282,7 +269,6 @@ "n’est plus disponible si le RENKAN a été modifié.\n" "\t\t\t\t\t" - #: templates/help_popup.html:39 msgid "2. Ajouter" msgstr "2. Ajouter" @@ -295,7 +281,6 @@ "Vous pouvez ajouter des ressources en faisant \"Glisser – déposer\" à partir " "de n’importe quelle fenêtre de navigation web." - #: templates/help_popup.html:43 msgid "" "\n" @@ -462,8 +447,7 @@ "Explorez 9 grands domaines artistiques à travers des arborescences enrichies " "de ressources du portail Histoire des Arts." -#: templates/index.html:76 -#: templates/renkan_list.html:35 +#: templates/index.html:76 templates/renkan_list.html:35 msgid "" "Construisez votre carte de connaissances à partir des ressources Histoires " "des arts et Wikipedia." @@ -531,159 +515,145 @@ msgid "Modifier mon profil" msgstr "Modifier mon profil" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +#, fuzzy +msgid "Modification du mot de passe" +msgstr "Récupération du mot de passe" + +#: templates/profile_home.html:47 +#, fuzzy +msgid "Modification des informations du compte" +msgstr "Date de modification" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" msgstr "Gérer mes Renkan" -#: templates/profile_home.html:53 -#: templates/renkan_list.html:33 +#: templates/profile_home.html:54 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:39 -#: templates/renkan_list.html.py:91 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: 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:40 -#: templates/renkan_list.html.py:92 +#: templates/profile_home.html:57 templates/profile_home.html.py:126 +#: 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:41 +#: templates/profile_home.html:58 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filtrer" -#: templates/profile_home.html:57 -#: templates/renkan_list.html:41 +#: templates/profile_home.html:58 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:43 -#: templates/renkan_list.html.py:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:78 +#: 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:44 -#: templates/renkan_list.html.py:63 +#: templates/profile_home.html:61 templates/profile_home.html.py:82 +#: 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:44 +#: templates/profile_home.html:61 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:45 +#: templates/profile_home.html:62 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:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "État" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "Édition" -#: templates/profile_home.html:66 -#: templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 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:68 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:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rejeté" -#: templates/profile_home.html:71 -#: templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "Favoris" -#: templates/profile_home.html:72 -#: templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Rechercher" -#: templates/profile_home.html:79 -#: templates/renkan_list.html:58 +#: templates/profile_home.html:80 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:84 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:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:105 -#: templates/renkan_list.html:83 +#: templates/profile_home.html:106 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 ?" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "Effacer Renkan" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 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:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publier renkan" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 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:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "dépublier renkan" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir dépublier ce Renkan ?" @@ -699,37 +669,31 @@ msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible si le RENKAN est modifié)" -#: 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 column" msgstr "Voir le graphe en colonne" -#: 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 line" msgstr "Voir le graphe en ligne" -#: templates/renkan_edit.html:203 -#: templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 #: templates/renkan_edit.html:211 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 views/profile.py:143 msgid "Marked Renkans list" -msgstr "Liste des renkans repères" +msgstr "Liste des Renkan repères" -#: templates/renkan_list.html:46 -#: templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 +#: templates/registration/login.html:25 msgid "Username" msgstr "Nom d'utilisateur" -#: templates/renkan_list.html:61 -#: templates/editorial/manage_renkans.html:64 +#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "Utilisateur" @@ -738,18 +702,19 @@ msgstr "Identifiants" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: 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 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "Nom d'utilisateur" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Mot de passe" @@ -758,18 +723,17 @@ 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:33 msgid "Login" msgstr "Connexion" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "Mot de passe oublié ?" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "Vous n'avez pas de compte ? Créez un compte" @@ -800,16 +764,41 @@ "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" " " -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "Envoyer !" +#: templates/hdabo/user_update_form.html:6 +#, fuzzy +msgid "Profile change" +msgstr "Modifier le mot de passe" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "Précédent" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "Envoyer" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Enregistrement - Activé" @@ -841,7 +830,8 @@ "\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" @@ -858,11 +848,11 @@ msgid "Account activation on" msgstr "Activation du compte sur" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "Authentification" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "Mot de passe" @@ -894,19 +884,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "Nouveau mot de passe (Verification)" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "Précédent" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "Envoyer" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "Reinitialisation du mot de passe effectuée" @@ -929,7 +906,8 @@ #: 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 @@ -952,28 +930,30 @@ msgid "Registration" msgstr "Enregistrement" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "Nouvel Utilisateur" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "Il y a un problème dans les données du nouvel utilisateur" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "E-Mail" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "Mot de passe (vérification)" -#: views/profile.py:439 +#: views/profile.py:131 +msgid "Public Renkans list" +msgstr "Liste des Renkan publics" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "Plus de Ressources" -#: views/profile.py:448 -#: views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "Période" - diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,7 +99,7 @@ msgstr "" #: templates/base.html:78 templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" @@ -460,134 +460,142 @@ msgid "Modifier mon profil" msgstr "" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +msgid "Modification du mot de passe" +msgstr "" + +#: templates/profile_home.html:47 +msgid "Modification des informations du compte" +msgstr "" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 templates/renkan_list.html:33 +#: templates/profile_home.html:54 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 #: 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/profile_home.html:57 templates/profile_home.html.py:126 #: 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:41 +#: templates/profile_home.html:58 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:41 +#: templates/profile_home.html:58 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/profile_home.html:60 templates/profile_home.html.py:78 #: 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/profile_home.html:61 templates/profile_home.html.py:82 #: 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:44 +#: templates/profile_home.html:61 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:45 +#: templates/profile_home.html:62 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/profile_home.html:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:58 +#: templates/profile_home.html:80 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" -#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:83 +#: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" @@ -618,12 +626,12 @@ msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 views/profile.py:143 msgid "Marked Renkans list" msgstr "" #: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/registration/login.html:25 msgid "Username" msgstr "" @@ -636,18 +644,18 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." msgstr "" #: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:24 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -656,17 +664,17 @@ msgstr "" #: 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:33 msgid "Login" msgstr "" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" @@ -699,10 +707,33 @@ " " msgstr "" -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -749,11 +780,11 @@ msgid "Account activation on" msgstr "" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "" @@ -785,19 +816,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "" @@ -842,27 +860,31 @@ msgid "Registration" msgstr "" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:439 +#: views/profile.py:131 +msgid "Public Renkans list" +msgstr "" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:448 views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "" diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -100,7 +100,7 @@ msgstr "" #: templates/base.html:78 templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" @@ -461,134 +461,142 @@ msgid "Modifier mon profil" msgstr "" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +msgid "Modification du mot de passe" +msgstr "" + +#: templates/profile_home.html:47 +msgid "Modification des informations du compte" +msgstr "" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 templates/renkan_list.html:33 +#: templates/profile_home.html:54 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 #: 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/profile_home.html:57 templates/profile_home.html.py:126 #: 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:41 +#: templates/profile_home.html:58 templates/renkan_list.html:41 #: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "フィルター" -#: templates/profile_home.html:57 templates/renkan_list.html:41 +#: templates/profile_home.html:58 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/profile_home.html:60 templates/profile_home.html.py:78 #: 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/profile_home.html:61 templates/profile_home.html.py:82 #: 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:44 +#: templates/profile_home.html:61 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:45 +#: templates/profile_home.html:62 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/profile_home.html:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:58 +#: templates/profile_home.html:80 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" -#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:83 +#: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" @@ -619,12 +627,12 @@ msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 views/profile.py:143 msgid "Marked Renkans list" msgstr "" #: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/registration/login.html:25 msgid "Username" msgstr "" @@ -637,18 +645,18 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." msgstr "" #: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:24 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -657,17 +665,17 @@ msgstr "" #: 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:33 msgid "Login" msgstr "" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" @@ -700,10 +708,33 @@ " " msgstr "" -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -750,11 +781,11 @@ msgid "Account activation on" msgstr "" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "" @@ -786,19 +817,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "" @@ -843,27 +861,31 @@ msgid "Registration" msgstr "" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:439 +#: views/profile.py:131 +msgid "Public Renkans list" +msgstr "" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:448 views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "" diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Wed Mar 11 18:09:41 2015 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-10 15:55+0100\n" +"POT-Creation-Date: 2015-03-11 11:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -100,7 +100,7 @@ msgstr "" #: templates/base.html:78 templates/envelope/contact.html:6 -#: templates/envelope/contact.html.py:16 +#: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" @@ -461,134 +461,142 @@ msgid "Modifier mon profil" msgstr "" -#: templates/profile_home.html:50 +#: templates/profile_home.html:46 +msgid "Modification du mot de passe" +msgstr "" + +#: templates/profile_home.html:47 +msgid "Modification des informations du compte" +msgstr "" + +#: templates/profile_home.html:51 msgid "Gerer mes Renkan" msgstr "" -#: templates/profile_home.html:53 templates/renkan_list.html:33 +#: templates/profile_home.html:54 templates/renkan_list.html:33 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 #: 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/profile_home.html:57 templates/profile_home.html.py:126 #: 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:41 +#: templates/profile_home.html:58 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:41 +#: templates/profile_home.html:58 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/profile_home.html:60 templates/profile_home.html.py:78 #: 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/profile_home.html:61 templates/profile_home.html.py:82 #: 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:44 +#: templates/profile_home.html:61 templates/renkan_list.html:44 #: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:61 templates/renkan_list.html:45 +#: templates/profile_home.html:62 templates/renkan_list.html:45 #: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/profile_home.html:63 templates/profile_home.html.py:85 #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:65 +#: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:71 templates/renkan_list.html:48 +#: templates/profile_home.html:72 templates/renkan_list.html:48 #: templates/editorial/manage_renkans.html:54 msgid "Favorite" msgstr "" -#: templates/profile_home.html:72 templates/renkan_list.html:50 +#: templates/profile_home.html:73 templates/renkan_list.html:50 #: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:79 templates/renkan_list.html:58 +#: templates/profile_home.html:80 templates/renkan_list.html:58 #: templates/editorial/manage_renkans.html:62 msgid "Fav." msgstr "" -#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 +#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 +#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:105 templates/renkan_list.html:83 +#: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:110 +#: templates/profile_home.html:111 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:115 +#: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 +#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:116 +#: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" @@ -619,12 +627,12 @@ msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 +#: templates/renkan_list.html:6 views/profile.py:143 msgid "Marked Renkans list" msgstr "" #: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:24 +#: templates/registration/login.html:25 msgid "Username" msgstr "" @@ -637,18 +645,18 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:18 +#: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:18 msgid "Sorry, that's not a valid username or password." msgstr "" #: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:24 +#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:32 +#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -657,17 +665,17 @@ msgstr "" #: 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:33 msgid "Login" msgstr "" #: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" #: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:36 +#: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" @@ -700,10 +708,33 @@ " " msgstr "" -#: templates/envelope/contact.html:29 +#: templates/envelope/contact.html:28 msgid "Send!" msgstr "" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:30 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:27 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -750,11 +781,11 @@ msgid "Account activation on" msgstr "" -#: templates/registration/login.html:16 +#: templates/registration/login.html:17 msgid "Authentication" msgstr "" -#: templates/registration/login.html:28 +#: templates/registration/login.html:29 msgid "Password" msgstr "" @@ -786,19 +817,6 @@ msgid "Nouveau mot de passe (Verification)" msgstr "" -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Precedent" -msgstr "" - -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:40 -msgid "Submit" -msgstr "" - #: templates/registration/password_reset_complete.html:5 msgid "Password Reset - Complete" msgstr "" @@ -843,27 +861,31 @@ msgid "Registration" msgstr "" -#: templates/registration/registration_form.html:16 +#: templates/registration/registration_form.html:17 msgid "Nouvel Utilisateur" msgstr "" -#: templates/registration/registration_form.html:18 +#: templates/registration/registration_form.html:19 msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:28 +#: templates/registration/registration_form.html:29 msgid "E-mail" msgstr "" -#: templates/registration/registration_form.html:36 +#: templates/registration/registration_form.html:37 msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:439 +#: views/profile.py:131 +msgid "Public Renkans list" +msgstr "" + +#: views/profile.py:447 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:448 views/profile.py:527 +#: views/profile.py:456 views/profile.py:535 msgid "Period" msgstr "" diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/templates/editorial/manage_renkans.html --- a/src/hdalab/templates/editorial/manage_renkans.html Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/templates/editorial/manage_renkans.html Wed Mar 11 18:09:41 2015 +0100 @@ -35,6 +35,9 @@ {% endblock %} {% block main_content %} +
+

{% trans 'Administrer les Renkan' %}

+

{% if page.has_previous %}{% trans 'Previous' %}{% endif %} {% if page.has_previous and page.has_next %} - {% endif %}{% if page.has_next %}{% trans 'Next' %}{% endif %}

{% if page.has_previous or page.has_next %} - {% endif %}{% trans 'Filter' %} : - {% trans 'Advanced search' %}

diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/templates/renkan_list.html --- a/src/hdalab/templates/renkan_list.html Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/templates/renkan_list.html Wed Mar 11 18:09:41 2015 +0100 @@ -26,7 +26,7 @@ {% block main_content %}
-

{% trans 'Marked Renkans list' %}

+

{{ list_title }}

{% csrf_token %} diff -r 5d3b4e1e5b34 -r 82758bd0ce10 src/hdalab/views/profile.py --- a/src/hdalab/views/profile.py Wed Mar 11 17:05:08 2015 +0100 +++ b/src/hdalab/views/profile.py Wed Mar 11 18:09:41 2015 +0100 @@ -11,7 +11,6 @@ from renkanmanager.models import Renkan from renkanmanager.utils import LineNodePlacer, HorLineNodePlacer, renkan_copier, renkan_deleter, \ CircleNodePlacer -from renkanmanager.views import RenkanGetPut import uuid from django.conf import settings @@ -20,7 +19,7 @@ from django.contrib.auth.forms import AuthenticationForm from django.contrib.sites.models import get_current_site from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage -from django.core.urlresolvers import reverse, reverse_lazy +from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponse, HttpResponseBadRequest from django.http import HttpResponseRedirect @@ -36,6 +35,7 @@ from django.views.decorators.debug import sensitive_post_parameters from django.views.generic import TemplateView, View from django.views.generic.edit import UpdateView +from renkanmanager.views import RenkanGetPut from hdabo.models import Tag, Datasheet, TaggedSheet, Folder from hdalab.forms import HdalabRenkanStateForm, HdalabRenkanFavoriteForm @@ -127,7 +127,10 @@ template_name = "renkan_list.html" def get_context_data(self, **kwargs): - return self.update_context( super(RenkanPublicList, self).get_context_data(**kwargs), HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED) ) + context = super(RenkanPublicList, self).get_context_data(**kwargs) + context['list_title'] = _('Public Renkans list') + #Liste des renkans publics + return self.update_context(context, HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED) ) class RenkanFavoriteList(BaseRenkanList): @@ -137,7 +140,8 @@ def get_context_data(self, **kwargs): context = super(BaseRenkanList, self).get_context_data(**kwargs) context['hide_favorite'] = True - return self.update_context(context , HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED, favorite=True) ) + context['list_title'] = _('Marked Renkans list') + return self.update_context(context, HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED, favorite=True) ) class RenkanNew(View):