diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-07 16:54:33 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-07 16:54:33 +0100 |
commit | 3730159ce403ca4c125fa2f08a718e429120b26f (patch) | |
tree | ad087f2406d8309b4ab06b7b8d2adb9baf7e5873 | |
parent | c0e04135cf0900022a4e476595bb1d6b14b43afc (diff) | |
download | Ishtar-3730159ce403ca4c125fa2f08a718e429120b26f.tar.bz2 Ishtar-3730159ce403ca4c125fa2f08a718e429120b26f.zip |
Update translations
-rw-r--r-- | archaeological_context_records/locale/django.pot | 6 | ||||
-rw-r--r-- | archaeological_files/locale/django.pot | 6 | ||||
-rw-r--r-- | archaeological_files_pdl/forms.py | 2 | ||||
-rw-r--r-- | archaeological_files_pdl/locale/django.pot | 4 | ||||
-rw-r--r-- | archaeological_finds/locale/django.pot | 6 | ||||
-rw-r--r-- | archaeological_operations/locale/django.pot | 11 | ||||
-rw-r--r-- | archaeological_warehouse/locale/django.pot | 2 | ||||
-rw-r--r-- | ishtar_common/locale/django.pot | 32 | ||||
-rw-r--r-- | translations/fr/archaeological_files_pdl.po | 7 |
9 files changed, 9 insertions, 67 deletions
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index b04238db1..39f4d55e9 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -21,7 +21,6 @@ msgid "Operation" msgstr "" #: forms.py:50 -#| msgid "Context record relations" msgid "Context record - 010 - Operation choice" msgstr "" @@ -82,7 +81,6 @@ msgid "General" msgstr "" #: forms.py:139 -#| msgid "Context record search" msgid "Context record - 020 - General" msgstr "" @@ -183,7 +181,6 @@ msgid "Dating type" msgstr "" #: forms.py:277 -#| msgid "Context record relations" msgid "Context record - 030 - Dating" msgstr "" @@ -196,7 +193,6 @@ msgid "Relations" msgstr "" #: forms.py:304 -#| msgid "Context record relations" msgid "Context record - 050 - Relations" msgstr "" @@ -434,7 +430,6 @@ msgid "Point (3D)" msgstr "" #: models.py:320 -#| msgid "Image" msgid "Images" msgstr "" @@ -556,7 +551,6 @@ msgid "Localisation" msgstr "" #: templates/ishtar/sheet_contextrecord.html:127 -#| msgid "No operation linked to this context unit!" msgid "No operation linked to this context record!" msgstr "" diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 76d8a99e2..5386dafae 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -10,7 +10,6 @@ msgid "" msgstr "" #: forms.py:50 forms.py:409 forms.py:437 -#| msgid "File search" msgid "Full text search" msgstr "" @@ -161,7 +160,6 @@ msgid "Parcels" msgstr "" #: forms.py:283 -#| msgid "Archaeological file search" msgid "Archaeological file - 020 - Parcel" msgstr "" @@ -183,7 +181,6 @@ msgid "Research archaeology" msgstr "" #: forms.py:347 -#| msgid "Archaeological file search" msgid "Archaeological file - 045 - Research - General" msgstr "" @@ -268,7 +265,6 @@ msgid "File permit reference" msgstr "" #: forms.py:550 -#| msgid "Archaeological files linked to at least one operation:" msgid "Archaeological file - Administrative act - General" msgstr "" @@ -435,7 +431,6 @@ msgid "Add an operation for this file" msgstr "" #: templates/ishtar/blocks/window_file_nav.html:6 -#| msgid "Creation" msgid "operation" msgstr "" @@ -444,7 +439,6 @@ msgid "Global informations" msgstr "" #: templates/ishtar/dashboards/dashboard_file.html:14 -#| msgid "Total:" msgid "Total" msgstr "" diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 14cb0e4d9..3b38e4fa5 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -238,7 +238,7 @@ class PersonOrgaForm(forms.Form): class FileFormGeneralContractor(CustomForm, PersonOrgaForm): form_label = _(u"General contractor") - form_admin_name = _("Archaeological file - 030 - General contrator") + form_admin_name = _("Archaeological file - 030 - General contractor") form_slug = "file-030-generalcontractor" associated_models = {'general_contractor': models.Person, diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot index 85b4f7f86..c99f4a81f 100644 --- a/archaeological_files_pdl/locale/django.pot +++ b/archaeological_files_pdl/locale/django.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2014. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata msgid "" msgstr "" @@ -109,7 +110,8 @@ msgid "General contractor" msgstr "" #: forms.py:241 -msgid "Archaeological file - 030 - General contrator" +#| msgid "Archaeological file - 030 - General contrator" +msgid "Archaeological file - 030 - General contractor" msgstr "" #: forms.py:265 forms.py:389 diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index d564d418b..084b42a6e 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -203,7 +203,6 @@ msgid "Preservation" msgstr "" #: forms.py:274 -#| msgid "Preservation" msgid "Find - 030 - Preservation" msgstr "" @@ -454,7 +453,6 @@ msgid "Base treatment" msgstr "" #: forms_treatments.py:83 -#| msgid "Treatment name" msgid "Treatment - 020 - General" msgstr "" @@ -543,7 +541,6 @@ msgid "Associated request" msgstr "" #: forms_treatments.py:269 -#| msgid "Treatment request source" msgid "Treatment - 010 - Request choice" msgstr "" @@ -629,7 +626,6 @@ msgid "Modified by" msgstr "" #: forms_treatments.py:387 -#| msgid "Treatment: administrative act deletion" msgid "Treatment - Administrative act - General" msgstr "" @@ -707,7 +703,6 @@ msgid "Treatment request internal reference" msgstr "" #: forms_treatments.py:646 -#| msgid "Treatment request: new administrative act" msgid "Treatment request - Administrative act - General" msgstr "" @@ -1001,7 +996,6 @@ msgid "Collection" msgstr "" #: models_finds.py:753 models_treatments.py:127 -#| msgid "Image" msgid "Images" msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 3ad502eea..c6cb7c976 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -117,7 +117,6 @@ msgid "Relations" msgstr "" #: forms.py:477 -#| msgid "Operation record relations" msgid "Operation - 080 - Relations" msgstr "" @@ -280,7 +279,6 @@ msgid "Abstract" msgstr "" #: forms.py:676 -#| msgid "Operation search" msgid "Operation - 090 - Abstract" msgstr "" @@ -350,7 +348,6 @@ msgid "General" msgstr "" #: forms.py:763 -#| msgid "Operation year" msgid "Operation - 010 - General" msgstr "" @@ -487,12 +484,10 @@ msgid "Towns" msgstr "" #: forms.py:1071 -#| msgid "Operation's town" msgid "Operation - 040 - Towns" msgstr "" #: forms.py:1076 -#| msgid "Operation's town" msgid "Operation - 040 - Towns (2)" msgstr "" @@ -501,7 +496,6 @@ msgid "Parcel" msgstr "" #: forms.py:1098 -#| msgid "Operation search" msgid "Operation - 050 - Parcels" msgstr "" @@ -514,7 +508,6 @@ msgid "Remain types" msgstr "" #: forms.py:1136 -#| msgid "Operation record relations" msgid "Operation - 060 - Remains" msgstr "" @@ -523,7 +516,6 @@ msgid "Remain type" msgstr "" #: forms.py:1152 -#| msgid "Operation code" msgid "Operation - 070 - Periods" msgstr "" @@ -546,7 +538,6 @@ msgid "Archaeological sites" msgstr "" #: forms.py:1225 -#| msgid "Archaeological sites" msgid "Operation - 030 - Archaeological sites" msgstr "" @@ -615,7 +606,6 @@ msgid "You should select an administrative act." msgstr "" #: forms.py:1406 -#| msgid "Operation: administrative act deletion" msgid "Operation - Administrative act - General" msgstr "" @@ -818,7 +808,6 @@ msgid "General comment" msgstr "" #: models.py:355 -#| msgid "Image" msgid "Images" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 984138a94..9a8449dba 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -31,7 +31,6 @@ msgid "Divisions" msgstr "" #: forms.py:76 -#| msgid "Warehouse division types" msgid "Warehouse - 020 - Divisions" msgstr "" @@ -172,7 +171,6 @@ msgid "Packaged finds" msgstr "" #: forms.py:297 -#| msgid "Container localisation" msgid "Container - 020 - Localisation" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 5fbb973e5..db5624737 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -6,6 +6,7 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata msgid "" msgstr "" @@ -46,7 +47,6 @@ msgid "Parents" msgstr "" #: admin.py:482 models.py:1647 -#| msgid "Format" msgid "Form" msgstr "" @@ -56,7 +56,6 @@ msgid "Users" msgstr "" #: admin.py:504 models.py:1716 -#| msgid "field" msgid "Field" msgstr "" @@ -354,7 +353,6 @@ msgstr "" #: forms_common.py:300 forms_common.py:414 forms_common.py:541 #: forms_common.py:924 -#| msgid "Account search" msgid "Full text search" msgstr "" @@ -518,7 +516,6 @@ msgid "Documentation informations" msgstr "" #: forms_common.py:878 -#| msgid "General" msgid "Source - General" msgstr "" @@ -1011,7 +1008,6 @@ msgid "Custom forms" msgstr "" #: models.py:1678 -#| msgid "User type" msgid "User types" msgstr "" @@ -1228,22 +1224,18 @@ msgid "Internal ref." msgstr "" #: models.py:2823 -#| msgid "User type" msgid "License type" msgstr "" #: models.py:2824 -#| msgid "Title types" msgid "License types" msgstr "" #: models.py:2830 -#| msgid "Image" msgid "Image type" msgstr "" #: models.py:2831 -#| msgid "Format types" msgid "Image types" msgstr "" @@ -1252,12 +1244,10 @@ msgid "License" msgstr "" #: models.py:2842 -#| msgid "Authors" msgid "Authors (raw)" msgstr "" #: models.py:2856 -#| msgid "Image" msgid "Images" msgstr "" @@ -1836,7 +1826,6 @@ msgid "Searches in the shortcut menu deal with only your items." msgstr "" #: templates/base.html:41 -#| msgid "Types" msgid "yes" msgstr "" @@ -1882,7 +1871,6 @@ msgstr "" #: templates/blocks/DataTables.html:58 templates/blocks/JQueryJqGrid.html:26 #: templates/ishtar/blocks/window_tables/dynamic_documents.html:45 -#| msgid "Export as:" msgid "Export" msgstr "" @@ -1898,7 +1886,6 @@ msgid "simple" msgstr "" #: templates/blocks/DataTables.html:61 -#| msgid "simple" msgid "Simple CSV" msgstr "" @@ -1930,12 +1917,10 @@ msgid "Add" msgstr "" #: templates/blocks/DataTables.html:157 -#| msgid "Search within all items" msgid "Select all items" msgstr "" #: templates/blocks/DataTables.html:158 -#| msgid "Select the main person" msgid "Select none" msgstr "" @@ -1962,12 +1947,10 @@ msgstr "" #: templates/blocks/bs_form_snippet.html:41 #: templates/blocks/bs_form_snippet.html:65 -#| msgid "Advanced menu" msgid "Advanced search" msgstr "" #: templates/blocks/bs_form_snippet.html:81 -#| msgid "Reset it" msgid "Reset" msgstr "" @@ -2033,7 +2016,6 @@ msgid "Unpin" msgstr "" #: templates/ishtar/blocks/base_shortcut_menu.html:18 -#| msgid "Author selection" msgid "No default selection" msgstr "" @@ -2045,7 +2027,6 @@ msgid "" msgstr "" #: templates/ishtar/blocks/base_shortcut_menu.html:30 -#| msgid "Author selection" msgid "Default selection" msgstr "" @@ -2079,7 +2060,6 @@ msgid "Internal ID" msgstr "" #: templates/ishtar/blocks/window_nav.html:5 -#| msgid "Directory" msgid "History" msgstr "" @@ -2094,7 +2074,6 @@ msgid "Restore this version" msgstr "" #: templates/ishtar/blocks/window_nav.html:34 -#| msgid "Action" msgid "Actions" msgstr "" @@ -2209,7 +2188,6 @@ msgid "User type" msgstr "" #: templates/ishtar/form.html:20 templates/ishtar/wizard/default_wizard.html:43 -#| msgid "Search and select an item" msgid "Search and select an item in the table" msgstr "" @@ -2260,22 +2238,18 @@ msgid "Action" msgstr "" #: templates/ishtar/import_list.html:22 -#| msgid "Link unmatched items" msgid "Unmatched items" msgstr "" #: templates/ishtar/import_list.html:23 -#| msgid "error" msgid "Error" msgstr "" #: templates/ishtar/import_list.html:24 -#| msgid "Control file" msgid "Control" msgstr "" #: templates/ishtar/import_list.html:25 templates/ishtar/import_list.html:54 -#| msgid "Match file" msgid "Match" msgstr "" @@ -2285,8 +2259,6 @@ msgstr "" #: templates/ishtar/import_list.html:58 templates/ishtar/import_list.html:61 #: templates/ishtar/import_list.html:64 -#| msgctxt "filesystem" -#| msgid "File" msgctxt "not a directory" msgid "File" msgstr "" @@ -2726,7 +2698,6 @@ msgid "where the magic happens." msgstr "" #: templates/widgets/image_input.html:13 -#| msgid "Delete" msgid "delete" msgstr "" @@ -2743,7 +2714,6 @@ msgid " (...)" msgstr "" #: utils.py:204 -#| msgid "Contact informations" msgid "Information" msgstr "" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 3a5814035..814398428 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -4,13 +4,14 @@ # Étienne Loks <etienne.loks at peacefrogs net>, 2014. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata +# Étienne Loks <etienne.loks@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-02-07 10:19-0500\n" -"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +"PO-Revision-Date: 2018-02-07 10:50-0500\n" +"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -119,7 +120,7 @@ msgid "General contractor" msgstr "Aménageur" #: forms.py:241 -msgid "Archaeological file - 030 - General contrator" +msgid "Archaeological file - 030 - General contractor" msgstr "Dossier archéologique - 030 - Aménageur" #: forms.py:265 forms.py:389 |