summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-18 19:02:32 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-18 19:02:32 +0100
commit866980919fe2c42fd46aac523fbc04724af5de97 (patch)
tree14945c8269483fcdb3b8b8c49c6a8e6fe740547f
parent2dcb1608f4ae2352987d263ab81eec2596c696b0 (diff)
downloadIshtar-866980919fe2c42fd46aac523fbc04724af5de97.tar.bz2
Ishtar-866980919fe2c42fd46aac523fbc04724af5de97.zip
Update translations
-rw-r--r--archaeological_warehouse/locale/django.pot2
-rw-r--r--ishtar_common/locale/django.pot28
-rw-r--r--translations/de/ishtar_common.po12
-rw-r--r--translations/fr/ishtar_common.po37
4 files changed, 45 insertions, 34 deletions
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot
index cbbeea097..430a51127 100644
--- a/archaeological_warehouse/locale/django.pot
+++ b/archaeological_warehouse/locale/django.pot
@@ -4,7 +4,7 @@
# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2011.
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
+# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
msgid ""
msgstr ""
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index fe237992b..7356bfd36 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -703,10 +703,15 @@ msgid "Json data - Menus"
msgstr ""
#: models.py:934
+#| msgid ""
+#| "Value of the key in the JSON schema. For hierarchical key use \"__\" to "
+#| "explain it. For instance the key 'my_subkey' with data such as {'my_key': "
+#| "{'my_subkey': 'value'}} will be reached with my_key__my_subkey."
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
-"explain it. For instance the key 'my_subkey' with data such as {'my_key': "
-"{'my_subkey': 'value'}} will be reached with my_key__my_subkey."
+"explain it. For instance for the key 'my_subkey' with data such as "
+"{'my_key': {'my_subkey': 'value'}}, its value will be reached with "
+"my_key__my_subkey."
msgstr ""
#: models.py:938
@@ -722,7 +727,8 @@ msgid "Json data - Fields"
msgstr ""
#: models.py:955
-msgid "Content type of the field and of the menu do not match"
+#| msgid "Content type of the field and of the menu do not match"
+msgid "Content types of the field and of the menu do not match"
msgstr ""
#: models.py:1015
@@ -1175,8 +1181,6 @@ msgid "Year of creation"
msgstr ""
#: models.py:2734
-#| msgid ""
-#| "Filling this field is relevant to distinguish old towns to new towns."
msgid "Filling this field is relevant to distinguish old towns from new towns."
msgstr ""
@@ -1426,7 +1430,8 @@ msgid "False"
msgstr ""
#: models_imports.py:505
-msgid "All user can user it"
+#| msgid "All user can user it"
+msgid "All user can use it"
msgstr ""
#: models_imports.py:507
@@ -2374,7 +2379,6 @@ msgid "Adminact: operator of archaeological operations"
msgstr ""
#: templates/ishtar/wizard/wizard_person.html:20
-#| msgid "Number"
msgctxt "phone number"
msgid "Number"
msgstr ""
@@ -2810,14 +2814,20 @@ msgid "Load another random image?"
msgstr ""
#: views.py:99
+#| msgid ""
+#| "PROJECT_SLUG is set to \"default\" change it in your local_settings (or "
+#| "ask your admin to do it)."
msgid ""
-"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask "
+"PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask "
"your admin to do it)."
msgstr ""
#: views.py:104
+#| msgid ""
+#| "The slug of your current profile is set to \"default\" change it on the "
+#| "administration page (or ask your admin to do it)."
msgid ""
-"The slug of your current profile is set to \"default\" change it on the "
+"The slug of your current profile is set to \"default\". Change it on the "
"administration page (or ask your admin to do it)."
msgstr ""
diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po
index 2f4e697c3..2b3943b3b 100644
--- a/translations/de/ishtar_common.po
+++ b/translations/de/ishtar_common.po
@@ -707,8 +707,8 @@ msgstr ""
#: models.py:934
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
-"explain it. For instance the key 'my_subkey' with data such as {'my_key': "
-"{'my_subkey': 'value'}} will be reached with my_key__my_subkey."
+"explain it. For instance for the key 'my_subkey' with data such as {'my_key':"
+" {'my_subkey': 'value'}}, its value will be reached with my_key__my_subkey."
msgstr ""
#: models.py:938
@@ -724,7 +724,7 @@ msgid "Json data - Fields"
msgstr ""
#: models.py:955
-msgid "Content type of the field and of the menu do not match"
+msgid "Content types of the field and of the menu do not match"
msgstr ""
#: models.py:1015
@@ -1427,7 +1427,7 @@ msgid "False"
msgstr ""
#: models_imports.py:505
-msgid "All user can user it"
+msgid "All user can use it"
msgstr ""
#: models_imports.py:507
@@ -2811,13 +2811,13 @@ msgstr ""
#: views.py:99
msgid ""
-"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask "
+"PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask "
"your admin to do it)."
msgstr ""
#: views.py:104
msgid ""
-"The slug of your current profile is set to \"default\" change it on the "
+"The slug of your current profile is set to \"default\". Change it on the "
"administration page (or ask your admin to do it)."
msgstr ""
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index a3d47dd1d..9127fce19 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -5,14 +5,13 @@
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2018-01-18 07:49-0500\n"
+"PO-Revision-Date: 2018-01-18 01:01-0500\n"
"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -739,8 +738,8 @@ msgstr "Données JSON - Menus"
#: models.py:934
msgid ""
"Value of the key in the JSON schema. For hierarchical key use \"__\" to "
-"explain it. For instance the key 'my_subkey' with data such as {'my_key': "
-"{'my_subkey': 'value'}} will be reached with my_key__my_subkey."
+"explain it. For instance for the key 'my_subkey' with data such as {'my_key':"
+" {'my_subkey': 'value'}}, its value will be reached with my_key__my_subkey."
msgstr ""
"Valeur de la clé dans le format JSON. Pour les clés hiérarchiques utiliser « "
"__ ». Par exemple pour la clé 'ma_sousclef' avec des données telles que "
@@ -760,7 +759,7 @@ msgid "Json data - Fields"
msgstr "Donnée JSON - Champs"
#: models.py:955
-msgid "Content type of the field and of the menu do not match"
+msgid "Content types of the field and of the menu do not match"
msgstr "Les types de contenu du champ et du menu ne correspondent pas"
#: models.py:1015
@@ -789,7 +788,7 @@ msgstr "Libellé court"
#: models.py:1323
msgid "Inverse relation"
-msgstr "Relation inversion"
+msgstr "Relation inverse"
#: models.py:1333
msgid "Cannot have symmetrical and an inverse_relation"
@@ -1245,6 +1244,8 @@ msgstr "Année de création"
msgid ""
"Filling this field is relevant to distinguish old towns from new towns."
msgstr ""
+"Remplir ce champ est nécessaire pour distinguer les anciennes communes des "
+"nouvelles communes."
#: models.py:2739
msgid "Cached name"
@@ -1336,7 +1337,7 @@ msgid ""
"administrator."
msgstr ""
"ISHTAR_SCRIPT_DIR n'est pas défini dans votre fichier local_settings. "
-"Contactez votre administrateur."
+"Contactez l'administrateur."
#: models.py:2976
msgid ""
@@ -1359,7 +1360,7 @@ msgid ""
"configuration."
msgstr ""
"Le script « {} »n'est pas un fichier valable de votre répertoire de script. "
-"Vérifiez votre configuration."
+"Vérifiez la configuration."
#: models_imports.py:89
msgid "Class name"
@@ -1502,7 +1503,7 @@ msgid "False"
msgstr "Non"
#: models_imports.py:505
-msgid "All user can user it"
+msgid "All user can use it"
msgstr "Tous les utilisateurs peuvent l'utiliser"
#: models_imports.py:507
@@ -1737,7 +1738,7 @@ msgstr "Import conservateur"
#: models_imports.py:790
msgid "If set to true, do not overload existing values."
-msgstr "Si coché, ne pas surcharger les valeurs existantes."
+msgstr "Si coché, ne surchargera pas les valeurs existantes."
#: models_imports.py:793
msgid "End date"
@@ -2473,7 +2474,7 @@ msgstr "Acte administratif : opérateur des opérations"
#: templates/ishtar/wizard/wizard_person.html:20
msgctxt "phone number"
msgid "Number"
-msgstr ""
+msgstr "Numéro"
#: templates/ishtar/wizard/wizard_person_deletion.html:33
msgid "Scientist in charge of archaeological files"
@@ -2917,20 +2918,20 @@ msgstr "Charger une autre image au hasard ?"
#: views.py:99
msgid ""
-"PROJECT_SLUG is set to \"default\" change it in your local_settings (or ask "
+"PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask "
"your admin to do it)."
msgstr ""
-"PROJECT_SLUG a été laissé à la valeur « default » changez-le dans votre "
-"fichier local_settings (ou demandez à un administrateur de le faire)."
+"Le « slug » du profil actuellement utilisé a été laissé à la valeur « "
+"default ». Changez-le sur la page d'administration (ou demandez à un "
+"administrateur de le faire)."
#: views.py:104
msgid ""
-"The slug of your current profile is set to \"default\" change it on the "
+"The slug of your current profile is set to \"default\". Change it on the "
"administration page (or ask your admin to do it)."
msgstr ""
-"Le « slug » du profil actuellement utilisé a été laissé à la valeur « "
-"default » changez-le sur la page d'administration (ou demandez à un "
-"administrateur de le faire)."
+"PROJECT_SLUG a été laissé à la valeur « default ». Changez-le dans le "
+"fichier local_settings (ou demandez à un administrateur de le faire)."
#: views.py:130
msgid "New person"