diff options
| -rw-r--r-- | Makefile.example | 2 | ||||
| -rw-r--r-- | archaeological_context_records/locale/django.pot | 8 | ||||
| -rw-r--r-- | archaeological_finds/locale/django.pot | 9 | ||||
| -rw-r--r-- | archaeological_operations/locale/django.pot | 216 | ||||
| -rw-r--r-- | archaeological_warehouse/locale/django.pot | 18 | ||||
| -rw-r--r-- | translations/fr/archaeological_context_records.po | 10 | ||||
| -rw-r--r-- | translations/fr/archaeological_finds.po | 8 | ||||
| -rw-r--r-- | translations/fr/archaeological_operations.po | 221 | ||||
| -rw-r--r-- | translations/fr/archaeological_warehouse.po | 18 | 
9 files changed, 256 insertions, 254 deletions
| diff --git a/Makefile.example b/Makefile.example index f356ce93e..f3ec3f7fd 100644 --- a/Makefile.example +++ b/Makefile.example @@ -248,7 +248,7 @@ fixtures_files:  							archaeological_files.permittype \  	   > '../archaeological_files/fixtures/initial_data-'$(default_data)'.json' -translations_push: makemessages +translations_push: translations_pull makemessages  	zanata-cli push  translations_pull: diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 75cb3b4a4..3320c91a6 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -76,8 +76,8 @@ msgstr ""  msgid "General comment"  msgstr "" -#: forms.py:145 -msgid "Excavation technic" +#: forms.py:145 models.py:255 +msgid "Excavation technique"  msgstr ""  #: forms.py:146 models.py:215 @@ -372,10 +372,6 @@ msgstr ""  msgid "Estimation of a \"Terminus Post Quem\""  msgstr "" -#: models.py:255 -msgid "Excavation technique" -msgstr "" -  #: models.py:258  msgid "Point"  msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 0fda2ed23..21cfba64a 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/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>, 2010-2015.  # 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  msgid ""  msgstr "" @@ -514,7 +515,7 @@ msgstr ""  #: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91  #: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 -#: templates/ishtar/sheet_find.html:227 +#: templates/ishtar/sheet_find.html:228  msgid "Type"  msgstr "" @@ -1251,15 +1252,15 @@ msgstr ""  msgid "SRID:"  msgstr "" -#: templates/ishtar/sheet_find.html:226 +#: templates/ishtar/sheet_find.html:227  msgid "Title"  msgstr "" -#: templates/ishtar/sheet_find.html:228 +#: templates/ishtar/sheet_find.html:229  msgid "Authors"  msgstr "" -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:230  msgid "Link"  msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 35facbbf5..3c8b1c7e5 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -10,12 +10,12 @@ msgid ""  msgstr ""  #: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039 -#: models.py:1241 templates/ishtar/sheet_operation.html:146 +#: models.py:1247 templates/ishtar/sheet_operation.html:151  #: templates/ishtar/blocks/window_tables/parcels.html:10  msgid "Parcels"  msgstr "" -#: forms.py:72 forms.py:205 forms.py:989 models.py:1227 +#: forms.py:72 forms.py:205 forms.py:989 models.py:1233  #: templates/ishtar/blocks/window_tables/parcels.html:7  #: templates/ishtar/dashboards/dashboard_operation.html:432  #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -25,21 +25,21 @@ msgid "Town"  msgstr ""  #: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 -#: models.py:1033 models.py:1225 +#: models.py:1039 models.py:1231  #: templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Year"  msgstr "" -#: forms.py:77 models.py:1228 +#: forms.py:77 models.py:1234  #: templates/ishtar/blocks/window_tables/parcels.html:9  msgid "Section"  msgstr "" -#: forms.py:80 models.py:1230 +#: forms.py:80 models.py:1236  msgid "Parcel number"  msgstr "" -#: forms.py:82 models.py:1232 models.py:1249 models.py:1298 +#: forms.py:82 models.py:1238 models.py:1255 models.py:1304  msgid "Public domain"  msgstr "" @@ -75,8 +75,8 @@ msgstr ""  msgid "Relation type"  msgstr "" -#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878 -#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:849 models.py:884 +#: models.py:917 models.py:1021 models.py:1230 wizards.py:344 wizards.py:355  #: templates/ishtar/sheet_operation.html:4  msgid "Operation"  msgstr "" @@ -113,7 +113,7 @@ msgstr ""  msgid "Parcel (section/number/public domain)"  msgstr "" -#: forms.py:465 forms.py:1273 models.py:844 +#: forms.py:465 forms.py:1273 models.py:850  #: templates/ishtar/dashboards/dashboard_operation.html:390  #: templates/ishtar/dashboards/dashboard_operation.html:411  #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -144,7 +144,7 @@ msgstr ""  msgid "In charge"  msgstr "" -#: forms.py:487 models.py:1009 +#: forms.py:487 models.py:1015  msgid "Scientist in charge"  msgstr "" @@ -250,7 +250,7 @@ msgstr ""  msgid "Associated file"  msgstr "" -#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020 +#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026  #: wizards.py:80  msgid "Archaeological file"  msgstr "" @@ -344,7 +344,7 @@ msgstr ""  msgid "Total surface (m2)"  msgstr "" -#: forms.py:804 models.py:54 models.py:256 models.py:1437 +#: forms.py:804 models.py:54 models.py:256 models.py:1443  msgid "Start date"  msgstr "" @@ -395,7 +395,7 @@ msgstr ""  msgid "Bad operation code"  msgstr "" -#: forms.py:933 models.py:525 models.py:873 +#: forms.py:933 models.py:531 models.py:879  msgid "Operation code"  msgstr "" @@ -436,11 +436,11 @@ msgstr ""  msgid "Prescription on geoarchaeological context"  msgstr "" -#: forms.py:987 forms.py:1009 models.py:284 models.py:1043 +#: forms.py:987 forms.py:1009 models.py:284 models.py:1049  msgid "Towns"  msgstr "" -#: forms.py:1016 models.py:1240 models.py:1435 +#: forms.py:1016 models.py:1246 models.py:1441  msgid "Parcel"  msgstr "" @@ -452,8 +452,8 @@ msgstr ""  msgid "Remain type"  msgstr "" -#: forms.py:1088 templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:197 +#: forms.py:1088 templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:202  msgid "Period"  msgstr "" @@ -486,7 +486,7 @@ msgstr ""  msgid "Would you like to delete this operation?"  msgstr "" -#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000 +#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006  msgid "Index"  msgstr "" @@ -513,7 +513,7 @@ msgstr ""  msgid "You should select a document."  msgstr "" -#: forms.py:1267 forms.py:1334 models.py:924 models.py:994 +#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000  msgid "Act type"  msgstr "" @@ -521,7 +521,7 @@ msgstr ""  msgid "Indexed?"  msgstr "" -#: forms.py:1274 forms.py:1339 models.py:1034 +#: forms.py:1274 forms.py:1339 models.py:1040  #: templates/ishtar/blocks/window_tables/administrativacts.html:10  msgid "Object"  msgstr "" @@ -534,7 +534,7 @@ msgstr ""  msgid "You should select an administrative act."  msgstr "" -#: forms.py:1342 models.py:1031 +#: forms.py:1342 models.py:1037  msgid "Signature date"  msgstr "" @@ -590,7 +590,7 @@ msgstr ""  msgid "Deletion"  msgstr "" -#: ishtar_menu.py:59 models.py:1050 +#: ishtar_menu.py:59 models.py:1056  #: templates/ishtar/sheet_administrativeact.html:4  msgid "Administrative act"  msgstr "" @@ -620,11 +620,11 @@ msgstr ""  msgid "Operations"  msgstr "" -#: models.py:53 models.py:71 models.py:1907 +#: models.py:53 models.py:71 models.py:1913  msgid "Order"  msgstr "" -#: models.py:55 models.py:1438 +#: models.py:55 models.py:1444  msgid "End date"  msgstr "" @@ -740,7 +740,7 @@ msgstr ""  msgid "In charge scientist"  msgstr "" -#: models.py:277 models.py:1220 +#: models.py:277 models.py:1226  msgid "File"  msgstr "" @@ -801,252 +801,252 @@ msgstr ""  msgid "Intercommunal"  msgstr "" -#: models.py:511 +#: models.py:517  msgid "Code patriarche"  msgstr "" -#: models.py:551 +#: models.py:557  msgid "This operation code already exists for this year"  msgstr "" -#: models.py:576 +#: models.py:582  msgid "Number of parcels"  msgstr "" -#: models.py:594 +#: models.py:600  msgid "Number of administrative acts"  msgstr "" -#: models.py:602 +#: models.py:608  msgid "Number of indexed administrative acts"  msgstr "" -#: models.py:610 +#: models.py:616  msgid "Number of context records"  msgstr "" -#: models.py:646 +#: models.py:652  msgid "Number of finds"  msgstr "" -#: models.py:691 +#: models.py:697  msgid "No type"  msgstr "" -#: models.py:722 +#: models.py:728  msgid "Number of sources"  msgstr "" -#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:770 templates/ishtar/dashboards/dashboard_operation.html:309  #: templates/ishtar/dashboards/dashboard_operation.html:575  #: templates/ishtar/dashboards/dashboard_operation.html:611  msgid "Mean"  msgstr "" -#: models.py:814 +#: models.py:820  msgid "Inverse relation"  msgstr "" -#: models.py:818 +#: models.py:824  msgid "Operation relation type"  msgstr "" -#: models.py:819 +#: models.py:825  msgid "Operation relation types"  msgstr "" -#: models.py:832 +#: models.py:838  msgid "Operation record relation"  msgstr "" -#: models.py:833 +#: models.py:839  msgid "Operation record relations"  msgstr "" -#: models.py:872 +#: models.py:878  msgid "Operation year"  msgstr "" -#: models.py:874 +#: models.py:880  msgid "Document code"  msgstr "" -#: models.py:884 +#: models.py:890  msgid "Operation documentation"  msgstr "" -#: models.py:885 +#: models.py:891  msgid "Operation documentations"  msgstr "" -#: models.py:888 +#: models.py:894  msgid "Can view all Operation sources"  msgstr "" -#: models.py:890 +#: models.py:896  msgid "Can view own Operation source"  msgstr "" -#: models.py:892 +#: models.py:898  msgid "Can add own Operation source"  msgstr "" -#: models.py:894 +#: models.py:900  msgid "Can change own Operation source"  msgstr "" -#: models.py:896 +#: models.py:902  msgid "Can delete own Operation source"  msgstr "" -#: models.py:912 models.py:1025 +#: models.py:918 models.py:1031  msgid "Treatment request"  msgstr "" -#: models.py:913 models.py:1030 +#: models.py:919 models.py:1036  msgid "Treatment"  msgstr "" -#: models.py:915 +#: models.py:921  msgid "Intended to"  msgstr "" -#: models.py:917 +#: models.py:923  msgid "Code"  msgstr "" -#: models.py:920 +#: models.py:926  msgid "Associated template"  msgstr "" -#: models.py:921 +#: models.py:927  msgid "Indexed"  msgstr "" -#: models.py:925 +#: models.py:931  msgid "Act types"  msgstr "" -#: models.py:991 models.py:1071 +#: models.py:997 models.py:1077  #: templates/ishtar/blocks/window_tables/administrativacts.html:7  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7  msgid "Ref."  msgstr "" -#: models.py:998 +#: models.py:1004  msgid "Person in charge of the operation"  msgstr "" -#: models.py:1004 +#: models.py:1010  msgid "Archaeological preventive operator"  msgstr "" -#: models.py:1012 +#: models.py:1018  msgid "Signatory"  msgstr "" -#: models.py:1040 +#: models.py:1046  msgid "Departments"  msgstr "" -#: models.py:1041 +#: models.py:1047  msgid "Cached values get from associated departments"  msgstr "" -#: models.py:1044 +#: models.py:1050  msgid "Cached values get from associated towns"  msgstr "" -#: models.py:1051 templates/ishtar/sheet_operation.html:104 -#: templates/ishtar/sheet_operation.html:140 +#: models.py:1057 templates/ishtar/sheet_operation.html:104 +#: templates/ishtar/sheet_operation.html:145  msgid "Administrative acts"  msgstr "" -#: models.py:1054 +#: models.py:1060  msgid "Can view all Administrative acts"  msgstr "" -#: models.py:1056 +#: models.py:1062  msgid "Can view own Administrative act"  msgstr "" -#: models.py:1058 +#: models.py:1064  msgid "Can add own Administrative act"  msgstr "" -#: models.py:1060 +#: models.py:1066  msgid "Can change own Administrative act"  msgstr "" -#: models.py:1062 +#: models.py:1068  msgid "Can delete own Administrative act"  msgstr "" -#: models.py:1165 +#: models.py:1171  msgid "This index already exists for this year"  msgstr "" -#: models.py:1233 +#: models.py:1239  msgid "External ID"  msgstr "" -#: models.py:1236 +#: models.py:1242  msgid "External ID is set automatically"  msgstr "" -#: models.py:1237 +#: models.py:1243  msgid "Address - Locality"  msgstr "" -#: models.py:1433 +#: models.py:1439  msgid "Owner"  msgstr "" -#: models.py:1441 +#: models.py:1447  msgid "Parcel owner"  msgstr "" -#: models.py:1442 +#: models.py:1448  msgid "Parcel owners"  msgstr "" -#: models.py:1468 +#: models.py:1474  msgid "Recorded"  msgstr "" -#: models.py:1469 +#: models.py:1475  msgid "Effective"  msgstr "" -#: models.py:1470 +#: models.py:1476  msgid "Active"  msgstr "" -#: models.py:1471 +#: models.py:1477  msgid "Field completed"  msgstr "" -#: models.py:1472 +#: models.py:1478  msgid "Associated report"  msgstr "" -#: models.py:1473 +#: models.py:1479  msgid "Closed"  msgstr "" -#: models.py:1474 +#: models.py:1480  msgid "Documented and closed"  msgstr "" -#: models.py:1908 +#: models.py:1914  msgid "Is preventive"  msgstr "" -#: models.py:1911 +#: models.py:1917  msgid "Operation type old"  msgstr "" -#: models.py:1912 +#: models.py:1918  msgid "Operation types old"  msgstr "" @@ -1170,43 +1170,47 @@ msgid "Document from this operation"  msgstr ""  #: templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:151 +#: templates/ishtar/sheet_operation.html:156  msgid "Context records"  msgstr "" -#: templates/ishtar/sheet_operation.html:118 +#: templates/ishtar/sheet_operation.html:119  msgid "Context record relations"  msgstr "" -#: templates/ishtar/sheet_operation.html:123 +#: templates/ishtar/sheet_operation.html:124  msgid "Documents from associated context records"  msgstr "" -#: templates/ishtar/sheet_operation.html:128 -#: templates/ishtar/sheet_operation.html:174 +#: templates/ishtar/sheet_operation.html:129 +#: templates/ishtar/sheet_operation.html:179  msgid "Finds"  msgstr "" -#: templates/ishtar/sheet_operation.html:133 +#: templates/ishtar/sheet_operation.html:134  msgid "Documents from associated finds"  msgstr "" -#: templates/ishtar/sheet_operation.html:138 +#: templates/ishtar/sheet_operation.html:139 +msgid "Associated containers" +msgstr "" + +#: templates/ishtar/sheet_operation.html:143  msgid "Statistics"  msgstr "" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:217  #: templates/ishtar/blocks/window_tables/administrativacts.html:8  msgid "Type"  msgstr "" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:181 -#: templates/ishtar/sheet_operation.html:189 -#: templates/ishtar/sheet_operation.html:197 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:186 +#: templates/ishtar/sheet_operation.html:194 +#: templates/ishtar/sheet_operation.html:202 +#: templates/ishtar/sheet_operation.html:217  #: templates/ishtar/dashboards/dashboard_operation.html:18  #: templates/ishtar/dashboards/dashboard_operation.html:164  #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1215,19 +1219,19 @@ msgstr ""  msgid "Number"  msgstr "" -#: templates/ishtar/sheet_operation.html:181 +#: templates/ishtar/sheet_operation.html:186  msgid "Material type"  msgstr "" -#: templates/ishtar/sheet_operation.html:189 +#: templates/ishtar/sheet_operation.html:194  msgid "Object type"  msgstr "" -#: templates/ishtar/sheet_operation.html:205 +#: templates/ishtar/sheet_operation.html:210  msgid "Sources"  msgstr "" -#: templates/ishtar/sheet_operation.html:221 +#: templates/ishtar/sheet_operation.html:226  msgid "Finds by context records"  msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 87fedd778..60b35a633 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -36,7 +36,7 @@ msgstr ""  msgid "Town"  msgstr "" -#: forms.py:79 views.py:98 +#: forms.py:79 views.py:100  msgid "Warehouse search"  msgstr "" @@ -105,7 +105,7 @@ msgstr ""  msgid "This ID already exists for this warehouse."  msgstr "" -#: forms.py:231 forms.py:237 views.py:131 +#: forms.py:231 forms.py:237 views.py:142  msgid "Container search"  msgstr "" @@ -117,7 +117,7 @@ msgstr ""  msgid "Add a new container"  msgstr "" -#: forms.py:244 ishtar_menu.py:36 views.py:93 +#: forms.py:244 ishtar_menu.py:36 views.py:95  msgid "Packaging"  msgstr "" @@ -273,27 +273,27 @@ msgstr ""  msgid "Container localisations"  msgstr "" -#: views.py:110 +#: views.py:112  msgid "Warehouse creation"  msgstr "" -#: views.py:119 +#: views.py:121  msgid "Warehouse modification"  msgstr "" -#: views.py:126 +#: views.py:137  msgid "Warehouse deletion"  msgstr "" -#: views.py:142 +#: views.py:153  msgid "Container creation"  msgstr "" -#: views.py:151 +#: views.py:162  msgid "Container modification"  msgstr "" -#: views.py:158 +#: views.py:177  msgid "Container deletion"  msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 47a9f5333..9cdf05399 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -85,9 +85,9 @@ msgstr "Description"  msgid "General comment"  msgstr "Commentaire général" -#: forms.py:145 -msgid "Excavation technic" -msgstr "" +#: forms.py:145 models.py:255 +msgid "Excavation technique" +msgstr "Méthode de fouille"  #: forms.py:146 models.py:215  msgid "Length (m)" @@ -387,10 +387,6 @@ msgstr ""  msgid "Estimation of a \"Terminus Post Quem\""  msgstr "Estimation d'un « Terminus Post Quem »." -#: models.py:255 -msgid "Excavation technique" -msgstr "Méthode de fouille" -  #: models.py:258  msgid "Point"  msgstr "Point" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 9bdbbeb57..8aa993d5d 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -538,7 +538,7 @@ msgstr "Réf. interne"  #: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91  #: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 -#: templates/ishtar/sheet_find.html:227 +#: templates/ishtar/sheet_find.html:228  msgid "Type"  msgstr "Type" @@ -1281,15 +1281,15 @@ msgstr "Z :"  msgid "SRID:"  msgstr "SRID :" -#: templates/ishtar/sheet_find.html:226 +#: templates/ishtar/sheet_find.html:227  msgid "Title"  msgstr "Titre" -#: templates/ishtar/sheet_find.html:228 +#: templates/ishtar/sheet_find.html:229  msgid "Authors"  msgstr "Auteurs" -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:230  msgid "Link"  msgstr "Lien" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 737ebc29e..af55782dc 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -6,25 +6,26 @@  # 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  msgid ""  msgstr ""  "MIME-Version: 1.0\n"  "Content-Transfer-Encoding: 8bit\n"  "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-03-15 07:12-0400\n" -"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +"PO-Revision-Date: 2017-03-16 05:04-0400\n" +"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"  "Language-Team: \n"  "Language: fr\n"  "Plural-Forms: nplurals=2; plural=n>1;\n"  "X-Generator: Zanata 3.9.6\n"  #: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039 -#: models.py:1241 templates/ishtar/sheet_operation.html:146 +#: models.py:1247 templates/ishtar/sheet_operation.html:151  #: templates/ishtar/blocks/window_tables/parcels.html:10  msgid "Parcels"  msgstr "Parcelles" -#: forms.py:72 forms.py:205 forms.py:989 models.py:1227 +#: forms.py:72 forms.py:205 forms.py:989 models.py:1233  #: templates/ishtar/blocks/window_tables/parcels.html:7  #: templates/ishtar/dashboards/dashboard_operation.html:432  #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -34,21 +35,21 @@ msgid "Town"  msgstr "Commune"  #: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 -#: models.py:1033 models.py:1225 +#: models.py:1039 models.py:1231  #: templates/ishtar/blocks/window_tables/parcels.html:8  msgid "Year"  msgstr "Année" -#: forms.py:77 models.py:1228 +#: forms.py:77 models.py:1234  #: templates/ishtar/blocks/window_tables/parcels.html:9  msgid "Section"  msgstr "Section" -#: forms.py:80 models.py:1230 +#: forms.py:80 models.py:1236  msgid "Parcel number"  msgstr "Numéro de parcelle" -#: forms.py:82 models.py:1232 models.py:1249 models.py:1298 +#: forms.py:82 models.py:1238 models.py:1255 models.py:1304  msgid "Public domain"  msgstr "Domaine public" @@ -84,8 +85,8 @@ msgstr "Il y a des parcelles identiques."  msgid "Relation type"  msgstr "Type de relation" -#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878 -#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:849 models.py:884 +#: models.py:917 models.py:1021 models.py:1230 wizards.py:344 wizards.py:355  #: templates/ishtar/sheet_operation.html:4  msgid "Operation"  msgstr "Opération" @@ -122,7 +123,7 @@ msgstr "Identifiant numérique"  msgid "Parcel (section/number/public domain)"  msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:465 forms.py:1273 models.py:844 +#: forms.py:465 forms.py:1273 models.py:850  #: templates/ishtar/dashboards/dashboard_operation.html:390  #: templates/ishtar/dashboards/dashboard_operation.html:411  #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -153,7 +154,7 @@ msgstr "Est ouvert ?"  msgid "In charge"  msgstr "Responsable du suivi scientifique" -#: forms.py:487 models.py:1009 +#: forms.py:487 models.py:1015  msgid "Scientist in charge"  msgstr "Responsable scientifique" @@ -259,7 +260,7 @@ msgstr "Rechercher une opération"  msgid "Associated file"  msgstr "Dossier associé" -#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020 +#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026  #: wizards.py:80  msgid "Archaeological file"  msgstr "Dossier archéologique" @@ -353,7 +354,7 @@ msgstr "Référence de l'opérateur"  msgid "Total surface (m2)"  msgstr "Surface totale (m2)" -#: forms.py:804 models.py:54 models.py:256 models.py:1437 +#: forms.py:804 models.py:54 models.py:256 models.py:1443  msgid "Start date"  msgstr "Date de début" @@ -411,7 +412,7 @@ msgstr ""  msgid "Bad operation code"  msgstr "Mauvais code d'opération" -#: forms.py:933 models.py:525 models.py:873 +#: forms.py:933 models.py:531 models.py:879  msgid "Operation code"  msgstr "Code de l'opération" @@ -452,11 +453,11 @@ msgstr "Prescription sur une vaste surface"  msgid "Prescription on geoarchaeological context"  msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:987 forms.py:1009 models.py:284 models.py:1043 +#: forms.py:987 forms.py:1009 models.py:284 models.py:1049  msgid "Towns"  msgstr "Communes" -#: forms.py:1016 models.py:1240 models.py:1435 +#: forms.py:1016 models.py:1246 models.py:1441  msgid "Parcel"  msgstr "Parcelle" @@ -468,8 +469,8 @@ msgstr "Types de vestige"  msgid "Remain type"  msgstr "Type de vestige" -#: forms.py:1088 templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:197 +#: forms.py:1088 templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:202  msgid "Period"  msgstr "Période" @@ -502,7 +503,7 @@ msgstr "Voulez-vous clore cette opération ?"  msgid "Would you like to delete this operation?"  msgstr "Voulez-vous supprimer cette opération ?" -#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000 +#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006  msgid "Index"  msgstr "Index" @@ -531,7 +532,7 @@ msgstr "Rechercher une documentation"  msgid "You should select a document."  msgstr "Vous devez sélectionner un document." -#: forms.py:1267 forms.py:1334 models.py:924 models.py:994 +#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000  msgid "Act type"  msgstr "Type d'acte" @@ -539,7 +540,7 @@ msgstr "Type d'acte"  msgid "Indexed?"  msgstr "Indexé ?" -#: forms.py:1274 forms.py:1339 models.py:1034 +#: forms.py:1274 forms.py:1339 models.py:1040  #: templates/ishtar/blocks/window_tables/administrativacts.html:10  msgid "Object"  msgstr "Objet" @@ -552,7 +553,7 @@ msgstr "Rechercher un acte administratif"  msgid "You should select an administrative act."  msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1342 models.py:1031 +#: forms.py:1342 models.py:1037  msgid "Signature date"  msgstr "Date de signature" @@ -610,7 +611,7 @@ msgstr "Clôture"  msgid "Deletion"  msgstr "Suppression" -#: ishtar_menu.py:59 models.py:1050 +#: ishtar_menu.py:59 models.py:1056  #: templates/ishtar/sheet_administrativeact.html:4  msgid "Administrative act"  msgstr "Acte administratif" @@ -640,11 +641,11 @@ msgstr "Informations générales"  msgid "Operations"  msgstr "Opérations" -#: models.py:53 models.py:71 models.py:1907 +#: models.py:53 models.py:71 models.py:1913  msgid "Order"  msgstr "Ordre" -#: models.py:55 models.py:1438 +#: models.py:55 models.py:1444  msgid "End date"  msgstr "Date de fin" @@ -760,7 +761,7 @@ msgstr "Date de clôture"  msgid "In charge scientist"  msgstr "Responsable du suivi scientifique" -#: models.py:277 models.py:1220 +#: models.py:277 models.py:1226  msgid "File"  msgstr "Dossier" @@ -823,252 +824,252 @@ msgstr "OPE"  msgid "Intercommunal"  msgstr "Intercommunal" -#: models.py:511 +#: models.py:517  msgid "Code patriarche"  msgstr "Code patriarche" -#: models.py:551 +#: models.py:557  msgid "This operation code already exists for this year"  msgstr "Ce code d'opération existe déjà pour cette année." -#: models.py:576 +#: models.py:582  msgid "Number of parcels"  msgstr "Nombre de parcelles" -#: models.py:594 +#: models.py:600  msgid "Number of administrative acts"  msgstr "Nombre d'actes administratifs" -#: models.py:602 +#: models.py:608  msgid "Number of indexed administrative acts"  msgstr "Nombre d'actes administratifs indexés" -#: models.py:610 +#: models.py:616  msgid "Number of context records"  msgstr "Nombre d'Unités d'Enregistrement" -#: models.py:646 +#: models.py:652  msgid "Number of finds"  msgstr "Nombre d'éléments de mobilier" -#: models.py:691 +#: models.py:697  msgid "No type"  msgstr "Pas de type" -#: models.py:722 +#: models.py:728  msgid "Number of sources"  msgstr "Nombre de documents" -#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:770 templates/ishtar/dashboards/dashboard_operation.html:309  #: templates/ishtar/dashboards/dashboard_operation.html:575  #: templates/ishtar/dashboards/dashboard_operation.html:611  msgid "Mean"  msgstr "Moyenne" -#: models.py:814 +#: models.py:820  msgid "Inverse relation"  msgstr "Relation inverse" -#: models.py:818 +#: models.py:824  msgid "Operation relation type"  msgstr "Type de relation entre opérations" -#: models.py:819 +#: models.py:825  msgid "Operation relation types"  msgstr "Types de relation entre opérations" -#: models.py:832 +#: models.py:838  msgid "Operation record relation"  msgstr "Relation entre opérations" -#: models.py:833 +#: models.py:839  msgid "Operation record relations"  msgstr "Relations entre opérations" -#: models.py:872 +#: models.py:878  msgid "Operation year"  msgstr "Année de l'opération" -#: models.py:874 +#: models.py:880  msgid "Document code"  msgstr "Code du document" -#: models.py:884 +#: models.py:890  msgid "Operation documentation"  msgstr "Documentation d'une opération" -#: models.py:885 +#: models.py:891  msgid "Operation documentations"  msgstr "Documentations des opérations" -#: models.py:888 +#: models.py:894  msgid "Can view all Operation sources"  msgstr "Peut voir toutes les Documentations d'opération" -#: models.py:890 +#: models.py:896  msgid "Can view own Operation source"  msgstr "Peut voir sa propre Documentation d'opération" -#: models.py:892 +#: models.py:898  msgid "Can add own Operation source"  msgstr "Peut ajouter sa propre Documentation d'opération" -#: models.py:894 +#: models.py:900  msgid "Can change own Operation source"  msgstr "Peut modifier sa propre Documentation d'opération" -#: models.py:896 +#: models.py:902  msgid "Can delete own Operation source"  msgstr "Peut supprimer sa propre Documentation d'opération" -#: models.py:912 models.py:1025 +#: models.py:918 models.py:1031  msgid "Treatment request"  msgstr "Demande de traitement" -#: models.py:913 models.py:1030 +#: models.py:919 models.py:1036  msgid "Treatment"  msgstr "Traitement" -#: models.py:915 +#: models.py:921  msgid "Intended to"  msgstr "Destiné à" -#: models.py:917 +#: models.py:923  msgid "Code"  msgstr "Code" -#: models.py:920 +#: models.py:926  msgid "Associated template"  msgstr "Patron associé" -#: models.py:921 +#: models.py:927  msgid "Indexed"  msgstr "Indexé" -#: models.py:925 +#: models.py:931  msgid "Act types"  msgstr "Types d'acte" -#: models.py:991 models.py:1071 +#: models.py:997 models.py:1077  #: templates/ishtar/blocks/window_tables/administrativacts.html:7  #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7  msgid "Ref."  msgstr "Réf." -#: models.py:998 +#: models.py:1004  msgid "Person in charge of the operation"  msgstr "Responsable d'opération" -#: models.py:1004 +#: models.py:1010  msgid "Archaeological preventive operator"  msgstr "Opérateur d'archéologie préventive" -#: models.py:1012 +#: models.py:1018  msgid "Signatory"  msgstr "Signataire" -#: models.py:1040 +#: models.py:1046  msgid "Departments"  msgstr "Départements" -#: models.py:1041 +#: models.py:1047  msgid "Cached values get from associated departments"  msgstr "Valeur en cache des départements associés" -#: models.py:1044 +#: models.py:1050  msgid "Cached values get from associated towns"  msgstr "Valeur en cache des communes associées" -#: models.py:1051 templates/ishtar/sheet_operation.html:104 -#: templates/ishtar/sheet_operation.html:140 +#: models.py:1057 templates/ishtar/sheet_operation.html:104 +#: templates/ishtar/sheet_operation.html:145  msgid "Administrative acts"  msgstr "Actes administratifs" -#: models.py:1054 +#: models.py:1060  msgid "Can view all Administrative acts"  msgstr "Peut voir tous les Actes administratifs" -#: models.py:1056 +#: models.py:1062  msgid "Can view own Administrative act"  msgstr "Peut voir son propre Acte administratif" -#: models.py:1058 +#: models.py:1064  msgid "Can add own Administrative act"  msgstr "Peut ajouter son propre Acte administratif" -#: models.py:1060 +#: models.py:1066  msgid "Can change own Administrative act"  msgstr "Peut modifier son propre Acte administratif" -#: models.py:1062 +#: models.py:1068  msgid "Can delete own Administrative act"  msgstr "Peut supprimer son propre Acte administratif" -#: models.py:1165 +#: models.py:1171  msgid "This index already exists for this year"  msgstr "Cet index existe déjà pour cette année." -#: models.py:1233 +#: models.py:1239  msgid "External ID"  msgstr "ID externe" -#: models.py:1236 +#: models.py:1242  msgid "External ID is set automatically"  msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:1237 +#: models.py:1243  msgid "Address - Locality"  msgstr "Adresse - Lieu-dit" -#: models.py:1433 +#: models.py:1439  msgid "Owner"  msgstr "Propriétaire" -#: models.py:1441 +#: models.py:1447  msgid "Parcel owner"  msgstr "Propriétaire de parcelle" -#: models.py:1442 +#: models.py:1448  msgid "Parcel owners"  msgstr "Propriétaires de parcelle" -#: models.py:1468 +#: models.py:1474  msgid "Recorded"  msgstr "Enregistré" -#: models.py:1469 +#: models.py:1475  msgid "Effective"  msgstr "Effectif" -#: models.py:1470 +#: models.py:1476  msgid "Active"  msgstr "Actif" -#: models.py:1471 +#: models.py:1477  msgid "Field completed"  msgstr "Terrain achevé" -#: models.py:1472 +#: models.py:1478  msgid "Associated report"  msgstr "Rapport associé" -#: models.py:1473 +#: models.py:1479  msgid "Closed"  msgstr "Clos" -#: models.py:1474 +#: models.py:1480  msgid "Documented and closed"  msgstr "Documenté et clos" -#: models.py:1908 +#: models.py:1914  msgid "Is preventive"  msgstr "Préventif" -#: models.py:1911 +#: models.py:1917  msgid "Operation type old"  msgstr "Type d'opération - ancien" -#: models.py:1912 +#: models.py:1918  msgid "Operation types old"  msgstr "Types d'opération - ancien" @@ -1194,43 +1195,47 @@ msgid "Document from this operation"  msgstr "Documents de cette opération"  #: templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:151 +#: templates/ishtar/sheet_operation.html:156  msgid "Context records"  msgstr "Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:118 +#: templates/ishtar/sheet_operation.html:119  msgid "Context record relations"  msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:123 +#: templates/ishtar/sheet_operation.html:124  msgid "Documents from associated context records"  msgstr "Documents des Unités d'Enregistrement associées" -#: templates/ishtar/sheet_operation.html:128 -#: templates/ishtar/sheet_operation.html:174 +#: templates/ishtar/sheet_operation.html:129 +#: templates/ishtar/sheet_operation.html:179  msgid "Finds"  msgstr "Mobilier" -#: templates/ishtar/sheet_operation.html:133 +#: templates/ishtar/sheet_operation.html:134  msgid "Documents from associated finds"  msgstr "Documents du mobilier associé" -#: templates/ishtar/sheet_operation.html:138 +#: templates/ishtar/sheet_operation.html:139 +msgid "Associated containers" +msgstr "Contenants associés" + +#: templates/ishtar/sheet_operation.html:143  msgid "Statistics"  msgstr "Statistiques" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:217  #: templates/ishtar/blocks/window_tables/administrativacts.html:8  msgid "Type"  msgstr "Type" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:181 -#: templates/ishtar/sheet_operation.html:189 -#: templates/ishtar/sheet_operation.html:197 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:186 +#: templates/ishtar/sheet_operation.html:194 +#: templates/ishtar/sheet_operation.html:202 +#: templates/ishtar/sheet_operation.html:217  #: templates/ishtar/dashboards/dashboard_operation.html:18  #: templates/ishtar/dashboards/dashboard_operation.html:164  #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1239,19 +1244,19 @@ msgstr "Type"  msgid "Number"  msgstr "Nombre" -#: templates/ishtar/sheet_operation.html:181 +#: templates/ishtar/sheet_operation.html:186  msgid "Material type"  msgstr "Type de matériau" -#: templates/ishtar/sheet_operation.html:189 +#: templates/ishtar/sheet_operation.html:194  msgid "Object type"  msgstr "Type d'objet" -#: templates/ishtar/sheet_operation.html:205 +#: templates/ishtar/sheet_operation.html:210  msgid "Sources"  msgstr "Documents" -#: templates/ishtar/sheet_operation.html:221 +#: templates/ishtar/sheet_operation.html:226  msgid "Finds by context records"  msgstr "Mobilier par Unités d'Enregistrement" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 978153b62..689d122df 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -45,7 +45,7 @@ msgstr "Type de dépôt"  msgid "Town"  msgstr "Commune" -#: forms.py:79 views.py:98 +#: forms.py:79 views.py:100  msgid "Warehouse search"  msgstr "Rechercher un dépôt" @@ -114,7 +114,7 @@ msgstr "Index"  msgid "This ID already exists for this warehouse."  msgstr "Cet identifiant existe déjà pour ce dépôt." -#: forms.py:231 forms.py:237 views.py:131 +#: forms.py:231 forms.py:237 views.py:142  msgid "Container search"  msgstr "Rechercher un contenant" @@ -126,7 +126,7 @@ msgstr "Vous devez sélectionner un contenant."  msgid "Add a new container"  msgstr "Ajouter un nouveau contenant" -#: forms.py:244 ishtar_menu.py:36 views.py:93 +#: forms.py:244 ishtar_menu.py:36 views.py:95  msgid "Packaging"  msgstr "Conditionnement" @@ -282,27 +282,27 @@ msgstr "Localisation de contenant"  msgid "Container localisations"  msgstr "Localisations de contenant" -#: views.py:110 +#: views.py:112  msgid "Warehouse creation"  msgstr "Ajouter un dépôt" -#: views.py:119 +#: views.py:121  msgid "Warehouse modification"  msgstr "Modifier un dépôt" -#: views.py:126 +#: views.py:137  msgid "Warehouse deletion"  msgstr "Supprimer un dépôt" -#: views.py:142 +#: views.py:153  msgid "Container creation"  msgstr "Ajouter un contenant" -#: views.py:151 +#: views.py:162  msgid "Container modification"  msgstr "Modifier un contenant" -#: views.py:158 +#: views.py:177  msgid "Container deletion"  msgstr "Supprimer un contenant" | 
