# HG changeset patch # User rougeronj # Date 1425651503 -3600 # Node ID f0f0f6bc37f39c5c4d573505952149aba7db1413 # Parent ef34954a7f9fd03480eba1746aba4504c1023fff# Parent 03b869fb1c1ed5b359e2c368ee51163268bc8d9b Merge with 03b869fb1c1ed5b359e2c368ee51163268bc8d9b diff -r ef34954a7f9f -r f0f0f6bc37f3 .hgtags --- a/.hgtags Fri Mar 06 12:23:30 2015 +0100 +++ b/.hgtags Fri Mar 06 15:18:23 2015 +0100 @@ -100,3 +100,4 @@ 8f70ba2106a9a1f17b72310e481d7ae12a16f483 V03.00-alpha.11 8f70ba2106a9a1f17b72310e481d7ae12a16f483 V03.00-alpha.11 51cd6fa9dfe313f5fec1f7de1958317d3519dd9e V03.00-alpha.11 +4629c62c0d0aefa6549aa8dd0a9e4cb99665df5a V03.00-alpha.12 diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdabo/templates/registration/password_reset_email.html --- a/src/hdabo/templates/registration/password_reset_email.html Fri Mar 06 12:23:30 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -{% load i18n %} -{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}: -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %} -{% endblock %} diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdabo/urls.py --- a/src/hdabo/urls.py Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdabo/urls.py Fri Mar 06 15:18:23 2015 +0100 @@ -18,7 +18,7 @@ # Uncomment the next line to enable the admin: url(r'^accounts/', include(auth_url)), - url(r'^accounts/password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', auth_views.password_reset_confirm, name='auth_password_reset_confirm'), + url(r'^accounts/password/reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', auth_views.password_reset_confirm, name='auth_password_reset_confirm'), url(r'^accounts/', include('registration.backends.default.urls')), url(r'^logout/', 'django.contrib.auth.views.logout_then_login'), url(r'^admin/', include(admin.site.urls)), diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/__init__.py --- a/src/hdalab/__init__.py Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/__init__.py Fri Mar 06 15:18:23 2015 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -VERSION = (3, 0, 0, "alpha", 11) +VERSION = (3, 0, 0, "alpha", 12) def get_version(): diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,24 +41,24 @@ msgid "Japanese" msgstr "Japanisch" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" msgstr "" @@ -100,7 +100,11 @@ msgid "Rubriques" msgstr "" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "" + +#: templates/base.html:102 msgid "Liens" msgstr "" @@ -112,59 +116,68 @@ msgid "Explorer les domaines artistiques" msgstr "Künstlerische Disziplinen" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "" + +#: templates/categories.html:67 +#, fuzzy +msgid "Entrez une catégorie" +msgstr "Information über ein Stichwort" + #: templates/credits.html:5 msgid "Credits" msgstr "" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Suche nach Facetten" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "Filter:" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "Die Ansicht verwalten" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "Name:" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "Sichtbare Blöcke:" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "" -#: templates/facettes.html:104 +#: templates/facettes.html:106 msgid "Entrez un mot-clef" msgstr "Information über ein Stichwort" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr "Schnittstelle übersetzt von Mara Dumitru" -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "Notizen" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "Künstlerische Disziplinen" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "Suchergebnisse" @@ -308,191 +321,201 @@ msgid "Profil utilisateur" msgstr "" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "" -#: templates/profile_home.html:37 +#: templates/profile_home.html:34 msgid "Adminsitration du Site" msgstr "" -#: templates/profile_home.html:39 +#: templates/profile_home.html:36 msgid "Administrer les Renkan" msgstr "" -#: templates/profile_home.html:40 +#: templates/profile_home.html:37 msgid "Editorialisation" msgstr "" -#: templates/profile_home.html:41 +#: templates/profile_home.html:38 msgid "Administration Hdalab" msgstr "" -#: templates/profile_home.html:42 +#: templates/profile_home.html:39 msgid "Administrer Hdabo" msgstr "" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "" +#: templates/profile_home.html:50 +msgid "Gerer mes Renkan" +msgstr "" + #: templates/profile_home.html:53 -msgid "Gerer mes Renkan" -msgstr "" - -#: templates/profile_home.html:55 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filter:" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "" + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" @@ -539,20 +562,20 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "reject renkan" +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" +#: templates/editorial/manage_renkans.html:92 +msgid "reject renkan" msgstr "" #: templates/registration/activate.html:5 @@ -577,10 +600,22 @@ msgstr "" #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "" + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" @@ -662,11 +697,6 @@ msgid "Email with password reset instructions has been sent." msgstr "" -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" @@ -703,11 +733,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -41,30 +41,30 @@ msgid "Japanese" msgstr "Japanese" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "edition" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "moderated" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "published" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "rejected" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" -msgstr "" +msgstr "About" #: templates/base.html:38 msgid "Accueil" -msgstr "" +msgstr "Home" #: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 msgid "Recherche" @@ -76,7 +76,7 @@ #: templates/base.html:41 templates/base.html.py:93 msgid "Thésaurus" -msgstr "" +msgstr "Thesaurus" #: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 msgid "Log out" @@ -98,11 +98,15 @@ #: templates/base.html:90 msgid "Rubriques" -msgstr "" +msgstr "Topics" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "Landmark Renkan" + +#: templates/base.html:102 msgid "Liens" -msgstr "" +msgstr "Links" #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" @@ -112,59 +116,67 @@ msgid "Explorer les domaines artistiques" msgstr "Explore by artistic discipline" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "More or less categories" + +#: templates/categories.html:67 +msgid "Entrez une catégorie" +msgstr "Enter a keyword" + #: templates/credits.html:5 msgid "Credits" msgstr "Credits" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Faceted search" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "Filters:" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "Manage view" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "Name:" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "Visible blocs:" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "Countries" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "Keywords search" -#: templates/facettes.html:104 +#: templates/facettes.html:106 msgid "Entrez un mot-clef" msgstr "Enter a keyword" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "Keywords cloud" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr " " -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "Notes" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "Artistic discipline" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "Search results" @@ -269,50 +281,61 @@ "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " "À la fois critères " msgstr "" +"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points " +"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. " +"À la fois critères " #: templates/index.html:48 msgid "" "de recherche et modes de visualisation des résultats, ces différentes " "facettes se mettent à jour au fur et à mesure de vos recherches." msgstr "" +"de recherche et modes de visualisation des résultats, ces différentes " +"facettes se mettent à jour au fur et à mesure de vos recherches." #: templates/index.html:59 msgid "Navigation à travers les Arts " -msgstr "" +msgstr "~Navigation through the Arts" #: templates/index.html:62 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 " +"the portal \"Histoire des Arts\"." #: templates/index.html:76 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 " +"Wikipedia." #: templates/index.html:91 msgid "Bienvenue sur Histoire des arts‘Lab !" -msgstr "" +msgstr "Welcome on Histoire des arts‘Lab!" #: templates/index.html:94 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\" " +"website:" #: templates/index.html:95 msgid "Visualisez vos recherches sur une ligne du temps, une carte du monde…" -msgstr "" +msgstr "Visualize your search on a timeline or a world map…" #: templates/index.html:96 msgid "Explorez les arts de ressource en ressource" -msgstr "" +msgstr "Explore the arts from one resource to another" #: templates/index.html:97 msgid "Construisez vos cartes de connaissances" -msgstr "" +msgstr "Build you knowledge maps" #: templates/mentions_legales.html:5 msgid "Mentions legales" @@ -322,192 +345,202 @@ msgid "Profil utilisateur" msgstr "User profile" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "My profile" -#: templates/profile_home.html:37 +#: templates/profile_home.html:34 msgid "Adminsitration du Site" msgstr "Site administration" -#: templates/profile_home.html:39 +#: templates/profile_home.html:36 msgid "Administrer les Renkan" msgstr "Renkan administration" -#: templates/profile_home.html:40 +#: templates/profile_home.html:37 msgid "Editorialisation" msgstr "Editorialisation" -#: templates/profile_home.html:41 +#: templates/profile_home.html:38 msgid "Administration Hdalab" msgstr "Hdalab administration" -#: templates/profile_home.html:42 +#: templates/profile_home.html:39 msgid "Administrer Hdabo" msgstr "Hdabo administration" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "Modify my profile" -#: templates/profile_home.html:53 +#: templates/profile_home.html:50 msgid "Gerer mes Renkan" msgstr "manage my Renkan" -#: templates/profile_home.html:55 +#: templates/profile_home.html:53 msgid "Nouveau Renkan" msgstr "New renkan" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "Previous" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "Next" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filter" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "Advanced search" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "Title" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "Modification date" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "Begin" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "End" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "State" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "Edition" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "Moderated" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "Published" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rejected" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "Favorite" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Search" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "Fav." + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "Preview" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "Are you sure you want to copy this renkan ?" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "remove renkan" msgstr "Remove Renkan" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" "Are you sure you want to delete this renkan ? You cannot undo this action." -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publish renkan" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 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:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "unpublish renkan" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Are you sure you want to ask to unpublish this renkan ?" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "Resources" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "Change organisation" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "(Not allowed if renkan has been modified)" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "View graph in column" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "View graph in line" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "View graph in circle" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "Public Renkans list" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "Username" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "User" @@ -554,22 +587,22 @@ msgid "Manage renkan publication" msgstr "Manage renkan publication" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "Are you sure you want to PUBLISH this renkan?" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "Are you sure you want to UNPUBLISH this renkan?" -#: templates/editorial/manage_renkans.html:79 +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "Are you sure you want to REJECT this renkan?" + +#: templates/editorial/manage_renkans.html:92 msgid "reject renkan" msgstr "reject Renkan" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "Are you sure you want to REJECT this renkan?" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Registration - Activated" @@ -592,10 +625,25 @@ msgstr "Your account is now activated." #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "Hello," + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "Activate account at" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "Link is valid for %(expiration_days)s days." @@ -677,11 +725,6 @@ msgid "Email with password reset instructions has been sent." msgstr "Email with password reset instructions has been sent." -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "Reset password at %(site_name)s" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "Password reset" @@ -718,14 +761,17 @@ msgid "Mot de passe (Verification)" msgstr "Password (verification)" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "More Resources" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "Period" +#~ msgid "Reset password at %(site_name)s" +#~ msgstr "Reset password at %(site_name)s" + #~ msgid "Contact" #~ msgstr "Contact" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,24 +41,24 @@ msgid "Japanese" msgstr "Japonés" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "estado_edición" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "estado_moderado" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "estado_publicado" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "estado_rechazado" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" msgstr "Acerca de Nosotros" @@ -104,7 +104,11 @@ msgid "Rubriques" msgstr "" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "" + +#: templates/base.html:102 msgid "Liens" msgstr "" @@ -116,59 +120,68 @@ msgid "Explorer les domaines artistiques" msgstr "Disciplinas artísticas" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "" + +#: templates/categories.html:67 +#, fuzzy +msgid "Entrez une catégorie" +msgstr "Entrar una palabra clave" + #: templates/credits.html:5 msgid "Credits" msgstr "Creditos" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Búsqueda por facetas" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "Filtros:" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "Administrar la vista" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "Nombre:" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "Bloques visibles:" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "Países" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "Búsqueda por Palabras Claves" -#: templates/facettes.html:104 +#: templates/facettes.html:106 msgid "Entrez un mot-clef" msgstr "Entrar una palabra clave" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "Nube de palabras claves" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr "traducción_información" -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "Notas" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "Disciplinas artísticas" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "Resultados de búsqueda" @@ -327,194 +340,204 @@ msgid "Profil utilisateur" msgstr "Perfil del usuario" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "Mi perfil" -#: templates/profile_home.html:37 +#: templates/profile_home.html:34 msgid "Adminsitration du Site" msgstr "Administración del Sitio" -#: templates/profile_home.html:39 +#: templates/profile_home.html:36 msgid "Administrer les Renkan" msgstr "Administrar los Renkan" -#: templates/profile_home.html:40 +#: templates/profile_home.html:37 msgid "Editorialisation" msgstr "Editorialisación" -#: templates/profile_home.html:41 +#: templates/profile_home.html:38 msgid "Administration Hdalab" msgstr "Administrar HdaLab" -#: templates/profile_home.html:42 +#: templates/profile_home.html:39 msgid "Administrer Hdabo" msgstr "Administrar Hdabo" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "Modificar mi perfil" -#: templates/profile_home.html:53 +#: templates/profile_home.html:50 msgid "Gerer mes Renkan" msgstr "Gestionar mis Renkan" -#: templates/profile_home.html:55 +#: templates/profile_home.html:53 msgid "Nouveau Renkan" msgstr "Nuevo Renkan" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "Anterior" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "Siguiente" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filtro" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "Búsqueda avanzada" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "Titulo" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "Modificar la fecha" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "inicio" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "fin" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "Estado" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "Edición" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "Administrado" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "Publicado" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rechazado" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Buscar" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "" + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "Vista previa" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Acciones " -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "¿ Esta seguro que desea copiar este Renkan ?" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 #, fuzzy msgid "remove renkan" msgstr "Gestionar mis Renkan" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 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" -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 #, fuzzy msgid "publish renkan" msgstr "estado_publicado" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 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:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "¿ Esta seguro que desea restringir la publicación de este Renkan ?" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "Recursos" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "Cambiar la organización" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible despues de modificar el RENKAN)" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "Vista del gráfico en columnas" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "Vista del gráfico en lineas" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "Vista del gráfico en círculo" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "Renkan Publicos" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "Nombre de Usuario" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "Usuario" @@ -561,23 +584,23 @@ msgid "Manage renkan publication" msgstr "Gestionar la publicación de Renkan" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "¿ Esta seguro que desea PUBLICAR este Renkan ?" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "¿ Esta seguro que desea RESTRINGIR la publicación de este Renkan ?" -#: templates/editorial/manage_renkans.html:79 +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "¿ Esta seguro que desea RECHAZAR este Renkan ?" + +#: templates/editorial/manage_renkans.html:92 #, fuzzy msgid "reject renkan" msgstr "Gestionar mis Renkan" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "¿ Esta seguro que desea RECHAZAR este Renkan ?" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Inscriptición - Activada" @@ -600,10 +623,22 @@ msgstr "Su cuenta esta ahora activada" #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "" + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "Activar la cuenta en" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "Enlace valido por %(expiration_days)s dias" @@ -685,11 +720,6 @@ msgid "Email with password reset instructions has been sent." msgstr "Un correo con los pasos para reiniciar su contraseña ha sido enviado" -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "Reiniciar la contraseña de %(site_name)s" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "Reiniciar la Contraseña" @@ -726,13 +756,16 @@ msgid "Mot de passe (Verification)" msgstr "Contraseña (verificación)" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "Mas recursos" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "Periodo" +#~ msgid "Reset password at %(site_name)s" +#~ msgstr "Reiniciar la contraseña de %(site_name)s" + #~ msgid "Contact" #~ msgstr "Contactos" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,24 +41,24 @@ msgid "Japanese" msgstr "Japonais" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "édition" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "modéré" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "publié" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "rejeté" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" msgstr "À Propos" @@ -100,7 +100,11 @@ msgid "Rubriques" msgstr "Rubriques" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "Renkan repères" + +#: templates/base.html:102 msgid "Liens" msgstr "Liens" @@ -112,59 +116,67 @@ msgid "Explorer les domaines artistiques" msgstr "Explorer les domaines artistiques" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "Voir plus ou moins de categories" + +#: templates/categories.html:67 +msgid "Entrez une catégorie" +msgstr "Entrez une ctégorie" + #: templates/credits.html:5 msgid "Credits" msgstr "Crédits" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Recherche par facettes" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "Filtres :" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "Gérer la vue" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "Nom :" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "Blocs visibles :" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "Pays" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "Recherche par mot-clef" -#: templates/facettes.html:104 +#: templates/facettes.html:106 msgid "Entrez un mot-clef" msgstr "Entrez un mot-clef" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "Nuage de mot-clef" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr " " -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "Notes" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "Disciplines artistiques" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "Résultats de recherche" @@ -334,193 +346,203 @@ msgid "Profil utilisateur" msgstr "Profil utilisateur" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "Mon profil" -#: templates/profile_home.html:37 +#: templates/profile_home.html:34 msgid "Adminsitration du Site" msgstr "Adminsitration du Site" -#: templates/profile_home.html:39 +#: templates/profile_home.html:36 msgid "Administrer les Renkan" msgstr "Administrer les Renkan" -#: templates/profile_home.html:40 +#: templates/profile_home.html:37 msgid "Editorialisation" msgstr "Éditorialisation" -#: templates/profile_home.html:41 +#: templates/profile_home.html:38 msgid "Administration Hdalab" msgstr "Administration Hdalab" -#: templates/profile_home.html:42 +#: templates/profile_home.html:39 msgid "Administrer Hdabo" msgstr "Administrer Hdabo" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "Modifier mon profil" -#: templates/profile_home.html:53 +#: templates/profile_home.html:50 msgid "Gerer mes Renkan" msgstr "Gérer mes Renkan" -#: templates/profile_home.html:55 +#: templates/profile_home.html:53 msgid "Nouveau Renkan" msgstr "Nouveau Renkan" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "Précédent" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "Suivant" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Filter" msgstr "Filtrer" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "Recherche avancée" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "Titre" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "Date de modification" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "début" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "fin" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "État" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "Édition" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "Modéré" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "Publié" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "Rejeté" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "Favoris" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "Rechercher" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "Fav." + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "Prévisualisation" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "Actions" -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "remove renkan" msgstr "Effacer Renkan" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" "Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas " "annuler cette action." -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "publier renkan" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 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:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "dépublier renkan" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir dépublier ce Renkan ?" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "Ressources" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "Changer de disposition" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible si le RENKAN est modifié)" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "Voir le graphe en colonne" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "Voir le graphe en ligne" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "Voir le graphe en cercle" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "Liste des renkans publics" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "Nom d'utilisateur" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "Utilisateur" @@ -568,22 +590,22 @@ msgid "Manage renkan publication" msgstr "Gérer les publications de Renkan" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "Êtes-vous certain(e) de vouloir PUBLIER ce Renkan ?" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "Êtes-vous certain(e) de vouloir DÉPUBLIER ce Renkan ?" -#: templates/editorial/manage_renkans.html:79 +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "Êtes-vous certain(e) de vouloir REJETER ce Renkan ?" + +#: templates/editorial/manage_renkans.html:92 msgid "reject renkan" msgstr "rejeter Renkan" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "Êtes-vous certain(e) de vouloir REJETER ce Renkan ?" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Enregistrement - Activé" @@ -606,10 +628,25 @@ msgstr "Votre compte est maintenant activé." #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "Bonjour," + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" +"\n" +"Vous avez créé un compte sur le site %(sitename)s avec le nom d'utilisateur " +"%(username)s.\n" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "Activer votre compte à" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "Le lien est valide pendant %(expiration_days)s jours." @@ -693,11 +730,6 @@ "L'email avec les instructions pour réinitialiser le mot de passe a été " "envoyé." -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "Réinitialiser le mot de passe sur %(site_name)s" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "Réinitialisation du mot de passe" @@ -734,13 +766,16 @@ msgid "Mot de passe (Verification)" msgstr "Mot de passe (vérification)" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "Plus de Ressources" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "Période" +#~ msgid "Reset password at %(site_name)s" +#~ msgstr "Réinitialiser le mot de passe sur %(site_name)s" + #~ msgid "Contact" #~ msgstr "Contact" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,24 +41,24 @@ msgid "Japanese" msgstr "Giapponese" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" msgstr "" @@ -102,7 +102,11 @@ msgid "Rubriques" msgstr "" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "" + +#: templates/base.html:102 msgid "Liens" msgstr "" @@ -116,60 +120,69 @@ msgid "Explorer les domaines artistiques" msgstr "Discipline artistiche" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "" + +#: templates/categories.html:67 +#, fuzzy +msgid "Entrez une catégorie" +msgstr "Informazioni su una parola chiave" + #: templates/credits.html:5 msgid "Credits" msgstr "" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Ricerca per campo" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "Filtri:" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "Gestire la veduta" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "Nome:" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "Blocchi visibili:" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "" -#: templates/facettes.html:104 +#: templates/facettes.html:106 #, fuzzy msgid "Entrez un mot-clef" msgstr "Informazioni su una parola chiave" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr "Traduzione dell'interfaccia informatica in italiano: Natalie Biet" -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "Note" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "Discipline artistiche" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "Risultati della ricerca" @@ -313,192 +326,202 @@ msgid "Profil utilisateur" msgstr "" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "" +#: templates/profile_home.html:34 +msgid "Adminsitration du Site" +msgstr "" + +#: templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + #: templates/profile_home.html:37 -msgid "Adminsitration du Site" +msgid "Editorialisation" +msgstr "" + +#: templates/profile_home.html:38 +msgid "Administration Hdalab" msgstr "" #: templates/profile_home.html:39 -msgid "Administrer les Renkan" -msgstr "" - -#: templates/profile_home.html:40 -msgid "Editorialisation" -msgstr "" - -#: templates/profile_home.html:41 -msgid "Administration Hdalab" -msgstr "" - -#: templates/profile_home.html:42 msgid "Administrer Hdabo" msgstr "" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "" +#: templates/profile_home.html:50 +msgid "Gerer mes Renkan" +msgstr "" + #: templates/profile_home.html:53 -msgid "Gerer mes Renkan" -msgstr "" - -#: templates/profile_home.html:55 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "Filtri:" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "" + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" @@ -545,20 +568,20 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "reject renkan" +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" +#: templates/editorial/manage_renkans.html:92 +msgid "reject renkan" msgstr "" #: templates/registration/activate.html:5 @@ -583,10 +606,22 @@ msgstr "" #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "" + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" @@ -668,11 +703,6 @@ msgid "Email with password reset instructions has been sent." msgstr "" -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" @@ -709,11 +739,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -42,24 +42,24 @@ msgid "Japanese" msgstr "日本語" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" msgstr "" @@ -103,7 +103,11 @@ msgid "Rubriques" msgstr "" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "" + +#: templates/base.html:102 msgid "Liens" msgstr "" @@ -117,60 +121,69 @@ msgid "Explorer les domaines artistiques" msgstr "学術・芸術分野" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "" + +#: templates/categories.html:67 +#, fuzzy +msgid "Entrez une catégorie" +msgstr "キーワードについての情報" + #: templates/credits.html:5 msgid "Credits" msgstr "" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "ファセット検索" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "フィルター" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "ビューの管理" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "名前：" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "可視ブロック：" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "" -#: templates/facettes.html:104 +#: templates/facettes.html:106 #, fuzzy msgid "Entrez un mot-clef" msgstr "キーワードについての情報" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr "翻訳に関する情報" -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "注釈" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "学術・芸術分野" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "検索結果" @@ -314,192 +327,202 @@ msgid "Profil utilisateur" msgstr "" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "" +#: templates/profile_home.html:34 +msgid "Adminsitration du Site" +msgstr "" + +#: templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + #: templates/profile_home.html:37 -msgid "Adminsitration du Site" +msgid "Editorialisation" +msgstr "" + +#: templates/profile_home.html:38 +msgid "Administration Hdalab" msgstr "" #: templates/profile_home.html:39 -msgid "Administrer les Renkan" -msgstr "" - -#: templates/profile_home.html:40 -msgid "Editorialisation" -msgstr "" - -#: templates/profile_home.html:41 -msgid "Administration Hdalab" -msgstr "" - -#: templates/profile_home.html:42 msgid "Administrer Hdabo" msgstr "" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "" +#: templates/profile_home.html:50 +msgid "Gerer mes Renkan" +msgstr "" + #: templates/profile_home.html:53 -msgid "Gerer mes Renkan" -msgstr "" - -#: templates/profile_home.html:55 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "フィルター" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "" + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" @@ -546,20 +569,20 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "reject renkan" +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" +#: templates/editorial/manage_renkans.html:92 +msgid "reject renkan" msgstr "" #: templates/registration/activate.html:5 @@ -584,10 +607,22 @@ msgstr "" #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "" + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" @@ -669,11 +704,6 @@ msgid "Email with password reset instructions has been sent." msgstr "" -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" @@ -710,11 +740,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Fri Mar 06 15:18:23 2015 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-26 03:27-0600\n" +"POT-Creation-Date: 2015-03-06 07:38-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,24 +42,24 @@ msgid "Japanese" msgstr "" -#: models/renkan.py:28 +#: models/renkan.py:37 msgid "edition_state" msgstr "" -#: models/renkan.py:29 +#: models/renkan.py:38 msgid "moderated_state" msgstr "" -#: models/renkan.py:30 +#: models/renkan.py:39 msgid "published_state" msgstr "" -#: models/renkan.py:31 +#: models/renkan.py:40 msgid "rejected_state" msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 -#: templates/base.html:95 +#: templates/base.html:96 msgid "A Propos" msgstr "" @@ -103,7 +103,11 @@ msgid "Rubriques" msgstr "" -#: templates/base.html:101 +#: templates/base.html:95 +msgid "Renkan repères" +msgstr "" + +#: templates/base.html:102 msgid "Liens" msgstr "" @@ -117,60 +121,69 @@ msgid "Explorer les domaines artistiques" msgstr "Disciplines artistiques" +#: templates/categories.html:63 +msgid "Voir plus ou moins de categories" +msgstr "" + +#: templates/categories.html:67 +#, fuzzy +msgid "Entrez une catégorie" +msgstr "Information sur un mot-clé" + #: templates/credits.html:5 msgid "Credits" msgstr "" -#: templates/facettes.html:5 templates/facettes.html.py:44 +#: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Recherche par facettes" -#: templates/facettes.html:63 +#: templates/facettes.html:65 msgid "Filtres :" msgstr "Filtres :" -#: templates/facettes.html:82 +#: templates/facettes.html:84 msgid "Gerer la vue" msgstr "Gérer la vue" -#: templates/facettes.html:86 +#: templates/facettes.html:88 msgid "Nom :" msgstr "Nom :" -#: templates/facettes.html:89 +#: templates/facettes.html:91 msgid "Blocs visibles :" msgstr "Blocs visibles :" -#: templates/facettes.html:94 +#: templates/facettes.html:96 msgid "Countries" msgstr "" -#: templates/facettes.html:100 +#: templates/facettes.html:102 msgid "Keywords research" msgstr "" -#: templates/facettes.html:104 +#: templates/facettes.html:106 #, fuzzy msgid "Entrez un mot-clef" msgstr "Information sur un mot-clé" -#: templates/facettes.html:113 +#: templates/facettes.html:115 msgid "Keywords cloud" msgstr "" -#: templates/facettes.html:119 +#: templates/facettes.html:121 msgid "translation_info" msgstr "" -#: templates/facettes.html:125 +#: templates/facettes.html:127 msgid "Notes" msgstr "Notes" -#: templates/facettes.html:131 +#: templates/facettes.html:133 msgid "Disciplines artistiques" msgstr "Disciplines artistiques" -#: templates/facettes.html:137 +#: templates/facettes.html:139 msgid "Resultats de recherche" msgstr "Résultats de recherche" @@ -314,192 +327,202 @@ msgid "Profil utilisateur" msgstr "" -#: templates/profile_home.html:33 +#: templates/profile_home.html:30 msgid "Mon profil" msgstr "" +#: templates/profile_home.html:34 +msgid "Adminsitration du Site" +msgstr "" + +#: templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + #: templates/profile_home.html:37 -msgid "Adminsitration du Site" +msgid "Editorialisation" +msgstr "" + +#: templates/profile_home.html:38 +msgid "Administration Hdalab" msgstr "" #: templates/profile_home.html:39 -msgid "Administrer les Renkan" -msgstr "" - -#: templates/profile_home.html:40 -msgid "Editorialisation" -msgstr "" - -#: templates/profile_home.html:41 -msgid "Administration Hdalab" -msgstr "" - -#: templates/profile_home.html:42 msgid "Administrer Hdabo" msgstr "" -#: templates/profile_home.html:47 +#: templates/profile_home.html:44 msgid "Modifier mon profil" msgstr "" +#: templates/profile_home.html:50 +msgid "Gerer mes Renkan" +msgstr "" + #: templates/profile_home.html:53 -msgid "Gerer mes Renkan" -msgstr "" - -#: templates/profile_home.html:55 msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:57 templates/profile_home.html.py:122 -#: templates/renkan_list.html:35 templates/renkan_list.html.py:77 -#: templates/editorial/manage_renkans.html:30 -#: templates/editorial/manage_renkans.html:87 +#: templates/profile_home.html:55 templates/profile_home.html.py:124 +#: templates/renkan_list.html:32 templates/renkan_list.html.py:84 +#: templates/editorial/manage_renkans.html:38 +#: templates/editorial/manage_renkans.html:100 msgid "Previous" msgstr "" -#: templates/profile_home.html:58 templates/profile_home.html.py:123 -#: templates/renkan_list.html:36 templates/renkan_list.html.py:78 -#: templates/editorial/manage_renkans.html:31 -#: templates/editorial/manage_renkans.html:88 +#: templates/profile_home.html:56 templates/profile_home.html.py:125 +#: templates/renkan_list.html:33 templates/renkan_list.html.py:85 +#: templates/editorial/manage_renkans.html:39 +#: templates/editorial/manage_renkans.html:101 msgid "Next" msgstr "" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 #, fuzzy msgid "Filter" msgstr "Filtres :" -#: templates/profile_home.html:59 templates/renkan_list.html:37 -#: templates/editorial/manage_renkans.html:32 +#: templates/profile_home.html:57 templates/renkan_list.html:34 +#: templates/editorial/manage_renkans.html:40 msgid "Advanced search" msgstr "" -#: templates/profile_home.html:61 templates/profile_home.html.py:78 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:48 -#: templates/editorial/manage_renkans.html:34 -#: templates/editorial/manage_renkans.html:51 +#: templates/profile_home.html:59 templates/profile_home.html.py:77 +#: templates/renkan_list.html:36 templates/renkan_list.html.py:48 +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:60 msgid "Title" msgstr "" -#: templates/profile_home.html:62 templates/profile_home.html.py:80 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:52 -#: templates/editorial/manage_renkans.html:35 -#: templates/editorial/manage_renkans.html:55 +#: templates/profile_home.html:60 templates/profile_home.html.py:81 +#: templates/renkan_list.html:37 templates/renkan_list.html.py:56 +#: templates/editorial/manage_renkans.html:43 +#: templates/editorial/manage_renkans.html:66 msgid "Modification date" msgstr "" -#: templates/profile_home.html:62 templates/renkan_list.html:40 -#: templates/editorial/manage_renkans.html:35 +#: templates/profile_home.html:60 templates/renkan_list.html:37 +#: templates/editorial/manage_renkans.html:43 msgid "begin" msgstr "" -#: templates/profile_home.html:63 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:36 +#: templates/profile_home.html:61 templates/renkan_list.html:38 +#: templates/editorial/manage_renkans.html:44 msgid "end" msgstr "" -#: templates/profile_home.html:64 templates/profile_home.html.py:83 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:58 +#: templates/profile_home.html:62 templates/profile_home.html.py:84 +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 msgid "State" msgstr "" -#: templates/profile_home.html:67 +#: templates/profile_home.html:65 msgid "Edition" msgstr "" -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:41 +#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49 msgid "Moderated" msgstr "" -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:42 +#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50 msgid "Published" msgstr "" -#: templates/profile_home.html:70 templates/editorial/manage_renkans.html:43 +#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51 msgid "Rejected" msgstr "" -#: templates/profile_home.html:73 templates/renkan_list.html:43 -#: templates/editorial/manage_renkans.html:46 +#: templates/profile_home.html:71 templates/renkan_list.html:41 +#: templates/editorial/manage_renkans.html:54 +msgid "Favorite" +msgstr "" + +#: templates/profile_home.html:72 templates/renkan_list.html:43 +#: templates/editorial/manage_renkans.html:55 msgid "Search" msgstr "" -#: templates/profile_home.html:82 templates/editorial/manage_renkans.html:57 +#: templates/profile_home.html:79 templates/renkan_list.html:51 +#: templates/editorial/manage_renkans.html:62 +msgid "Fav." +msgstr "" + +#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68 msgid "Preview" msgstr "" -#: templates/profile_home.html:85 templates/editorial/manage_renkans.html:60 +#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71 msgid "Actions" msgstr "" -#: templates/profile_home.html:103 templates/renkan_list.html:69 +#: templates/profile_home.html:105 templates/renkan_list.html:76 msgid "Are you sure you want to copy this renkan ?" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "remove renkan" msgstr "" -#: templates/profile_home.html:108 +#: templates/profile_home.html:110 msgid "" "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:113 templates/editorial/manage_renkans.html:77 +#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90 msgid "publish renkan" msgstr "" -#: templates/profile_home.html:113 +#: templates/profile_home.html:115 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:114 templates/editorial/manage_renkans.html:78 +#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91 msgid "unpublish renkan" msgstr "" -#: templates/profile_home.html:114 +#: templates/profile_home.html:116 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:68 +#: templates/renkan_edit.html:65 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:185 +#: templates/renkan_edit.html:191 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:186 +#: templates/renkan_edit.html:192 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:189 templates/renkan_edit.html.py:193 -#: templates/renkan_edit.html:197 +#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199 +#: templates/renkan_edit.html:203 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:190 templates/renkan_edit.html.py:194 -#: templates/renkan_edit.html:198 +#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200 +#: templates/renkan_edit.html:204 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:191 templates/renkan_edit.html.py:195 -#: templates/renkan_edit.html:199 +#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201 +#: templates/renkan_edit.html:205 msgid "View graph in circle" msgstr "" -#: templates/renkan_list.html:6 templates/renkan_list.html.py:32 +#: templates/renkan_list.html:6 templates/renkan_list.html.py:29 msgid "Public Renkans list" msgstr "" -#: templates/renkan_list.html:42 templates/editorial/manage_renkans.html:37 +#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45 #: templates/registration/login.html:24 msgid "Username" msgstr "" -#: templates/renkan_list.html:50 templates/editorial/manage_renkans.html:53 +#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64 msgid "User" msgstr "" @@ -546,20 +569,20 @@ msgid "Manage renkan publication" msgstr "" -#: templates/editorial/manage_renkans.html:77 +#: templates/editorial/manage_renkans.html:29 msgid "Are you sure you want to PUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:78 +#: templates/editorial/manage_renkans.html:30 msgid "Are you sure you want to UNPUBLISH this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "reject renkan" +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" msgstr "" -#: templates/editorial/manage_renkans.html:79 -msgid "Are you sure you want to REJECT this renkan ?" +#: templates/editorial/manage_renkans.html:92 +msgid "reject renkan" msgstr "" #: templates/registration/activate.html:5 @@ -584,10 +607,22 @@ msgstr "" #: templates/registration/activation_email.txt:2 +msgid "Hello" +msgstr "" + +#: templates/registration/activation_email.txt:4 +#, python-format +msgid "" +"\n" +"You have created an account at %(sitename)s with the user name " +"%(username)s.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" -#: templates/registration/activation_email.txt:6 +#: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" @@ -669,11 +704,6 @@ msgid "Email with password reset instructions has been sent." msgstr "" -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "Reset password at %(site_name)s" -msgstr "" - #: templates/registration/password_reset_form.html:5 msgid "Password reset" msgstr "" @@ -710,11 +740,11 @@ msgid "Mot de passe (Verification)" msgstr "" -#: views/profile.py:427 +#: views/profile.py:439 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:436 views/profile.py:515 +#: views/profile.py:448 views/profile.py:527 msgid "Period" msgstr "" diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/templates/registration/activation_email.txt --- a/src/hdalab/templates/registration/activation_email.txt Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/templates/registration/activation_email.txt Fri Mar 06 15:18:23 2015 +0100 @@ -1,4 +1,9 @@ {% load i18n %} +{% trans "Hello" %} {{user.firstname}} {{user.lastname}}, + +{% blocktrans with sitename=site.name username=user.username %} +You have created an account at {{ sitename }} with the user name {{ username }}. +{% endblocktrans %} {% trans "Activate account at" %} {{ site.name }}: http://{{ site.domain }}{% url 'registration_activate' activation_key %} diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/templates/registration/password_reset_email.html --- a/src/hdalab/templates/registration/password_reset_email.html Fri Mar 06 12:23:30 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -{% load i18n %} -{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}: -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %} -{% endblock %} diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/templates/renkan_edit.html --- a/src/hdalab/templates/renkan_edit.html Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/templates/renkan_edit.html Fri Mar 06 15:18:23 2015 +0100 @@ -38,6 +38,7 @@ user_color_editable: false, user_name_editable: false, show_user_color: false, + show_export_button: false, static_url : "{% static 'renkanmanager/lib/renkan/' %}", allow_image_upload : false, search: [ diff -r ef34954a7f9f -r f0f0f6bc37f3 src/hdalab/templates/renkan_view.html --- a/src/hdalab/templates/renkan_view.html Fri Mar 06 12:23:30 2015 +0100 +++ b/src/hdalab/templates/renkan_view.html Fri Mar 06 15:18:23 2015 +0100 @@ -30,6 +30,7 @@ static_url : "{% static 'renkanmanager/lib/renkan/' %}", editor_mode: false, show_bins: false, + show_export_button: false, language: "fr" }); Rkns.jsonIO(_renkan, {