# HG changeset patch # User veltr # Date 1377184827 -7200 # Node ID dc08f5692d8085670c13ba1048d6c49cd3ac9edb # Parent b174c4467f7cbaccdb17c6fa9b55fe96e746204e Added translations diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/locale/en/LC_MESSAGES/django.mo Binary file src/jocondelab/locale/en/LC_MESSAGES/django.mo has changed diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/locale/en/LC_MESSAGES/django.po --- a/src/jocondelab/locale/en/LC_MESSAGES/django.po Thu Aug 22 16:46:19 2013 +0200 +++ b/src/jocondelab/locale/en/LC_MESSAGES/django.po Thu Aug 22 17:20:27 2013 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-12 04:17-0500\n" +"POT-Creation-Date: 2013-08-22 09:54-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,80 +16,76 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:11 forms.py:179 -msgid "language" -msgstr "language" - -#: forms.py:53 forms.py:55 +#: forms.py:48 forms.py:50 msgid "Open Dialog" msgstr "Open thesaurus" -#: forms.py:65 +#: forms.py:60 msgid "yes" msgstr "yes" -#: forms.py:66 +#: forms.py:61 msgid "no" msgstr "no" -#: forms.py:81 +#: forms.py:76 msgid "Wikipedia version" msgstr "Wikipedia version" -#: forms.py:91 templates/jocondelab/term_list.html:20 +#: forms.py:86 templates/jocondelab/term_list.html:20 msgid "thesaurus" msgstr "thesaurus" -#: forms.py:92 +#: forms.py:87 msgid "thesaurus tree" msgstr "thesaurus tree" -#: forms.py:93 forms.py:98 templates/jocondelab/term_edit.html:80 +#: forms.py:88 forms.py:93 templates/jocondelab/term_edit.html:80 msgid "label" msgstr "label" -#: forms.py:94 +#: forms.py:89 msgid "link_status" msgstr "link status" -#: forms.py:95 +#: forms.py:90 msgid "link_semantic_level" msgstr "link level" -#: forms.py:96 +#: forms.py:91 msgid "wikipedia_edition" msgstr "Wp Edit" -#: forms.py:97 +#: forms.py:92 msgid "validated" msgstr "valid." -#: forms.py:98 +#: forms.py:93 msgid "order_by" msgstr "order by" -#: forms.py:98 templates/jocondelab/term_edit.html:181 +#: forms.py:93 templates/jocondelab/term_edit.html:181 #: templates/jocondelab/term_list.html:20 msgid "nb notice" msgstr "nb of notice" -#: forms.py:98 templates/jocondelab/term_list.html:20 +#: forms.py:93 templates/jocondelab/term_list.html:20 msgid "level" msgstr "level" -#: forms.py:98 +#: forms.py:93 msgid "order_lft" msgstr "node" -#: forms.py:99 +#: forms.py:94 msgid "order_dir" msgstr "sort order" -#: forms.py:99 +#: forms.py:94 msgid "asc" msgstr "asc." -#: forms.py:99 +#: forms.py:94 msgid "desc" msgstr "desc." @@ -99,28 +95,86 @@ #: settings.py:43 msgid "English" -msgstr "" +msgstr "English" + +#: templates/jocondelab/ajax_contents.html:2 +#: templates/jocondelab/front_search.html:35 +msgid "results for:" +msgstr "results for:" + +#: templates/jocondelab/front_base.html:55 +msgid "Menu" +msgstr "Menu" + +#: templates/jocondelab/front_base.html:58 +#: templates/jocondelab/front_search.html:15 +#: templates/jocondelab/front_search.html:17 +msgid "Multilingual search" +msgstr "Multilingual search" -#: templates/jocondelab/front_search.html:10 -#: templates/jocondelab/front_search.html:12 -msgid "Multilingual search" -msgstr "" +#: templates/jocondelab/front_base.html:61 +#: templates/jocondelab/front_timeline.html:28 +#: templates/jocondelab/front_timeline.html:30 +msgid "Timeline" +msgstr "Timeline" + +#: templates/jocondelab/front_base.html:64 +#: templates/jocondelab/front_geo.html:34 +#: templates/jocondelab/front_geo.html:36 +msgid "World map" +msgstr "World map" -#: templates/jocondelab/front_search.html:29 +#: templates/jocondelab/front_base.html:71 +msgid "Search in contents" +msgstr "Search in contents" + +#: templates/jocondelab/front_base.html:92 +#, fuzzy +msgid "Source: Wikipedia" +msgstr "Source: Wikipedia" + +#: templates/jocondelab/front_geo.html:43 +msgid "Search for a place" +msgstr "Search for a place" + +#: templates/jocondelab/front_notice.html:44 +#: templates/jocondelab/partial/notice_list.html:9 msgid "Title:" -msgstr "" +msgstr "Title:" -#: templates/jocondelab/front_search.html:30 +#: templates/jocondelab/front_notice.html:50 +#: templates/jocondelab/partial/notice_list.html:10 msgid "Denomination:" -msgstr "" +msgstr "Denomination:" + +#: templates/jocondelab/front_notice.html:56 +#: templates/jocondelab/partial/notice_list.html:24 +msgid ":" +msgstr ":" + +#: templates/jocondelab/front_notice.html:70 +msgid "Description:" +msgstr "Description:" -#: templates/jocondelab/front_search.html:31 -msgid "Author(s):" -msgstr "" +#: templates/jocondelab/front_notice.html:76 +msgid "History:" +msgstr "History:" + +#: templates/jocondelab/front_notice.html:82 +msgid "Conservation location:" +msgstr "Conservation location:" + +#: templates/jocondelab/front_notice.html:88 +msgid "Datasheet rights:" +msgstr "Datasheet rights:" + +#: templates/jocondelab/front_notice.html:94 +msgid "Images rights:" +msgstr "Images rights:" #: templates/jocondelab/front_search.html:35 -msgid ":" -msgstr "" +msgid "results" +msgstr "results" #: templates/jocondelab/term_edit.html:73 msgid "prev" @@ -196,6 +250,10 @@ msgid "Search" msgstr "Search" +#: templates/jocondelab/partial/notice_list.html:14 +msgid "Author(s):" +msgstr "Author(s):" + # python-format #: templates/jocondelab/partial/pagination.html:6 #, python-format @@ -214,3 +272,39 @@ #: templates/registration/login.html:19 msgid "login" msgstr "login" + +#~ msgid "language" +#~ msgstr "language" + +# Thesaurus Identifiers +msgctxt "Thesaurus label" +msgid "AUTR" +msgstr "Author(s)" + +msgctxt "Thesaurus label" +msgid "DOMN" +msgstr "Domain(s)" + +msgctxt "Thesaurus label" +msgid "ECOL" +msgstr "School" + +msgctxt "Thesaurus label" +msgid "EPOQ" +msgstr "Period or style" + +msgctxt "Thesaurus label" +msgid "LIEUX" +msgstr "Place(s)" + +msgctxt "Thesaurus label" +msgid "PERI" +msgstr "Creation time" + +msgctxt "Thesaurus label" +msgid "REPR" +msgstr "Represented subject" + +msgctxt "Thesaurus label" +msgid "SREP" +msgstr "Representation source" diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/locale/fr/LC_MESSAGES/django.mo Binary file src/jocondelab/locale/fr/LC_MESSAGES/django.mo has changed diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/locale/fr/LC_MESSAGES/django.po --- a/src/jocondelab/locale/fr/LC_MESSAGES/django.po Thu Aug 22 16:46:19 2013 +0200 +++ b/src/jocondelab/locale/fr/LC_MESSAGES/django.po Thu Aug 22 17:20:27 2013 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-12 04:17-0500\n" +"POT-Creation-Date: 2013-08-22 10:10-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,80 +17,76 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: admin.py:11 forms.py:179 -msgid "language" -msgstr "langue" - -#: forms.py:53 forms.py:55 +#: forms.py:48 forms.py:50 msgid "Open Dialog" msgstr "Ouvrir thésaurus" -#: forms.py:65 +#: forms.py:60 msgid "yes" msgstr "oui" -#: forms.py:66 +#: forms.py:61 msgid "no" msgstr "non" -#: forms.py:81 +#: forms.py:76 msgid "Wikipedia version" msgstr "Version wikipedia" -#: forms.py:91 templates/jocondelab/term_list.html:20 +#: forms.py:86 templates/jocondelab/term_list.html:20 msgid "thesaurus" msgstr "thésaurus" -#: forms.py:92 +#: forms.py:87 msgid "thesaurus tree" msgstr "Arbre du thésaurus" -#: forms.py:93 forms.py:98 templates/jocondelab/term_edit.html:80 +#: forms.py:88 forms.py:93 templates/jocondelab/term_edit.html:80 msgid "label" msgstr "label" -#: forms.py:94 +#: forms.py:89 msgid "link_status" msgstr "statut lien" -#: forms.py:95 +#: forms.py:90 msgid "link_semantic_level" msgstr "niveau lien" -#: forms.py:96 +#: forms.py:91 msgid "wikipedia_edition" msgstr "Édit. wk" -#: forms.py:97 +#: forms.py:92 msgid "validated" msgstr "validé" -#: forms.py:98 +#: forms.py:93 msgid "order_by" msgstr "ord. par" -#: forms.py:98 templates/jocondelab/term_edit.html:181 +#: forms.py:93 templates/jocondelab/term_edit.html:181 #: templates/jocondelab/term_list.html:20 msgid "nb notice" msgstr "nb notice" -#: forms.py:98 templates/jocondelab/term_list.html:20 +#: forms.py:93 templates/jocondelab/term_list.html:20 msgid "level" msgstr "niveau" -#: forms.py:98 +#: forms.py:93 msgid "order_lft" msgstr "node" -#: forms.py:99 +#: forms.py:94 msgid "order_dir" msgstr "ordre tri" -#: forms.py:99 +#: forms.py:94 msgid "asc" msgstr "asc." -#: forms.py:99 +#: forms.py:94 msgid "desc" msgstr "desc." @@ -102,51 +98,85 @@ msgid "English" msgstr "Anglais" -#: templates/jocondelab/front_search.html:10 -#: templates/jocondelab/front_search.html:12 +#: templates/jocondelab/ajax_contents.html:2 +#: templates/jocondelab/front_search.html:35 +msgid "results for:" +msgstr "résultats pour :" + +#: templates/jocondelab/front_base.html:55 +msgid "Menu" +msgstr "Menu" + +#: templates/jocondelab/front_base.html:58 +#: templates/jocondelab/front_search.html:15 +#: templates/jocondelab/front_search.html:17 msgid "Multilingual search" msgstr "Recherche multilingue" -#: templates/jocondelab/front_search.html:29 +#: templates/jocondelab/front_base.html:61 +#: templates/jocondelab/front_timeline.html:28 +#: templates/jocondelab/front_timeline.html:30 +msgid "Timeline" +msgstr "Frise chronologique" + +#: templates/jocondelab/front_base.html:64 +#: templates/jocondelab/front_geo.html:34 +#: templates/jocondelab/front_geo.html:36 +msgid "World map" +msgstr "Mappemonde" + +#: templates/jocondelab/front_base.html:71 +msgid "Search in contents" +msgstr "Rechercher dans les notices" + +#: templates/jocondelab/front_base.html:92 +#, fuzzy +msgid "Source: Wikipedia" +msgstr "Source : Wikipédia" + +#: templates/jocondelab/front_geo.html:43 +msgid "Search for a place" +msgstr "Rechercher un lieu" + +#: templates/jocondelab/front_notice.html:44 +#: templates/jocondelab/partial/notice_list.html:9 msgid "Title:" -msgstr "Titre :" +msgstr "Titre :" -#: templates/jocondelab/front_search.html:30 +#: templates/jocondelab/front_notice.html:50 +#: templates/jocondelab/partial/notice_list.html:10 msgid "Denomination:" -msgstr "Dénomination :" +msgstr "Dénomination :" + +#: templates/jocondelab/front_notice.html:56 +#: templates/jocondelab/partial/notice_list.html:24 +msgid ":" +msgstr " :" + +#: templates/jocondelab/front_notice.html:70 +#, fuzzy +msgid "Description:" +msgstr "Description :" -#: templates/jocondelab/front_search.html:31 -msgid "Author(s):" -msgstr "Auteur(s) :" +#: templates/jocondelab/front_notice.html:76 +msgid "History:" +msgstr "Histoire :" + +#: templates/jocondelab/front_notice.html:82 +msgid "Conservation location:" +msgstr "Lieu de conservation :" + +#: templates/jocondelab/front_notice.html:88 +msgid "Datasheet rights:" +msgstr "Copyright notice :" + +#: templates/jocondelab/front_notice.html:94 +msgid "Images rights:" +msgstr "Droits photographiques :" #: templates/jocondelab/front_search.html:35 -msgid ":" -msgstr " :" - -# Thesaurus Identifiers -msgid "AUTR" -msgstr "Auteur" - -msgid "DOMN" -msgstr "Domaine" - -msgid "ECOL" -msgstr "École" - -msgid "EPOQ" -msgstr "Époque" - -msgid "LIEUX" -msgstr "Lieu" - -msgid "PERI" -msgstr "Période" - -msgid "REPR" -msgstr "Sujet représenté" - -msgid "SREP" -msgstr "Source de la représentation" +msgid "results" +msgstr "résultats" #: templates/jocondelab/term_edit.html:73 msgid "prev" @@ -222,6 +252,10 @@ msgid "Search" msgstr "Rech." +#: templates/jocondelab/partial/notice_list.html:14 +msgid "Author(s):" +msgstr "Auteur(s) :" + #: templates/jocondelab/partial/pagination.html:6 #, python-format msgid "Total number of term in the request : %(total_count)s" @@ -240,3 +274,39 @@ #: templates/registration/login.html:19 msgid "login" msgstr "connex." + +#~ msgid "language" +#~ msgstr "langue" + +# Thesaurus Identifiers +msgctxt "Thesaurus label" +msgid "AUTR" +msgstr "Auteur(s)" + +msgctxt "Thesaurus label" +msgid "DOMN" +msgstr "Domaine(s)" + +msgctxt "Thesaurus label" +msgid "ECOL" +msgstr "École" + +msgctxt "Thesaurus label" +msgid "EPOQ" +msgstr "Époque, style, mouvement" + +msgctxt "Thesaurus label" +msgid "LIEUX" +msgstr "Lieu" + +msgctxt "Thesaurus label" +msgid "PERI" +msgstr "Période de création ou exécution" + +msgctxt "Thesaurus label" +msgid "REPR" +msgstr "Sujet représenté" + +msgctxt "Thesaurus label" +msgid "SREP" +msgstr "Source de la représentation" diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/static/jocondelab/css/front-common.css --- a/src/jocondelab/static/jocondelab/css/front-common.css Thu Aug 22 16:46:19 2013 +0200 +++ b/src/jocondelab/static/jocondelab/css/front-common.css Thu Aug 22 17:20:27 2013 +0200 @@ -177,7 +177,7 @@ /* HEADER > MENUS */ .top-menus { - float: right; + position: absolute; right: 0; } .menu-container { diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/templates/jocondelab/front_notice.html --- a/src/jocondelab/templates/jocondelab/front_notice.html Thu Aug 22 16:46:19 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/front_notice.html Thu Aug 22 17:20:27 2013 +0200 @@ -53,7 +53,7 @@ {% endif %} {% for thesaurus, terms in terms_by_thesaurus.items %} - {% trans thesaurus %}{% trans ':' %} + {% trans thesaurus context 'Thesaurus label' %}{% trans ':' %}
    {% for termtype, terms in terms.items %} diff -r b174c4467f7c -r dc08f5692d80 src/jocondelab/templates/jocondelab/partial/notice_list.html --- a/src/jocondelab/templates/jocondelab/partial/notice_list.html Thu Aug 22 16:46:19 2013 +0200 +++ b/src/jocondelab/templates/jocondelab/partial/notice_list.html Thu Aug 22 17:20:27 2013 +0200 @@ -21,7 +21,7 @@ {% endif %} {% for thesaurus, terms in notice.terms_by_thesaurus.items %}
  • -

    {% trans thesaurus %}{% trans ':' %}

    +

    {% trans thesaurus context 'Thesaurus label' %}{% trans ':' %}