diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-11 01:40:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-11 01:40:59 +0200 |
| commit | 3d0781ac104207d89eb487dd78324f9681694747 (patch) | |
| tree | 3b82d806de3017efcbd89ba17d810f2ea8ab578e | |
| parent | a25984d0634044013f8547f727c2dc6b625406a5 (diff) | |
| download | Ishtar-3d0781ac104207d89eb487dd78324f9681694747.tar.bz2 Ishtar-3d0781ac104207d89eb487dd78324f9681694747.zip | |
Update translation
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 800 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 800 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 800 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 800 |
4 files changed, 1360 insertions, 1840 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index fa7e28db7..58eb37b9f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-08 14:59+0200\n" +"POT-Creation-Date: 2022-07-11 01:38+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -46,14 +46,13 @@ msgstr "" #: archaeological_operations/models.py:2174 #: archaeological_operations/models.py:2191 #: archaeological_operations/models.py:2307 -#: archaeological_operations/models.py:2501 -#: archaeological_operations/models.py:2787 +#: archaeological_operations/models.py:2504 +#: archaeological_operations/models.py:2791 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:353 #: archaeological_operations/wizards.py:365 #: archaeological_warehouse/models.py:803 ishtar_common/forms_common.py:1957 #: ishtar_common/models.py:4850 ishtar_common/views.py:395 -#: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -99,7 +98,7 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:871 archaeological_files/forms.py:908 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -125,7 +124,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1932 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1934 msgid "Code PATRIARCHE" msgstr "" @@ -176,13 +175,13 @@ msgstr "" #: archaeological_context_records/models.py:626 #: archaeological_context_records/models.py:1313 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:922 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 #: archaeological_finds/models_finds.py:1087 #: archaeological_operations/forms.py:496 #: archaeological_operations/forms.py:1141 #: archaeological_operations/forms.py:1631 -#: archaeological_operations/models.py:2809 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:2813 +#: archaeological_operations/models.py:3055 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -216,13 +215,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:761 #: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1686 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:40 #: archaeological_operations/templates/ishtar/sheet_site.html:36 #: archaeological_warehouse/templates/ishtar/sheet_container.html:24 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 -#: na_app/templates/ishtar/sheet_operation.html:40 #: sra_idf_app/templates/ishtar/sheet_operation.html:40 msgid "General" msgstr "" @@ -241,7 +239,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1084 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:206 #: archaeological_operations/forms.py:1113 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 @@ -282,7 +280,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1777 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1623 ishtar_common/forms_common.py:1891 #: ishtar_common/models.py:1012 ishtar_common/models.py:3965 #: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 @@ -302,8 +299,8 @@ msgid "General comment" msgstr "" #: archaeological_context_records/forms.py:313 -#: archaeological_files/forms.py:298 archaeological_files/forms.py:583 -#: archaeological_files/models.py:620 archaeological_files_pdl/forms.py:143 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:595 +#: archaeological_files/models.py:628 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:833 msgid "Total surface (m2)" msgstr "" @@ -346,7 +343,7 @@ msgstr "" #: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:655 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:591 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:556 @@ -358,7 +355,6 @@ msgstr "" #: archaeological_operations/models.py:1128 #: archaeological_operations/templates/ishtar/sheet_operation.html:182 #: ishtar_common/forms.py:988 ishtar_common/forms.py:989 -#: na_app/templates/ishtar/sheet_operation.html:181 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Closing date" msgstr "" @@ -453,7 +449,6 @@ msgstr "" #: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 #: archaeological_finds/models_finds.py:1820 #: archaeological_finds/templates/ishtar/sheet_find.html:215 -#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "" @@ -467,10 +462,7 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 #: archaeological_operations/templates/ishtar/sheet_operation.html:505 -#: cd17_app/templates/ishtar/sheet_find.html:231 #: ishtar_common/models_imports.py:746 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:498 @@ -479,8 +471,8 @@ msgstr "" #: archaeological_context_records/forms.py:471 #: archaeological_context_records/models.py:104 -#: archaeological_files/forms.py:542 archaeological_files/models.py:75 -#: archaeological_files/models.py:683 +#: archaeological_files/forms.py:559 archaeological_files/models.py:75 +#: archaeological_files/models.py:697 #: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_finds/forms.py:1262 #: archaeological_finds/forms_treatments.py:180 @@ -496,11 +488,7 @@ msgstr "" #: archaeological_operations/forms.py:836 #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1129 -#: archaeological_operations/models.py:3052 -#: cd17_app/templates/ishtar/sheet_find.html:232 -#: cd17_app/templates/ishtar/sheet_find.html:347 -#: cd17_app/templates/ishtar/sheet_find.html:385 -#: cd17_app/templates/ishtar/sheet_find.html:423 +#: archaeological_operations/models.py:3056 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -510,8 +498,8 @@ msgstr "" #: archaeological_context_records/forms.py:472 #: archaeological_context_records/models.py:105 -#: archaeological_files/forms.py:547 archaeological_files/models.py:76 -#: archaeological_files/models.py:684 archaeological_finds/forms.py:1263 +#: archaeological_files/forms.py:564 archaeological_files/models.py:76 +#: archaeological_files/models.py:698 archaeological_finds/forms.py:1263 #: archaeological_finds/models_finds.py:3273 #: archaeological_finds/models_treatments.py:745 #: archaeological_finds/templates/ishtar/sheet_find.html:225 @@ -520,13 +508,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3053 -#: cd17_app/templates/ishtar/sheet_find.html:233 -#: cd17_app/templates/ishtar/sheet_find.html:348 -#: cd17_app/templates/ishtar/sheet_find.html:386 -#: cd17_app/templates/ishtar/sheet_find.html:424 -#: cd17_app/templates/ishtar/sheet_find.html:462 -#: ishtar_common/models_imports.py:991 +#: archaeological_operations/models.py:3057 ishtar_common/models_imports.py:991 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -539,7 +521,6 @@ msgstr "" #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1264 #: archaeological_finds/templates/ishtar/sheet_find.html:227 -#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "" @@ -549,7 +530,6 @@ msgstr "" #: archaeological_context_records/models.py:108 #: archaeological_finds/forms.py:1265 #: archaeological_finds/templates/ishtar/sheet_find.html:226 -#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "" @@ -558,7 +538,6 @@ msgstr "" #: archaeological_context_records/models.py:120 #: archaeological_finds/forms.py:1266 #: archaeological_finds/templates/ishtar/sheet_find.html:228 -#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "" @@ -588,8 +567,6 @@ msgstr "" #: archaeological_operations/forms.py:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:66 #: archaeological_operations/templates/ishtar/sheet_operation.html:334 -#: na_app/templates/ishtar/sheet_operation.html:66 -#: na_app/templates/ishtar/sheet_operation.html:337 #: sra_idf_app/templates/ishtar/sheet_operation.html:66 #: sra_idf_app/templates/ishtar/sheet_operation.html:328 msgid "Relations" @@ -623,7 +600,6 @@ msgstr "" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1676 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -674,7 +650,7 @@ msgstr "" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:2002 ishtar_common/forms_common.py:2137 +#: archaeological_operations/forms.py:2004 ishtar_common/forms_common.py:2137 #: ishtar_common/models.py:3018 ishtar_common/models.py:3317 msgid " - duplicate" msgstr "" @@ -857,7 +833,6 @@ msgstr "" #: archaeological_finds/models_finds.py:3265 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1986 ishtar_common/models.py:4853 #: ishtar_common/views.py:403 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -868,7 +843,7 @@ msgstr "" #: archaeological_context_records/models.py:339 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:223 archaeological_finds/models_finds.py:98 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:127 #: archaeological_finds/models_finds.py:247 @@ -881,7 +856,7 @@ msgstr "" #: archaeological_operations/models.py:121 #: archaeological_operations/models.py:139 #: archaeological_operations/models.py:148 -#: archaeological_operations/models.py:3610 +#: archaeological_operations/models.py:3614 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:651 #: archaeological_warehouse/models.py:675 ishtar_common/models.py:663 #: ishtar_common/models.py:718 ishtar_common/models.py:759 @@ -1002,7 +977,7 @@ msgstr "" #: archaeological_context_records/models.py:502 #: archaeological_context_records/tests.py:700 -#: archaeological_files/models.py:457 archaeological_finds/models_finds.py:1234 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1234 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:957 #: archaeological_operations/tests.py:2773 @@ -1081,7 +1056,7 @@ msgid "unit-type" msgstr "" #: archaeological_context_records/models.py:539 -#: archaeological_files/models.py:460 archaeological_operations/models.py:963 +#: archaeological_files/models.py:467 archaeological_operations/models.py:963 #: archaeological_operations/models.py:2355 msgctxt "key for text search" msgid "parcel" @@ -1146,20 +1121,20 @@ msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:620 -#: archaeological_files/models.py:522 archaeological_finds/models_finds.py:399 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:399 #: archaeological_finds/models_finds.py:1766 #: archaeological_finds/models_treatments.py:249 #: archaeological_finds/models_treatments.py:1090 -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2802 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1066 ishtar_common/models.py:3880 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:401 +#: archaeological_files/models.py:532 archaeological_finds/models_finds.py:401 #: archaeological_finds/models_finds.py:1768 -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2805 #: archaeological_warehouse/models.py:387 #: archaeological_warehouse/models.py:1068 msgid "External ID is set automatically" @@ -1200,14 +1175,14 @@ msgstr "" #: archaeological_context_records/models.py:741 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:87 -#: archaeological_files/models.py:704 archaeological_finds/models_finds.py:1961 +#: archaeological_files/models.py:718 archaeological_finds/models_finds.py:1961 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:1138 #: archaeological_finds/templates/ishtar/sheet_find.html:70 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:402 #: archaeological_operations/models.py:1253 -#: archaeological_operations/models.py:2546 +#: archaeological_operations/models.py:2550 #: archaeological_operations/templates/ishtar/sheet_operation.html:57 #: archaeological_operations/templates/ishtar/sheet_site.html:94 #: archaeological_warehouse/models.py:374 @@ -1215,10 +1190,9 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3990 +#: ishtar_common/models.py:3990 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 -#: na_app/templates/ishtar/sheet_operation.html:57 #: sra_idf_app/templates/ishtar/sheet_find.html:70 #: sra_idf_app/templates/ishtar/sheet_operation.html:57 msgid "Documents" @@ -1230,19 +1204,19 @@ msgstr "" #: archaeological_finds/models_treatments.py:1145 #: archaeological_operations/models.py:408 #: archaeological_operations/models.py:1259 -#: archaeological_operations/models.py:2553 +#: archaeological_operations/models.py:2557 #: archaeological_warehouse/models.py:381 #: archaeological_warehouse/models.py:1080 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:753 -#: archaeological_files/models.py:708 archaeological_finds/models_finds.py:1979 +#: archaeological_files/models.py:722 archaeological_finds/models_finds.py:1979 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:413 #: archaeological_operations/models.py:1264 -#: archaeological_operations/models.py:2805 ishtar_common/models.py:2365 +#: archaeological_operations/models.py:2809 ishtar_common/models.py:2365 #: ishtar_common/models.py:2657 ishtar_common/models.py:3346 #: ishtar_common/models_common.py:1926 ishtar_common/models_common.py:1949 msgid "Cached name" @@ -1257,7 +1231,7 @@ msgstr "" #: archaeological_context_records/models.py:759 #: archaeological_context_records/models.py:765 -#: archaeological_files/models.py:712 archaeological_finds/models_finds.py:1983 +#: archaeological_files/models.py:726 archaeological_finds/models_finds.py:1983 #: archaeological_finds/models_finds.py:1989 #: archaeological_finds/models_finds.py:1995 #: archaeological_finds/models_finds.py:2001 @@ -1414,9 +1388,6 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 #: ishtar_common/views.py:1004 ishtar_common/views.py:1076 -#: na_app/templates/ishtar/sheet_operation.html:84 -#: na_app/templates/ishtar/sheet_operation.html:395 -#: na_app/templates/ishtar/sheet_operation.html:479 #: sra_idf_app/templates/ishtar/sheet_operation.html:84 #: sra_idf_app/templates/ishtar/sheet_operation.html:386 #: sra_idf_app/templates/ishtar/sheet_operation.html:470 @@ -1426,8 +1397,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 -#: cd17_app/templates/ishtar/sheet_find.html:79 -#: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 msgid "Custom fields" @@ -1440,10 +1409,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:3022 #: ishtar_common/templates/ishtar/sheet_document.html:37 -#: na_app/templates/ishtar/sheet_operation.html:122 #: sra_idf_app/templates/ishtar/sheet_find.html:137 #: sra_idf_app/templates/ishtar/sheet_operation.html:120 msgid "Complete identifier" @@ -1451,10 +1418,9 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_files/templates/ishtar/sheet_file.html:102 -#: archaeological_files/templates/ishtar/sheet_file.html:265 +#: archaeological_files/templates/ishtar/sheet_file.html:267 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:190 -#: na_app/templates/ishtar/sheet_operation.html:189 #: sra_idf_app/templates/ishtar/sheet_operation.html:188 msgid "Surface" msgstr "" @@ -1469,7 +1435,6 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 #: ishtar_common/models_common.py:1903 -#: na_app/templates/ishtar/sheet_operation.html:282 #: sra_idf_app/templates/ishtar/sheet_operation.html:273 msgid "Localisation" msgstr "" @@ -1480,9 +1445,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 -#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 #: sra_idf_app/templates/ishtar/sheet_operation.html:244 msgid "Sheet" @@ -1494,7 +1457,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 #: archaeological_operations/templates/ishtar/sheet_operation.html:260 -#: na_app/templates/ishtar/sheet_operation.html:267 #: sra_idf_app/templates/ishtar/sheet_operation.html:258 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -1522,13 +1484,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: cd17_app/templates/ishtar/sheet_find.html:343 -#: cd17_app/templates/ishtar/sheet_find.html:381 -#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4748 -#: ishtar_common/models.py:4881 ishtar_common/models.py:4959 -#: ishtar_common/models_common.py:1829 ishtar_common/models_common.py:1844 -#: ishtar_common/models_imports.py:984 -#: na_app/templates/ishtar/sheet_operation.html:153 +#: ishtar_common/models.py:4748 ishtar_common/models.py:4881 +#: ishtar_common/models.py:4959 ishtar_common/models_common.py:1829 +#: ishtar_common/models_common.py:1844 ishtar_common/models_imports.py:984 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 #: sra_idf_app/templates/ishtar/sheet_find.html:418 @@ -1539,14 +1497,12 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 -#: na_app/templates/ishtar/sheet_operation.html:158 #: sra_idf_app/templates/ishtar/sheet_operation.html:156 msgid "Active file" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 -#: na_app/templates/ishtar/sheet_operation.html:161 #: sra_idf_app/templates/ishtar/sheet_operation.html:159 msgid "Closed operation" msgstr "" @@ -1554,7 +1510,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:225 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 -#: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:182 msgid "by" msgstr "" @@ -1571,14 +1526,12 @@ msgstr "E-Mail-Adresse" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 #: archaeological_operations/templates/ishtar/sheet_operation.html:398 -#: na_app/templates/ishtar/sheet_operation.html:400 #: sra_idf_app/templates/ishtar/sheet_operation.html:391 msgid "Documents from associated finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:276 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 -#: na_app/templates/ishtar/sheet_operation.html:366 #: sra_idf_app/templates/ishtar/sheet_operation.html:357 msgid "Context record relations" msgstr "" @@ -1616,23 +1569,23 @@ msgstr "" msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:144 +#: archaeological_files/admin.py:145 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:148 +#: archaeological_files/admin.py:149 msgid "To" msgstr "" -#: archaeological_files/admin.py:165 +#: archaeological_files/admin.py:166 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:211 +#: archaeological_files/admin.py:212 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:215 +#: archaeological_files/admin.py:216 msgid "{} item(s) already in database." msgstr "" @@ -1641,9 +1594,9 @@ msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 -#: archaeological_files/forms.py:329 archaeological_files/forms.py:878 -#: archaeological_files/forms.py:915 archaeological_files/models.py:373 -#: archaeological_files/models.py:514 +#: archaeological_files/forms.py:329 archaeological_files/forms.py:890 +#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/models.py:521 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 #: archaeological_finds/forms.py:1377 @@ -1660,12 +1613,12 @@ msgstr "" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:486 #: archaeological_operations/forms.py:789 #: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1934 +#: archaeological_operations/forms.py:1936 #: archaeological_operations/models.py:809 #: archaeological_operations/models.py:1166 #: archaeological_operations/models.py:2305 -#: archaeological_operations/models.py:2525 -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2794 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:797 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1673,7 +1626,7 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 -#: archaeological_files/forms.py:332 archaeological_files/models.py:516 +#: archaeological_files/forms.py:332 archaeological_files/models.py:523 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:487 #: archaeological_operations/models.py:1167 msgid "Numeric reference" @@ -1687,8 +1640,8 @@ msgstr "" msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:887 -#: archaeological_files/forms.py:925 archaeological_files/models.py:1211 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 +#: archaeological_files/forms.py:937 archaeological_files/models.py:1319 #: archaeological_operations/forms.py:499 #: archaeological_operations/forms.py:1634 #: archaeological_operations/models.py:2177 @@ -1702,13 +1655,13 @@ msgstr "" msgid "Department" msgstr "" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:935 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 msgid "File name" msgstr "" #: archaeological_files/forms.py:95 archaeological_files/forms.py:207 -#: archaeological_files/forms.py:285 archaeological_files/models.py:374 -#: archaeological_files/models.py:379 archaeological_files/models.py:528 +#: archaeological_files/forms.py:285 archaeological_files/models.py:381 +#: archaeological_files/models.py:386 archaeological_files/models.py:535 #: archaeological_files_pdl/forms.py:65 msgid "File type" msgstr "" @@ -1723,18 +1676,18 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:98 archaeological_files/forms.py:392 -#: archaeological_files/models.py:293 archaeological_files/models.py:378 -#: archaeological_files/models.py:577 archaeological_files_pdl/forms.py:100 +#: archaeological_files/models.py:300 archaeological_files/models.py:385 +#: archaeological_files/models.py:584 archaeological_files_pdl/forms.py:100 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:99 archaeological_files/forms.py:394 -#: archaeological_files/models.py:582 -msgid "Permit reference" +#: archaeological_files/models.py:589 +msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 -#: archaeological_files/forms.py:479 archaeological_files/models.py:629 +#: archaeological_files/forms.py:479 archaeological_files/models.py:637 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 #: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 @@ -1749,8 +1702,11 @@ msgstr "" #: archaeological_operations/forms.py:871 #: archaeological_operations/forms.py:1393 #: archaeological_operations/forms.py:1514 +#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1699 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:2546 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:364 #: archaeological_warehouse/models.py:1036 ishtar_common/forms_common.py:1621 @@ -1769,26 +1725,26 @@ msgid "In charge" msgstr "" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:937 archaeological_files/models.py:540 +#: archaeological_files/forms.py:949 archaeological_files/models.py:547 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:978 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 #: archaeological_operations/forms.py:552 -#: archaeological_operations/forms.py:1638 ishtar_common/forms.py:921 +#: archaeological_operations/forms.py:1639 ishtar_common/forms.py:921 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:986 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:558 -#: archaeological_operations/forms.py:1644 +#: archaeological_operations/forms.py:1645 msgid "Modified by" msgstr "" @@ -1797,7 +1753,7 @@ msgid "Archaeological file search" msgstr "" #: archaeological_files/forms.py:198 archaeological_files/forms.py:283 -#: archaeological_files/models.py:596 archaeological_files_pdl/forms.py:75 +#: archaeological_files/models.py:604 archaeological_files_pdl/forms.py:75 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1122 #: archaeological_operations/forms.py:683 @@ -1809,12 +1765,11 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:198 archaeological_files/forms.py:410 -#: archaeological_files/models.py:598 archaeological_files_pdl/forms.py:78 +#: archaeological_files/models.py:606 archaeological_files_pdl/forms.py:78 #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "" @@ -1851,16 +1806,15 @@ msgstr "" msgid "Date before" msgstr "" -#: archaeological_files/forms.py:256 archaeological_files/models.py:532 +#: archaeological_files/forms.py:256 archaeological_files/models.py:539 #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:352 -#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "" -#: archaeological_files/forms.py:281 archaeological_files/models.py:527 +#: archaeological_files/forms.py:281 archaeological_files/models.py:534 #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1092 @@ -1869,42 +1823,40 @@ msgstr "" #: archaeological_operations/forms.py:1229 #: archaeological_operations/forms.py:1384 #: archaeological_operations/forms.py:1499 -#: archaeological_operations/forms.py:1990 +#: archaeological_operations/forms.py:1992 #: archaeological_operations/models.py:362 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:346 -#: cd17_app/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:409 ishtar_common/forms_common.py:468 -#: ishtar_common/forms_common.py:645 ishtar_common/forms_common.py:772 -#: ishtar_common/forms_common.py:863 ishtar_common/forms_common.py:1099 -#: ishtar_common/forms_common.py:1150 ishtar_common/models.py:662 -#: ishtar_common/models.py:701 ishtar_common/models.py:1006 -#: ishtar_common/models.py:1497 ishtar_common/models.py:1879 -#: ishtar_common/models.py:2353 ishtar_common/models.py:2641 -#: ishtar_common/models.py:2968 ishtar_common/models.py:4724 -#: ishtar_common/models_common.py:1900 ishtar_common/models_common.py:1949 -#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 -#: ishtar_common/models_imports.py:513 ishtar_common/models_imports.py:530 -#: ishtar_common/models_imports.py:638 ishtar_common/models_imports.py:948 +#: archaeological_warehouse/models.py:346 ishtar_common/forms_common.py:409 +#: ishtar_common/forms_common.py:468 ishtar_common/forms_common.py:645 +#: ishtar_common/forms_common.py:772 ishtar_common/forms_common.py:863 +#: ishtar_common/forms_common.py:1099 ishtar_common/forms_common.py:1150 +#: ishtar_common/models.py:662 ishtar_common/models.py:701 +#: ishtar_common/models.py:1006 ishtar_common/models.py:1497 +#: ishtar_common/models.py:1879 ishtar_common/models.py:2353 +#: ishtar_common/models.py:2641 ishtar_common/models.py:2968 +#: ishtar_common/models.py:4724 ishtar_common/models_common.py:1900 +#: ishtar_common/models_common.py:1949 ishtar_common/models_imports.py:82 +#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:513 +#: ishtar_common/models_imports.py:530 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:948 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 -#: na_app/templates/ishtar/sheet_operation.html:137 #: sra_idf_app/templates/ishtar/sheet_find.html:456 #: sra_idf_app/templates/ishtar/sheet_operation.html:135 msgid "Name" msgstr "" -#: archaeological_files/forms.py:287 archaeological_files/models.py:604 +#: archaeological_files/forms.py:287 archaeological_files/models.py:612 #: archaeological_files_pdl/forms.py:447 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:304 archaeological_files/models.py:625 +#: archaeological_files/forms.py:304 archaeological_files/models.py:633 msgid "Main address" msgstr "" @@ -1925,9 +1877,8 @@ msgstr "" #: archaeological_operations/forms.py:1138 #: archaeological_operations/forms.py:1154 #: archaeological_operations/forms.py:1160 -#: archaeological_operations/models.py:2810 +#: archaeological_operations/models.py:2814 #: archaeological_operations/templates/ishtar/sheet_operation.html:445 -#: na_app/templates/ishtar/sheet_operation.html:447 #: sra_idf_app/templates/ishtar/sheet_operation.html:438 msgid "Parcels" msgstr "" @@ -1940,12 +1891,12 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:378 archaeological_files/models.py:561 +#: archaeological_files/forms.py:378 archaeological_files/models.py:568 msgid "Responsible for planning service" msgstr "" -#: archaeological_files/forms.py:400 archaeological_files/forms.py:573 -#: archaeological_files/models.py:622 archaeological_files_pdl/forms.py:151 +#: archaeological_files/forms.py:400 archaeological_files/forms.py:585 +#: archaeological_files/models.py:630 archaeological_files_pdl/forms.py:151 msgid "Total developed surface (m2)" msgstr "" @@ -1959,20 +1910,20 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:439 archaeological_files/models.py:632 +#: archaeological_files/forms.py:439 archaeological_files/models.py:640 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2532 ishtar_common/models_common.py:1853 +#: archaeological_operations/models.py:2535 ishtar_common/models_common.py:1853 msgid "Departments" msgstr "" -#: archaeological_files/forms.py:459 archaeological_files/models.py:656 +#: archaeological_files/forms.py:459 archaeological_files/models.py:664 #: archaeological_operations/forms.py:518 #: archaeological_operations/models.py:884 -#: archaeological_operations/models.py:2486 +#: archaeological_operations/models.py:2489 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:462 archaeological_files/models.py:640 +#: archaeological_files/forms.py:462 archaeological_files/models.py:648 msgid "Requested operation type" msgstr "" @@ -1980,11 +1931,11 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:488 archaeological_files/models.py:662 +#: archaeological_files/forms.py:488 archaeological_files/models.py:670 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:489 archaeological_files/models.py:664 +#: archaeological_files/forms.py:489 archaeological_files/models.py:672 msgid "Protected area" msgstr "" @@ -2017,84 +1968,93 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:552 archaeological_files/models.py:685 -msgid "Ground start date" +#: archaeological_files/forms.py:544 archaeological_files/models.py:689 +msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:557 archaeological_files/models.py:686 -msgid "Ground end date" +#: archaeological_files/forms.py:549 archaeological_files/models.py:692 +msgid "Study period" msgstr "" -#: archaeological_files/forms.py:562 archaeological_files/models.py:681 -msgid "Study period" +#: archaeological_files/forms.py:554 archaeological_files/models.py:695 +msgid "Report due period" +msgstr "" + +#: archaeological_files/forms.py:569 archaeological_files/models.py:699 +msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:567 archaeological_files/models.py:688 +#: archaeological_files/forms.py:574 archaeological_files/models.py:700 +msgid "Ground end date" +msgstr "" + +#: archaeological_files/forms.py:579 archaeological_files/models.py:702 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:590 +#: archaeological_files/forms.py:602 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:650 archaeological_files/forms.py:652 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/forms.py:662 archaeological_files/forms.py:664 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:342 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:651 archaeological_files/forms.py:653 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/forms.py:663 archaeological_files/forms.py:665 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:343 msgid "Days" msgstr "" -#: archaeological_files/forms.py:654 archaeological_files/models.py:114 -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/forms.py:666 archaeological_files/models.py:114 +#: archaeological_files/models.py:1509 archaeological_files/models.py:1525 +#: archaeological_files/templates/ishtar/sheet_file.html:281 +#: archaeological_files/templates/ishtar/sheet_file.html:333 msgid "Job" msgstr "" -#: archaeological_files/forms.py:674 archaeological_files/models.py:79 +#: archaeological_files/forms.py:686 archaeological_files/models.py:79 #: archaeological_files/models.py:80 archaeological_files/models.py:91 -#: archaeological_files/models.py:194 archaeological_files/models.py:677 +#: archaeological_files/models.py:201 archaeological_files/models.py:685 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:740 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:741 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:753 -#: archaeological_files/templates/ishtar/sheet_file.html:275 +#: archaeological_files/forms.py:765 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:755 +#: archaeological_files/forms.py:767 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:761 archaeological_files/forms.py:763 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/forms.py:773 archaeological_files/forms.py:775 +#: archaeological_files/templates/ishtar/sheet_file.html:391 +#: archaeological_files/templates/ishtar/sheet_file.html:394 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:765 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/forms.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:385 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:916 -#: archaeological_files/forms.py:1052 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 +#: archaeological_files/forms.py:1064 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2107,85 +2067,84 @@ msgstr "" #: archaeological_finds/models_treatments.py:1085 #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 -#: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2471 -#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3879 +#: archaeological_operations/forms.py:1757 +#: archaeological_operations/models.py:2474 ishtar_common/models.py:3879 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "" -#: archaeological_files/forms.py:882 archaeological_files/forms.py:919 -#: archaeological_files/forms.py:1041 +#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 +#: archaeological_files/forms.py:1053 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 #: archaeological_operations/forms.py:1628 -#: archaeological_operations/forms.py:1688 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:2207 -#: archaeological_operations/models.py:2462 +#: archaeological_operations/models.py:2465 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:883 +#: archaeological_files/forms.py:895 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:920 +#: archaeological_files/forms.py:932 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 #: archaeological_operations/forms.py:1629 -#: archaeological_operations/forms.py:1825 +#: archaeological_operations/forms.py:1827 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:927 +#: archaeological_files/forms.py:939 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 #: archaeological_operations/forms.py:1635 -#: archaeological_operations/forms.py:1695 -#: archaeological_operations/models.py:2526 +#: archaeological_operations/forms.py:1696 +#: archaeological_operations/models.py:2529 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:930 +#: archaeological_files/forms.py:942 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:933 +#: archaeological_files/forms.py:945 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:958 +#: archaeological_files/forms.py:970 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:960 +#: archaeological_files/forms.py:972 msgid "File year" msgstr "" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:974 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:965 +#: archaeological_files/forms.py:977 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:975 +#: archaeological_files/forms.py:987 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1039 +#: archaeological_files/forms.py:1051 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:725 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:747 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:666 @@ -2193,7 +2152,7 @@ msgstr "" #: archaeological_operations/models.py:1683 #: archaeological_operations/models.py:2190 #: archaeological_operations/models.py:2306 -#: archaeological_operations/models.py:2508 +#: archaeological_operations/models.py:2511 #: archaeological_operations/wizards.py:89 ishtar_common/views.py:394 msgid "Archaeological file" msgstr "" @@ -2208,7 +2167,7 @@ msgstr "" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3267 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2562 +#: archaeological_operations/models.py:2566 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2230,7 +2189,7 @@ msgid "Def. daily number on ground" msgstr "" #: archaeological_files/models.py:102 -msgid "Def. daily number" +msgid "Def. daily number on study" msgstr "" #: archaeological_files/models.py:108 @@ -2275,7 +2234,6 @@ msgstr "" #: archaeological_files/models.py:183 #: archaeological_operations/templates/ishtar/sheet_operation.html:207 -#: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:205 msgid "days" msgstr "" @@ -2294,115 +2252,115 @@ msgstr "" msgid "linear m." msgstr "" -#: archaeological_files/models.py:198 +#: archaeological_files/models.py:205 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:201 ishtar_common/models_common.py:160 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:160 #: ishtar_common/models_common.py:191 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:205 ishtar_common/models_common.py:164 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:164 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." msgstr "" -#: archaeological_files/models.py:211 +#: archaeological_files/models.py:218 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:213 archaeological_files/models.py:253 +#: archaeological_files/models.py:220 archaeological_files/models.py:260 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:221 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:216 ishtar_common/models_imports.py:751 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:751 msgid "Unit" msgstr "" -#: archaeological_files/models.py:219 +#: archaeological_files/models.py:226 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:222 +#: archaeological_files/models.py:229 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:224 ishtar_common/models.py:1499 +#: archaeological_files/models.py:231 ishtar_common/models.py:1499 #: ishtar_common/models.py:1909 ishtar_common/models.py:3221 #: ishtar_common/models_common.py:170 ishtar_common/models_imports.py:124 #: ishtar_common/models_imports.py:643 msgid "Available" msgstr "" -#: archaeological_files/models.py:230 archaeological_warehouse/forms.py:752 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:752 #: ishtar_common/admin.py:999 ishtar_common/admin.py:1018 #: ishtar_common/models.py:2214 ishtar_common/models_common.py:702 msgid "Parent" msgstr "" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:238 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:236 +#: archaeological_files/models.py:243 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:237 +#: archaeological_files/models.py:244 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:280 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:274 +#: archaeological_files/models.py:281 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:294 +#: archaeological_files/models.py:301 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:305 +#: archaeological_files/models.py:312 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:325 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:319 +#: archaeological_files/models.py:326 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:329 +#: archaeological_files/models.py:336 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:338 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:340 msgid "Category" msgstr "" -#: archaeological_files/models.py:337 +#: archaeological_files/models.py:344 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:338 +#: archaeological_files/models.py:345 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:375 archaeological_finds/models_finds.py:1132 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1132 #: archaeological_operations/models.py:191 #: archaeological_operations/models.py:810 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 @@ -2416,13 +2374,13 @@ msgstr "" msgid "Area" msgstr "" -#: archaeological_files/models.py:376 archaeological_finds/models_finds.py:1135 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1135 #: archaeological_operations/models.py:192 #: archaeological_operations/models.py:811 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:385 archaeological_finds/models_finds.py:1156 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1156 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2439,12 +2397,6 @@ msgstr "" #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:487 -#: na_app/templates/ishtar/sheet_operation.html:497 -#: na_app/templates/ishtar/sheet_operation.html:507 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_operation.html:451 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 @@ -2454,15 +2406,15 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:386 +#: archaeological_files/models.py:393 msgid "Total surface (km2)" msgstr "" -#: archaeological_files/models.py:387 +#: archaeological_files/models.py:394 msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:437 archaeological_files/models.py:593 +#: archaeological_files/models.py:444 archaeological_files/models.py:601 #: archaeological_files_pdl/forms.py:124 archaeological_files_pdl/forms.py:168 #: archaeological_operations/forms.py:1111 #: archaeological_operations/forms.py:1127 @@ -2473,17 +2425,16 @@ msgstr "" #: archaeological_operations/models.py:895 #: archaeological_operations/models.py:897 #: archaeological_operations/models.py:1184 -#: archaeological_operations/models.py:2538 +#: archaeological_operations/models.py:2541 #: archaeological_operations/templates/ishtar/sheet_operation.html:130 #: ishtar_common/forms_common.py:1268 ishtar_common/forms_common.py:1281 #: ishtar_common/forms_common.py:1282 ishtar_common/models.py:2207 #: ishtar_common/models_common.py:1932 -#: na_app/templates/ishtar/sheet_operation.html:130 #: sra_idf_app/templates/ishtar/sheet_operation.html:128 msgid "Towns" msgstr "" -#: archaeological_files/models.py:448 archaeological_finds/models_finds.py:1238 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1238 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:948 @@ -2494,7 +2445,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:450 +#: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1036 #: archaeological_operations/models.py:240 #: archaeological_warehouse/models.py:859 ishtar_common/models.py:3645 @@ -2502,19 +2453,19 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:453 +#: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 #: archaeological_operations/models.py:246 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:464 archaeological_operations/models.py:967 +#: archaeological_files/models.py:471 archaeological_operations/models.py:967 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:971 @@ -2525,7 +2476,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:977 @@ -2539,96 +2490,97 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:474 +#: archaeological_files/models.py:481 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:477 +#: archaeological_files/models.py:484 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:481 +#: archaeological_files/models.py:488 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:485 +#: archaeological_files/models.py:492 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:489 archaeological_finds/models_finds.py:1444 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1444 #: archaeological_operations/models.py:262 #: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:2451 #: archaeological_warehouse/models.py:866 ishtar_common/models.py:3705 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:492 archaeological_finds/models_finds.py:1595 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1595 #: archaeological_finds/models_treatments.py:1045 #: archaeological_finds/tests.py:1328 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:496 archaeological_operations/models.py:2386 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2386 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:500 archaeological_operations/models.py:2390 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2390 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:519 +#: archaeological_files/models.py:526 #: archaeological_finds/models_treatments.py:1087 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1890 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:546 +#: archaeological_files/models.py:553 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:551 +#: archaeological_files/models.py:558 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:565 +#: archaeological_files/models.py:572 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:579 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:594 msgid "Main town" msgstr "" -#: archaeological_files/models.py:600 archaeological_files_pdl/forms.py:407 +#: archaeological_files/models.py:608 archaeological_files_pdl/forms.py:407 msgid "Date of planning service file" msgstr "" -#: archaeological_files/models.py:618 +#: archaeological_files/models.py:626 msgid "Instruction deadline" msgstr "" -#: archaeological_files/models.py:624 archaeological_files_pdl/forms.py:132 +#: archaeological_files/models.py:632 archaeological_files_pdl/forms.py:132 #: archaeological_files_pdl/forms.py:173 msgid "Locality" msgstr "" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:635 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:654 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:242 @@ -2644,99 +2596,99 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:667 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/models.py:690 +#: archaeological_files/models.py:704 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:694 +#: archaeological_files/models.py:708 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:699 +#: archaeological_files/models.py:713 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:714 +#: archaeological_files/models.py:728 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:748 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 #: ishtar_common/views.py:999 ishtar_common/views.py:1060 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:754 +#: archaeological_files/models.py:776 msgid "FILE" msgstr "" -#: archaeological_files/models.py:953 +#: archaeological_files/models.py:1013 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:959 +#: archaeological_files/models.py:1019 msgid "No town" msgstr "" -#: archaeological_files/models.py:1120 +#: archaeological_files/models.py:1228 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1122 +#: archaeological_files/models.py:1230 msgid "plan" msgstr "" -#: archaeological_files/models.py:1128 +#: archaeological_files/models.py:1236 #: archaeological_finds/models_treatments.py:399 #: archaeological_finds/models_treatments.py:1205 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1130 +#: archaeological_files/models.py:1238 #: archaeological_finds/models_treatments.py:401 #: archaeological_finds/models_treatments.py:1207 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1139 +#: archaeological_files/models.py:1247 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1141 +#: archaeological_files/models.py:1249 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1208 archaeological_operations/models.py:1171 -#: archaeological_operations/models.py:2777 +#: archaeological_files/models.py:1316 archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:2781 msgid "File" msgstr "" -#: archaeological_files/models.py:1375 +#: archaeological_files/models.py:1483 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1377 archaeological_files/models.py:1437 +#: archaeological_files/models.py:1485 archaeological_files/models.py:1545 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1379 +#: archaeological_files/models.py:1487 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1381 archaeological_files/models.py:1441 +#: archaeological_files/models.py:1489 archaeological_files/models.py:1549 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1435 +#: archaeological_files/models.py:1543 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1439 +#: archaeological_files/models.py:1547 msgid "Quantity by day - worked" msgstr "" @@ -2763,9 +2715,9 @@ msgid "Global informations" msgstr "" #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:14 -#: archaeological_files/templates/ishtar/sheet_file.html:305 -#: archaeological_files/templates/ishtar/sheet_file.html:357 -#: archaeological_files/templates/ishtar/sheet_file.html:413 +#: archaeological_files/templates/ishtar/sheet_file.html:307 +#: archaeological_files/templates/ishtar/sheet_file.html:359 +#: archaeological_files/templates/ishtar/sheet_file.html:415 #: archaeological_warehouse/templates/ishtar/sheet_container.html:234 #: archaeological_warehouse/templates/ishtar/sheet_container.html:258 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 @@ -2857,9 +2809,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:280 -#: archaeological_files/templates/ishtar/sheet_file.html:332 -#: archaeological_files/templates/ishtar/sheet_file.html:384 +#: archaeological_files/templates/ishtar/sheet_file.html:282 +#: archaeological_files/templates/ishtar/sheet_file.html:334 +#: archaeological_files/templates/ishtar/sheet_file.html:386 msgid "Planned" msgstr "" @@ -2903,7 +2855,6 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:181 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 -#: na_app/templates/ishtar/sheet_operation.html:313 #: sra_idf_app/templates/ishtar/sheet_operation.html:304 msgid "Associated parcels" msgstr "" @@ -2912,11 +2863,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2567 #: archaeological_operations/templates/ishtar/sheet_operation.html:315 #: archaeological_operations/templates/ishtar/sheet_operation.html:439 -#: na_app/templates/ishtar/sheet_operation.html:318 -#: na_app/templates/ishtar/sheet_operation.html:441 #: sra_idf_app/templates/ishtar/sheet_operation.html:309 #: sra_idf_app/templates/ishtar/sheet_operation.html:432 msgid "Administrative acts" @@ -2930,7 +2879,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2304 -#: archaeological_operations/models.py:2599 +#: archaeological_operations/models.py:2603 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 @@ -2952,25 +2901,18 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:458 #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:834 -#: cd17_app/templates/ishtar/sheet_find.html:342 -#: cd17_app/templates/ishtar/sheet_find.html:380 -#: cd17_app/templates/ishtar/sheet_find.html:418 -#: cd17_app/templates/ishtar/sheet_find.html:456 -#: ishtar_common/forms_common.py:469 ishtar_common/forms_common.py:648 -#: ishtar_common/forms_common.py:866 ishtar_common/forms_common.py:1097 -#: ishtar_common/forms_common.py:1482 ishtar_common/forms_common.py:1888 -#: ishtar_common/forms_common.py:2121 ishtar_common/models.py:716 -#: ishtar_common/models.py:2354 ishtar_common/models.py:3885 -#: ishtar_common/models_imports.py:796 +#: archaeological_warehouse/models.py:834 ishtar_common/forms_common.py:469 +#: ishtar_common/forms_common.py:648 ishtar_common/forms_common.py:866 +#: ishtar_common/forms_common.py:1097 ishtar_common/forms_common.py:1482 +#: ishtar_common/forms_common.py:1888 ishtar_common/forms_common.py:2121 +#: ishtar_common/models.py:716 ishtar_common/models.py:2354 +#: ishtar_common/models.py:3885 ishtar_common/models_imports.py:796 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 #: ishtar_common/templates/ishtar/import_table.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_find.html:341 #: sra_idf_app/templates/ishtar/sheet_find.html:379 #: sra_idf_app/templates/ishtar/sheet_find.html:417 @@ -3009,41 +2951,40 @@ msgstr "" msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:257 +#: archaeological_files/templates/ishtar/sheet_file.html:259 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:272 +#: archaeological_files/templates/ishtar/sheet_file.html:274 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:281 -#: archaeological_files/templates/ishtar/sheet_file.html:333 -#: archaeological_files/templates/ishtar/sheet_file.html:385 -#: archaeological_operations/models.py:3107 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_operations/models.py:3111 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:339 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:391 -#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:670 #: archaeological_operations/templates/ishtar/sheet_operation.html:198 -#: na_app/templates/ishtar/sheet_operation.html:197 #: sra_idf_app/templates/ishtar/sheet_operation.html:196 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:316 -#: archaeological_files/templates/ishtar/sheet_file.html:368 -#: archaeological_files/templates/ishtar/sheet_file.html:420 +#: archaeological_files/templates/ishtar/sheet_file.html:318 +#: archaeological_files/templates/ishtar/sheet_file.html:370 +#: archaeological_files/templates/ishtar/sheet_file.html:422 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:327 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Post-excavation jobs" msgstr "" @@ -3384,7 +3325,6 @@ msgstr "" #: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 #: archaeological_finds/forms.py:1319 #: archaeological_finds/templates/ishtar/sheet_find.html:168 -#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "" @@ -3428,7 +3368,6 @@ msgstr "" #: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 #: archaeological_finds/forms.py:2002 #: archaeological_finds/templates/ishtar/sheet_find.html:177 -#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "" @@ -3567,7 +3506,6 @@ msgstr "" #: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1347 #: archaeological_finds/templates/ishtar/sheet_find.html:198 -#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "" @@ -3736,8 +3674,8 @@ msgstr "" #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:701 #: archaeological_operations/forms.py:783 -#: archaeological_operations/forms.py:1873 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1941 #: archaeological_operations/models.py:808 #: archaeological_operations/models.py:896 #: archaeological_operations/models.py:1177 ishtar_common/models.py:4635 @@ -3820,7 +3758,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1138 #: archaeological_operations/templates/ishtar/sheet_operation.html:485 #: archaeological_warehouse/forms.py:571 -#: na_app/templates/ishtar/sheet_operation.html:487 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 msgid "Material type" msgstr "" @@ -3829,7 +3766,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1139 #: archaeological_operations/templates/ishtar/sheet_operation.html:495 #: archaeological_warehouse/forms.py:577 ishtar_common/models_imports.py:768 -#: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" msgstr "" @@ -3969,7 +3905,6 @@ msgstr "" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1098 #: archaeological_finds/models_finds.py:1835 #: archaeological_finds/templates/ishtar/sheet_find.html:273 -#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1500 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3981,7 +3916,6 @@ msgstr "" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1097 #: archaeological_finds/templates/ishtar/sheet_find.html:294 -#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1492 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -4035,9 +3969,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 -#: cd17_app/templates/ishtar/sheet_find.html:341 -#: cd17_app/templates/ishtar/sheet_find.html:379 -#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1434 ishtar_common/models.py:940 #: ishtar_common/models.py:1670 ishtar_common/models.py:3209 #: ishtar_common/models_common.py:158 ishtar_common/models_common.py:191 @@ -4102,7 +4033,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2193 -#: archaeological_operations/models.py:2522 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2525 ishtar_common/views.py:406 msgid "Treatment" msgstr "" @@ -4200,7 +4131,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2192 -#: archaeological_operations/models.py:2515 ishtar_common/views.py:405 +#: archaeological_operations/models.py:2518 ishtar_common/views.py:405 msgid "Treatment request" msgstr "" @@ -4226,9 +4157,6 @@ msgstr "" #: archaeological_warehouse/models.py:1090 #: archaeological_warehouse/models.py:1871 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:346 -#: cd17_app/templates/ishtar/sheet_find.html:384 -#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1995 ishtar_common/forms_common.py:2186 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -4316,7 +4244,6 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 -#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "" @@ -4326,7 +4253,6 @@ msgstr "" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "" @@ -5226,14 +5152,12 @@ msgstr "" #: archaeological_finds/models_finds.py:1809 #: archaeological_finds/templates/ishtar/sheet_find.html:366 -#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1816 #: archaeological_finds/templates/ishtar/sheet_find.html:404 -#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "" @@ -5415,9 +5339,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 -#: cd17_app/templates/ishtar/sheet_find.html:345 -#: cd17_app/templates/ishtar/sheet_find.html:383 -#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -5470,8 +5391,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:1006 -#: ishtar_common/views.py:1079 sra_idf_app/templates/ishtar/sheet_find.html:450 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1079 +#: sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "" @@ -5540,7 +5461,6 @@ msgid "Last modified by" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 -#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -5548,55 +5468,46 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:37 -#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:44 -#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:52 -#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:61 -#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:142 -#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:188 -#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:269 -#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:295 -#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "" @@ -5605,10 +5516,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 -#: cd17_app/templates/ishtar/sheet_find.html:340 -#: cd17_app/templates/ishtar/sheet_find.html:378 -#: cd17_app/templates/ishtar/sheet_find.html:416 -#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -5619,9 +5526,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 -#: cd17_app/templates/ishtar/sheet_find.html:344 -#: cd17_app/templates/ishtar/sheet_find.html:382 -#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5629,7 +5533,6 @@ msgid "Related finds (max. 15 displayed)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 -#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5641,8 +5544,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 -#: cd17_app/templates/ishtar/sheet_find.html:408 -#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5654,7 +5555,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5854,20 +5754,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2792 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2798 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2796 -#: archaeological_operations/models.py:2824 -#: archaeological_operations/models.py:2889 +#: archaeological_operations/models.py:2800 +#: archaeological_operations/models.py:2828 +#: archaeological_operations/models.py:2893 msgid "Public domain" msgstr "" @@ -5941,14 +5841,14 @@ msgstr "" #: archaeological_operations/forms.py:511 #: archaeological_operations/forms.py:821 -#: archaeological_operations/models.py:2468 +#: archaeological_operations/models.py:2471 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:520 #: archaeological_operations/forms.py:703 #: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1877 +#: archaeological_operations/forms.py:1879 #: archaeological_operations/models.py:1149 msgid "Operator" msgstr "" @@ -6014,7 +5914,7 @@ msgstr "" #: archaeological_operations/forms.py:565 #: archaeological_operations/forms.py:864 -#: archaeological_operations/forms.py:1885 +#: archaeological_operations/forms.py:1887 #: archaeological_operations/models.py:815 #: archaeological_operations/models.py:1303 msgid "Documentation received" @@ -6030,7 +5930,7 @@ msgstr "" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:869 -#: archaeological_operations/forms.py:1889 +#: archaeological_operations/forms.py:1891 #: archaeological_operations/models.py:816 #: archaeological_operations/models.py:1308 msgid "Finds received" @@ -6087,7 +5987,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:785 -#: archaeological_operations/forms.py:1937 +#: archaeological_operations/forms.py:1939 #: archaeological_operations/models.py:1246 msgid "Generic name" msgstr "" @@ -6148,7 +6048,6 @@ msgstr "" #: archaeological_operations/forms.py:1025 #: archaeological_operations/templates/ishtar/sheet_operation.html:265 -#: na_app/templates/ishtar/sheet_operation.html:272 #: sra_idf_app/templates/ishtar/sheet_operation.html:263 msgid "Court-ordered seizure" msgstr "" @@ -6184,8 +6083,8 @@ msgstr "" #: archaeological_operations/forms.py:1061 #: archaeological_operations/forms.py:1068 #: archaeological_operations/forms.py:1513 -#: archaeological_operations/forms.py:1893 -#: archaeological_operations/forms.py:2030 +#: archaeological_operations/forms.py:1895 +#: archaeological_operations/forms.py:2032 #: archaeological_operations/models.py:383 #: archaeological_operations/models.py:1163 msgid "Collaborators" @@ -6284,7 +6183,7 @@ msgstr "" #: archaeological_operations/forms.py:1228 #: archaeological_operations/forms.py:1382 #: archaeological_operations/forms.py:1498 -#: archaeological_operations/forms.py:1989 +#: archaeological_operations/forms.py:1991 #: archaeological_operations/models.py:360 #: archaeological_warehouse/models.py:1874 ishtar_common/forms_common.py:1603 #: ishtar_common/forms_common.py:1889 ishtar_common/forms_common.py:2120 @@ -6295,13 +6194,13 @@ msgstr "" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1509 -#: archaeological_operations/forms.py:2036 +#: archaeological_operations/forms.py:2038 msgid "Cultural attributions" msgstr "" #: archaeological_operations/forms.py:1284 #: archaeological_operations/forms.py:1568 -#: archaeological_operations/forms.py:2009 +#: archaeological_operations/forms.py:2011 msgid "This reference already exists." msgstr "" @@ -6309,7 +6208,6 @@ msgstr "" #: archaeological_operations/models.py:442 #: archaeological_operations/models.py:1273 #: archaeological_operations/templates/ishtar/sheet_operation.html:305 -#: na_app/templates/ishtar/sheet_operation.html:308 #: sra_idf_app/templates/ishtar/sheet_operation.html:299 msgid "Archaeological sites" msgstr "" @@ -6409,80 +6307,80 @@ msgstr "" msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1665 +#: archaeological_operations/forms.py:1666 #: archaeological_operations/views.py:499 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1783 -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1852 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:2493 +#: archaeological_operations/forms.py:1691 +#: archaeological_operations/models.py:2496 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1697 -#: archaeological_operations/models.py:2524 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:2527 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1709 +#: archaeological_operations/forms.py:1711 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1745 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1749 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1760 +#: archaeological_operations/forms.py:1762 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1765 ishtar_common/forms.py:1271 +#: archaeological_operations/forms.py:1767 ishtar_common/forms.py:1271 #: ishtar_common/models.py:1883 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1789 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1791 +#: archaeological_operations/forms.py:1795 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1813 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1813 +#: archaeological_operations/forms.py:1815 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1834 +#: archaeological_operations/forms.py:1836 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:592 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1855 +#: archaeological_operations/forms.py:1857 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1966 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:2020 +#: archaeological_operations/forms.py:2022 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7022,71 +6920,71 @@ msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2476 +#: archaeological_operations/models.py:2479 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2535 +#: archaeological_operations/models.py:2538 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2544 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2719 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:2807 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3049 ishtar_common/models.py:3219 +#: archaeological_operations/models.py:3053 ishtar_common/models.py:3219 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3057 +#: archaeological_operations/models.py:3061 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3062 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3106 +#: archaeological_operations/models.py:3110 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3108 +#: archaeological_operations/models.py:3112 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3109 +#: archaeological_operations/models.py:3113 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3110 +#: archaeological_operations/models.py:3114 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3111 +#: archaeological_operations/models.py:3115 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3116 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3611 ishtar_common/models.py:4631 +#: archaeological_operations/models.py:3615 ishtar_common/models.py:4631 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3614 +#: archaeological_operations/models.py:3618 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3615 +#: archaeological_operations/models.py:3619 msgid "Operation types old" msgstr "" @@ -7266,7 +7164,6 @@ msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:48 -#: na_app/templates/ishtar/sheet_operation.html:48 #: sra_idf_app/templates/ishtar/sheet_operation.html:48 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" @@ -7275,9 +7172,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:360 #: archaeological_operations/templates/ishtar/sheet_operation.html:450 #: ishtar_common/models.py:964 ishtar_common/views.py:1002 -#: ishtar_common/views.py:1072 na_app/templates/ishtar/sheet_operation.html:75 -#: na_app/templates/ishtar/sheet_operation.html:362 -#: na_app/templates/ishtar/sheet_operation.html:452 +#: ishtar_common/views.py:1072 #: sra_idf_app/templates/ishtar/sheet_operation.html:75 #: sra_idf_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:443 @@ -7291,58 +7186,48 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 -#: na_app/templates/ishtar/sheet_operation.html:101 -#: na_app/templates/ishtar/sheet_operation.html:421 #: sra_idf_app/templates/ishtar/sheet_operation.html:101 #: sra_idf_app/templates/ishtar/sheet_operation.html:412 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:143 -#: na_app/templates/ishtar/sheet_operation.html:143 #: sra_idf_app/templates/ishtar/sheet_operation.html:141 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:206 -#: na_app/templates/ishtar/sheet_operation.html:205 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Duration" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:253 -#: na_app/templates/ishtar/sheet_operation.html:260 #: sra_idf_app/templates/ishtar/sheet_operation.html:251 msgid "This operation is virtual." msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:324 -#: na_app/templates/ishtar/sheet_operation.html:327 #: sra_idf_app/templates/ishtar/sheet_operation.html:318 msgid "Document from this operation" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:351 -#: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:344 msgid "No relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:370 -#: na_app/templates/ishtar/sheet_operation.html:372 #: sra_idf_app/templates/ishtar/sheet_operation.html:363 msgid "Documents from associated context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:375 -#: na_app/templates/ishtar/sheet_operation.html:377 #: sra_idf_app/templates/ishtar/sheet_operation.html:368 msgid "Diagram of stratigraphic relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:404 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 -#: na_app/templates/ishtar/sheet_operation.html:406 #: sra_idf_app/templates/ishtar/sheet_operation.html:397 msgid "Associated containers" msgstr "" @@ -7355,7 +7240,6 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:72 #: ishtar_common/templates/ishtar/blocks/window_nav.html:78 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:45 -#: na_app/templates/ishtar/sheet_operation.html:426 #: sra_idf_app/templates/ishtar/sheet_operation.html:417 msgid "Export" msgstr "" @@ -7363,7 +7247,6 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:429 #: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 -#: na_app/templates/ishtar/sheet_operation.html:431 #: sra_idf_app/templates/ishtar/sheet_operation.html:422 msgid "Regenerate statistics" msgstr "" @@ -7371,19 +7254,16 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_warehouse/templates/ishtar/sheet_container.html:212 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 -#: na_app/templates/ishtar/sheet_operation.html:436 #: sra_idf_app/templates/ishtar/sheet_operation.html:427 msgid "Last update:" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:514 -#: na_app/templates/ishtar/sheet_operation.html:516 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 msgid "Sources" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:532 -#: na_app/templates/ishtar/sheet_operation.html:534 #: sra_idf_app/templates/ishtar/sheet_operation.html:525 msgid "Finds by context records" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 3590df3e5..894e4a16b 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-08 14:59+0200\n" +"POT-Creation-Date: 2022-07-11 01:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,14 +45,13 @@ msgstr "" #: archaeological_operations/models.py:2174 #: archaeological_operations/models.py:2191 #: archaeological_operations/models.py:2307 -#: archaeological_operations/models.py:2501 -#: archaeological_operations/models.py:2787 +#: archaeological_operations/models.py:2504 +#: archaeological_operations/models.py:2791 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:353 #: archaeological_operations/wizards.py:365 #: archaeological_warehouse/models.py:803 ishtar_common/forms_common.py:1957 #: ishtar_common/models.py:4850 ishtar_common/views.py:395 -#: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -98,7 +97,7 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:871 archaeological_files/forms.py:908 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -124,7 +123,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1932 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1934 msgid "Code PATRIARCHE" msgstr "" @@ -171,13 +170,13 @@ msgstr "" #: archaeological_context_records/models.py:626 #: archaeological_context_records/models.py:1313 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:922 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 #: archaeological_finds/models_finds.py:1087 #: archaeological_operations/forms.py:496 #: archaeological_operations/forms.py:1141 #: archaeological_operations/forms.py:1631 -#: archaeological_operations/models.py:2809 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:2813 +#: archaeological_operations/models.py:3055 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -211,13 +210,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:761 #: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1686 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:40 #: archaeological_operations/templates/ishtar/sheet_site.html:36 #: archaeological_warehouse/templates/ishtar/sheet_container.html:24 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 -#: na_app/templates/ishtar/sheet_operation.html:40 #: sra_idf_app/templates/ishtar/sheet_operation.html:40 msgid "General" msgstr "" @@ -236,7 +234,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1084 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:206 #: archaeological_operations/forms.py:1113 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 @@ -277,7 +275,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1777 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1623 ishtar_common/forms_common.py:1891 #: ishtar_common/models.py:1012 ishtar_common/models.py:3965 #: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 @@ -297,8 +294,8 @@ msgid "General comment" msgstr "" #: archaeological_context_records/forms.py:313 -#: archaeological_files/forms.py:298 archaeological_files/forms.py:583 -#: archaeological_files/models.py:620 archaeological_files_pdl/forms.py:143 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:595 +#: archaeological_files/models.py:628 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:833 msgid "Total surface (m2)" msgstr "" @@ -341,7 +338,7 @@ msgstr "" #: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:655 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:591 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:556 @@ -353,7 +350,6 @@ msgstr "" #: archaeological_operations/models.py:1128 #: archaeological_operations/templates/ishtar/sheet_operation.html:182 #: ishtar_common/forms.py:988 ishtar_common/forms.py:989 -#: na_app/templates/ishtar/sheet_operation.html:181 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Closing date" msgstr "" @@ -448,7 +444,6 @@ msgstr "" #: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 #: archaeological_finds/models_finds.py:1820 #: archaeological_finds/templates/ishtar/sheet_find.html:215 -#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "" @@ -462,10 +457,7 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 #: archaeological_operations/templates/ishtar/sheet_operation.html:505 -#: cd17_app/templates/ishtar/sheet_find.html:231 #: ishtar_common/models_imports.py:746 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:498 @@ -474,8 +466,8 @@ msgstr "" #: archaeological_context_records/forms.py:471 #: archaeological_context_records/models.py:104 -#: archaeological_files/forms.py:542 archaeological_files/models.py:75 -#: archaeological_files/models.py:683 +#: archaeological_files/forms.py:559 archaeological_files/models.py:75 +#: archaeological_files/models.py:697 #: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_finds/forms.py:1262 #: archaeological_finds/forms_treatments.py:180 @@ -491,11 +483,7 @@ msgstr "" #: archaeological_operations/forms.py:836 #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1129 -#: archaeological_operations/models.py:3052 -#: cd17_app/templates/ishtar/sheet_find.html:232 -#: cd17_app/templates/ishtar/sheet_find.html:347 -#: cd17_app/templates/ishtar/sheet_find.html:385 -#: cd17_app/templates/ishtar/sheet_find.html:423 +#: archaeological_operations/models.py:3056 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -505,8 +493,8 @@ msgstr "" #: archaeological_context_records/forms.py:472 #: archaeological_context_records/models.py:105 -#: archaeological_files/forms.py:547 archaeological_files/models.py:76 -#: archaeological_files/models.py:684 archaeological_finds/forms.py:1263 +#: archaeological_files/forms.py:564 archaeological_files/models.py:76 +#: archaeological_files/models.py:698 archaeological_finds/forms.py:1263 #: archaeological_finds/models_finds.py:3273 #: archaeological_finds/models_treatments.py:745 #: archaeological_finds/templates/ishtar/sheet_find.html:225 @@ -515,13 +503,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3053 -#: cd17_app/templates/ishtar/sheet_find.html:233 -#: cd17_app/templates/ishtar/sheet_find.html:348 -#: cd17_app/templates/ishtar/sheet_find.html:386 -#: cd17_app/templates/ishtar/sheet_find.html:424 -#: cd17_app/templates/ishtar/sheet_find.html:462 -#: ishtar_common/models_imports.py:991 +#: archaeological_operations/models.py:3057 ishtar_common/models_imports.py:991 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -534,7 +516,6 @@ msgstr "" #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1264 #: archaeological_finds/templates/ishtar/sheet_find.html:227 -#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "" @@ -544,7 +525,6 @@ msgstr "" #: archaeological_context_records/models.py:108 #: archaeological_finds/forms.py:1265 #: archaeological_finds/templates/ishtar/sheet_find.html:226 -#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "" @@ -553,7 +533,6 @@ msgstr "" #: archaeological_context_records/models.py:120 #: archaeological_finds/forms.py:1266 #: archaeological_finds/templates/ishtar/sheet_find.html:228 -#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "" @@ -583,8 +562,6 @@ msgstr "" #: archaeological_operations/forms.py:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:66 #: archaeological_operations/templates/ishtar/sheet_operation.html:334 -#: na_app/templates/ishtar/sheet_operation.html:66 -#: na_app/templates/ishtar/sheet_operation.html:337 #: sra_idf_app/templates/ishtar/sheet_operation.html:66 #: sra_idf_app/templates/ishtar/sheet_operation.html:328 msgid "Relations" @@ -618,7 +595,6 @@ msgstr "" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1676 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -669,7 +645,7 @@ msgstr "" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:2002 ishtar_common/forms_common.py:2137 +#: archaeological_operations/forms.py:2004 ishtar_common/forms_common.py:2137 #: ishtar_common/models.py:3018 ishtar_common/models.py:3317 msgid " - duplicate" msgstr "" @@ -850,7 +826,6 @@ msgstr "" #: archaeological_finds/models_finds.py:3265 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1986 ishtar_common/models.py:4853 #: ishtar_common/views.py:403 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -861,7 +836,7 @@ msgstr "" #: archaeological_context_records/models.py:339 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:223 archaeological_finds/models_finds.py:98 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:127 #: archaeological_finds/models_finds.py:247 @@ -874,7 +849,7 @@ msgstr "" #: archaeological_operations/models.py:121 #: archaeological_operations/models.py:139 #: archaeological_operations/models.py:148 -#: archaeological_operations/models.py:3610 +#: archaeological_operations/models.py:3614 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:651 #: archaeological_warehouse/models.py:675 ishtar_common/models.py:663 #: ishtar_common/models.py:718 ishtar_common/models.py:759 @@ -995,7 +970,7 @@ msgstr "" #: archaeological_context_records/models.py:502 #: archaeological_context_records/tests.py:700 -#: archaeological_files/models.py:457 archaeological_finds/models_finds.py:1234 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1234 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:957 #: archaeological_operations/tests.py:2773 @@ -1074,7 +1049,7 @@ msgid "unit-type" msgstr "" #: archaeological_context_records/models.py:539 -#: archaeological_files/models.py:460 archaeological_operations/models.py:963 +#: archaeological_files/models.py:467 archaeological_operations/models.py:963 #: archaeological_operations/models.py:2355 msgctxt "key for text search" msgid "parcel" @@ -1139,20 +1114,20 @@ msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:620 -#: archaeological_files/models.py:522 archaeological_finds/models_finds.py:399 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:399 #: archaeological_finds/models_finds.py:1766 #: archaeological_finds/models_treatments.py:249 #: archaeological_finds/models_treatments.py:1090 -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2802 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1066 ishtar_common/models.py:3880 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:401 +#: archaeological_files/models.py:532 archaeological_finds/models_finds.py:401 #: archaeological_finds/models_finds.py:1768 -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2805 #: archaeological_warehouse/models.py:387 #: archaeological_warehouse/models.py:1068 msgid "External ID is set automatically" @@ -1193,14 +1168,14 @@ msgstr "" #: archaeological_context_records/models.py:741 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:87 -#: archaeological_files/models.py:704 archaeological_finds/models_finds.py:1961 +#: archaeological_files/models.py:718 archaeological_finds/models_finds.py:1961 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:1138 #: archaeological_finds/templates/ishtar/sheet_find.html:70 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:402 #: archaeological_operations/models.py:1253 -#: archaeological_operations/models.py:2546 +#: archaeological_operations/models.py:2550 #: archaeological_operations/templates/ishtar/sheet_operation.html:57 #: archaeological_operations/templates/ishtar/sheet_site.html:94 #: archaeological_warehouse/models.py:374 @@ -1208,10 +1183,9 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3990 +#: ishtar_common/models.py:3990 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 -#: na_app/templates/ishtar/sheet_operation.html:57 #: sra_idf_app/templates/ishtar/sheet_find.html:70 #: sra_idf_app/templates/ishtar/sheet_operation.html:57 msgid "Documents" @@ -1223,19 +1197,19 @@ msgstr "" #: archaeological_finds/models_treatments.py:1145 #: archaeological_operations/models.py:408 #: archaeological_operations/models.py:1259 -#: archaeological_operations/models.py:2553 +#: archaeological_operations/models.py:2557 #: archaeological_warehouse/models.py:381 #: archaeological_warehouse/models.py:1080 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:753 -#: archaeological_files/models.py:708 archaeological_finds/models_finds.py:1979 +#: archaeological_files/models.py:722 archaeological_finds/models_finds.py:1979 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:413 #: archaeological_operations/models.py:1264 -#: archaeological_operations/models.py:2805 ishtar_common/models.py:2365 +#: archaeological_operations/models.py:2809 ishtar_common/models.py:2365 #: ishtar_common/models.py:2657 ishtar_common/models.py:3346 #: ishtar_common/models_common.py:1926 ishtar_common/models_common.py:1949 msgid "Cached name" @@ -1250,7 +1224,7 @@ msgstr "" #: archaeological_context_records/models.py:759 #: archaeological_context_records/models.py:765 -#: archaeological_files/models.py:712 archaeological_finds/models_finds.py:1983 +#: archaeological_files/models.py:726 archaeological_finds/models_finds.py:1983 #: archaeological_finds/models_finds.py:1989 #: archaeological_finds/models_finds.py:1995 #: archaeological_finds/models_finds.py:2001 @@ -1405,9 +1379,6 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 #: ishtar_common/views.py:1004 ishtar_common/views.py:1076 -#: na_app/templates/ishtar/sheet_operation.html:84 -#: na_app/templates/ishtar/sheet_operation.html:395 -#: na_app/templates/ishtar/sheet_operation.html:479 #: sra_idf_app/templates/ishtar/sheet_operation.html:84 #: sra_idf_app/templates/ishtar/sheet_operation.html:386 #: sra_idf_app/templates/ishtar/sheet_operation.html:470 @@ -1417,8 +1388,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 -#: cd17_app/templates/ishtar/sheet_find.html:79 -#: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 msgid "Custom fields" @@ -1431,10 +1400,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:3022 #: ishtar_common/templates/ishtar/sheet_document.html:37 -#: na_app/templates/ishtar/sheet_operation.html:122 #: sra_idf_app/templates/ishtar/sheet_find.html:137 #: sra_idf_app/templates/ishtar/sheet_operation.html:120 msgid "Complete identifier" @@ -1442,10 +1409,9 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_files/templates/ishtar/sheet_file.html:102 -#: archaeological_files/templates/ishtar/sheet_file.html:265 +#: archaeological_files/templates/ishtar/sheet_file.html:267 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:190 -#: na_app/templates/ishtar/sheet_operation.html:189 #: sra_idf_app/templates/ishtar/sheet_operation.html:188 msgid "Surface" msgstr "" @@ -1460,7 +1426,6 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 #: ishtar_common/models_common.py:1903 -#: na_app/templates/ishtar/sheet_operation.html:282 #: sra_idf_app/templates/ishtar/sheet_operation.html:273 msgid "Localisation" msgstr "" @@ -1471,9 +1436,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 -#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 #: sra_idf_app/templates/ishtar/sheet_operation.html:244 msgid "Sheet" @@ -1485,7 +1448,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 #: archaeological_operations/templates/ishtar/sheet_operation.html:260 -#: na_app/templates/ishtar/sheet_operation.html:267 #: sra_idf_app/templates/ishtar/sheet_operation.html:258 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -1513,13 +1475,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: cd17_app/templates/ishtar/sheet_find.html:343 -#: cd17_app/templates/ishtar/sheet_find.html:381 -#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4748 -#: ishtar_common/models.py:4881 ishtar_common/models.py:4959 -#: ishtar_common/models_common.py:1829 ishtar_common/models_common.py:1844 -#: ishtar_common/models_imports.py:984 -#: na_app/templates/ishtar/sheet_operation.html:153 +#: ishtar_common/models.py:4748 ishtar_common/models.py:4881 +#: ishtar_common/models.py:4959 ishtar_common/models_common.py:1829 +#: ishtar_common/models_common.py:1844 ishtar_common/models_imports.py:984 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 #: sra_idf_app/templates/ishtar/sheet_find.html:418 @@ -1530,14 +1488,12 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 -#: na_app/templates/ishtar/sheet_operation.html:158 #: sra_idf_app/templates/ishtar/sheet_operation.html:156 msgid "Active file" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 -#: na_app/templates/ishtar/sheet_operation.html:161 #: sra_idf_app/templates/ishtar/sheet_operation.html:159 msgid "Closed operation" msgstr "" @@ -1545,7 +1501,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:225 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 -#: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:182 msgid "by" msgstr "" @@ -1560,14 +1515,12 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 #: archaeological_operations/templates/ishtar/sheet_operation.html:398 -#: na_app/templates/ishtar/sheet_operation.html:400 #: sra_idf_app/templates/ishtar/sheet_operation.html:391 msgid "Documents from associated finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:276 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 -#: na_app/templates/ishtar/sheet_operation.html:366 #: sra_idf_app/templates/ishtar/sheet_operation.html:357 msgid "Context record relations" msgstr "" @@ -1605,23 +1558,23 @@ msgstr "" msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:144 +#: archaeological_files/admin.py:145 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:148 +#: archaeological_files/admin.py:149 msgid "To" msgstr "" -#: archaeological_files/admin.py:165 +#: archaeological_files/admin.py:166 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:211 +#: archaeological_files/admin.py:212 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:215 +#: archaeological_files/admin.py:216 msgid "{} item(s) already in database." msgstr "" @@ -1630,9 +1583,9 @@ msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 -#: archaeological_files/forms.py:329 archaeological_files/forms.py:878 -#: archaeological_files/forms.py:915 archaeological_files/models.py:373 -#: archaeological_files/models.py:514 +#: archaeological_files/forms.py:329 archaeological_files/forms.py:890 +#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/models.py:521 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 #: archaeological_finds/forms.py:1377 @@ -1649,12 +1602,12 @@ msgstr "" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:486 #: archaeological_operations/forms.py:789 #: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1934 +#: archaeological_operations/forms.py:1936 #: archaeological_operations/models.py:809 #: archaeological_operations/models.py:1166 #: archaeological_operations/models.py:2305 -#: archaeological_operations/models.py:2525 -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2794 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:797 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1662,7 +1615,7 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 -#: archaeological_files/forms.py:332 archaeological_files/models.py:516 +#: archaeological_files/forms.py:332 archaeological_files/models.py:523 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:487 #: archaeological_operations/models.py:1167 msgid "Numeric reference" @@ -1676,8 +1629,8 @@ msgstr "" msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:887 -#: archaeological_files/forms.py:925 archaeological_files/models.py:1211 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 +#: archaeological_files/forms.py:937 archaeological_files/models.py:1319 #: archaeological_operations/forms.py:499 #: archaeological_operations/forms.py:1634 #: archaeological_operations/models.py:2177 @@ -1691,13 +1644,13 @@ msgstr "" msgid "Department" msgstr "" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:935 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 msgid "File name" msgstr "" #: archaeological_files/forms.py:95 archaeological_files/forms.py:207 -#: archaeological_files/forms.py:285 archaeological_files/models.py:374 -#: archaeological_files/models.py:379 archaeological_files/models.py:528 +#: archaeological_files/forms.py:285 archaeological_files/models.py:381 +#: archaeological_files/models.py:386 archaeological_files/models.py:535 #: archaeological_files_pdl/forms.py:65 msgid "File type" msgstr "" @@ -1712,18 +1665,18 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:98 archaeological_files/forms.py:392 -#: archaeological_files/models.py:293 archaeological_files/models.py:378 -#: archaeological_files/models.py:577 archaeological_files_pdl/forms.py:100 +#: archaeological_files/models.py:300 archaeological_files/models.py:385 +#: archaeological_files/models.py:584 archaeological_files_pdl/forms.py:100 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:99 archaeological_files/forms.py:394 -#: archaeological_files/models.py:582 -msgid "Permit reference" +#: archaeological_files/models.py:589 +msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 -#: archaeological_files/forms.py:479 archaeological_files/models.py:629 +#: archaeological_files/forms.py:479 archaeological_files/models.py:637 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 #: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 @@ -1738,8 +1691,11 @@ msgstr "" #: archaeological_operations/forms.py:871 #: archaeological_operations/forms.py:1393 #: archaeological_operations/forms.py:1514 +#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1699 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:2546 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:364 #: archaeological_warehouse/models.py:1036 ishtar_common/forms_common.py:1621 @@ -1758,26 +1714,26 @@ msgid "In charge" msgstr "" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:937 archaeological_files/models.py:540 +#: archaeological_files/forms.py:949 archaeological_files/models.py:547 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:978 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 #: archaeological_operations/forms.py:552 -#: archaeological_operations/forms.py:1638 ishtar_common/forms.py:921 +#: archaeological_operations/forms.py:1639 ishtar_common/forms.py:921 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:986 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:558 -#: archaeological_operations/forms.py:1644 +#: archaeological_operations/forms.py:1645 msgid "Modified by" msgstr "" @@ -1786,7 +1742,7 @@ msgid "Archaeological file search" msgstr "" #: archaeological_files/forms.py:198 archaeological_files/forms.py:283 -#: archaeological_files/models.py:596 archaeological_files_pdl/forms.py:75 +#: archaeological_files/models.py:604 archaeological_files_pdl/forms.py:75 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1122 #: archaeological_operations/forms.py:683 @@ -1798,12 +1754,11 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:198 archaeological_files/forms.py:410 -#: archaeological_files/models.py:598 archaeological_files_pdl/forms.py:78 +#: archaeological_files/models.py:606 archaeological_files_pdl/forms.py:78 #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "" @@ -1840,16 +1795,15 @@ msgstr "" msgid "Date before" msgstr "" -#: archaeological_files/forms.py:256 archaeological_files/models.py:532 +#: archaeological_files/forms.py:256 archaeological_files/models.py:539 #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:352 -#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "" -#: archaeological_files/forms.py:281 archaeological_files/models.py:527 +#: archaeological_files/forms.py:281 archaeological_files/models.py:534 #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1092 @@ -1858,42 +1812,40 @@ msgstr "" #: archaeological_operations/forms.py:1229 #: archaeological_operations/forms.py:1384 #: archaeological_operations/forms.py:1499 -#: archaeological_operations/forms.py:1990 +#: archaeological_operations/forms.py:1992 #: archaeological_operations/models.py:362 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:346 -#: cd17_app/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:409 ishtar_common/forms_common.py:468 -#: ishtar_common/forms_common.py:645 ishtar_common/forms_common.py:772 -#: ishtar_common/forms_common.py:863 ishtar_common/forms_common.py:1099 -#: ishtar_common/forms_common.py:1150 ishtar_common/models.py:662 -#: ishtar_common/models.py:701 ishtar_common/models.py:1006 -#: ishtar_common/models.py:1497 ishtar_common/models.py:1879 -#: ishtar_common/models.py:2353 ishtar_common/models.py:2641 -#: ishtar_common/models.py:2968 ishtar_common/models.py:4724 -#: ishtar_common/models_common.py:1900 ishtar_common/models_common.py:1949 -#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 -#: ishtar_common/models_imports.py:513 ishtar_common/models_imports.py:530 -#: ishtar_common/models_imports.py:638 ishtar_common/models_imports.py:948 +#: archaeological_warehouse/models.py:346 ishtar_common/forms_common.py:409 +#: ishtar_common/forms_common.py:468 ishtar_common/forms_common.py:645 +#: ishtar_common/forms_common.py:772 ishtar_common/forms_common.py:863 +#: ishtar_common/forms_common.py:1099 ishtar_common/forms_common.py:1150 +#: ishtar_common/models.py:662 ishtar_common/models.py:701 +#: ishtar_common/models.py:1006 ishtar_common/models.py:1497 +#: ishtar_common/models.py:1879 ishtar_common/models.py:2353 +#: ishtar_common/models.py:2641 ishtar_common/models.py:2968 +#: ishtar_common/models.py:4724 ishtar_common/models_common.py:1900 +#: ishtar_common/models_common.py:1949 ishtar_common/models_imports.py:82 +#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:513 +#: ishtar_common/models_imports.py:530 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:948 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 -#: na_app/templates/ishtar/sheet_operation.html:137 #: sra_idf_app/templates/ishtar/sheet_find.html:456 #: sra_idf_app/templates/ishtar/sheet_operation.html:135 msgid "Name" msgstr "" -#: archaeological_files/forms.py:287 archaeological_files/models.py:604 +#: archaeological_files/forms.py:287 archaeological_files/models.py:612 #: archaeological_files_pdl/forms.py:447 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:304 archaeological_files/models.py:625 +#: archaeological_files/forms.py:304 archaeological_files/models.py:633 msgid "Main address" msgstr "" @@ -1914,9 +1866,8 @@ msgstr "" #: archaeological_operations/forms.py:1138 #: archaeological_operations/forms.py:1154 #: archaeological_operations/forms.py:1160 -#: archaeological_operations/models.py:2810 +#: archaeological_operations/models.py:2814 #: archaeological_operations/templates/ishtar/sheet_operation.html:445 -#: na_app/templates/ishtar/sheet_operation.html:447 #: sra_idf_app/templates/ishtar/sheet_operation.html:438 msgid "Parcels" msgstr "" @@ -1929,12 +1880,12 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:378 archaeological_files/models.py:561 +#: archaeological_files/forms.py:378 archaeological_files/models.py:568 msgid "Responsible for planning service" msgstr "" -#: archaeological_files/forms.py:400 archaeological_files/forms.py:573 -#: archaeological_files/models.py:622 archaeological_files_pdl/forms.py:151 +#: archaeological_files/forms.py:400 archaeological_files/forms.py:585 +#: archaeological_files/models.py:630 archaeological_files_pdl/forms.py:151 msgid "Total developed surface (m2)" msgstr "" @@ -1948,20 +1899,20 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:439 archaeological_files/models.py:632 +#: archaeological_files/forms.py:439 archaeological_files/models.py:640 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2532 ishtar_common/models_common.py:1853 +#: archaeological_operations/models.py:2535 ishtar_common/models_common.py:1853 msgid "Departments" msgstr "" -#: archaeological_files/forms.py:459 archaeological_files/models.py:656 +#: archaeological_files/forms.py:459 archaeological_files/models.py:664 #: archaeological_operations/forms.py:518 #: archaeological_operations/models.py:884 -#: archaeological_operations/models.py:2486 +#: archaeological_operations/models.py:2489 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:462 archaeological_files/models.py:640 +#: archaeological_files/forms.py:462 archaeological_files/models.py:648 msgid "Requested operation type" msgstr "" @@ -1969,11 +1920,11 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:488 archaeological_files/models.py:662 +#: archaeological_files/forms.py:488 archaeological_files/models.py:670 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:489 archaeological_files/models.py:664 +#: archaeological_files/forms.py:489 archaeological_files/models.py:672 msgid "Protected area" msgstr "" @@ -2006,84 +1957,93 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:552 archaeological_files/models.py:685 -msgid "Ground start date" +#: archaeological_files/forms.py:544 archaeological_files/models.py:689 +msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:557 archaeological_files/models.py:686 -msgid "Ground end date" +#: archaeological_files/forms.py:549 archaeological_files/models.py:692 +msgid "Study period" msgstr "" -#: archaeological_files/forms.py:562 archaeological_files/models.py:681 -msgid "Study period" +#: archaeological_files/forms.py:554 archaeological_files/models.py:695 +msgid "Report due period" +msgstr "" + +#: archaeological_files/forms.py:569 archaeological_files/models.py:699 +msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:567 archaeological_files/models.py:688 +#: archaeological_files/forms.py:574 archaeological_files/models.py:700 +msgid "Ground end date" +msgstr "" + +#: archaeological_files/forms.py:579 archaeological_files/models.py:702 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:590 +#: archaeological_files/forms.py:602 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:650 archaeological_files/forms.py:652 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/forms.py:662 archaeological_files/forms.py:664 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:342 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:651 archaeological_files/forms.py:653 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/forms.py:663 archaeological_files/forms.py:665 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:343 msgid "Days" msgstr "" -#: archaeological_files/forms.py:654 archaeological_files/models.py:114 -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/forms.py:666 archaeological_files/models.py:114 +#: archaeological_files/models.py:1509 archaeological_files/models.py:1525 +#: archaeological_files/templates/ishtar/sheet_file.html:281 +#: archaeological_files/templates/ishtar/sheet_file.html:333 msgid "Job" msgstr "" -#: archaeological_files/forms.py:674 archaeological_files/models.py:79 +#: archaeological_files/forms.py:686 archaeological_files/models.py:79 #: archaeological_files/models.py:80 archaeological_files/models.py:91 -#: archaeological_files/models.py:194 archaeological_files/models.py:677 +#: archaeological_files/models.py:201 archaeological_files/models.py:685 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:740 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:741 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:753 -#: archaeological_files/templates/ishtar/sheet_file.html:275 +#: archaeological_files/forms.py:765 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:755 +#: archaeological_files/forms.py:767 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:761 archaeological_files/forms.py:763 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/forms.py:773 archaeological_files/forms.py:775 +#: archaeological_files/templates/ishtar/sheet_file.html:391 +#: archaeological_files/templates/ishtar/sheet_file.html:394 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:765 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/forms.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:385 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:916 -#: archaeological_files/forms.py:1052 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 +#: archaeological_files/forms.py:1064 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2096,85 +2056,84 @@ msgstr "" #: archaeological_finds/models_treatments.py:1085 #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 -#: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2471 -#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3879 +#: archaeological_operations/forms.py:1757 +#: archaeological_operations/models.py:2474 ishtar_common/models.py:3879 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "" -#: archaeological_files/forms.py:882 archaeological_files/forms.py:919 -#: archaeological_files/forms.py:1041 +#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 +#: archaeological_files/forms.py:1053 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 #: archaeological_operations/forms.py:1628 -#: archaeological_operations/forms.py:1688 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:2207 -#: archaeological_operations/models.py:2462 +#: archaeological_operations/models.py:2465 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:883 +#: archaeological_files/forms.py:895 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:920 +#: archaeological_files/forms.py:932 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 #: archaeological_operations/forms.py:1629 -#: archaeological_operations/forms.py:1825 +#: archaeological_operations/forms.py:1827 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:927 +#: archaeological_files/forms.py:939 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 #: archaeological_operations/forms.py:1635 -#: archaeological_operations/forms.py:1695 -#: archaeological_operations/models.py:2526 +#: archaeological_operations/forms.py:1696 +#: archaeological_operations/models.py:2529 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:930 +#: archaeological_files/forms.py:942 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:933 +#: archaeological_files/forms.py:945 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:958 +#: archaeological_files/forms.py:970 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:960 +#: archaeological_files/forms.py:972 msgid "File year" msgstr "" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:974 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:965 +#: archaeological_files/forms.py:977 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:975 +#: archaeological_files/forms.py:987 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1039 +#: archaeological_files/forms.py:1051 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:725 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:747 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:666 @@ -2182,7 +2141,7 @@ msgstr "" #: archaeological_operations/models.py:1683 #: archaeological_operations/models.py:2190 #: archaeological_operations/models.py:2306 -#: archaeological_operations/models.py:2508 +#: archaeological_operations/models.py:2511 #: archaeological_operations/wizards.py:89 ishtar_common/views.py:394 msgid "Archaeological file" msgstr "" @@ -2197,7 +2156,7 @@ msgstr "" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3267 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2562 +#: archaeological_operations/models.py:2566 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2219,7 +2178,7 @@ msgid "Def. daily number on ground" msgstr "" #: archaeological_files/models.py:102 -msgid "Def. daily number" +msgid "Def. daily number on study" msgstr "" #: archaeological_files/models.py:108 @@ -2264,7 +2223,6 @@ msgstr "" #: archaeological_files/models.py:183 #: archaeological_operations/templates/ishtar/sheet_operation.html:207 -#: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:205 msgid "days" msgstr "" @@ -2283,115 +2241,115 @@ msgstr "" msgid "linear m." msgstr "" -#: archaeological_files/models.py:198 +#: archaeological_files/models.py:205 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:201 ishtar_common/models_common.py:160 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:160 #: ishtar_common/models_common.py:191 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:205 ishtar_common/models_common.py:164 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:164 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." msgstr "" -#: archaeological_files/models.py:211 +#: archaeological_files/models.py:218 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:213 archaeological_files/models.py:253 +#: archaeological_files/models.py:220 archaeological_files/models.py:260 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:221 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:216 ishtar_common/models_imports.py:751 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:751 msgid "Unit" msgstr "" -#: archaeological_files/models.py:219 +#: archaeological_files/models.py:226 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:222 +#: archaeological_files/models.py:229 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:224 ishtar_common/models.py:1499 +#: archaeological_files/models.py:231 ishtar_common/models.py:1499 #: ishtar_common/models.py:1909 ishtar_common/models.py:3221 #: ishtar_common/models_common.py:170 ishtar_common/models_imports.py:124 #: ishtar_common/models_imports.py:643 msgid "Available" msgstr "" -#: archaeological_files/models.py:230 archaeological_warehouse/forms.py:752 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:752 #: ishtar_common/admin.py:999 ishtar_common/admin.py:1018 #: ishtar_common/models.py:2214 ishtar_common/models_common.py:702 msgid "Parent" msgstr "" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:238 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:236 +#: archaeological_files/models.py:243 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:237 +#: archaeological_files/models.py:244 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:280 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:274 +#: archaeological_files/models.py:281 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:294 +#: archaeological_files/models.py:301 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:305 +#: archaeological_files/models.py:312 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:325 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:319 +#: archaeological_files/models.py:326 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:329 +#: archaeological_files/models.py:336 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:338 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:340 msgid "Category" msgstr "" -#: archaeological_files/models.py:337 +#: archaeological_files/models.py:344 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:338 +#: archaeological_files/models.py:345 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:375 archaeological_finds/models_finds.py:1132 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1132 #: archaeological_operations/models.py:191 #: archaeological_operations/models.py:810 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 @@ -2405,13 +2363,13 @@ msgstr "" msgid "Area" msgstr "" -#: archaeological_files/models.py:376 archaeological_finds/models_finds.py:1135 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1135 #: archaeological_operations/models.py:192 #: archaeological_operations/models.py:811 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:385 archaeological_finds/models_finds.py:1156 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1156 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2428,12 +2386,6 @@ msgstr "" #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:487 -#: na_app/templates/ishtar/sheet_operation.html:497 -#: na_app/templates/ishtar/sheet_operation.html:507 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_operation.html:451 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 @@ -2443,15 +2395,15 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:386 +#: archaeological_files/models.py:393 msgid "Total surface (km2)" msgstr "" -#: archaeological_files/models.py:387 +#: archaeological_files/models.py:394 msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:437 archaeological_files/models.py:593 +#: archaeological_files/models.py:444 archaeological_files/models.py:601 #: archaeological_files_pdl/forms.py:124 archaeological_files_pdl/forms.py:168 #: archaeological_operations/forms.py:1111 #: archaeological_operations/forms.py:1127 @@ -2462,17 +2414,16 @@ msgstr "" #: archaeological_operations/models.py:895 #: archaeological_operations/models.py:897 #: archaeological_operations/models.py:1184 -#: archaeological_operations/models.py:2538 +#: archaeological_operations/models.py:2541 #: archaeological_operations/templates/ishtar/sheet_operation.html:130 #: ishtar_common/forms_common.py:1268 ishtar_common/forms_common.py:1281 #: ishtar_common/forms_common.py:1282 ishtar_common/models.py:2207 #: ishtar_common/models_common.py:1932 -#: na_app/templates/ishtar/sheet_operation.html:130 #: sra_idf_app/templates/ishtar/sheet_operation.html:128 msgid "Towns" msgstr "" -#: archaeological_files/models.py:448 archaeological_finds/models_finds.py:1238 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1238 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:948 @@ -2483,7 +2434,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:450 +#: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1036 #: archaeological_operations/models.py:240 #: archaeological_warehouse/models.py:859 ishtar_common/models.py:3645 @@ -2491,19 +2442,19 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:453 +#: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 #: archaeological_operations/models.py:246 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:464 archaeological_operations/models.py:967 +#: archaeological_files/models.py:471 archaeological_operations/models.py:967 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:971 @@ -2514,7 +2465,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:977 @@ -2528,96 +2479,97 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:474 +#: archaeological_files/models.py:481 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:477 +#: archaeological_files/models.py:484 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:481 +#: archaeological_files/models.py:488 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:485 +#: archaeological_files/models.py:492 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:489 archaeological_finds/models_finds.py:1444 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1444 #: archaeological_operations/models.py:262 #: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:2451 #: archaeological_warehouse/models.py:866 ishtar_common/models.py:3705 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:492 archaeological_finds/models_finds.py:1595 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1595 #: archaeological_finds/models_treatments.py:1045 #: archaeological_finds/tests.py:1328 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:496 archaeological_operations/models.py:2386 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2386 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:500 archaeological_operations/models.py:2390 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2390 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:519 +#: archaeological_files/models.py:526 #: archaeological_finds/models_treatments.py:1087 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1890 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:546 +#: archaeological_files/models.py:553 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:551 +#: archaeological_files/models.py:558 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:565 +#: archaeological_files/models.py:572 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:579 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:594 msgid "Main town" msgstr "" -#: archaeological_files/models.py:600 archaeological_files_pdl/forms.py:407 +#: archaeological_files/models.py:608 archaeological_files_pdl/forms.py:407 msgid "Date of planning service file" msgstr "" -#: archaeological_files/models.py:618 +#: archaeological_files/models.py:626 msgid "Instruction deadline" msgstr "" -#: archaeological_files/models.py:624 archaeological_files_pdl/forms.py:132 +#: archaeological_files/models.py:632 archaeological_files_pdl/forms.py:132 #: archaeological_files_pdl/forms.py:173 msgid "Locality" msgstr "" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:635 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:654 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:242 @@ -2633,99 +2585,99 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:667 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/models.py:690 +#: archaeological_files/models.py:704 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:694 +#: archaeological_files/models.py:708 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:699 +#: archaeological_files/models.py:713 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:714 +#: archaeological_files/models.py:728 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:748 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 #: ishtar_common/views.py:999 ishtar_common/views.py:1060 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:754 +#: archaeological_files/models.py:776 msgid "FILE" msgstr "" -#: archaeological_files/models.py:953 +#: archaeological_files/models.py:1013 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:959 +#: archaeological_files/models.py:1019 msgid "No town" msgstr "" -#: archaeological_files/models.py:1120 +#: archaeological_files/models.py:1228 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1122 +#: archaeological_files/models.py:1230 msgid "plan" msgstr "" -#: archaeological_files/models.py:1128 +#: archaeological_files/models.py:1236 #: archaeological_finds/models_treatments.py:399 #: archaeological_finds/models_treatments.py:1205 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1130 +#: archaeological_files/models.py:1238 #: archaeological_finds/models_treatments.py:401 #: archaeological_finds/models_treatments.py:1207 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1139 +#: archaeological_files/models.py:1247 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1141 +#: archaeological_files/models.py:1249 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1208 archaeological_operations/models.py:1171 -#: archaeological_operations/models.py:2777 +#: archaeological_files/models.py:1316 archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:2781 msgid "File" msgstr "" -#: archaeological_files/models.py:1375 +#: archaeological_files/models.py:1483 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1377 archaeological_files/models.py:1437 +#: archaeological_files/models.py:1485 archaeological_files/models.py:1545 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1379 +#: archaeological_files/models.py:1487 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1381 archaeological_files/models.py:1441 +#: archaeological_files/models.py:1489 archaeological_files/models.py:1549 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1435 +#: archaeological_files/models.py:1543 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1439 +#: archaeological_files/models.py:1547 msgid "Quantity by day - worked" msgstr "" @@ -2752,9 +2704,9 @@ msgid "Global informations" msgstr "" #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:14 -#: archaeological_files/templates/ishtar/sheet_file.html:305 -#: archaeological_files/templates/ishtar/sheet_file.html:357 -#: archaeological_files/templates/ishtar/sheet_file.html:413 +#: archaeological_files/templates/ishtar/sheet_file.html:307 +#: archaeological_files/templates/ishtar/sheet_file.html:359 +#: archaeological_files/templates/ishtar/sheet_file.html:415 #: archaeological_warehouse/templates/ishtar/sheet_container.html:234 #: archaeological_warehouse/templates/ishtar/sheet_container.html:258 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 @@ -2846,9 +2798,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:280 -#: archaeological_files/templates/ishtar/sheet_file.html:332 -#: archaeological_files/templates/ishtar/sheet_file.html:384 +#: archaeological_files/templates/ishtar/sheet_file.html:282 +#: archaeological_files/templates/ishtar/sheet_file.html:334 +#: archaeological_files/templates/ishtar/sheet_file.html:386 msgid "Planned" msgstr "" @@ -2892,7 +2844,6 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:181 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 -#: na_app/templates/ishtar/sheet_operation.html:313 #: sra_idf_app/templates/ishtar/sheet_operation.html:304 msgid "Associated parcels" msgstr "" @@ -2901,11 +2852,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2567 #: archaeological_operations/templates/ishtar/sheet_operation.html:315 #: archaeological_operations/templates/ishtar/sheet_operation.html:439 -#: na_app/templates/ishtar/sheet_operation.html:318 -#: na_app/templates/ishtar/sheet_operation.html:441 #: sra_idf_app/templates/ishtar/sheet_operation.html:309 #: sra_idf_app/templates/ishtar/sheet_operation.html:432 msgid "Administrative acts" @@ -2919,7 +2868,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2304 -#: archaeological_operations/models.py:2599 +#: archaeological_operations/models.py:2603 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 @@ -2941,25 +2890,18 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:458 #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:834 -#: cd17_app/templates/ishtar/sheet_find.html:342 -#: cd17_app/templates/ishtar/sheet_find.html:380 -#: cd17_app/templates/ishtar/sheet_find.html:418 -#: cd17_app/templates/ishtar/sheet_find.html:456 -#: ishtar_common/forms_common.py:469 ishtar_common/forms_common.py:648 -#: ishtar_common/forms_common.py:866 ishtar_common/forms_common.py:1097 -#: ishtar_common/forms_common.py:1482 ishtar_common/forms_common.py:1888 -#: ishtar_common/forms_common.py:2121 ishtar_common/models.py:716 -#: ishtar_common/models.py:2354 ishtar_common/models.py:3885 -#: ishtar_common/models_imports.py:796 +#: archaeological_warehouse/models.py:834 ishtar_common/forms_common.py:469 +#: ishtar_common/forms_common.py:648 ishtar_common/forms_common.py:866 +#: ishtar_common/forms_common.py:1097 ishtar_common/forms_common.py:1482 +#: ishtar_common/forms_common.py:1888 ishtar_common/forms_common.py:2121 +#: ishtar_common/models.py:716 ishtar_common/models.py:2354 +#: ishtar_common/models.py:3885 ishtar_common/models_imports.py:796 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 #: ishtar_common/templates/ishtar/import_table.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_find.html:341 #: sra_idf_app/templates/ishtar/sheet_find.html:379 #: sra_idf_app/templates/ishtar/sheet_find.html:417 @@ -2998,41 +2940,40 @@ msgstr "" msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:257 +#: archaeological_files/templates/ishtar/sheet_file.html:259 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:272 +#: archaeological_files/templates/ishtar/sheet_file.html:274 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:281 -#: archaeological_files/templates/ishtar/sheet_file.html:333 -#: archaeological_files/templates/ishtar/sheet_file.html:385 -#: archaeological_operations/models.py:3107 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_operations/models.py:3111 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:339 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:391 -#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:670 #: archaeological_operations/templates/ishtar/sheet_operation.html:198 -#: na_app/templates/ishtar/sheet_operation.html:197 #: sra_idf_app/templates/ishtar/sheet_operation.html:196 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:316 -#: archaeological_files/templates/ishtar/sheet_file.html:368 -#: archaeological_files/templates/ishtar/sheet_file.html:420 +#: archaeological_files/templates/ishtar/sheet_file.html:318 +#: archaeological_files/templates/ishtar/sheet_file.html:370 +#: archaeological_files/templates/ishtar/sheet_file.html:422 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:327 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Post-excavation jobs" msgstr "" @@ -3373,7 +3314,6 @@ msgstr "" #: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 #: archaeological_finds/forms.py:1319 #: archaeological_finds/templates/ishtar/sheet_find.html:168 -#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "" @@ -3417,7 +3357,6 @@ msgstr "" #: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 #: archaeological_finds/forms.py:2002 #: archaeological_finds/templates/ishtar/sheet_find.html:177 -#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "" @@ -3556,7 +3495,6 @@ msgstr "" #: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1347 #: archaeological_finds/templates/ishtar/sheet_find.html:198 -#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "" @@ -3725,8 +3663,8 @@ msgstr "" #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:701 #: archaeological_operations/forms.py:783 -#: archaeological_operations/forms.py:1873 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1941 #: archaeological_operations/models.py:808 #: archaeological_operations/models.py:896 #: archaeological_operations/models.py:1177 ishtar_common/models.py:4635 @@ -3809,7 +3747,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1138 #: archaeological_operations/templates/ishtar/sheet_operation.html:485 #: archaeological_warehouse/forms.py:571 -#: na_app/templates/ishtar/sheet_operation.html:487 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 msgid "Material type" msgstr "" @@ -3818,7 +3755,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1139 #: archaeological_operations/templates/ishtar/sheet_operation.html:495 #: archaeological_warehouse/forms.py:577 ishtar_common/models_imports.py:768 -#: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" msgstr "" @@ -3958,7 +3894,6 @@ msgstr "" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1098 #: archaeological_finds/models_finds.py:1835 #: archaeological_finds/templates/ishtar/sheet_find.html:273 -#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1500 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3970,7 +3905,6 @@ msgstr "" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1097 #: archaeological_finds/templates/ishtar/sheet_find.html:294 -#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1492 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -4024,9 +3958,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 -#: cd17_app/templates/ishtar/sheet_find.html:341 -#: cd17_app/templates/ishtar/sheet_find.html:379 -#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1434 ishtar_common/models.py:940 #: ishtar_common/models.py:1670 ishtar_common/models.py:3209 #: ishtar_common/models_common.py:158 ishtar_common/models_common.py:191 @@ -4091,7 +4022,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2193 -#: archaeological_operations/models.py:2522 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2525 ishtar_common/views.py:406 msgid "Treatment" msgstr "" @@ -4189,7 +4120,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2192 -#: archaeological_operations/models.py:2515 ishtar_common/views.py:405 +#: archaeological_operations/models.py:2518 ishtar_common/views.py:405 msgid "Treatment request" msgstr "" @@ -4215,9 +4146,6 @@ msgstr "" #: archaeological_warehouse/models.py:1090 #: archaeological_warehouse/models.py:1871 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:346 -#: cd17_app/templates/ishtar/sheet_find.html:384 -#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1995 ishtar_common/forms_common.py:2186 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -4305,7 +4233,6 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 -#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "" @@ -4315,7 +4242,6 @@ msgstr "" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "" @@ -5213,14 +5139,12 @@ msgstr "" #: archaeological_finds/models_finds.py:1809 #: archaeological_finds/templates/ishtar/sheet_find.html:366 -#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1816 #: archaeological_finds/templates/ishtar/sheet_find.html:404 -#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "" @@ -5398,9 +5322,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 -#: cd17_app/templates/ishtar/sheet_find.html:345 -#: cd17_app/templates/ishtar/sheet_find.html:383 -#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -5453,8 +5374,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:1006 -#: ishtar_common/views.py:1079 sra_idf_app/templates/ishtar/sheet_find.html:450 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1079 +#: sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "" @@ -5523,7 +5444,6 @@ msgid "Last modified by" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 -#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -5531,55 +5451,46 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:37 -#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:44 -#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:52 -#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:61 -#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:142 -#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:188 -#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:269 -#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:295 -#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "" @@ -5588,10 +5499,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 -#: cd17_app/templates/ishtar/sheet_find.html:340 -#: cd17_app/templates/ishtar/sheet_find.html:378 -#: cd17_app/templates/ishtar/sheet_find.html:416 -#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -5602,9 +5509,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 -#: cd17_app/templates/ishtar/sheet_find.html:344 -#: cd17_app/templates/ishtar/sheet_find.html:382 -#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5612,7 +5516,6 @@ msgid "Related finds (max. 15 displayed)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 -#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5624,8 +5527,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 -#: cd17_app/templates/ishtar/sheet_find.html:408 -#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5637,7 +5538,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5837,20 +5737,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2792 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2798 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2796 -#: archaeological_operations/models.py:2824 -#: archaeological_operations/models.py:2889 +#: archaeological_operations/models.py:2800 +#: archaeological_operations/models.py:2828 +#: archaeological_operations/models.py:2893 msgid "Public domain" msgstr "" @@ -5924,14 +5824,14 @@ msgstr "" #: archaeological_operations/forms.py:511 #: archaeological_operations/forms.py:821 -#: archaeological_operations/models.py:2468 +#: archaeological_operations/models.py:2471 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:520 #: archaeological_operations/forms.py:703 #: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1877 +#: archaeological_operations/forms.py:1879 #: archaeological_operations/models.py:1149 msgid "Operator" msgstr "" @@ -5997,7 +5897,7 @@ msgstr "" #: archaeological_operations/forms.py:565 #: archaeological_operations/forms.py:864 -#: archaeological_operations/forms.py:1885 +#: archaeological_operations/forms.py:1887 #: archaeological_operations/models.py:815 #: archaeological_operations/models.py:1303 msgid "Documentation received" @@ -6013,7 +5913,7 @@ msgstr "" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:869 -#: archaeological_operations/forms.py:1889 +#: archaeological_operations/forms.py:1891 #: archaeological_operations/models.py:816 #: archaeological_operations/models.py:1308 msgid "Finds received" @@ -6070,7 +5970,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:785 -#: archaeological_operations/forms.py:1937 +#: archaeological_operations/forms.py:1939 #: archaeological_operations/models.py:1246 msgid "Generic name" msgstr "" @@ -6131,7 +6031,6 @@ msgstr "" #: archaeological_operations/forms.py:1025 #: archaeological_operations/templates/ishtar/sheet_operation.html:265 -#: na_app/templates/ishtar/sheet_operation.html:272 #: sra_idf_app/templates/ishtar/sheet_operation.html:263 msgid "Court-ordered seizure" msgstr "" @@ -6167,8 +6066,8 @@ msgstr "" #: archaeological_operations/forms.py:1061 #: archaeological_operations/forms.py:1068 #: archaeological_operations/forms.py:1513 -#: archaeological_operations/forms.py:1893 -#: archaeological_operations/forms.py:2030 +#: archaeological_operations/forms.py:1895 +#: archaeological_operations/forms.py:2032 #: archaeological_operations/models.py:383 #: archaeological_operations/models.py:1163 msgid "Collaborators" @@ -6267,7 +6166,7 @@ msgstr "" #: archaeological_operations/forms.py:1228 #: archaeological_operations/forms.py:1382 #: archaeological_operations/forms.py:1498 -#: archaeological_operations/forms.py:1989 +#: archaeological_operations/forms.py:1991 #: archaeological_operations/models.py:360 #: archaeological_warehouse/models.py:1874 ishtar_common/forms_common.py:1603 #: ishtar_common/forms_common.py:1889 ishtar_common/forms_common.py:2120 @@ -6278,13 +6177,13 @@ msgstr "" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1509 -#: archaeological_operations/forms.py:2036 +#: archaeological_operations/forms.py:2038 msgid "Cultural attributions" msgstr "" #: archaeological_operations/forms.py:1284 #: archaeological_operations/forms.py:1568 -#: archaeological_operations/forms.py:2009 +#: archaeological_operations/forms.py:2011 msgid "This reference already exists." msgstr "" @@ -6292,7 +6191,6 @@ msgstr "" #: archaeological_operations/models.py:442 #: archaeological_operations/models.py:1273 #: archaeological_operations/templates/ishtar/sheet_operation.html:305 -#: na_app/templates/ishtar/sheet_operation.html:308 #: sra_idf_app/templates/ishtar/sheet_operation.html:299 msgid "Archaeological sites" msgstr "" @@ -6392,80 +6290,80 @@ msgstr "" msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1665 +#: archaeological_operations/forms.py:1666 #: archaeological_operations/views.py:499 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1783 -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1852 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:2493 +#: archaeological_operations/forms.py:1691 +#: archaeological_operations/models.py:2496 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1697 -#: archaeological_operations/models.py:2524 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:2527 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1709 +#: archaeological_operations/forms.py:1711 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1745 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1749 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1760 +#: archaeological_operations/forms.py:1762 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1765 ishtar_common/forms.py:1271 +#: archaeological_operations/forms.py:1767 ishtar_common/forms.py:1271 #: ishtar_common/models.py:1883 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1789 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1791 +#: archaeological_operations/forms.py:1795 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1813 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1813 +#: archaeological_operations/forms.py:1815 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1834 +#: archaeological_operations/forms.py:1836 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:592 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1855 +#: archaeological_operations/forms.py:1857 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1966 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:2020 +#: archaeological_operations/forms.py:2022 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7003,71 +6901,71 @@ msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2476 +#: archaeological_operations/models.py:2479 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2535 +#: archaeological_operations/models.py:2538 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2544 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2719 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:2807 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3049 ishtar_common/models.py:3219 +#: archaeological_operations/models.py:3053 ishtar_common/models.py:3219 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3057 +#: archaeological_operations/models.py:3061 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3062 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3106 +#: archaeological_operations/models.py:3110 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3108 +#: archaeological_operations/models.py:3112 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3109 +#: archaeological_operations/models.py:3113 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3110 +#: archaeological_operations/models.py:3114 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3111 +#: archaeological_operations/models.py:3115 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3116 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3611 ishtar_common/models.py:4631 +#: archaeological_operations/models.py:3615 ishtar_common/models.py:4631 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3614 +#: archaeological_operations/models.py:3618 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3615 +#: archaeological_operations/models.py:3619 msgid "Operation types old" msgstr "" @@ -7247,7 +7145,6 @@ msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:48 -#: na_app/templates/ishtar/sheet_operation.html:48 #: sra_idf_app/templates/ishtar/sheet_operation.html:48 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" @@ -7256,9 +7153,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:360 #: archaeological_operations/templates/ishtar/sheet_operation.html:450 #: ishtar_common/models.py:964 ishtar_common/views.py:1002 -#: ishtar_common/views.py:1072 na_app/templates/ishtar/sheet_operation.html:75 -#: na_app/templates/ishtar/sheet_operation.html:362 -#: na_app/templates/ishtar/sheet_operation.html:452 +#: ishtar_common/views.py:1072 #: sra_idf_app/templates/ishtar/sheet_operation.html:75 #: sra_idf_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:443 @@ -7272,58 +7167,48 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 -#: na_app/templates/ishtar/sheet_operation.html:101 -#: na_app/templates/ishtar/sheet_operation.html:421 #: sra_idf_app/templates/ishtar/sheet_operation.html:101 #: sra_idf_app/templates/ishtar/sheet_operation.html:412 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:143 -#: na_app/templates/ishtar/sheet_operation.html:143 #: sra_idf_app/templates/ishtar/sheet_operation.html:141 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:206 -#: na_app/templates/ishtar/sheet_operation.html:205 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Duration" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:253 -#: na_app/templates/ishtar/sheet_operation.html:260 #: sra_idf_app/templates/ishtar/sheet_operation.html:251 msgid "This operation is virtual." msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:324 -#: na_app/templates/ishtar/sheet_operation.html:327 #: sra_idf_app/templates/ishtar/sheet_operation.html:318 msgid "Document from this operation" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:351 -#: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:344 msgid "No relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:370 -#: na_app/templates/ishtar/sheet_operation.html:372 #: sra_idf_app/templates/ishtar/sheet_operation.html:363 msgid "Documents from associated context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:375 -#: na_app/templates/ishtar/sheet_operation.html:377 #: sra_idf_app/templates/ishtar/sheet_operation.html:368 msgid "Diagram of stratigraphic relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:404 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 -#: na_app/templates/ishtar/sheet_operation.html:406 #: sra_idf_app/templates/ishtar/sheet_operation.html:397 msgid "Associated containers" msgstr "" @@ -7336,7 +7221,6 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:72 #: ishtar_common/templates/ishtar/blocks/window_nav.html:78 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:45 -#: na_app/templates/ishtar/sheet_operation.html:426 #: sra_idf_app/templates/ishtar/sheet_operation.html:417 msgid "Export" msgstr "" @@ -7344,7 +7228,6 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:429 #: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 -#: na_app/templates/ishtar/sheet_operation.html:431 #: sra_idf_app/templates/ishtar/sheet_operation.html:422 msgid "Regenerate statistics" msgstr "" @@ -7352,19 +7235,16 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_warehouse/templates/ishtar/sheet_container.html:212 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 -#: na_app/templates/ishtar/sheet_operation.html:436 #: sra_idf_app/templates/ishtar/sheet_operation.html:427 msgid "Last update:" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:514 -#: na_app/templates/ishtar/sheet_operation.html:516 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 msgid "Sources" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:532 -#: na_app/templates/ishtar/sheet_operation.html:534 #: sra_idf_app/templates/ishtar/sheet_operation.html:525 msgid "Finds by context records" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index ad857f037..4659c9951 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-08 14:59+0200\n" +"POT-Creation-Date: 2022-07-11 01:38+0200\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" -"Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/" -"wip-i18n/fr/>\n" +"Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" +"i18n/fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,14 +46,13 @@ msgstr "Polygones multi-parties" #: archaeological_operations/models.py:2174 #: archaeological_operations/models.py:2191 #: archaeological_operations/models.py:2307 -#: archaeological_operations/models.py:2501 -#: archaeological_operations/models.py:2787 +#: archaeological_operations/models.py:2504 +#: archaeological_operations/models.py:2791 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:353 #: archaeological_operations/wizards.py:365 #: archaeological_warehouse/models.py:803 ishtar_common/forms_common.py:1957 #: ishtar_common/models.py:4850 ishtar_common/views.py:395 -#: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -99,7 +98,7 @@ msgid "Context record - 001 - Search" msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:871 archaeological_files/forms.py:908 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -125,7 +124,7 @@ msgid "ID" msgstr "Identifiant" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1932 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1934 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" @@ -172,13 +171,13 @@ msgstr "Type d'unité" #: archaeological_context_records/models.py:626 #: archaeological_context_records/models.py:1313 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:922 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 #: archaeological_finds/models_finds.py:1087 #: archaeological_operations/forms.py:496 #: archaeological_operations/forms.py:1141 #: archaeological_operations/forms.py:1631 -#: archaeological_operations/models.py:2809 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:2813 +#: archaeological_operations/models.py:3055 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" @@ -212,13 +211,12 @@ msgstr "Rechercher une Unité d'Enregistrement" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:761 #: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1686 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:40 #: archaeological_operations/templates/ishtar/sheet_site.html:36 #: archaeological_warehouse/templates/ishtar/sheet_container.html:24 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 -#: na_app/templates/ishtar/sheet_operation.html:40 #: sra_idf_app/templates/ishtar/sheet_operation.html:40 msgid "General" msgstr "Général" @@ -237,7 +235,7 @@ msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_finds/models_finds.py:1084 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:206 #: archaeological_operations/forms.py:1113 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 @@ -278,7 +276,6 @@ msgstr "Type d'Unité d'Enregistrement" #: archaeological_finds/models_finds.py:1777 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1623 ishtar_common/forms_common.py:1891 #: ishtar_common/models.py:1012 ishtar_common/models.py:3965 #: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 @@ -298,8 +295,8 @@ msgid "General comment" msgstr "Commentaire général" #: archaeological_context_records/forms.py:313 -#: archaeological_files/forms.py:298 archaeological_files/forms.py:583 -#: archaeological_files/models.py:620 archaeological_files_pdl/forms.py:143 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:595 +#: archaeological_files/models.py:628 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:833 msgid "Total surface (m2)" msgstr "Surface totale (m2)" @@ -342,7 +339,7 @@ msgstr "Date d'ouverture" #: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:655 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:591 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:556 @@ -354,7 +351,6 @@ msgstr "Date d'ouverture" #: archaeological_operations/models.py:1128 #: archaeological_operations/templates/ishtar/sheet_operation.html:182 #: ishtar_common/forms.py:988 ishtar_common/forms.py:989 -#: na_app/templates/ishtar/sheet_operation.html:181 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Closing date" msgstr "Date de clôture" @@ -449,7 +445,6 @@ msgstr "Vous devez choisir une commune ou une parcelle." #: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 #: archaeological_finds/models_finds.py:1820 #: archaeological_finds/templates/ishtar/sheet_find.html:215 -#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "Datation" @@ -463,10 +458,7 @@ msgstr "Datation" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 #: archaeological_operations/templates/ishtar/sheet_operation.html:505 -#: cd17_app/templates/ishtar/sheet_find.html:231 #: ishtar_common/models_imports.py:746 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:498 @@ -475,8 +467,8 @@ msgstr "Période" #: archaeological_context_records/forms.py:471 #: archaeological_context_records/models.py:104 -#: archaeological_files/forms.py:542 archaeological_files/models.py:75 -#: archaeological_files/models.py:683 +#: archaeological_files/forms.py:559 archaeological_files/models.py:75 +#: archaeological_files/models.py:697 #: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_finds/forms.py:1262 #: archaeological_finds/forms_treatments.py:180 @@ -492,11 +484,7 @@ msgstr "Période" #: archaeological_operations/forms.py:836 #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1129 -#: archaeological_operations/models.py:3052 -#: cd17_app/templates/ishtar/sheet_find.html:232 -#: cd17_app/templates/ishtar/sheet_find.html:347 -#: cd17_app/templates/ishtar/sheet_find.html:385 -#: cd17_app/templates/ishtar/sheet_find.html:423 +#: archaeological_operations/models.py:3056 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -506,8 +494,8 @@ msgstr "Date de début" #: archaeological_context_records/forms.py:472 #: archaeological_context_records/models.py:105 -#: archaeological_files/forms.py:547 archaeological_files/models.py:76 -#: archaeological_files/models.py:684 archaeological_finds/forms.py:1263 +#: archaeological_files/forms.py:564 archaeological_files/models.py:76 +#: archaeological_files/models.py:698 archaeological_finds/forms.py:1263 #: archaeological_finds/models_finds.py:3273 #: archaeological_finds/models_treatments.py:745 #: archaeological_finds/templates/ishtar/sheet_find.html:225 @@ -516,13 +504,7 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3053 -#: cd17_app/templates/ishtar/sheet_find.html:233 -#: cd17_app/templates/ishtar/sheet_find.html:348 -#: cd17_app/templates/ishtar/sheet_find.html:386 -#: cd17_app/templates/ishtar/sheet_find.html:424 -#: cd17_app/templates/ishtar/sheet_find.html:462 -#: ishtar_common/models_imports.py:991 +#: archaeological_operations/models.py:3057 ishtar_common/models_imports.py:991 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -535,7 +517,6 @@ msgstr "Date de fin" #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1264 #: archaeological_finds/templates/ishtar/sheet_find.html:227 -#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "Qualité" @@ -545,7 +526,6 @@ msgstr "Qualité" #: archaeological_context_records/models.py:108 #: archaeological_finds/forms.py:1265 #: archaeological_finds/templates/ishtar/sheet_find.html:226 -#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "Type de datation" @@ -554,7 +534,6 @@ msgstr "Type de datation" #: archaeological_context_records/models.py:120 #: archaeological_finds/forms.py:1266 #: archaeological_finds/templates/ishtar/sheet_find.html:228 -#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "Datation précise" @@ -584,8 +563,6 @@ msgstr "Unité d'Enregistrement" #: archaeological_operations/forms.py:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:66 #: archaeological_operations/templates/ishtar/sheet_operation.html:334 -#: na_app/templates/ishtar/sheet_operation.html:66 -#: na_app/templates/ishtar/sheet_operation.html:337 #: sra_idf_app/templates/ishtar/sheet_operation.html:66 #: sra_idf_app/templates/ishtar/sheet_operation.html:328 msgid "Relations" @@ -619,7 +596,6 @@ msgstr "Activité" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1676 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -670,7 +646,7 @@ msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:2002 ishtar_common/forms_common.py:2137 +#: archaeological_operations/forms.py:2004 ishtar_common/forms_common.py:2137 #: ishtar_common/models.py:3018 ishtar_common/models.py:3317 msgid " - duplicate" msgstr " - copie" @@ -855,7 +831,6 @@ msgstr "Datations" #: archaeological_finds/models_finds.py:3265 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1986 ishtar_common/models.py:4853 #: ishtar_common/views.py:403 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -866,7 +841,7 @@ msgstr "Mobilier" #: archaeological_context_records/models.py:339 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:223 archaeological_finds/models_finds.py:98 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:127 #: archaeological_finds/models_finds.py:247 @@ -879,7 +854,7 @@ msgstr "Mobilier" #: archaeological_operations/models.py:121 #: archaeological_operations/models.py:139 #: archaeological_operations/models.py:148 -#: archaeological_operations/models.py:3610 +#: archaeological_operations/models.py:3614 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:651 #: archaeological_warehouse/models.py:675 ishtar_common/models.py:663 #: ishtar_common/models.py:718 ishtar_common/models.py:759 @@ -1000,7 +975,7 @@ msgstr "id" #: archaeological_context_records/models.py:502 #: archaeological_context_records/tests.py:700 -#: archaeological_files/models.py:457 archaeological_finds/models_finds.py:1234 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1234 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:957 #: archaeological_operations/tests.py:2773 @@ -1079,7 +1054,7 @@ msgid "unit-type" msgstr "type-unite" #: archaeological_context_records/models.py:539 -#: archaeological_files/models.py:460 archaeological_operations/models.py:963 +#: archaeological_files/models.py:467 archaeological_operations/models.py:963 #: archaeological_operations/models.py:2355 msgctxt "key for text search" msgid "parcel" @@ -1144,20 +1119,20 @@ msgid "Duplicate" msgstr "Dupliquer" #: archaeological_context_records/models.py:620 -#: archaeological_files/models.py:522 archaeological_finds/models_finds.py:399 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:399 #: archaeological_finds/models_finds.py:1766 #: archaeological_finds/models_treatments.py:249 #: archaeological_finds/models_treatments.py:1090 -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2802 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1066 ishtar_common/models.py:3880 msgid "External ID" msgstr "Identifiant" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:401 +#: archaeological_files/models.py:532 archaeological_finds/models_finds.py:401 #: archaeological_finds/models_finds.py:1768 -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2805 #: archaeological_warehouse/models.py:387 #: archaeological_warehouse/models.py:1068 msgid "External ID is set automatically" @@ -1202,14 +1177,14 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_context_records/models.py:741 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:87 -#: archaeological_files/models.py:704 archaeological_finds/models_finds.py:1961 +#: archaeological_files/models.py:718 archaeological_finds/models_finds.py:1961 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:1138 #: archaeological_finds/templates/ishtar/sheet_find.html:70 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:402 #: archaeological_operations/models.py:1253 -#: archaeological_operations/models.py:2546 +#: archaeological_operations/models.py:2550 #: archaeological_operations/templates/ishtar/sheet_operation.html:57 #: archaeological_operations/templates/ishtar/sheet_site.html:94 #: archaeological_warehouse/models.py:374 @@ -1217,10 +1192,9 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3990 +#: ishtar_common/models.py:3990 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 -#: na_app/templates/ishtar/sheet_operation.html:57 #: sra_idf_app/templates/ishtar/sheet_find.html:70 #: sra_idf_app/templates/ishtar/sheet_operation.html:57 msgid "Documents" @@ -1232,19 +1206,19 @@ msgstr "Documents" #: archaeological_finds/models_treatments.py:1145 #: archaeological_operations/models.py:408 #: archaeological_operations/models.py:1259 -#: archaeological_operations/models.py:2553 +#: archaeological_operations/models.py:2557 #: archaeological_warehouse/models.py:381 #: archaeological_warehouse/models.py:1080 msgid "Main image" msgstr "Image principale" #: archaeological_context_records/models.py:753 -#: archaeological_files/models.py:708 archaeological_finds/models_finds.py:1979 +#: archaeological_files/models.py:722 archaeological_finds/models_finds.py:1979 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:413 #: archaeological_operations/models.py:1264 -#: archaeological_operations/models.py:2805 ishtar_common/models.py:2365 +#: archaeological_operations/models.py:2809 ishtar_common/models.py:2365 #: ishtar_common/models.py:2657 ishtar_common/models.py:3346 #: ishtar_common/models_common.py:1926 ishtar_common/models_common.py:1949 msgid "Cached name" @@ -1259,7 +1233,7 @@ msgstr "Nom en cache des périodes" #: archaeological_context_records/models.py:759 #: archaeological_context_records/models.py:765 -#: archaeological_files/models.py:712 archaeological_finds/models_finds.py:1983 +#: archaeological_files/models.py:726 archaeological_finds/models_finds.py:1983 #: archaeological_finds/models_finds.py:1989 #: archaeological_finds/models_finds.py:1995 #: archaeological_finds/models_finds.py:2001 @@ -1416,9 +1390,6 @@ msgstr "Opération / Site" #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 #: ishtar_common/views.py:1004 ishtar_common/views.py:1076 -#: na_app/templates/ishtar/sheet_operation.html:84 -#: na_app/templates/ishtar/sheet_operation.html:395 -#: na_app/templates/ishtar/sheet_operation.html:479 #: sra_idf_app/templates/ishtar/sheet_operation.html:84 #: sra_idf_app/templates/ishtar/sheet_operation.html:386 #: sra_idf_app/templates/ishtar/sheet_operation.html:470 @@ -1428,8 +1399,6 @@ msgstr "Mobilier" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 -#: cd17_app/templates/ishtar/sheet_find.html:79 -#: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 msgid "Custom fields" @@ -1442,10 +1411,8 @@ msgstr "Champs personnalisés" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:3022 #: ishtar_common/templates/ishtar/sheet_document.html:37 -#: na_app/templates/ishtar/sheet_operation.html:122 #: sra_idf_app/templates/ishtar/sheet_find.html:137 #: sra_idf_app/templates/ishtar/sheet_operation.html:120 msgid "Complete identifier" @@ -1453,10 +1420,9 @@ msgstr "Identifiant complet" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_files/templates/ishtar/sheet_file.html:102 -#: archaeological_files/templates/ishtar/sheet_file.html:265 +#: archaeological_files/templates/ishtar/sheet_file.html:267 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:190 -#: na_app/templates/ishtar/sheet_operation.html:189 #: sra_idf_app/templates/ishtar/sheet_operation.html:188 msgid "Surface" msgstr "Surface" @@ -1471,7 +1437,6 @@ msgstr "Surface" #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 #: ishtar_common/models_common.py:1903 -#: na_app/templates/ishtar/sheet_operation.html:282 #: sra_idf_app/templates/ishtar/sheet_operation.html:273 msgid "Localisation" msgstr "Localisation" @@ -1482,9 +1447,7 @@ msgstr "Localisation" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 -#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 #: sra_idf_app/templates/ishtar/sheet_operation.html:244 msgid "Sheet" @@ -1496,7 +1459,6 @@ msgstr "Résumé de l'opération" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 #: archaeological_operations/templates/ishtar/sheet_operation.html:260 -#: na_app/templates/ishtar/sheet_operation.html:267 #: sra_idf_app/templates/ishtar/sheet_operation.html:258 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" @@ -1524,13 +1486,9 @@ msgstr "Référence numérique" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: cd17_app/templates/ishtar/sheet_find.html:343 -#: cd17_app/templates/ishtar/sheet_find.html:381 -#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4748 -#: ishtar_common/models.py:4881 ishtar_common/models.py:4959 -#: ishtar_common/models_common.py:1829 ishtar_common/models_common.py:1844 -#: ishtar_common/models_imports.py:984 -#: na_app/templates/ishtar/sheet_operation.html:153 +#: ishtar_common/models.py:4748 ishtar_common/models.py:4881 +#: ishtar_common/models.py:4959 ishtar_common/models_common.py:1829 +#: ishtar_common/models_common.py:1844 ishtar_common/models_imports.py:984 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 #: sra_idf_app/templates/ishtar/sheet_find.html:418 @@ -1541,14 +1499,12 @@ msgstr "État" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 -#: na_app/templates/ishtar/sheet_operation.html:158 #: sra_idf_app/templates/ishtar/sheet_operation.html:156 msgid "Active file" msgstr "Dossier actif" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 -#: na_app/templates/ishtar/sheet_operation.html:161 #: sra_idf_app/templates/ishtar/sheet_operation.html:159 msgid "Closed operation" msgstr "Opération close" @@ -1556,7 +1512,6 @@ msgstr "Opération close" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:225 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 -#: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:182 msgid "by" msgstr "par" @@ -1571,14 +1526,12 @@ msgstr "Pas de mobilier associé." #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 #: archaeological_operations/templates/ishtar/sheet_operation.html:398 -#: na_app/templates/ishtar/sheet_operation.html:400 #: sra_idf_app/templates/ishtar/sheet_operation.html:391 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:276 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 -#: na_app/templates/ishtar/sheet_operation.html:366 #: sra_idf_app/templates/ishtar/sheet_operation.html:357 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" @@ -1616,23 +1569,23 @@ msgstr "Supprimer une Unité d'Enregistrement" msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" -#: archaeological_files/admin.py:144 +#: archaeological_files/admin.py:145 msgid "Copy from" msgstr "Copier depuis" -#: archaeological_files/admin.py:148 +#: archaeological_files/admin.py:149 msgid "To" msgstr "Vers" -#: archaeological_files/admin.py:165 +#: archaeological_files/admin.py:166 msgid "Source and destination must be different." msgstr "Source et destination doivent être différents." -#: archaeological_files/admin.py:211 +#: archaeological_files/admin.py:212 msgid "{} item(s) created." msgstr "{} élément(s) créés." -#: archaeological_files/admin.py:215 +#: archaeological_files/admin.py:216 msgid "{} item(s) already in database." msgstr "{} élément(s) existe(nt) déjà en base de données." @@ -1641,9 +1594,9 @@ msgid "File - 001 - Search" msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 -#: archaeological_files/forms.py:329 archaeological_files/forms.py:878 -#: archaeological_files/forms.py:915 archaeological_files/models.py:373 -#: archaeological_files/models.py:514 +#: archaeological_files/forms.py:329 archaeological_files/forms.py:890 +#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/models.py:521 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 #: archaeological_finds/forms.py:1377 @@ -1660,12 +1613,12 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:486 #: archaeological_operations/forms.py:789 #: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1934 +#: archaeological_operations/forms.py:1936 #: archaeological_operations/models.py:809 #: archaeological_operations/models.py:1166 #: archaeological_operations/models.py:2305 -#: archaeological_operations/models.py:2525 -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2794 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:797 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1673,7 +1626,7 @@ msgid "Year" msgstr "Année" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 -#: archaeological_files/forms.py:332 archaeological_files/models.py:516 +#: archaeological_files/forms.py:332 archaeological_files/models.py:523 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:487 #: archaeological_operations/models.py:1167 msgid "Numeric reference" @@ -1687,8 +1640,8 @@ msgstr "Identifiant numérique" msgid "Other reference" msgstr "Autre référence" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:887 -#: archaeological_files/forms.py:925 archaeological_files/models.py:1211 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 +#: archaeological_files/forms.py:937 archaeological_files/models.py:1319 #: archaeological_operations/forms.py:499 #: archaeological_operations/forms.py:1634 #: archaeological_operations/models.py:2177 @@ -1702,13 +1655,13 @@ msgstr "Autre référence" msgid "Department" msgstr "Département" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:935 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 msgid "File name" msgstr "Nom du dossier" #: archaeological_files/forms.py:95 archaeological_files/forms.py:207 -#: archaeological_files/forms.py:285 archaeological_files/models.py:374 -#: archaeological_files/models.py:379 archaeological_files/models.py:528 +#: archaeological_files/forms.py:285 archaeological_files/models.py:381 +#: archaeological_files/models.py:386 archaeological_files/models.py:535 #: archaeological_files_pdl/forms.py:65 msgid "File type" msgstr "Type de dossier" @@ -1723,18 +1676,18 @@ msgid "Saisine type" msgstr "Type de saisine" #: archaeological_files/forms.py:98 archaeological_files/forms.py:392 -#: archaeological_files/models.py:293 archaeological_files/models.py:378 -#: archaeological_files/models.py:577 archaeological_files_pdl/forms.py:100 +#: archaeological_files/models.py:300 archaeological_files/models.py:385 +#: archaeological_files/models.py:584 archaeological_files_pdl/forms.py:100 msgid "Permit type" msgstr "Type de permis" #: archaeological_files/forms.py:99 archaeological_files/forms.py:394 -#: archaeological_files/models.py:582 +#: archaeological_files/models.py:589 msgid "Permit/order reference" msgstr "Référence du permis / de l'arrêté" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 -#: archaeological_files/forms.py:479 archaeological_files/models.py:629 +#: archaeological_files/forms.py:479 archaeological_files/models.py:637 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 #: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 @@ -1749,8 +1702,11 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_operations/forms.py:871 #: archaeological_operations/forms.py:1393 #: archaeological_operations/forms.py:1514 +#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1699 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:2546 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:364 #: archaeological_warehouse/models.py:1036 ishtar_common/forms_common.py:1621 @@ -1769,26 +1725,26 @@ msgid "In charge" msgstr "Responsable" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:937 archaeological_files/models.py:540 +#: archaeological_files/forms.py:949 archaeological_files/models.py:547 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "Aménageur" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:978 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 #: archaeological_operations/forms.py:552 -#: archaeological_operations/forms.py:1638 ishtar_common/forms.py:921 +#: archaeological_operations/forms.py:1639 ishtar_common/forms.py:921 msgid "Created by" msgstr "Créé par" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:986 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:558 -#: archaeological_operations/forms.py:1644 +#: archaeological_operations/forms.py:1645 msgid "Modified by" msgstr "Modifié par" @@ -1797,7 +1753,7 @@ msgid "Archaeological file search" msgstr "Rechercher un dossier archéologique" #: archaeological_files/forms.py:198 archaeological_files/forms.py:283 -#: archaeological_files/models.py:596 archaeological_files_pdl/forms.py:75 +#: archaeological_files/models.py:604 archaeological_files_pdl/forms.py:75 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1122 #: archaeological_operations/forms.py:683 @@ -1809,12 +1765,11 @@ msgid "Creation date" msgstr "Date de création" #: archaeological_files/forms.py:198 archaeological_files/forms.py:410 -#: archaeological_files/models.py:598 archaeological_files_pdl/forms.py:78 +#: archaeological_files/models.py:606 archaeological_files_pdl/forms.py:78 #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "Date de réception" @@ -1851,16 +1806,15 @@ msgstr "Date après" msgid "Date before" msgstr "Date avant" -#: archaeological_files/forms.py:256 archaeological_files/models.py:532 +#: archaeological_files/forms.py:256 archaeological_files/models.py:539 #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:352 -#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "Personne responsable" -#: archaeological_files/forms.py:281 archaeological_files/models.py:527 +#: archaeological_files/forms.py:281 archaeological_files/models.py:534 #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1092 @@ -1869,42 +1823,40 @@ msgstr "Personne responsable" #: archaeological_operations/forms.py:1229 #: archaeological_operations/forms.py:1384 #: archaeological_operations/forms.py:1499 -#: archaeological_operations/forms.py:1990 +#: archaeological_operations/forms.py:1992 #: archaeological_operations/models.py:362 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:346 -#: cd17_app/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:409 ishtar_common/forms_common.py:468 -#: ishtar_common/forms_common.py:645 ishtar_common/forms_common.py:772 -#: ishtar_common/forms_common.py:863 ishtar_common/forms_common.py:1099 -#: ishtar_common/forms_common.py:1150 ishtar_common/models.py:662 -#: ishtar_common/models.py:701 ishtar_common/models.py:1006 -#: ishtar_common/models.py:1497 ishtar_common/models.py:1879 -#: ishtar_common/models.py:2353 ishtar_common/models.py:2641 -#: ishtar_common/models.py:2968 ishtar_common/models.py:4724 -#: ishtar_common/models_common.py:1900 ishtar_common/models_common.py:1949 -#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 -#: ishtar_common/models_imports.py:513 ishtar_common/models_imports.py:530 -#: ishtar_common/models_imports.py:638 ishtar_common/models_imports.py:948 +#: archaeological_warehouse/models.py:346 ishtar_common/forms_common.py:409 +#: ishtar_common/forms_common.py:468 ishtar_common/forms_common.py:645 +#: ishtar_common/forms_common.py:772 ishtar_common/forms_common.py:863 +#: ishtar_common/forms_common.py:1099 ishtar_common/forms_common.py:1150 +#: ishtar_common/models.py:662 ishtar_common/models.py:701 +#: ishtar_common/models.py:1006 ishtar_common/models.py:1497 +#: ishtar_common/models.py:1879 ishtar_common/models.py:2353 +#: ishtar_common/models.py:2641 ishtar_common/models.py:2968 +#: ishtar_common/models.py:4724 ishtar_common/models_common.py:1900 +#: ishtar_common/models_common.py:1949 ishtar_common/models_imports.py:82 +#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:513 +#: ishtar_common/models_imports.py:530 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:948 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 -#: na_app/templates/ishtar/sheet_operation.html:137 #: sra_idf_app/templates/ishtar/sheet_find.html:456 #: sra_idf_app/templates/ishtar/sheet_operation.html:135 msgid "Name" msgstr "Nom" -#: archaeological_files/forms.py:287 archaeological_files/models.py:604 +#: archaeological_files/forms.py:287 archaeological_files/models.py:612 #: archaeological_files_pdl/forms.py:447 msgid "Related file" msgstr "Dossier associé" -#: archaeological_files/forms.py:304 archaeological_files/models.py:625 +#: archaeological_files/forms.py:304 archaeological_files/models.py:633 msgid "Main address" msgstr "Adresse des terrains" @@ -1925,9 +1877,8 @@ msgstr "Un autre dossier avec cet identifiant numérique existe." #: archaeological_operations/forms.py:1138 #: archaeological_operations/forms.py:1154 #: archaeological_operations/forms.py:1160 -#: archaeological_operations/models.py:2810 +#: archaeological_operations/models.py:2814 #: archaeological_operations/templates/ishtar/sheet_operation.html:445 -#: na_app/templates/ishtar/sheet_operation.html:447 #: sra_idf_app/templates/ishtar/sheet_operation.html:438 msgid "Parcels" msgstr "Parcelles" @@ -1940,12 +1891,12 @@ msgstr "Dossier archéologique - 020 - Parcelles" msgid "Preventive informations" msgstr "Information archéologie préventive" -#: archaeological_files/forms.py:378 archaeological_files/models.py:561 +#: archaeological_files/forms.py:378 archaeological_files/models.py:568 msgid "Responsible for planning service" msgstr "Responsable pour le service instructeur" -#: archaeological_files/forms.py:400 archaeological_files/forms.py:573 -#: archaeological_files/models.py:622 archaeological_files_pdl/forms.py:151 +#: archaeological_files/forms.py:400 archaeological_files/forms.py:585 +#: archaeological_files/models.py:630 archaeological_files_pdl/forms.py:151 msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" @@ -1959,20 +1910,20 @@ msgstr "Archéologie programmée" msgid "Archaeological file - 045 - Research - General" msgstr "Dossier archéologique - 045 - Recherche - Général" -#: archaeological_files/forms.py:439 archaeological_files/models.py:632 +#: archaeological_files/forms.py:439 archaeological_files/models.py:640 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2532 ishtar_common/models_common.py:1853 +#: archaeological_operations/models.py:2535 ishtar_common/models_common.py:1853 msgid "Departments" msgstr "Départements" -#: archaeological_files/forms.py:459 archaeological_files/models.py:656 +#: archaeological_files/forms.py:459 archaeological_files/models.py:664 #: archaeological_operations/forms.py:518 #: archaeological_operations/models.py:884 -#: archaeological_operations/models.py:2486 +#: archaeological_operations/models.py:2489 msgid "Scientist in charge" msgstr "Responsable d'opération" -#: archaeological_files/forms.py:462 archaeological_files/models.py:640 +#: archaeological_files/forms.py:462 archaeological_files/models.py:648 msgid "Requested operation type" msgstr "Type d'opération demandée" @@ -1980,11 +1931,11 @@ msgstr "Type d'opération demandée" msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: archaeological_files/forms.py:488 archaeological_files/models.py:662 +#: archaeological_files/forms.py:488 archaeological_files/models.py:670 msgid "Classified area" msgstr "Au sein d'un site classé" -#: archaeological_files/forms.py:489 archaeological_files/models.py:664 +#: archaeological_files/forms.py:489 archaeological_files/models.py:672 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" @@ -2017,84 +1968,93 @@ msgstr "Surfaces" msgid "Archaeological royalties" msgstr "Redevances archéologiques" -#: archaeological_files/forms.py:552 archaeological_files/models.py:685 +#: archaeological_files/forms.py:544 archaeological_files/models.py:689 +msgid "Intervention period" +msgstr "Période d'intervention" + +#: archaeological_files/forms.py:549 archaeological_files/models.py:692 +msgid "Study period" +msgstr "Période d'étude" + +#: archaeological_files/forms.py:554 archaeological_files/models.py:695 +msgid "Report due period" +msgstr "Période de remise du rapport" + +#: archaeological_files/forms.py:569 archaeological_files/models.py:699 msgid "Ground start date" msgstr "Date de début de la fouille" -#: archaeological_files/forms.py:557 archaeological_files/models.py:686 +#: archaeological_files/forms.py:574 archaeological_files/models.py:700 msgid "Ground end date" msgstr "Date de fin de la fouille" -#: archaeological_files/forms.py:562 archaeological_files/models.py:681 -msgid "Study period" -msgstr "Période d'étude" - -#: archaeological_files/forms.py:567 archaeological_files/models.py:688 +#: archaeological_files/forms.py:579 archaeological_files/models.py:702 msgid "Execution report date" msgstr "Date du rapport d'exécution" -#: archaeological_files/forms.py:590 +#: archaeological_files/forms.py:602 msgid "Linear meter (m)" msgstr "Mètre linéaire (m)" -#: archaeological_files/forms.py:650 archaeological_files/forms.py:652 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/forms.py:662 archaeological_files/forms.py:664 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:342 msgid "Man by day" msgstr "Personnes par jour" -#: archaeological_files/forms.py:651 archaeological_files/forms.py:653 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/forms.py:663 archaeological_files/forms.py:665 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:343 msgid "Days" msgstr "Jours" -#: archaeological_files/forms.py:654 archaeological_files/models.py:114 -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/forms.py:666 archaeological_files/models.py:114 +#: archaeological_files/models.py:1509 archaeological_files/models.py:1525 +#: archaeological_files/templates/ishtar/sheet_file.html:281 +#: archaeological_files/templates/ishtar/sheet_file.html:333 msgid "Job" msgstr "Emploi" -#: archaeological_files/forms.py:674 archaeological_files/models.py:79 +#: archaeological_files/forms.py:686 archaeological_files/models.py:79 #: archaeological_files/models.py:80 archaeological_files/models.py:91 -#: archaeological_files/models.py:194 archaeological_files/models.py:677 +#: archaeological_files/models.py:201 archaeological_files/models.py:685 msgid "Price agreement" msgstr "Contrat tarifaire" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:740 msgid "Post-excavation" msgstr "Post-fouille" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:741 msgid "Preventive file - 030 - Post-excavation" msgstr "Dossier préventif - 030 - Post-fouille" -#: archaeological_files/forms.py:753 -#: archaeological_files/templates/ishtar/sheet_file.html:275 +#: archaeological_files/forms.py:765 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Ground jobs" msgstr "Emplois de terrain" -#: archaeological_files/forms.py:755 +#: archaeological_files/forms.py:767 msgid "Preventive file - 040 - Ground jobs" msgstr "Dossier préventif - 040 - Emplois de terrain" -#: archaeological_files/forms.py:761 archaeological_files/forms.py:763 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/forms.py:773 archaeological_files/forms.py:775 +#: archaeological_files/templates/ishtar/sheet_file.html:391 +#: archaeological_files/templates/ishtar/sheet_file.html:394 msgid "Quantity" msgstr "Quantité" -#: archaeological_files/forms.py:765 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/forms.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:385 msgid "Equipment / service" msgstr "Équipement / service" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:916 -#: archaeological_files/forms.py:1052 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 +#: archaeological_files/forms.py:1064 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2107,85 +2067,84 @@ msgstr "Équipement / service" #: archaeological_finds/models_treatments.py:1085 #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 -#: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2471 -#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3879 +#: archaeological_operations/forms.py:1757 +#: archaeological_operations/models.py:2474 ishtar_common/models.py:3879 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "Index" -#: archaeological_files/forms.py:882 archaeological_files/forms.py:919 -#: archaeological_files/forms.py:1041 +#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 +#: archaeological_files/forms.py:1053 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 #: archaeological_operations/forms.py:1628 -#: archaeological_operations/forms.py:1688 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:2207 -#: archaeological_operations/models.py:2462 +#: archaeological_operations/models.py:2465 msgid "Act type" msgstr "Type d'acte" -#: archaeological_files/forms.py:883 +#: archaeological_files/forms.py:895 msgid "Object (full text search)" msgstr "Objet (recherche en texte intégral)" -#: archaeological_files/forms.py:920 +#: archaeological_files/forms.py:932 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 #: archaeological_operations/forms.py:1629 -#: archaeological_operations/forms.py:1825 +#: archaeological_operations/forms.py:1827 msgid "Indexed?" msgstr "Indexé ?" -#: archaeological_files/forms.py:927 +#: archaeological_files/forms.py:939 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 #: archaeological_operations/forms.py:1635 -#: archaeological_operations/forms.py:1695 -#: archaeological_operations/models.py:2526 +#: archaeological_operations/forms.py:1696 +#: archaeological_operations/models.py:2529 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: archaeological_files/forms.py:930 +#: archaeological_files/forms.py:942 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "Date de signature avant" -#: archaeological_files/forms.py:933 +#: archaeological_files/forms.py:945 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "Date de signature après" -#: archaeological_files/forms.py:958 +#: archaeological_files/forms.py:970 msgid "File numeric reference" msgstr "Dossier : réf. numérique" -#: archaeological_files/forms.py:960 +#: archaeological_files/forms.py:972 msgid "File year" msgstr "Dossier : année" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:974 msgid "File other reference" msgstr "Dossier : autre référence" -#: archaeological_files/forms.py:965 +#: archaeological_files/forms.py:977 msgid "File in charge" msgstr "Dossier : responsable" -#: archaeological_files/forms.py:975 +#: archaeological_files/forms.py:987 msgid "File permit reference" msgstr "Dossier : réf. du permis" -#: archaeological_files/forms.py:1039 +#: archaeological_files/forms.py:1051 msgid "Archaeological file - Administrative act - General" msgstr "Dossier archéologique - Acte administratif - Général" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:725 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:747 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:666 @@ -2193,7 +2152,7 @@ msgstr "Dossier archéologique - Acte administratif - Général" #: archaeological_operations/models.py:1683 #: archaeological_operations/models.py:2190 #: archaeological_operations/models.py:2306 -#: archaeological_operations/models.py:2508 +#: archaeological_operations/models.py:2511 #: archaeological_operations/wizards.py:89 ishtar_common/views.py:394 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2208,7 +2167,7 @@ msgstr "Clôture" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3267 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2562 +#: archaeological_operations/models.py:2566 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -2275,7 +2234,6 @@ msgstr "Types d'équipement/de service" #: archaeological_files/models.py:183 #: archaeological_operations/templates/ishtar/sheet_operation.html:207 -#: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:205 msgid "days" msgstr "jours" @@ -2294,16 +2252,16 @@ msgstr "mois" msgid "linear m." msgstr "m. linéaire" -#: archaeological_files/models.py:198 +#: archaeological_files/models.py:205 msgid "Equipment/Service" msgstr "Équipement/Service" -#: archaeological_files/models.py:201 ishtar_common/models_common.py:160 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:160 #: ishtar_common/models_common.py:191 msgid "Textual ID" msgstr "Identifiant textuel" -#: archaeological_files/models.py:205 ishtar_common/models_common.py:164 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:164 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2312,100 +2270,100 @@ msgstr "" "lettres en minuscule, des nombres et des tirets (-). Chaque \"slug\" doit " "être unique dans la typologie." -#: archaeological_files/models.py:211 +#: archaeological_files/models.py:218 msgid "Service provider" msgstr "Fournisseur de service" -#: archaeological_files/models.py:213 archaeological_files/models.py:253 +#: archaeological_files/models.py:220 archaeological_files/models.py:260 msgid "Flat rate" msgstr "Tarif forfaitaire" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:221 msgid "Unitary cost" msgstr "Coût unitaire" -#: archaeological_files/models.py:216 ishtar_common/models_imports.py:751 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:751 msgid "Unit" msgstr "Unité" -#: archaeological_files/models.py:219 +#: archaeological_files/models.py:226 msgid "Specificity" msgstr "Spécificité" -#: archaeological_files/models.py:222 +#: archaeological_files/models.py:229 msgid "Default quantity by day" msgstr "Quantité par défaut par jour" -#: archaeological_files/models.py:224 ishtar_common/models.py:1499 +#: archaeological_files/models.py:231 ishtar_common/models.py:1499 #: ishtar_common/models.py:1909 ishtar_common/models.py:3221 #: ishtar_common/models_common.py:170 ishtar_common/models_imports.py:124 #: ishtar_common/models_imports.py:643 msgid "Available" msgstr "Disponible" -#: archaeological_files/models.py:230 archaeological_warehouse/forms.py:752 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:752 #: ishtar_common/admin.py:999 ishtar_common/admin.py:1018 #: ishtar_common/models.py:2214 ishtar_common/models_common.py:702 msgid "Parent" msgstr "Parent" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:238 msgid "Auto-add this cost when a parent is added" msgstr "Ajout automatique de ce coût lorsqu'un parent est ajouté" -#: archaeological_files/models.py:236 +#: archaeological_files/models.py:243 msgid "Equipment/service cost" msgstr "Coût équipement/service" -#: archaeological_files/models.py:237 +#: archaeological_files/models.py:244 msgid "Equipment/service costs" msgstr "Coûts équipement/service" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:280 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: archaeological_files/models.py:274 +#: archaeological_files/models.py:281 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: archaeological_files/models.py:294 +#: archaeological_files/models.py:301 msgid "Permit types" msgstr "Types de permis" -#: archaeological_files/models.py:305 +#: archaeological_files/models.py:312 msgid "Delay (in days)" msgstr "Délai (en jours)" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:325 msgid "Agreement type - France" msgstr "Type de convention - France" -#: archaeological_files/models.py:319 +#: archaeological_files/models.py:326 msgid "Agreement types - France" msgstr "Types de convention - France" -#: archaeological_files/models.py:329 +#: archaeological_files/models.py:336 msgid "Increase coefficient" msgstr "Coefficient majoration" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:338 msgid "Increased final value" msgstr "Valeur finale majorée" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:340 msgid "Category" msgstr "Catégorie" -#: archaeological_files/models.py:337 +#: archaeological_files/models.py:344 msgid "Operation type for royalties - France" msgstr "Type d'opération pour les redevances - France" -#: archaeological_files/models.py:338 +#: archaeological_files/models.py:345 msgid "Operation types for royalties - France" msgstr "Types d'opération pour les redevances - France" -#: archaeological_files/models.py:375 archaeological_finds/models_finds.py:1132 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1132 #: archaeological_operations/models.py:191 #: archaeological_operations/models.py:810 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 @@ -2419,13 +2377,13 @@ msgstr "Types d'opération pour les redevances - France" msgid "Area" msgstr "Zone" -#: archaeological_files/models.py:376 archaeological_finds/models_finds.py:1135 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1135 #: archaeological_operations/models.py:192 #: archaeological_operations/models.py:811 msgid "Extended area" msgstr "Zone étendue" -#: archaeological_files/models.py:385 archaeological_finds/models_finds.py:1156 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1156 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2442,12 +2400,6 @@ msgstr "Zone étendue" #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:487 -#: na_app/templates/ishtar/sheet_operation.html:497 -#: na_app/templates/ishtar/sheet_operation.html:507 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_operation.html:451 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 @@ -2457,15 +2409,15 @@ msgstr "Zone étendue" msgid "Number" msgstr "Nombre" -#: archaeological_files/models.py:386 +#: archaeological_files/models.py:393 msgid "Total surface (km2)" msgstr "Surface totale (km2)" -#: archaeological_files/models.py:387 +#: archaeological_files/models.py:394 msgid "Total developed surface (km2)" msgstr "Surface totale aménagée (km²)" -#: archaeological_files/models.py:437 archaeological_files/models.py:593 +#: archaeological_files/models.py:444 archaeological_files/models.py:601 #: archaeological_files_pdl/forms.py:124 archaeological_files_pdl/forms.py:168 #: archaeological_operations/forms.py:1111 #: archaeological_operations/forms.py:1127 @@ -2476,17 +2428,16 @@ msgstr "Surface totale aménagée (km²)" #: archaeological_operations/models.py:895 #: archaeological_operations/models.py:897 #: archaeological_operations/models.py:1184 -#: archaeological_operations/models.py:2538 +#: archaeological_operations/models.py:2541 #: archaeological_operations/templates/ishtar/sheet_operation.html:130 #: ishtar_common/forms_common.py:1268 ishtar_common/forms_common.py:1281 #: ishtar_common/forms_common.py:1282 ishtar_common/models.py:2207 #: ishtar_common/models_common.py:1932 -#: na_app/templates/ishtar/sheet_operation.html:130 #: sra_idf_app/templates/ishtar/sheet_operation.html:128 msgid "Towns" msgstr "Communes" -#: archaeological_files/models.py:448 archaeological_finds/models_finds.py:1238 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1238 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:948 @@ -2497,7 +2448,7 @@ msgctxt "key for text search" msgid "year" msgstr "annee" -#: archaeological_files/models.py:450 +#: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1036 #: archaeological_operations/models.py:240 #: archaeological_warehouse/models.py:859 ishtar_common/models.py:3645 @@ -2505,19 +2456,19 @@ msgctxt "key for text search" msgid "reference" msgstr "reference" -#: archaeological_files/models.py:453 +#: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 #: archaeological_operations/models.py:246 msgctxt "key for text search" msgid "other-reference" msgstr "autre-reference" -#: archaeological_files/models.py:464 archaeological_operations/models.py:967 +#: archaeological_files/models.py:471 archaeological_operations/models.py:967 msgctxt "key for text search" msgid "department" msgstr "departement" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:971 @@ -2528,7 +2479,7 @@ msgctxt "key for text search" msgid "name" msgstr "nom" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:977 @@ -2542,96 +2493,97 @@ msgctxt "key for text search" msgid "type" msgstr "type" -#: archaeological_files/models.py:474 +#: archaeological_files/models.py:481 msgctxt "key for text search" msgid "active" msgstr "actif" -#: archaeological_files/models.py:477 +#: archaeological_files/models.py:484 msgctxt "key for text search" msgid "saisine-type" msgstr "type-saisine" -#: archaeological_files/models.py:481 +#: archaeological_files/models.py:488 msgctxt "key for text search" msgid "permit-type" msgstr "type-permis" -#: archaeological_files/models.py:485 +#: archaeological_files/models.py:492 msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:489 archaeological_finds/models_finds.py:1444 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1444 #: archaeological_operations/models.py:262 #: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:2451 #: archaeological_warehouse/models.py:866 ishtar_common/models.py:3705 msgctxt "key for text search" msgid "comment" msgstr "commentaire" -#: archaeological_files/models.py:492 archaeological_finds/models_finds.py:1595 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1595 #: archaeological_finds/models_treatments.py:1045 #: archaeological_finds/tests.py:1328 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:496 archaeological_operations/models.py:2386 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2386 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:500 archaeological_operations/models.py:2390 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2390 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" -#: archaeological_files/models.py:519 +#: archaeological_files/models.py:526 #: archaeological_finds/models_treatments.py:1087 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1890 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" -#: archaeological_files/models.py:546 +#: archaeological_files/models.py:553 msgid "General contractor (raw)" msgstr "Aménageur (brut)" -#: archaeological_files/models.py:551 +#: archaeological_files/models.py:558 msgid "General contractor organization" msgstr "Organisation de l'aménageur" -#: archaeological_files/models.py:565 +#: archaeological_files/models.py:572 msgid "Planning service (raw)" msgstr "Service instructeur (brut)" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:579 msgid "Planning service organization" msgstr "Service instructeur" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:594 msgid "Main town" msgstr "Commune principale" -#: archaeological_files/models.py:600 archaeological_files_pdl/forms.py:407 +#: archaeological_files/models.py:608 archaeological_files_pdl/forms.py:407 msgid "Date of planning service file" msgstr "Date du dossier du service instructeur" -#: archaeological_files/models.py:618 +#: archaeological_files/models.py:626 msgid "Instruction deadline" msgstr "Date limite d'instruction" -#: archaeological_files/models.py:624 archaeological_files_pdl/forms.py:132 +#: archaeological_files/models.py:632 archaeological_files_pdl/forms.py:132 #: archaeological_files_pdl/forms.py:173 msgid "Locality" msgstr "Lieu-dit" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:635 msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:654 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:242 @@ -2647,99 +2599,99 @@ msgstr "Adresse des terrains - code postal" msgid "Organization" msgstr "Organisation" -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:667 msgid "Research archaeology comment" msgstr "Commentaire relatif à l'archéologie programmée" -#: archaeological_files/models.py:690 +#: archaeological_files/models.py:704 msgid "Linear meter" msgstr "Mètre linéaire" -#: archaeological_files/models.py:694 +#: archaeological_files/models.py:708 msgid "Type of agreement" msgstr "Type de convention" -#: archaeological_files/models.py:699 +#: archaeological_files/models.py:713 msgid "Operation type for royalties" msgstr "Type d'opération pour la redevance" -#: archaeological_files/models.py:714 +#: archaeological_files/models.py:728 msgid "Imported line" msgstr "Ligne importée" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:748 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 #: ishtar_common/views.py:999 ishtar_common/views.py:1060 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: archaeological_files/models.py:754 +#: archaeological_files/models.py:776 msgid "FILE" msgstr "DOSSIER" -#: archaeological_files/models.py:953 +#: archaeological_files/models.py:1013 msgid "Multi-town" msgstr "Intercommunal" -#: archaeological_files/models.py:959 +#: archaeological_files/models.py:1019 msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1120 +#: archaeological_files/models.py:1228 msgid "Edit intervention plan" msgstr "Modifier le plan d'intervention" -#: archaeological_files/models.py:1122 +#: archaeological_files/models.py:1230 msgid "plan" msgstr "plan d'intervention" -#: archaeological_files/models.py:1128 +#: archaeological_files/models.py:1236 #: archaeological_finds/models_treatments.py:399 #: archaeological_finds/models_treatments.py:1205 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" -#: archaeological_files/models.py:1130 +#: archaeological_files/models.py:1238 #: archaeological_finds/models_treatments.py:401 #: archaeological_finds/models_treatments.py:1207 msgid "admin. act" msgstr "acte admin." -#: archaeological_files/models.py:1139 +#: archaeological_files/models.py:1247 msgid "Add operation" msgstr "Ajouter une opération" -#: archaeological_files/models.py:1141 +#: archaeological_files/models.py:1249 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1208 archaeological_operations/models.py:1171 -#: archaeological_operations/models.py:2777 +#: archaeological_files/models.py:1316 archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:2781 msgid "File" msgstr "Dossier" -#: archaeological_files/models.py:1375 +#: archaeological_files/models.py:1483 msgid "Man by day - planned" msgstr "Personnes par jour - planifiés" -#: archaeological_files/models.py:1377 archaeological_files/models.py:1437 +#: archaeological_files/models.py:1485 archaeological_files/models.py:1545 msgid "Days - planned" msgstr "Jours - planifiés" -#: archaeological_files/models.py:1379 +#: archaeological_files/models.py:1487 msgid "Man by day - worked" msgstr "Personnes par jour - travaillés" -#: archaeological_files/models.py:1381 archaeological_files/models.py:1441 +#: archaeological_files/models.py:1489 archaeological_files/models.py:1549 msgid "Days - worked" msgstr "Jours - travaillés" -#: archaeological_files/models.py:1435 +#: archaeological_files/models.py:1543 msgid "Quantity by day - planned" msgstr "Quantité par jour - planifié" -#: archaeological_files/models.py:1439 +#: archaeological_files/models.py:1547 msgid "Quantity by day - worked" msgstr "Quantité par jour - travaillé" @@ -2766,9 +2718,9 @@ msgid "Global informations" msgstr "Informations générales" #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:14 -#: archaeological_files/templates/ishtar/sheet_file.html:305 -#: archaeological_files/templates/ishtar/sheet_file.html:357 -#: archaeological_files/templates/ishtar/sheet_file.html:413 +#: archaeological_files/templates/ishtar/sheet_file.html:307 +#: archaeological_files/templates/ishtar/sheet_file.html:359 +#: archaeological_files/templates/ishtar/sheet_file.html:415 #: archaeological_warehouse/templates/ishtar/sheet_container.html:234 #: archaeological_warehouse/templates/ishtar/sheet_container.html:258 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 @@ -2860,9 +2812,9 @@ msgid "Change price agreement" msgstr "Changer le contrat tarifaire" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:280 -#: archaeological_files/templates/ishtar/sheet_file.html:332 -#: archaeological_files/templates/ishtar/sheet_file.html:384 +#: archaeological_files/templates/ishtar/sheet_file.html:282 +#: archaeological_files/templates/ishtar/sheet_file.html:334 +#: archaeological_files/templates/ishtar/sheet_file.html:386 msgid "Planned" msgstr "Planifié" @@ -2906,7 +2858,6 @@ msgstr "Surface aménagée" #: archaeological_files/templates/ishtar/sheet_file.html:181 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 -#: na_app/templates/ishtar/sheet_operation.html:313 #: sra_idf_app/templates/ishtar/sheet_operation.html:304 msgid "Associated parcels" msgstr "Parcelles associées" @@ -2915,11 +2866,9 @@ msgstr "Parcelles associées" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2567 #: archaeological_operations/templates/ishtar/sheet_operation.html:315 #: archaeological_operations/templates/ishtar/sheet_operation.html:439 -#: na_app/templates/ishtar/sheet_operation.html:318 -#: na_app/templates/ishtar/sheet_operation.html:441 #: sra_idf_app/templates/ishtar/sheet_operation.html:309 #: sra_idf_app/templates/ishtar/sheet_operation.html:432 msgid "Administrative acts" @@ -2933,7 +2882,7 @@ msgstr "Opérations associées" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2304 -#: archaeological_operations/models.py:2599 +#: archaeological_operations/models.py:2603 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 @@ -2955,25 +2904,18 @@ msgstr "Réf." #: archaeological_operations/templates/ishtar/sheet_operation.html:458 #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:834 -#: cd17_app/templates/ishtar/sheet_find.html:342 -#: cd17_app/templates/ishtar/sheet_find.html:380 -#: cd17_app/templates/ishtar/sheet_find.html:418 -#: cd17_app/templates/ishtar/sheet_find.html:456 -#: ishtar_common/forms_common.py:469 ishtar_common/forms_common.py:648 -#: ishtar_common/forms_common.py:866 ishtar_common/forms_common.py:1097 -#: ishtar_common/forms_common.py:1482 ishtar_common/forms_common.py:1888 -#: ishtar_common/forms_common.py:2121 ishtar_common/models.py:716 -#: ishtar_common/models.py:2354 ishtar_common/models.py:3885 -#: ishtar_common/models_imports.py:796 +#: archaeological_warehouse/models.py:834 ishtar_common/forms_common.py:469 +#: ishtar_common/forms_common.py:648 ishtar_common/forms_common.py:866 +#: ishtar_common/forms_common.py:1097 ishtar_common/forms_common.py:1482 +#: ishtar_common/forms_common.py:1888 ishtar_common/forms_common.py:2121 +#: ishtar_common/models.py:716 ishtar_common/models.py:2354 +#: ishtar_common/models.py:3885 ishtar_common/models_imports.py:796 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 #: ishtar_common/templates/ishtar/import_table.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_find.html:341 #: sra_idf_app/templates/ishtar/sheet_find.html:379 #: sra_idf_app/templates/ishtar/sheet_find.html:417 @@ -3012,41 +2954,40 @@ msgstr "Pas d'acte administratif associé à ces opérations" msgid "Document for this archaeological file" msgstr "Document pour ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:257 +#: archaeological_files/templates/ishtar/sheet_file.html:259 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:272 +#: archaeological_files/templates/ishtar/sheet_file.html:274 msgid "Human and technical requirements" msgstr "Besoins humains et techniques" -#: archaeological_files/templates/ishtar/sheet_file.html:281 -#: archaeological_files/templates/ishtar/sheet_file.html:333 -#: archaeological_files/templates/ishtar/sheet_file.html:385 -#: archaeological_operations/models.py:3107 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_operations/models.py:3111 msgid "Effective" msgstr "Effectif" -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:339 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:391 -#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:670 #: archaeological_operations/templates/ishtar/sheet_operation.html:198 -#: na_app/templates/ishtar/sheet_operation.html:197 #: sra_idf_app/templates/ishtar/sheet_operation.html:196 msgid "Cost" msgstr "Coût" -#: archaeological_files/templates/ishtar/sheet_file.html:316 -#: archaeological_files/templates/ishtar/sheet_file.html:368 -#: archaeological_files/templates/ishtar/sheet_file.html:420 +#: archaeological_files/templates/ishtar/sheet_file.html:318 +#: archaeological_files/templates/ishtar/sheet_file.html:370 +#: archaeological_files/templates/ishtar/sheet_file.html:422 msgid "Difference" msgstr "Différence" -#: archaeological_files/templates/ishtar/sheet_file.html:327 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Post-excavation jobs" msgstr "Emplois post-fouille" @@ -3390,7 +3331,6 @@ msgstr "Commentaire relatif aux datations" #: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 #: archaeological_finds/forms.py:1319 #: archaeological_finds/templates/ishtar/sheet_find.html:168 -#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "Dimensions" @@ -3434,7 +3374,6 @@ msgstr "Volume (l)" #: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 #: archaeological_finds/forms.py:2002 #: archaeological_finds/templates/ishtar/sheet_find.html:177 -#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "Poids (g)" @@ -3584,7 +3523,6 @@ msgstr "Datation" #: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1347 #: archaeological_finds/templates/ishtar/sheet_find.html:198 -#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "Conservation" @@ -3753,8 +3691,8 @@ msgstr "Mobilier d'origine - ID complet" #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:701 #: archaeological_operations/forms.py:783 -#: archaeological_operations/forms.py:1873 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1941 #: archaeological_operations/models.py:808 #: archaeological_operations/models.py:896 #: archaeological_operations/models.py:1177 ishtar_common/models.py:4635 @@ -3837,7 +3775,6 @@ msgstr "Date de découverte (TAQ) avant" #: archaeological_finds/models_finds.py:1138 #: archaeological_operations/templates/ishtar/sheet_operation.html:485 #: archaeological_warehouse/forms.py:571 -#: na_app/templates/ishtar/sheet_operation.html:487 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 msgid "Material type" msgstr "Type de matériau" @@ -3846,7 +3783,6 @@ msgstr "Type de matériau" #: archaeological_finds/models_finds.py:1139 #: archaeological_operations/templates/ishtar/sheet_operation.html:495 #: archaeological_warehouse/forms.py:577 ishtar_common/models_imports.py:768 -#: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" msgstr "Type d'objet" @@ -3986,7 +3922,6 @@ msgstr "Traitement - date de clôture avant" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1098 #: archaeological_finds/models_finds.py:1835 #: archaeological_finds/templates/ishtar/sheet_find.html:273 -#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1500 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3998,7 +3933,6 @@ msgstr "Lieu de conservation du contenant de référence" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1097 #: archaeological_finds/templates/ishtar/sheet_find.html:294 -#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1492 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -4052,9 +3986,6 @@ msgstr "Panier de mobilier" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 -#: cd17_app/templates/ishtar/sheet_find.html:341 -#: cd17_app/templates/ishtar/sheet_find.html:379 -#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1434 ishtar_common/models.py:940 #: ishtar_common/models.py:1670 ishtar_common/models.py:3209 #: ishtar_common/models_common.py:158 ishtar_common/models_common.py:191 @@ -4119,7 +4050,7 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2193 -#: archaeological_operations/models.py:2522 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2525 ishtar_common/views.py:406 msgid "Treatment" msgstr "Traitement" @@ -4223,7 +4154,7 @@ msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2192 -#: archaeological_operations/models.py:2515 ishtar_common/views.py:405 +#: archaeological_operations/models.py:2518 ishtar_common/views.py:405 msgid "Treatment request" msgstr "Demande de traitement" @@ -4252,9 +4183,6 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_warehouse/models.py:1090 #: archaeological_warehouse/models.py:1871 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:346 -#: cd17_app/templates/ishtar/sheet_find.html:384 -#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1995 ishtar_common/forms_common.py:2186 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -4342,7 +4270,6 @@ msgstr "Réf. interne" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 -#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "Demandeur" @@ -4352,7 +4279,6 @@ msgstr "Demandeur" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "Organisation demandeuse" @@ -5258,14 +5184,12 @@ msgstr "Unité de poids" #: archaeological_finds/models_finds.py:1809 #: archaeological_finds/templates/ishtar/sheet_find.html:366 -#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "Traitement amont" #: archaeological_finds/models_finds.py:1816 #: archaeological_finds/templates/ishtar/sheet_find.html:404 -#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "Traitement aval" @@ -5448,9 +5372,6 @@ msgstr "Mobilier aval" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 -#: cd17_app/templates/ishtar/sheet_find.html:345 -#: cd17_app/templates/ishtar/sheet_find.html:383 -#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -5503,8 +5424,8 @@ msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:1006 -#: ishtar_common/views.py:1079 sra_idf_app/templates/ishtar/sheet_find.html:450 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1079 +#: sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -5579,7 +5500,6 @@ msgid "Last modified by" msgstr "Modifié en dernier par" #: archaeological_finds/templates/ishtar/sheet_find.html:14 -#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -5589,55 +5509,46 @@ msgstr "" "de ce mobilier." #: archaeological_finds/templates/ishtar/sheet_find.html:37 -#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "Image / Mobilier d'origine" #: archaeological_finds/templates/ishtar/sheet_find.html:44 -#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "Identification / Description / Dimensions" #: archaeological_finds/templates/ishtar/sheet_find.html:52 -#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "Datations / Conservation" #: archaeological_finds/templates/ishtar/sheet_find.html:61 -#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "Lieu de conservation / Traitements" #: archaeological_finds/templates/ishtar/sheet_find.html:142 -#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "Index administratif" #: archaeological_finds/templates/ishtar/sheet_find.html:188 -#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "Vérifié" #: archaeological_finds/templates/ishtar/sheet_find.html:269 -#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" #: archaeological_finds/templates/ishtar/sheet_find.html:295 -#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "Contenant de référence / contenant actuel" #: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "Traitements simples" @@ -5646,10 +5557,6 @@ msgstr "Traitements simples" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 -#: cd17_app/templates/ishtar/sheet_find.html:340 -#: cd17_app/templates/ishtar/sheet_find.html:378 -#: cd17_app/templates/ishtar/sheet_find.html:416 -#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -5660,9 +5567,6 @@ msgstr "Année - index" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 -#: cd17_app/templates/ishtar/sheet_find.html:344 -#: cd17_app/templates/ishtar/sheet_find.html:382 -#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5670,7 +5574,6 @@ msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" #: archaeological_finds/templates/ishtar/sheet_find.html:400 -#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5682,8 +5585,6 @@ msgstr "Export en CSV" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 -#: cd17_app/templates/ishtar/sheet_find.html:408 -#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5695,7 +5596,6 @@ msgstr "CSV" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5906,20 +5806,20 @@ msgstr "" "recherche a été épinglée." #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2792 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2798 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2796 -#: archaeological_operations/models.py:2824 -#: archaeological_operations/models.py:2889 +#: archaeological_operations/models.py:2800 +#: archaeological_operations/models.py:2828 +#: archaeological_operations/models.py:2893 msgid "Public domain" msgstr "Domaine public" @@ -5993,14 +5893,14 @@ msgstr "Est ouvert ?" #: archaeological_operations/forms.py:511 #: archaeological_operations/forms.py:821 -#: archaeological_operations/models.py:2468 +#: archaeological_operations/models.py:2471 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:520 #: archaeological_operations/forms.py:703 #: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1877 +#: archaeological_operations/forms.py:1879 #: archaeological_operations/models.py:1149 msgid "Operator" msgstr "Opérateur" @@ -6066,7 +5966,7 @@ msgstr "Opération virtuelle" #: archaeological_operations/forms.py:565 #: archaeological_operations/forms.py:864 -#: archaeological_operations/forms.py:1885 +#: archaeological_operations/forms.py:1887 #: archaeological_operations/models.py:815 #: archaeological_operations/models.py:1303 msgid "Documentation received" @@ -6082,7 +5982,7 @@ msgstr "Date limite de versement de la documentation après" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:869 -#: archaeological_operations/forms.py:1889 +#: archaeological_operations/forms.py:1891 #: archaeological_operations/models.py:816 #: archaeological_operations/models.py:1308 msgid "Finds received" @@ -6139,7 +6039,7 @@ msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" #: archaeological_operations/forms.py:785 -#: archaeological_operations/forms.py:1937 +#: archaeological_operations/forms.py:1939 #: archaeological_operations/models.py:1246 msgid "Generic name" msgstr "Nom générique" @@ -6204,7 +6104,6 @@ msgstr "Code de l'opération" #: archaeological_operations/forms.py:1025 #: archaeological_operations/templates/ishtar/sheet_operation.html:265 -#: na_app/templates/ishtar/sheet_operation.html:272 #: sra_idf_app/templates/ishtar/sheet_operation.html:263 msgid "Court-ordered seizure" msgstr "Saisie judiciaire" @@ -6240,8 +6139,8 @@ msgstr "Rédacteur du procès verbal" #: archaeological_operations/forms.py:1061 #: archaeological_operations/forms.py:1068 #: archaeological_operations/forms.py:1513 -#: archaeological_operations/forms.py:1893 -#: archaeological_operations/forms.py:2030 +#: archaeological_operations/forms.py:1895 +#: archaeological_operations/forms.py:2032 #: archaeological_operations/models.py:383 #: archaeological_operations/models.py:1163 msgid "Collaborators" @@ -6340,7 +6239,7 @@ msgstr "Opération - 070 - Périodes" #: archaeological_operations/forms.py:1228 #: archaeological_operations/forms.py:1382 #: archaeological_operations/forms.py:1498 -#: archaeological_operations/forms.py:1989 +#: archaeological_operations/forms.py:1991 #: archaeological_operations/models.py:360 #: archaeological_warehouse/models.py:1874 ishtar_common/forms_common.py:1603 #: ishtar_common/forms_common.py:1889 ishtar_common/forms_common.py:2120 @@ -6351,13 +6250,13 @@ msgstr "Référence" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1509 -#: archaeological_operations/forms.py:2036 +#: archaeological_operations/forms.py:2038 msgid "Cultural attributions" msgstr "Attributions culturelles" #: archaeological_operations/forms.py:1284 #: archaeological_operations/forms.py:1568 -#: archaeological_operations/forms.py:2009 +#: archaeological_operations/forms.py:2011 msgid "This reference already exists." msgstr "Cette référence existe déjà." @@ -6365,7 +6264,6 @@ msgstr "Cette référence existe déjà." #: archaeological_operations/models.py:442 #: archaeological_operations/models.py:1273 #: archaeological_operations/templates/ishtar/sheet_operation.html:305 -#: na_app/templates/ishtar/sheet_operation.html:308 #: sra_idf_app/templates/ishtar/sheet_operation.html:299 msgid "Archaeological sites" msgstr "Entités archéologiques" @@ -6465,32 +6363,32 @@ msgstr "Sous-marin / subaquatique" msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1665 +#: archaeological_operations/forms.py:1666 #: archaeological_operations/views.py:499 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1783 -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1852 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:2493 +#: archaeological_operations/forms.py:1691 +#: archaeological_operations/models.py:2496 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1697 -#: archaeological_operations/models.py:2524 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:2527 msgid "Signature date" msgstr "Date de signature" -#: archaeological_operations/forms.py:1709 +#: archaeological_operations/forms.py:1711 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1745 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -6499,48 +6397,48 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1749 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1760 +#: archaeological_operations/forms.py:1762 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1765 ishtar_common/forms.py:1271 +#: archaeological_operations/forms.py:1767 ishtar_common/forms.py:1271 #: ishtar_common/models.py:1883 msgid "Template" msgstr "Patron" -#: archaeological_operations/forms.py:1789 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1791 +#: archaeological_operations/forms.py:1795 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1813 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1813 +#: archaeological_operations/forms.py:1815 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1834 +#: archaeological_operations/forms.py:1836 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:592 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1855 +#: archaeological_operations/forms.py:1857 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1966 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:2020 +#: archaeological_operations/forms.py:2022 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -7080,71 +6978,71 @@ msgctxt "key for text search" msgid "treatment-file-type" msgstr "dossier-traitement-type" -#: archaeological_operations/models.py:2476 +#: archaeological_operations/models.py:2479 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2535 +#: archaeological_operations/models.py:2538 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2544 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2719 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:2807 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3049 ishtar_common/models.py:3219 +#: archaeological_operations/models.py:3053 ishtar_common/models.py:3219 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3057 +#: archaeological_operations/models.py:3061 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3062 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3106 +#: archaeological_operations/models.py:3110 msgid "Recorded" msgstr "Enregistré" -#: archaeological_operations/models.py:3108 +#: archaeological_operations/models.py:3112 msgid "Active" msgstr "Actif" -#: archaeological_operations/models.py:3109 +#: archaeological_operations/models.py:3113 msgid "Field completed" msgstr "Terrain achevé" -#: archaeological_operations/models.py:3110 +#: archaeological_operations/models.py:3114 msgid "Associated report" msgstr "Rapport associé" -#: archaeological_operations/models.py:3111 +#: archaeological_operations/models.py:3115 msgid "Closed" msgstr "Clos" -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3116 msgid "Documented and closed" msgstr "Documenté et clos" -#: archaeological_operations/models.py:3611 ishtar_common/models.py:4631 +#: archaeological_operations/models.py:3615 ishtar_common/models.py:4631 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3614 +#: archaeological_operations/models.py:3618 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3615 +#: archaeological_operations/models.py:3619 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -7326,7 +7224,6 @@ msgid "View PDF" msgstr "Voir le PDF" #: archaeological_operations/templates/ishtar/sheet_operation.html:48 -#: na_app/templates/ishtar/sheet_operation.html:48 #: sra_idf_app/templates/ishtar/sheet_operation.html:48 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "Sites / parcelles / actes administratifs" @@ -7335,9 +7232,7 @@ msgstr "Sites / parcelles / actes administratifs" #: archaeological_operations/templates/ishtar/sheet_operation.html:360 #: archaeological_operations/templates/ishtar/sheet_operation.html:450 #: ishtar_common/models.py:964 ishtar_common/views.py:1002 -#: ishtar_common/views.py:1072 na_app/templates/ishtar/sheet_operation.html:75 -#: na_app/templates/ishtar/sheet_operation.html:362 -#: na_app/templates/ishtar/sheet_operation.html:452 +#: ishtar_common/views.py:1072 #: sra_idf_app/templates/ishtar/sheet_operation.html:75 #: sra_idf_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:443 @@ -7351,58 +7246,48 @@ msgstr "Unités d'Enregistrement" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 -#: na_app/templates/ishtar/sheet_operation.html:101 -#: na_app/templates/ishtar/sheet_operation.html:421 #: sra_idf_app/templates/ishtar/sheet_operation.html:101 #: sra_idf_app/templates/ishtar/sheet_operation.html:412 msgid "Statistics" msgstr "Statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:143 -#: na_app/templates/ishtar/sheet_operation.html:143 #: sra_idf_app/templates/ishtar/sheet_operation.html:141 msgid "Excavation dates (start/end)" msgstr "Date de chantier (début/fin)" #: archaeological_operations/templates/ishtar/sheet_operation.html:206 -#: na_app/templates/ishtar/sheet_operation.html:205 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Duration" msgstr "Durée" #: archaeological_operations/templates/ishtar/sheet_operation.html:253 -#: na_app/templates/ishtar/sheet_operation.html:260 #: sra_idf_app/templates/ishtar/sheet_operation.html:251 msgid "This operation is virtual." msgstr "Cette opération est virtuelle." #: archaeological_operations/templates/ishtar/sheet_operation.html:324 -#: na_app/templates/ishtar/sheet_operation.html:327 #: sra_idf_app/templates/ishtar/sheet_operation.html:318 msgid "Document from this operation" msgstr "Documents de cette opération" #: archaeological_operations/templates/ishtar/sheet_operation.html:351 -#: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:344 msgid "No relations" msgstr "Pas de relation" #: archaeological_operations/templates/ishtar/sheet_operation.html:370 -#: na_app/templates/ishtar/sheet_operation.html:372 #: sra_idf_app/templates/ishtar/sheet_operation.html:363 msgid "Documents from associated context records" msgstr "Documents des Unités d'Enregistrement associées" #: archaeological_operations/templates/ishtar/sheet_operation.html:375 -#: na_app/templates/ishtar/sheet_operation.html:377 #: sra_idf_app/templates/ishtar/sheet_operation.html:368 msgid "Diagram of stratigraphic relations" msgstr "Diagramme de relations stratigraphiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:404 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 -#: na_app/templates/ishtar/sheet_operation.html:406 #: sra_idf_app/templates/ishtar/sheet_operation.html:397 msgid "Associated containers" msgstr "Contenants associés" @@ -7415,7 +7300,6 @@ msgstr "Contenants associés" #: ishtar_common/templates/ishtar/blocks/window_nav.html:72 #: ishtar_common/templates/ishtar/blocks/window_nav.html:78 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:45 -#: na_app/templates/ishtar/sheet_operation.html:426 #: sra_idf_app/templates/ishtar/sheet_operation.html:417 msgid "Export" msgstr "Exporter" @@ -7423,7 +7307,6 @@ msgstr "Exporter" #: archaeological_operations/templates/ishtar/sheet_operation.html:429 #: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 -#: na_app/templates/ishtar/sheet_operation.html:431 #: sra_idf_app/templates/ishtar/sheet_operation.html:422 msgid "Regenerate statistics" msgstr "Re-générer les statistiques" @@ -7431,19 +7314,16 @@ msgstr "Re-générer les statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_warehouse/templates/ishtar/sheet_container.html:212 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 -#: na_app/templates/ishtar/sheet_operation.html:436 #: sra_idf_app/templates/ishtar/sheet_operation.html:427 msgid "Last update:" msgstr "Dernière mise à jour :" #: archaeological_operations/templates/ishtar/sheet_operation.html:514 -#: na_app/templates/ishtar/sheet_operation.html:516 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 msgid "Sources" msgstr "Documents" #: archaeological_operations/templates/ishtar/sheet_operation.html:532 -#: na_app/templates/ishtar/sheet_operation.html:534 #: sra_idf_app/templates/ishtar/sheet_operation.html:525 msgid "Finds by context records" msgstr "Mobilier par Unités d'Enregistrement" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 3590df3e5..894e4a16b 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-08 14:59+0200\n" +"POT-Creation-Date: 2022-07-11 01:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,14 +45,13 @@ msgstr "" #: archaeological_operations/models.py:2174 #: archaeological_operations/models.py:2191 #: archaeological_operations/models.py:2307 -#: archaeological_operations/models.py:2501 -#: archaeological_operations/models.py:2787 +#: archaeological_operations/models.py:2504 +#: archaeological_operations/models.py:2791 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:353 #: archaeological_operations/wizards.py:365 #: archaeological_warehouse/models.py:803 ishtar_common/forms_common.py:1957 #: ishtar_common/models.py:4850 ishtar_common/views.py:395 -#: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -98,7 +97,7 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:871 archaeological_files/forms.py:908 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -124,7 +123,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1932 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1934 msgid "Code PATRIARCHE" msgstr "" @@ -171,13 +170,13 @@ msgstr "" #: archaeological_context_records/models.py:626 #: archaeological_context_records/models.py:1313 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:922 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 #: archaeological_finds/models_finds.py:1087 #: archaeological_operations/forms.py:496 #: archaeological_operations/forms.py:1141 #: archaeological_operations/forms.py:1631 -#: archaeological_operations/models.py:2809 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:2813 +#: archaeological_operations/models.py:3055 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -211,13 +210,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:761 #: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1686 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:40 #: archaeological_operations/templates/ishtar/sheet_site.html:36 #: archaeological_warehouse/templates/ishtar/sheet_container.html:24 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 -#: na_app/templates/ishtar/sheet_operation.html:40 #: sra_idf_app/templates/ishtar/sheet_operation.html:40 msgid "General" msgstr "" @@ -236,7 +234,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1084 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:206 #: archaeological_operations/forms.py:1113 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 @@ -277,7 +275,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1777 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1623 ishtar_common/forms_common.py:1891 #: ishtar_common/models.py:1012 ishtar_common/models.py:3965 #: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 @@ -297,8 +294,8 @@ msgid "General comment" msgstr "" #: archaeological_context_records/forms.py:313 -#: archaeological_files/forms.py:298 archaeological_files/forms.py:583 -#: archaeological_files/models.py:620 archaeological_files_pdl/forms.py:143 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:595 +#: archaeological_files/models.py:628 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:833 msgid "Total surface (m2)" msgstr "" @@ -341,7 +338,7 @@ msgstr "" #: archaeological_context_records/forms.py:331 #: archaeological_context_records/models.py:655 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:591 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:556 @@ -353,7 +350,6 @@ msgstr "" #: archaeological_operations/models.py:1128 #: archaeological_operations/templates/ishtar/sheet_operation.html:182 #: ishtar_common/forms.py:988 ishtar_common/forms.py:989 -#: na_app/templates/ishtar/sheet_operation.html:181 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Closing date" msgstr "" @@ -448,7 +444,6 @@ msgstr "" #: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 #: archaeological_finds/models_finds.py:1820 #: archaeological_finds/templates/ishtar/sheet_find.html:215 -#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "" @@ -462,10 +457,7 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 #: archaeological_operations/templates/ishtar/sheet_operation.html:505 -#: cd17_app/templates/ishtar/sheet_find.html:231 #: ishtar_common/models_imports.py:746 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:498 @@ -474,8 +466,8 @@ msgstr "" #: archaeological_context_records/forms.py:471 #: archaeological_context_records/models.py:104 -#: archaeological_files/forms.py:542 archaeological_files/models.py:75 -#: archaeological_files/models.py:683 +#: archaeological_files/forms.py:559 archaeological_files/models.py:75 +#: archaeological_files/models.py:697 #: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_finds/forms.py:1262 #: archaeological_finds/forms_treatments.py:180 @@ -491,11 +483,7 @@ msgstr "" #: archaeological_operations/forms.py:836 #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1129 -#: archaeological_operations/models.py:3052 -#: cd17_app/templates/ishtar/sheet_find.html:232 -#: cd17_app/templates/ishtar/sheet_find.html:347 -#: cd17_app/templates/ishtar/sheet_find.html:385 -#: cd17_app/templates/ishtar/sheet_find.html:423 +#: archaeological_operations/models.py:3056 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -505,8 +493,8 @@ msgstr "" #: archaeological_context_records/forms.py:472 #: archaeological_context_records/models.py:105 -#: archaeological_files/forms.py:547 archaeological_files/models.py:76 -#: archaeological_files/models.py:684 archaeological_finds/forms.py:1263 +#: archaeological_files/forms.py:564 archaeological_files/models.py:76 +#: archaeological_files/models.py:698 archaeological_finds/forms.py:1263 #: archaeological_finds/models_finds.py:3273 #: archaeological_finds/models_treatments.py:745 #: archaeological_finds/templates/ishtar/sheet_find.html:225 @@ -515,13 +503,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3053 -#: cd17_app/templates/ishtar/sheet_find.html:233 -#: cd17_app/templates/ishtar/sheet_find.html:348 -#: cd17_app/templates/ishtar/sheet_find.html:386 -#: cd17_app/templates/ishtar/sheet_find.html:424 -#: cd17_app/templates/ishtar/sheet_find.html:462 -#: ishtar_common/models_imports.py:991 +#: archaeological_operations/models.py:3057 ishtar_common/models_imports.py:991 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -534,7 +516,6 @@ msgstr "" #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1264 #: archaeological_finds/templates/ishtar/sheet_find.html:227 -#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "" @@ -544,7 +525,6 @@ msgstr "" #: archaeological_context_records/models.py:108 #: archaeological_finds/forms.py:1265 #: archaeological_finds/templates/ishtar/sheet_find.html:226 -#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "" @@ -553,7 +533,6 @@ msgstr "" #: archaeological_context_records/models.py:120 #: archaeological_finds/forms.py:1266 #: archaeological_finds/templates/ishtar/sheet_find.html:228 -#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "" @@ -583,8 +562,6 @@ msgstr "" #: archaeological_operations/forms.py:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:66 #: archaeological_operations/templates/ishtar/sheet_operation.html:334 -#: na_app/templates/ishtar/sheet_operation.html:66 -#: na_app/templates/ishtar/sheet_operation.html:337 #: sra_idf_app/templates/ishtar/sheet_operation.html:66 #: sra_idf_app/templates/ishtar/sheet_operation.html:328 msgid "Relations" @@ -618,7 +595,6 @@ msgstr "" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1676 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -669,7 +645,7 @@ msgstr "" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:2002 ishtar_common/forms_common.py:2137 +#: archaeological_operations/forms.py:2004 ishtar_common/forms_common.py:2137 #: ishtar_common/models.py:3018 ishtar_common/models.py:3317 msgid " - duplicate" msgstr "" @@ -850,7 +826,6 @@ msgstr "" #: archaeological_finds/models_finds.py:3265 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1986 ishtar_common/models.py:4853 #: ishtar_common/views.py:403 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -861,7 +836,7 @@ msgstr "" #: archaeological_context_records/models.py:339 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:223 archaeological_finds/models_finds.py:98 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:127 #: archaeological_finds/models_finds.py:247 @@ -874,7 +849,7 @@ msgstr "" #: archaeological_operations/models.py:121 #: archaeological_operations/models.py:139 #: archaeological_operations/models.py:148 -#: archaeological_operations/models.py:3610 +#: archaeological_operations/models.py:3614 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:651 #: archaeological_warehouse/models.py:675 ishtar_common/models.py:663 #: ishtar_common/models.py:718 ishtar_common/models.py:759 @@ -995,7 +970,7 @@ msgstr "" #: archaeological_context_records/models.py:502 #: archaeological_context_records/tests.py:700 -#: archaeological_files/models.py:457 archaeological_finds/models_finds.py:1234 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1234 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:957 #: archaeological_operations/tests.py:2773 @@ -1074,7 +1049,7 @@ msgid "unit-type" msgstr "" #: archaeological_context_records/models.py:539 -#: archaeological_files/models.py:460 archaeological_operations/models.py:963 +#: archaeological_files/models.py:467 archaeological_operations/models.py:963 #: archaeological_operations/models.py:2355 msgctxt "key for text search" msgid "parcel" @@ -1139,20 +1114,20 @@ msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:620 -#: archaeological_files/models.py:522 archaeological_finds/models_finds.py:399 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:399 #: archaeological_finds/models_finds.py:1766 #: archaeological_finds/models_treatments.py:249 #: archaeological_finds/models_treatments.py:1090 -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2802 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1066 ishtar_common/models.py:3880 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:622 -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:401 +#: archaeological_files/models.py:532 archaeological_finds/models_finds.py:401 #: archaeological_finds/models_finds.py:1768 -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2805 #: archaeological_warehouse/models.py:387 #: archaeological_warehouse/models.py:1068 msgid "External ID is set automatically" @@ -1193,14 +1168,14 @@ msgstr "" #: archaeological_context_records/models.py:741 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:87 -#: archaeological_files/models.py:704 archaeological_finds/models_finds.py:1961 +#: archaeological_files/models.py:718 archaeological_finds/models_finds.py:1961 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:1138 #: archaeological_finds/templates/ishtar/sheet_find.html:70 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:402 #: archaeological_operations/models.py:1253 -#: archaeological_operations/models.py:2546 +#: archaeological_operations/models.py:2550 #: archaeological_operations/templates/ishtar/sheet_operation.html:57 #: archaeological_operations/templates/ishtar/sheet_site.html:94 #: archaeological_warehouse/models.py:374 @@ -1208,10 +1183,9 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3990 +#: ishtar_common/models.py:3990 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 -#: na_app/templates/ishtar/sheet_operation.html:57 #: sra_idf_app/templates/ishtar/sheet_find.html:70 #: sra_idf_app/templates/ishtar/sheet_operation.html:57 msgid "Documents" @@ -1223,19 +1197,19 @@ msgstr "" #: archaeological_finds/models_treatments.py:1145 #: archaeological_operations/models.py:408 #: archaeological_operations/models.py:1259 -#: archaeological_operations/models.py:2553 +#: archaeological_operations/models.py:2557 #: archaeological_warehouse/models.py:381 #: archaeological_warehouse/models.py:1080 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:753 -#: archaeological_files/models.py:708 archaeological_finds/models_finds.py:1979 +#: archaeological_files/models.py:722 archaeological_finds/models_finds.py:1979 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:413 #: archaeological_operations/models.py:1264 -#: archaeological_operations/models.py:2805 ishtar_common/models.py:2365 +#: archaeological_operations/models.py:2809 ishtar_common/models.py:2365 #: ishtar_common/models.py:2657 ishtar_common/models.py:3346 #: ishtar_common/models_common.py:1926 ishtar_common/models_common.py:1949 msgid "Cached name" @@ -1250,7 +1224,7 @@ msgstr "" #: archaeological_context_records/models.py:759 #: archaeological_context_records/models.py:765 -#: archaeological_files/models.py:712 archaeological_finds/models_finds.py:1983 +#: archaeological_files/models.py:726 archaeological_finds/models_finds.py:1983 #: archaeological_finds/models_finds.py:1989 #: archaeological_finds/models_finds.py:1995 #: archaeological_finds/models_finds.py:2001 @@ -1405,9 +1379,6 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 #: ishtar_common/views.py:1004 ishtar_common/views.py:1076 -#: na_app/templates/ishtar/sheet_operation.html:84 -#: na_app/templates/ishtar/sheet_operation.html:395 -#: na_app/templates/ishtar/sheet_operation.html:479 #: sra_idf_app/templates/ishtar/sheet_operation.html:84 #: sra_idf_app/templates/ishtar/sheet_operation.html:386 #: sra_idf_app/templates/ishtar/sheet_operation.html:470 @@ -1417,8 +1388,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 -#: cd17_app/templates/ishtar/sheet_find.html:79 -#: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 msgid "Custom fields" @@ -1431,10 +1400,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:3022 #: ishtar_common/templates/ishtar/sheet_document.html:37 -#: na_app/templates/ishtar/sheet_operation.html:122 #: sra_idf_app/templates/ishtar/sheet_find.html:137 #: sra_idf_app/templates/ishtar/sheet_operation.html:120 msgid "Complete identifier" @@ -1442,10 +1409,9 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_files/templates/ishtar/sheet_file.html:102 -#: archaeological_files/templates/ishtar/sheet_file.html:265 +#: archaeological_files/templates/ishtar/sheet_file.html:267 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:190 -#: na_app/templates/ishtar/sheet_operation.html:189 #: sra_idf_app/templates/ishtar/sheet_operation.html:188 msgid "Surface" msgstr "" @@ -1460,7 +1426,6 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 #: ishtar_common/models_common.py:1903 -#: na_app/templates/ishtar/sheet_operation.html:282 #: sra_idf_app/templates/ishtar/sheet_operation.html:273 msgid "Localisation" msgstr "" @@ -1471,9 +1436,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 -#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 #: sra_idf_app/templates/ishtar/sheet_operation.html:244 msgid "Sheet" @@ -1485,7 +1448,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 #: archaeological_operations/templates/ishtar/sheet_operation.html:260 -#: na_app/templates/ishtar/sheet_operation.html:267 #: sra_idf_app/templates/ishtar/sheet_operation.html:258 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -1513,13 +1475,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: cd17_app/templates/ishtar/sheet_find.html:343 -#: cd17_app/templates/ishtar/sheet_find.html:381 -#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4748 -#: ishtar_common/models.py:4881 ishtar_common/models.py:4959 -#: ishtar_common/models_common.py:1829 ishtar_common/models_common.py:1844 -#: ishtar_common/models_imports.py:984 -#: na_app/templates/ishtar/sheet_operation.html:153 +#: ishtar_common/models.py:4748 ishtar_common/models.py:4881 +#: ishtar_common/models.py:4959 ishtar_common/models_common.py:1829 +#: ishtar_common/models_common.py:1844 ishtar_common/models_imports.py:984 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 #: sra_idf_app/templates/ishtar/sheet_find.html:418 @@ -1530,14 +1488,12 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 -#: na_app/templates/ishtar/sheet_operation.html:158 #: sra_idf_app/templates/ishtar/sheet_operation.html:156 msgid "Active file" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 -#: na_app/templates/ishtar/sheet_operation.html:161 #: sra_idf_app/templates/ishtar/sheet_operation.html:159 msgid "Closed operation" msgstr "" @@ -1545,7 +1501,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:225 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 -#: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:182 msgid "by" msgstr "" @@ -1560,14 +1515,12 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 #: archaeological_operations/templates/ishtar/sheet_operation.html:398 -#: na_app/templates/ishtar/sheet_operation.html:400 #: sra_idf_app/templates/ishtar/sheet_operation.html:391 msgid "Documents from associated finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:276 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 -#: na_app/templates/ishtar/sheet_operation.html:366 #: sra_idf_app/templates/ishtar/sheet_operation.html:357 msgid "Context record relations" msgstr "" @@ -1605,23 +1558,23 @@ msgstr "" msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:144 +#: archaeological_files/admin.py:145 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:148 +#: archaeological_files/admin.py:149 msgid "To" msgstr "" -#: archaeological_files/admin.py:165 +#: archaeological_files/admin.py:166 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:211 +#: archaeological_files/admin.py:212 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:215 +#: archaeological_files/admin.py:216 msgid "{} item(s) already in database." msgstr "" @@ -1630,9 +1583,9 @@ msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 -#: archaeological_files/forms.py:329 archaeological_files/forms.py:878 -#: archaeological_files/forms.py:915 archaeological_files/models.py:373 -#: archaeological_files/models.py:514 +#: archaeological_files/forms.py:329 archaeological_files/forms.py:890 +#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/models.py:521 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 #: archaeological_finds/forms.py:1377 @@ -1649,12 +1602,12 @@ msgstr "" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:486 #: archaeological_operations/forms.py:789 #: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1934 +#: archaeological_operations/forms.py:1936 #: archaeological_operations/models.py:809 #: archaeological_operations/models.py:1166 #: archaeological_operations/models.py:2305 -#: archaeological_operations/models.py:2525 -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2794 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:797 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1662,7 +1615,7 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 -#: archaeological_files/forms.py:332 archaeological_files/models.py:516 +#: archaeological_files/forms.py:332 archaeological_files/models.py:523 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:487 #: archaeological_operations/models.py:1167 msgid "Numeric reference" @@ -1676,8 +1629,8 @@ msgstr "" msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:887 -#: archaeological_files/forms.py:925 archaeological_files/models.py:1211 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 +#: archaeological_files/forms.py:937 archaeological_files/models.py:1319 #: archaeological_operations/forms.py:499 #: archaeological_operations/forms.py:1634 #: archaeological_operations/models.py:2177 @@ -1691,13 +1644,13 @@ msgstr "" msgid "Department" msgstr "" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:935 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 msgid "File name" msgstr "" #: archaeological_files/forms.py:95 archaeological_files/forms.py:207 -#: archaeological_files/forms.py:285 archaeological_files/models.py:374 -#: archaeological_files/models.py:379 archaeological_files/models.py:528 +#: archaeological_files/forms.py:285 archaeological_files/models.py:381 +#: archaeological_files/models.py:386 archaeological_files/models.py:535 #: archaeological_files_pdl/forms.py:65 msgid "File type" msgstr "" @@ -1712,18 +1665,18 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:98 archaeological_files/forms.py:392 -#: archaeological_files/models.py:293 archaeological_files/models.py:378 -#: archaeological_files/models.py:577 archaeological_files_pdl/forms.py:100 +#: archaeological_files/models.py:300 archaeological_files/models.py:385 +#: archaeological_files/models.py:584 archaeological_files_pdl/forms.py:100 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:99 archaeological_files/forms.py:394 -#: archaeological_files/models.py:582 -msgid "Permit reference" +#: archaeological_files/models.py:589 +msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 -#: archaeological_files/forms.py:479 archaeological_files/models.py:629 +#: archaeological_files/forms.py:479 archaeological_files/models.py:637 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 #: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 @@ -1738,8 +1691,11 @@ msgstr "" #: archaeological_operations/forms.py:871 #: archaeological_operations/forms.py:1393 #: archaeological_operations/forms.py:1514 +#: archaeological_operations/forms.py:1637 +#: archaeological_operations/forms.py:1699 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:2546 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:364 #: archaeological_warehouse/models.py:1036 ishtar_common/forms_common.py:1621 @@ -1758,26 +1714,26 @@ msgid "In charge" msgstr "" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:937 archaeological_files/models.py:540 +#: archaeological_files/forms.py:949 archaeological_files/models.py:547 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:978 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 #: archaeological_operations/forms.py:552 -#: archaeological_operations/forms.py:1638 ishtar_common/forms.py:921 +#: archaeological_operations/forms.py:1639 ishtar_common/forms.py:921 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:986 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:558 -#: archaeological_operations/forms.py:1644 +#: archaeological_operations/forms.py:1645 msgid "Modified by" msgstr "" @@ -1786,7 +1742,7 @@ msgid "Archaeological file search" msgstr "" #: archaeological_files/forms.py:198 archaeological_files/forms.py:283 -#: archaeological_files/models.py:596 archaeological_files_pdl/forms.py:75 +#: archaeological_files/models.py:604 archaeological_files_pdl/forms.py:75 #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1122 #: archaeological_operations/forms.py:683 @@ -1798,12 +1754,11 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:198 archaeological_files/forms.py:410 -#: archaeological_files/models.py:598 archaeological_files_pdl/forms.py:78 +#: archaeological_files/models.py:606 archaeological_files_pdl/forms.py:78 #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "" @@ -1840,16 +1795,15 @@ msgstr "" msgid "Date before" msgstr "" -#: archaeological_files/forms.py:256 archaeological_files/models.py:532 +#: archaeological_files/forms.py:256 archaeological_files/models.py:539 #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:352 -#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "" -#: archaeological_files/forms.py:281 archaeological_files/models.py:527 +#: archaeological_files/forms.py:281 archaeological_files/models.py:534 #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1092 @@ -1858,42 +1812,40 @@ msgstr "" #: archaeological_operations/forms.py:1229 #: archaeological_operations/forms.py:1384 #: archaeological_operations/forms.py:1499 -#: archaeological_operations/forms.py:1990 +#: archaeological_operations/forms.py:1992 #: archaeological_operations/models.py:362 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:346 -#: cd17_app/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:409 ishtar_common/forms_common.py:468 -#: ishtar_common/forms_common.py:645 ishtar_common/forms_common.py:772 -#: ishtar_common/forms_common.py:863 ishtar_common/forms_common.py:1099 -#: ishtar_common/forms_common.py:1150 ishtar_common/models.py:662 -#: ishtar_common/models.py:701 ishtar_common/models.py:1006 -#: ishtar_common/models.py:1497 ishtar_common/models.py:1879 -#: ishtar_common/models.py:2353 ishtar_common/models.py:2641 -#: ishtar_common/models.py:2968 ishtar_common/models.py:4724 -#: ishtar_common/models_common.py:1900 ishtar_common/models_common.py:1949 -#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 -#: ishtar_common/models_imports.py:513 ishtar_common/models_imports.py:530 -#: ishtar_common/models_imports.py:638 ishtar_common/models_imports.py:948 +#: archaeological_warehouse/models.py:346 ishtar_common/forms_common.py:409 +#: ishtar_common/forms_common.py:468 ishtar_common/forms_common.py:645 +#: ishtar_common/forms_common.py:772 ishtar_common/forms_common.py:863 +#: ishtar_common/forms_common.py:1099 ishtar_common/forms_common.py:1150 +#: ishtar_common/models.py:662 ishtar_common/models.py:701 +#: ishtar_common/models.py:1006 ishtar_common/models.py:1497 +#: ishtar_common/models.py:1879 ishtar_common/models.py:2353 +#: ishtar_common/models.py:2641 ishtar_common/models.py:2968 +#: ishtar_common/models.py:4724 ishtar_common/models_common.py:1900 +#: ishtar_common/models_common.py:1949 ishtar_common/models_imports.py:82 +#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:513 +#: ishtar_common/models_imports.py:530 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:948 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 -#: na_app/templates/ishtar/sheet_operation.html:137 #: sra_idf_app/templates/ishtar/sheet_find.html:456 #: sra_idf_app/templates/ishtar/sheet_operation.html:135 msgid "Name" msgstr "" -#: archaeological_files/forms.py:287 archaeological_files/models.py:604 +#: archaeological_files/forms.py:287 archaeological_files/models.py:612 #: archaeological_files_pdl/forms.py:447 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:304 archaeological_files/models.py:625 +#: archaeological_files/forms.py:304 archaeological_files/models.py:633 msgid "Main address" msgstr "" @@ -1914,9 +1866,8 @@ msgstr "" #: archaeological_operations/forms.py:1138 #: archaeological_operations/forms.py:1154 #: archaeological_operations/forms.py:1160 -#: archaeological_operations/models.py:2810 +#: archaeological_operations/models.py:2814 #: archaeological_operations/templates/ishtar/sheet_operation.html:445 -#: na_app/templates/ishtar/sheet_operation.html:447 #: sra_idf_app/templates/ishtar/sheet_operation.html:438 msgid "Parcels" msgstr "" @@ -1929,12 +1880,12 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:378 archaeological_files/models.py:561 +#: archaeological_files/forms.py:378 archaeological_files/models.py:568 msgid "Responsible for planning service" msgstr "" -#: archaeological_files/forms.py:400 archaeological_files/forms.py:573 -#: archaeological_files/models.py:622 archaeological_files_pdl/forms.py:151 +#: archaeological_files/forms.py:400 archaeological_files/forms.py:585 +#: archaeological_files/models.py:630 archaeological_files_pdl/forms.py:151 msgid "Total developed surface (m2)" msgstr "" @@ -1948,20 +1899,20 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:439 archaeological_files/models.py:632 +#: archaeological_files/forms.py:439 archaeological_files/models.py:640 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2532 ishtar_common/models_common.py:1853 +#: archaeological_operations/models.py:2535 ishtar_common/models_common.py:1853 msgid "Departments" msgstr "" -#: archaeological_files/forms.py:459 archaeological_files/models.py:656 +#: archaeological_files/forms.py:459 archaeological_files/models.py:664 #: archaeological_operations/forms.py:518 #: archaeological_operations/models.py:884 -#: archaeological_operations/models.py:2486 +#: archaeological_operations/models.py:2489 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:462 archaeological_files/models.py:640 +#: archaeological_files/forms.py:462 archaeological_files/models.py:648 msgid "Requested operation type" msgstr "" @@ -1969,11 +1920,11 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:488 archaeological_files/models.py:662 +#: archaeological_files/forms.py:488 archaeological_files/models.py:670 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:489 archaeological_files/models.py:664 +#: archaeological_files/forms.py:489 archaeological_files/models.py:672 msgid "Protected area" msgstr "" @@ -2006,84 +1957,93 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:552 archaeological_files/models.py:685 -msgid "Ground start date" +#: archaeological_files/forms.py:544 archaeological_files/models.py:689 +msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:557 archaeological_files/models.py:686 -msgid "Ground end date" +#: archaeological_files/forms.py:549 archaeological_files/models.py:692 +msgid "Study period" msgstr "" -#: archaeological_files/forms.py:562 archaeological_files/models.py:681 -msgid "Study period" +#: archaeological_files/forms.py:554 archaeological_files/models.py:695 +msgid "Report due period" +msgstr "" + +#: archaeological_files/forms.py:569 archaeological_files/models.py:699 +msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:567 archaeological_files/models.py:688 +#: archaeological_files/forms.py:574 archaeological_files/models.py:700 +msgid "Ground end date" +msgstr "" + +#: archaeological_files/forms.py:579 archaeological_files/models.py:702 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:590 +#: archaeological_files/forms.py:602 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:650 archaeological_files/forms.py:652 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:288 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/forms.py:662 archaeological_files/forms.py:664 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:342 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:651 archaeological_files/forms.py:653 -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/forms.py:663 archaeological_files/forms.py:665 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:343 msgid "Days" msgstr "" -#: archaeological_files/forms.py:654 archaeological_files/models.py:114 -#: archaeological_files/templates/ishtar/sheet_file.html:279 -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/forms.py:666 archaeological_files/models.py:114 +#: archaeological_files/models.py:1509 archaeological_files/models.py:1525 +#: archaeological_files/templates/ishtar/sheet_file.html:281 +#: archaeological_files/templates/ishtar/sheet_file.html:333 msgid "Job" msgstr "" -#: archaeological_files/forms.py:674 archaeological_files/models.py:79 +#: archaeological_files/forms.py:686 archaeological_files/models.py:79 #: archaeological_files/models.py:80 archaeological_files/models.py:91 -#: archaeological_files/models.py:194 archaeological_files/models.py:677 +#: archaeological_files/models.py:201 archaeological_files/models.py:685 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:740 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:741 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:753 -#: archaeological_files/templates/ishtar/sheet_file.html:275 +#: archaeological_files/forms.py:765 +#: archaeological_files/templates/ishtar/sheet_file.html:277 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:755 +#: archaeological_files/forms.py:767 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:761 archaeological_files/forms.py:763 -#: archaeological_files/templates/ishtar/sheet_file.html:389 -#: archaeological_files/templates/ishtar/sheet_file.html:392 +#: archaeological_files/forms.py:773 archaeological_files/forms.py:775 +#: archaeological_files/templates/ishtar/sheet_file.html:391 +#: archaeological_files/templates/ishtar/sheet_file.html:394 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:765 -#: archaeological_files/templates/ishtar/sheet_file.html:383 +#: archaeological_files/forms.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:385 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:916 -#: archaeological_files/forms.py:1052 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 +#: archaeological_files/forms.py:1064 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2096,85 +2056,84 @@ msgstr "" #: archaeological_finds/models_treatments.py:1085 #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 -#: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2471 -#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3879 +#: archaeological_operations/forms.py:1757 +#: archaeological_operations/models.py:2474 ishtar_common/models.py:3879 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "" -#: archaeological_files/forms.py:882 archaeological_files/forms.py:919 -#: archaeological_files/forms.py:1041 +#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 +#: archaeological_files/forms.py:1053 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 #: archaeological_operations/forms.py:1628 -#: archaeological_operations/forms.py:1688 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:2207 -#: archaeological_operations/models.py:2462 +#: archaeological_operations/models.py:2465 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:883 +#: archaeological_files/forms.py:895 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:920 +#: archaeological_files/forms.py:932 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 #: archaeological_operations/forms.py:1629 -#: archaeological_operations/forms.py:1825 +#: archaeological_operations/forms.py:1827 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:927 +#: archaeological_files/forms.py:939 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 #: archaeological_operations/forms.py:1635 -#: archaeological_operations/forms.py:1695 -#: archaeological_operations/models.py:2526 +#: archaeological_operations/forms.py:1696 +#: archaeological_operations/models.py:2529 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:930 +#: archaeological_files/forms.py:942 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:933 +#: archaeological_files/forms.py:945 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:958 +#: archaeological_files/forms.py:970 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:960 +#: archaeological_files/forms.py:972 msgid "File year" msgstr "" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:974 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:965 +#: archaeological_files/forms.py:977 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:975 +#: archaeological_files/forms.py:987 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1039 +#: archaeological_files/forms.py:1051 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:725 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:747 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:666 @@ -2182,7 +2141,7 @@ msgstr "" #: archaeological_operations/models.py:1683 #: archaeological_operations/models.py:2190 #: archaeological_operations/models.py:2306 -#: archaeological_operations/models.py:2508 +#: archaeological_operations/models.py:2511 #: archaeological_operations/wizards.py:89 ishtar_common/views.py:394 msgid "Archaeological file" msgstr "" @@ -2197,7 +2156,7 @@ msgstr "" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3267 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2562 +#: archaeological_operations/models.py:2566 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2219,7 +2178,7 @@ msgid "Def. daily number on ground" msgstr "" #: archaeological_files/models.py:102 -msgid "Def. daily number" +msgid "Def. daily number on study" msgstr "" #: archaeological_files/models.py:108 @@ -2264,7 +2223,6 @@ msgstr "" #: archaeological_files/models.py:183 #: archaeological_operations/templates/ishtar/sheet_operation.html:207 -#: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:205 msgid "days" msgstr "" @@ -2283,115 +2241,115 @@ msgstr "" msgid "linear m." msgstr "" -#: archaeological_files/models.py:198 +#: archaeological_files/models.py:205 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:201 ishtar_common/models_common.py:160 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:160 #: ishtar_common/models_common.py:191 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:205 ishtar_common/models_common.py:164 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:164 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." msgstr "" -#: archaeological_files/models.py:211 +#: archaeological_files/models.py:218 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:213 archaeological_files/models.py:253 +#: archaeological_files/models.py:220 archaeological_files/models.py:260 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:221 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:216 ishtar_common/models_imports.py:751 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:751 msgid "Unit" msgstr "" -#: archaeological_files/models.py:219 +#: archaeological_files/models.py:226 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:222 +#: archaeological_files/models.py:229 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:224 ishtar_common/models.py:1499 +#: archaeological_files/models.py:231 ishtar_common/models.py:1499 #: ishtar_common/models.py:1909 ishtar_common/models.py:3221 #: ishtar_common/models_common.py:170 ishtar_common/models_imports.py:124 #: ishtar_common/models_imports.py:643 msgid "Available" msgstr "" -#: archaeological_files/models.py:230 archaeological_warehouse/forms.py:752 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:752 #: ishtar_common/admin.py:999 ishtar_common/admin.py:1018 #: ishtar_common/models.py:2214 ishtar_common/models_common.py:702 msgid "Parent" msgstr "" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:238 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:236 +#: archaeological_files/models.py:243 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:237 +#: archaeological_files/models.py:244 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:280 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:274 +#: archaeological_files/models.py:281 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:294 +#: archaeological_files/models.py:301 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:305 +#: archaeological_files/models.py:312 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:318 +#: archaeological_files/models.py:325 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:319 +#: archaeological_files/models.py:326 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:329 +#: archaeological_files/models.py:336 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:331 +#: archaeological_files/models.py:338 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:340 msgid "Category" msgstr "" -#: archaeological_files/models.py:337 +#: archaeological_files/models.py:344 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:338 +#: archaeological_files/models.py:345 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:375 archaeological_finds/models_finds.py:1132 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1132 #: archaeological_operations/models.py:191 #: archaeological_operations/models.py:810 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 @@ -2405,13 +2363,13 @@ msgstr "" msgid "Area" msgstr "" -#: archaeological_files/models.py:376 archaeological_finds/models_finds.py:1135 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1135 #: archaeological_operations/models.py:192 #: archaeological_operations/models.py:811 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:385 archaeological_finds/models_finds.py:1156 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1156 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2428,12 +2386,6 @@ msgstr "" #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:470 -#: na_app/templates/ishtar/sheet_operation.html:487 -#: na_app/templates/ishtar/sheet_operation.html:497 -#: na_app/templates/ishtar/sheet_operation.html:507 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_operation.html:451 #: sra_idf_app/templates/ishtar/sheet_operation.html:461 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 @@ -2443,15 +2395,15 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:386 +#: archaeological_files/models.py:393 msgid "Total surface (km2)" msgstr "" -#: archaeological_files/models.py:387 +#: archaeological_files/models.py:394 msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:437 archaeological_files/models.py:593 +#: archaeological_files/models.py:444 archaeological_files/models.py:601 #: archaeological_files_pdl/forms.py:124 archaeological_files_pdl/forms.py:168 #: archaeological_operations/forms.py:1111 #: archaeological_operations/forms.py:1127 @@ -2462,17 +2414,16 @@ msgstr "" #: archaeological_operations/models.py:895 #: archaeological_operations/models.py:897 #: archaeological_operations/models.py:1184 -#: archaeological_operations/models.py:2538 +#: archaeological_operations/models.py:2541 #: archaeological_operations/templates/ishtar/sheet_operation.html:130 #: ishtar_common/forms_common.py:1268 ishtar_common/forms_common.py:1281 #: ishtar_common/forms_common.py:1282 ishtar_common/models.py:2207 #: ishtar_common/models_common.py:1932 -#: na_app/templates/ishtar/sheet_operation.html:130 #: sra_idf_app/templates/ishtar/sheet_operation.html:128 msgid "Towns" msgstr "" -#: archaeological_files/models.py:448 archaeological_finds/models_finds.py:1238 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1238 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:948 @@ -2483,7 +2434,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:450 +#: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1036 #: archaeological_operations/models.py:240 #: archaeological_warehouse/models.py:859 ishtar_common/models.py:3645 @@ -2491,19 +2442,19 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:453 +#: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 #: archaeological_operations/models.py:246 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:464 archaeological_operations/models.py:967 +#: archaeological_files/models.py:471 archaeological_operations/models.py:967 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:468 +#: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:971 @@ -2514,7 +2465,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:977 @@ -2528,96 +2479,97 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:474 +#: archaeological_files/models.py:481 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:477 +#: archaeological_files/models.py:484 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:481 +#: archaeological_files/models.py:488 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:485 +#: archaeological_files/models.py:492 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:489 archaeological_finds/models_finds.py:1444 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1444 #: archaeological_operations/models.py:262 #: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:2451 #: archaeological_warehouse/models.py:866 ishtar_common/models.py:3705 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:492 archaeological_finds/models_finds.py:1595 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1595 #: archaeological_finds/models_treatments.py:1045 #: archaeological_finds/tests.py:1328 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:496 archaeological_operations/models.py:2386 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2386 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:500 archaeological_operations/models.py:2390 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2390 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:519 +#: archaeological_files/models.py:526 #: archaeological_finds/models_treatments.py:1087 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1890 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:546 +#: archaeological_files/models.py:553 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:551 +#: archaeological_files/models.py:558 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:565 +#: archaeological_files/models.py:572 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:579 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:594 msgid "Main town" msgstr "" -#: archaeological_files/models.py:600 archaeological_files_pdl/forms.py:407 +#: archaeological_files/models.py:608 archaeological_files_pdl/forms.py:407 msgid "Date of planning service file" msgstr "" -#: archaeological_files/models.py:618 +#: archaeological_files/models.py:626 msgid "Instruction deadline" msgstr "" -#: archaeological_files/models.py:624 archaeological_files_pdl/forms.py:132 +#: archaeological_files/models.py:632 archaeological_files_pdl/forms.py:132 #: archaeological_files_pdl/forms.py:173 msgid "Locality" msgstr "" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:635 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:654 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:242 @@ -2633,99 +2585,99 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:667 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/models.py:690 +#: archaeological_files/models.py:704 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:694 +#: archaeological_files/models.py:708 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:699 +#: archaeological_files/models.py:713 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:714 +#: archaeological_files/models.py:728 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:726 +#: archaeological_files/models.py:748 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 #: ishtar_common/views.py:999 ishtar_common/views.py:1060 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:754 +#: archaeological_files/models.py:776 msgid "FILE" msgstr "" -#: archaeological_files/models.py:953 +#: archaeological_files/models.py:1013 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:959 +#: archaeological_files/models.py:1019 msgid "No town" msgstr "" -#: archaeological_files/models.py:1120 +#: archaeological_files/models.py:1228 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1122 +#: archaeological_files/models.py:1230 msgid "plan" msgstr "" -#: archaeological_files/models.py:1128 +#: archaeological_files/models.py:1236 #: archaeological_finds/models_treatments.py:399 #: archaeological_finds/models_treatments.py:1205 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1130 +#: archaeological_files/models.py:1238 #: archaeological_finds/models_treatments.py:401 #: archaeological_finds/models_treatments.py:1207 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1139 +#: archaeological_files/models.py:1247 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1141 +#: archaeological_files/models.py:1249 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1208 archaeological_operations/models.py:1171 -#: archaeological_operations/models.py:2777 +#: archaeological_files/models.py:1316 archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:2781 msgid "File" msgstr "" -#: archaeological_files/models.py:1375 +#: archaeological_files/models.py:1483 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1377 archaeological_files/models.py:1437 +#: archaeological_files/models.py:1485 archaeological_files/models.py:1545 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1379 +#: archaeological_files/models.py:1487 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1381 archaeological_files/models.py:1441 +#: archaeological_files/models.py:1489 archaeological_files/models.py:1549 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1435 +#: archaeological_files/models.py:1543 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1439 +#: archaeological_files/models.py:1547 msgid "Quantity by day - worked" msgstr "" @@ -2752,9 +2704,9 @@ msgid "Global informations" msgstr "" #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:14 -#: archaeological_files/templates/ishtar/sheet_file.html:305 -#: archaeological_files/templates/ishtar/sheet_file.html:357 -#: archaeological_files/templates/ishtar/sheet_file.html:413 +#: archaeological_files/templates/ishtar/sheet_file.html:307 +#: archaeological_files/templates/ishtar/sheet_file.html:359 +#: archaeological_files/templates/ishtar/sheet_file.html:415 #: archaeological_warehouse/templates/ishtar/sheet_container.html:234 #: archaeological_warehouse/templates/ishtar/sheet_container.html:258 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 @@ -2846,9 +2798,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:280 -#: archaeological_files/templates/ishtar/sheet_file.html:332 -#: archaeological_files/templates/ishtar/sheet_file.html:384 +#: archaeological_files/templates/ishtar/sheet_file.html:282 +#: archaeological_files/templates/ishtar/sheet_file.html:334 +#: archaeological_files/templates/ishtar/sheet_file.html:386 msgid "Planned" msgstr "" @@ -2892,7 +2844,6 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:181 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 -#: na_app/templates/ishtar/sheet_operation.html:313 #: sra_idf_app/templates/ishtar/sheet_operation.html:304 msgid "Associated parcels" msgstr "" @@ -2901,11 +2852,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2567 #: archaeological_operations/templates/ishtar/sheet_operation.html:315 #: archaeological_operations/templates/ishtar/sheet_operation.html:439 -#: na_app/templates/ishtar/sheet_operation.html:318 -#: na_app/templates/ishtar/sheet_operation.html:441 #: sra_idf_app/templates/ishtar/sheet_operation.html:309 #: sra_idf_app/templates/ishtar/sheet_operation.html:432 msgid "Administrative acts" @@ -2919,7 +2868,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2304 -#: archaeological_operations/models.py:2599 +#: archaeological_operations/models.py:2603 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 @@ -2941,25 +2890,18 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:458 #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:834 -#: cd17_app/templates/ishtar/sheet_find.html:342 -#: cd17_app/templates/ishtar/sheet_find.html:380 -#: cd17_app/templates/ishtar/sheet_find.html:418 -#: cd17_app/templates/ishtar/sheet_find.html:456 -#: ishtar_common/forms_common.py:469 ishtar_common/forms_common.py:648 -#: ishtar_common/forms_common.py:866 ishtar_common/forms_common.py:1097 -#: ishtar_common/forms_common.py:1482 ishtar_common/forms_common.py:1888 -#: ishtar_common/forms_common.py:2121 ishtar_common/models.py:716 -#: ishtar_common/models.py:2354 ishtar_common/models.py:3885 -#: ishtar_common/models_imports.py:796 +#: archaeological_warehouse/models.py:834 ishtar_common/forms_common.py:469 +#: ishtar_common/forms_common.py:648 ishtar_common/forms_common.py:866 +#: ishtar_common/forms_common.py:1097 ishtar_common/forms_common.py:1482 +#: ishtar_common/forms_common.py:1888 ishtar_common/forms_common.py:2121 +#: ishtar_common/models.py:716 ishtar_common/models.py:2354 +#: ishtar_common/models.py:3885 ishtar_common/models_imports.py:796 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 #: ishtar_common/templates/ishtar/import_table.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: na_app/templates/ishtar/sheet_operation.html:460 -#: na_app/templates/ishtar/sheet_operation.html:524 #: sra_idf_app/templates/ishtar/sheet_find.html:341 #: sra_idf_app/templates/ishtar/sheet_find.html:379 #: sra_idf_app/templates/ishtar/sheet_find.html:417 @@ -2998,41 +2940,40 @@ msgstr "" msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:257 +#: archaeological_files/templates/ishtar/sheet_file.html:259 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:272 +#: archaeological_files/templates/ishtar/sheet_file.html:274 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:281 -#: archaeological_files/templates/ishtar/sheet_file.html:333 -#: archaeological_files/templates/ishtar/sheet_file.html:385 -#: archaeological_operations/models.py:3107 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_operations/models.py:3111 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:287 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:339 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:391 -#: archaeological_files/templates/ishtar/sheet_file.html:394 +#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/templates/ishtar/sheet_file.html:292 +#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:670 #: archaeological_operations/templates/ishtar/sheet_operation.html:198 -#: na_app/templates/ishtar/sheet_operation.html:197 #: sra_idf_app/templates/ishtar/sheet_operation.html:196 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:316 -#: archaeological_files/templates/ishtar/sheet_file.html:368 -#: archaeological_files/templates/ishtar/sheet_file.html:420 +#: archaeological_files/templates/ishtar/sheet_file.html:318 +#: archaeological_files/templates/ishtar/sheet_file.html:370 +#: archaeological_files/templates/ishtar/sheet_file.html:422 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:327 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Post-excavation jobs" msgstr "" @@ -3373,7 +3314,6 @@ msgstr "" #: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 #: archaeological_finds/forms.py:1319 #: archaeological_finds/templates/ishtar/sheet_find.html:168 -#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "" @@ -3417,7 +3357,6 @@ msgstr "" #: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 #: archaeological_finds/forms.py:2002 #: archaeological_finds/templates/ishtar/sheet_find.html:177 -#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "" @@ -3556,7 +3495,6 @@ msgstr "" #: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1347 #: archaeological_finds/templates/ishtar/sheet_find.html:198 -#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "" @@ -3725,8 +3663,8 @@ msgstr "" #: archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:701 #: archaeological_operations/forms.py:783 -#: archaeological_operations/forms.py:1873 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1941 #: archaeological_operations/models.py:808 #: archaeological_operations/models.py:896 #: archaeological_operations/models.py:1177 ishtar_common/models.py:4635 @@ -3809,7 +3747,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1138 #: archaeological_operations/templates/ishtar/sheet_operation.html:485 #: archaeological_warehouse/forms.py:571 -#: na_app/templates/ishtar/sheet_operation.html:487 #: sra_idf_app/templates/ishtar/sheet_operation.html:478 msgid "Material type" msgstr "" @@ -3818,7 +3755,6 @@ msgstr "" #: archaeological_finds/models_finds.py:1139 #: archaeological_operations/templates/ishtar/sheet_operation.html:495 #: archaeological_warehouse/forms.py:577 ishtar_common/models_imports.py:768 -#: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" msgstr "" @@ -3958,7 +3894,6 @@ msgstr "" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1098 #: archaeological_finds/models_finds.py:1835 #: archaeological_finds/templates/ishtar/sheet_find.html:273 -#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1500 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3970,7 +3905,6 @@ msgstr "" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1097 #: archaeological_finds/templates/ishtar/sheet_find.html:294 -#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1492 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -4024,9 +3958,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 -#: cd17_app/templates/ishtar/sheet_find.html:341 -#: cd17_app/templates/ishtar/sheet_find.html:379 -#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1434 ishtar_common/models.py:940 #: ishtar_common/models.py:1670 ishtar_common/models.py:3209 #: ishtar_common/models_common.py:158 ishtar_common/models_common.py:191 @@ -4091,7 +4022,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2193 -#: archaeological_operations/models.py:2522 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2525 ishtar_common/views.py:406 msgid "Treatment" msgstr "" @@ -4189,7 +4120,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2192 -#: archaeological_operations/models.py:2515 ishtar_common/views.py:405 +#: archaeological_operations/models.py:2518 ishtar_common/views.py:405 msgid "Treatment request" msgstr "" @@ -4215,9 +4146,6 @@ msgstr "" #: archaeological_warehouse/models.py:1090 #: archaeological_warehouse/models.py:1871 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: cd17_app/templates/ishtar/sheet_find.html:346 -#: cd17_app/templates/ishtar/sheet_find.html:384 -#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1995 ishtar_common/forms_common.py:2186 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -4305,7 +4233,6 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 -#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "" @@ -4315,7 +4242,6 @@ msgstr "" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 -#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "" @@ -5213,14 +5139,12 @@ msgstr "" #: archaeological_finds/models_finds.py:1809 #: archaeological_finds/templates/ishtar/sheet_find.html:366 -#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1816 #: archaeological_finds/templates/ishtar/sheet_find.html:404 -#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "" @@ -5398,9 +5322,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 -#: cd17_app/templates/ishtar/sheet_find.html:345 -#: cd17_app/templates/ishtar/sheet_find.html:383 -#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -5453,8 +5374,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:1006 -#: ishtar_common/views.py:1079 sra_idf_app/templates/ishtar/sheet_find.html:450 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1079 +#: sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "" @@ -5523,7 +5444,6 @@ msgid "Last modified by" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 -#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -5531,55 +5451,46 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:37 -#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:44 -#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:52 -#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:61 -#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:142 -#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:188 -#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:269 -#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:295 -#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:328 -#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "" @@ -5588,10 +5499,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 -#: cd17_app/templates/ishtar/sheet_find.html:340 -#: cd17_app/templates/ishtar/sheet_find.html:378 -#: cd17_app/templates/ishtar/sheet_find.html:416 -#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -5602,9 +5509,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 -#: cd17_app/templates/ishtar/sheet_find.html:344 -#: cd17_app/templates/ishtar/sheet_find.html:382 -#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5612,7 +5516,6 @@ msgid "Related finds (max. 15 displayed)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 -#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5624,8 +5527,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 -#: cd17_app/templates/ishtar/sheet_find.html:408 -#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5637,7 +5538,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 -#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5837,20 +5737,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2792 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2798 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2796 -#: archaeological_operations/models.py:2824 -#: archaeological_operations/models.py:2889 +#: archaeological_operations/models.py:2800 +#: archaeological_operations/models.py:2828 +#: archaeological_operations/models.py:2893 msgid "Public domain" msgstr "" @@ -5924,14 +5824,14 @@ msgstr "" #: archaeological_operations/forms.py:511 #: archaeological_operations/forms.py:821 -#: archaeological_operations/models.py:2468 +#: archaeological_operations/models.py:2471 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:520 #: archaeological_operations/forms.py:703 #: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1877 +#: archaeological_operations/forms.py:1879 #: archaeological_operations/models.py:1149 msgid "Operator" msgstr "" @@ -5997,7 +5897,7 @@ msgstr "" #: archaeological_operations/forms.py:565 #: archaeological_operations/forms.py:864 -#: archaeological_operations/forms.py:1885 +#: archaeological_operations/forms.py:1887 #: archaeological_operations/models.py:815 #: archaeological_operations/models.py:1303 msgid "Documentation received" @@ -6013,7 +5913,7 @@ msgstr "" #: archaeological_operations/forms.py:572 #: archaeological_operations/forms.py:869 -#: archaeological_operations/forms.py:1889 +#: archaeological_operations/forms.py:1891 #: archaeological_operations/models.py:816 #: archaeological_operations/models.py:1308 msgid "Finds received" @@ -6070,7 +5970,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:785 -#: archaeological_operations/forms.py:1937 +#: archaeological_operations/forms.py:1939 #: archaeological_operations/models.py:1246 msgid "Generic name" msgstr "" @@ -6131,7 +6031,6 @@ msgstr "" #: archaeological_operations/forms.py:1025 #: archaeological_operations/templates/ishtar/sheet_operation.html:265 -#: na_app/templates/ishtar/sheet_operation.html:272 #: sra_idf_app/templates/ishtar/sheet_operation.html:263 msgid "Court-ordered seizure" msgstr "" @@ -6167,8 +6066,8 @@ msgstr "" #: archaeological_operations/forms.py:1061 #: archaeological_operations/forms.py:1068 #: archaeological_operations/forms.py:1513 -#: archaeological_operations/forms.py:1893 -#: archaeological_operations/forms.py:2030 +#: archaeological_operations/forms.py:1895 +#: archaeological_operations/forms.py:2032 #: archaeological_operations/models.py:383 #: archaeological_operations/models.py:1163 msgid "Collaborators" @@ -6267,7 +6166,7 @@ msgstr "" #: archaeological_operations/forms.py:1228 #: archaeological_operations/forms.py:1382 #: archaeological_operations/forms.py:1498 -#: archaeological_operations/forms.py:1989 +#: archaeological_operations/forms.py:1991 #: archaeological_operations/models.py:360 #: archaeological_warehouse/models.py:1874 ishtar_common/forms_common.py:1603 #: ishtar_common/forms_common.py:1889 ishtar_common/forms_common.py:2120 @@ -6278,13 +6177,13 @@ msgstr "" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1509 -#: archaeological_operations/forms.py:2036 +#: archaeological_operations/forms.py:2038 msgid "Cultural attributions" msgstr "" #: archaeological_operations/forms.py:1284 #: archaeological_operations/forms.py:1568 -#: archaeological_operations/forms.py:2009 +#: archaeological_operations/forms.py:2011 msgid "This reference already exists." msgstr "" @@ -6292,7 +6191,6 @@ msgstr "" #: archaeological_operations/models.py:442 #: archaeological_operations/models.py:1273 #: archaeological_operations/templates/ishtar/sheet_operation.html:305 -#: na_app/templates/ishtar/sheet_operation.html:308 #: sra_idf_app/templates/ishtar/sheet_operation.html:299 msgid "Archaeological sites" msgstr "" @@ -6392,80 +6290,80 @@ msgstr "" msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1665 +#: archaeological_operations/forms.py:1666 #: archaeological_operations/views.py:499 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1783 -#: archaeological_operations/forms.py:1850 +#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1852 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:2493 +#: archaeological_operations/forms.py:1691 +#: archaeological_operations/models.py:2496 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1697 -#: archaeological_operations/models.py:2524 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:2527 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1709 +#: archaeological_operations/forms.py:1711 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1745 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1749 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1760 +#: archaeological_operations/forms.py:1762 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1765 ishtar_common/forms.py:1271 +#: archaeological_operations/forms.py:1767 ishtar_common/forms.py:1271 #: ishtar_common/models.py:1883 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1789 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1791 +#: archaeological_operations/forms.py:1795 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1813 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1813 +#: archaeological_operations/forms.py:1815 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1834 +#: archaeological_operations/forms.py:1836 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:592 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1855 +#: archaeological_operations/forms.py:1857 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1966 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:2020 +#: archaeological_operations/forms.py:2022 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7003,71 +6901,71 @@ msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2476 +#: archaeological_operations/models.py:2479 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2535 +#: archaeological_operations/models.py:2538 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2544 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2719 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:2807 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3049 ishtar_common/models.py:3219 +#: archaeological_operations/models.py:3053 ishtar_common/models.py:3219 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3057 +#: archaeological_operations/models.py:3061 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3062 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3106 +#: archaeological_operations/models.py:3110 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3108 +#: archaeological_operations/models.py:3112 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3109 +#: archaeological_operations/models.py:3113 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3110 +#: archaeological_operations/models.py:3114 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3111 +#: archaeological_operations/models.py:3115 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3116 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3611 ishtar_common/models.py:4631 +#: archaeological_operations/models.py:3615 ishtar_common/models.py:4631 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3614 +#: archaeological_operations/models.py:3618 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3615 +#: archaeological_operations/models.py:3619 msgid "Operation types old" msgstr "" @@ -7247,7 +7145,6 @@ msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:48 -#: na_app/templates/ishtar/sheet_operation.html:48 #: sra_idf_app/templates/ishtar/sheet_operation.html:48 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" @@ -7256,9 +7153,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:360 #: archaeological_operations/templates/ishtar/sheet_operation.html:450 #: ishtar_common/models.py:964 ishtar_common/views.py:1002 -#: ishtar_common/views.py:1072 na_app/templates/ishtar/sheet_operation.html:75 -#: na_app/templates/ishtar/sheet_operation.html:362 -#: na_app/templates/ishtar/sheet_operation.html:452 +#: ishtar_common/views.py:1072 #: sra_idf_app/templates/ishtar/sheet_operation.html:75 #: sra_idf_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:443 @@ -7272,58 +7167,48 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 -#: na_app/templates/ishtar/sheet_operation.html:101 -#: na_app/templates/ishtar/sheet_operation.html:421 #: sra_idf_app/templates/ishtar/sheet_operation.html:101 #: sra_idf_app/templates/ishtar/sheet_operation.html:412 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:143 -#: na_app/templates/ishtar/sheet_operation.html:143 #: sra_idf_app/templates/ishtar/sheet_operation.html:141 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:206 -#: na_app/templates/ishtar/sheet_operation.html:205 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Duration" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:253 -#: na_app/templates/ishtar/sheet_operation.html:260 #: sra_idf_app/templates/ishtar/sheet_operation.html:251 msgid "This operation is virtual." msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:324 -#: na_app/templates/ishtar/sheet_operation.html:327 #: sra_idf_app/templates/ishtar/sheet_operation.html:318 msgid "Document from this operation" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:351 -#: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:344 msgid "No relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:370 -#: na_app/templates/ishtar/sheet_operation.html:372 #: sra_idf_app/templates/ishtar/sheet_operation.html:363 msgid "Documents from associated context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:375 -#: na_app/templates/ishtar/sheet_operation.html:377 #: sra_idf_app/templates/ishtar/sheet_operation.html:368 msgid "Diagram of stratigraphic relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:404 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 -#: na_app/templates/ishtar/sheet_operation.html:406 #: sra_idf_app/templates/ishtar/sheet_operation.html:397 msgid "Associated containers" msgstr "" @@ -7336,7 +7221,6 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:72 #: ishtar_common/templates/ishtar/blocks/window_nav.html:78 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:45 -#: na_app/templates/ishtar/sheet_operation.html:426 #: sra_idf_app/templates/ishtar/sheet_operation.html:417 msgid "Export" msgstr "" @@ -7344,7 +7228,6 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:429 #: archaeological_warehouse/templates/ishtar/sheet_container.html:207 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:160 -#: na_app/templates/ishtar/sheet_operation.html:431 #: sra_idf_app/templates/ishtar/sheet_operation.html:422 msgid "Regenerate statistics" msgstr "" @@ -7352,19 +7235,16 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_warehouse/templates/ishtar/sheet_container.html:212 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 -#: na_app/templates/ishtar/sheet_operation.html:436 #: sra_idf_app/templates/ishtar/sheet_operation.html:427 msgid "Last update:" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:514 -#: na_app/templates/ishtar/sheet_operation.html:516 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 msgid "Sources" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:532 -#: na_app/templates/ishtar/sheet_operation.html:534 #: sra_idf_app/templates/ishtar/sheet_operation.html:525 msgid "Finds by context records" msgstr "" |