diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-05 16:39:00 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-10 15:40:32 +0200 |
commit | 9e01f9240a8641e20c51353dff054afd53f73629 (patch) | |
tree | 8f126be742fe7552f24ae7e6307f9352457e357c /locale | |
parent | c2c438f1d820cfdfc939975fa38641a1c3567899 (diff) | |
download | Ishtar-9e01f9240a8641e20c51353dff054afd53f73629.tar.bz2 Ishtar-9e01f9240a8641e20c51353dff054afd53f73629.zip |
🌐 localization
Diffstat (limited to 'locale')
-rw-r--r-- | locale/de/LC_MESSAGES/django.po | 1469 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 1467 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 1488 | ||||
-rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 1467 |
4 files changed, 3061 insertions, 2830 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 96fcabfad..7abac0591 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: 2024-07-15 16:31+0200\n" +"POT-Creation-Date: 2024-09-10 12:47+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-" @@ -26,7 +26,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2716 +#: archaeological_finds/models_finds.py:2733 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:381 @@ -84,13 +84,13 @@ msgstr "" #: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 #: archaeological_finds/forms.py:1692 archaeological_finds/forms.py:2406 #: archaeological_finds/forms_treatments.py:52 -#: archaeological_finds/forms_treatments.py:559 -#: archaeological_finds/forms_treatments.py:634 -#: archaeological_finds/forms_treatments.py:817 +#: archaeological_finds/forms_treatments.py:557 +#: archaeological_finds/forms_treatments.py:632 +#: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:1225 #: archaeological_operations/forms.py:1438 -#: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 +#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" @@ -101,7 +101,7 @@ msgstr "" #: archaeological_context_records/forms.py:560 #: archaeological_context_records/forms.py:614 #: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/models.py:1393 msgid "ID" msgstr "" @@ -189,7 +189,7 @@ msgstr "" #: archaeological_context_records/models.py:510 #: archaeological_context_records/models.py:511 #: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1395 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 #: archaeological_finds/models_finds.py:1154 @@ -263,7 +263,7 @@ msgstr "" #: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:3152 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 -#: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 +#: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 #: ishtar_common/models_common.py:3417 ishtar_common/models_common.py:4202 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 @@ -282,13 +282,13 @@ msgstr "" #: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1394 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:300 #: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1396 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 #: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 @@ -297,7 +297,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:192 #: archaeological_finds/models_finds.py:556 #: archaeological_finds/models_finds.py:1985 -#: archaeological_finds/models_treatments.py:264 +#: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -321,7 +321,7 @@ msgstr "" #: archaeological_context_records/forms.py:304 #: archaeological_context_records/models.py:755 #: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1851 -#: archaeological_finds/models_finds.py:2122 +#: archaeological_finds/models_finds.py:2130 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 @@ -375,10 +375,10 @@ msgstr "" #: archaeological_files/models.py:629 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 -#: archaeological_finds/forms_treatments.py:662 -#: archaeological_finds/forms_treatments.py:755 -#: archaeological_finds/models_treatments.py:267 -#: archaeological_finds/models_treatments.py:1141 +#: archaeological_finds/forms_treatments.py:660 +#: archaeological_finds/forms_treatments.py:753 +#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1044 ishtar_common/forms.py:1045 @@ -395,9 +395,9 @@ msgstr "" #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:768 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:228 -#: archaeological_finds/models_treatments.py:762 -#: archaeological_warehouse/forms.py:742 +#: archaeological_finds/models_treatments.py:237 +#: archaeological_finds/models_treatments.py:851 +#: archaeological_warehouse/forms.py:769 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" @@ -452,16 +452,15 @@ msgstr "" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:775 archaeological_files/models.py:76 #: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1550 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:753 -#: archaeological_finds/models_finds.py:3569 -#: archaeological_finds/models_treatments.py:266 -#: archaeological_finds/models_treatments.py:760 -#: archaeological_finds/templates/ishtar/sheet_find.html:392 -#: archaeological_finds/templates/ishtar/sheet_find.html:430 -#: archaeological_finds/templates/ishtar/sheet_find.html:468 +#: archaeological_finds/forms_treatments.py:751 +#: archaeological_finds/models_finds.py:3692 +#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:849 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 +#: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 @@ -499,12 +498,11 @@ msgstr "" #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:664 archaeological_files/forms.py:780 #: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3570 -#: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:393 -#: archaeological_finds/templates/ishtar/sheet_find.html:431 -#: archaeological_finds/templates/ishtar/sheet_find.html:469 -#: archaeological_finds/templates/ishtar/sheet_find.html:507 +#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3693 +#: archaeological_finds/models_treatments.py:850 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: archaeological_finds/templates/ishtar/sheet_find.html:477 +#: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 @@ -584,15 +582,15 @@ msgstr "" #: archaeological_context_records/forms.py:469 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:268 -#: archaeological_context_records/models.py:1521 +#: archaeological_context_records/models.py:1524 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 #: archaeological_finds/forms.py:1773 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2708 +#: archaeological_finds/models_finds.py:2725 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1720 -#: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2528 +#: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5588 ishtar_common/views.py:504 msgid "Context record" msgstr "" @@ -689,9 +687,9 @@ msgid "Context record - Quick action - Modify" msgstr "" #: archaeological_context_records/forms.py:700 -#: archaeological_context_records/models.py:1282 -#: archaeological_context_records/models.py:1321 -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1285 +#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1392 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" @@ -845,10 +843,11 @@ msgstr "" #: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2293 -#: archaeological_finds/models_finds.py:3531 -#: archaeological_finds/models_finds.py:3557 -#: archaeological_finds/models_treatments.py:742 +#: archaeological_finds/models_finds.py:2302 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_finds.py:3639 +#: archaeological_finds/models_finds.py:3680 +#: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -871,14 +870,14 @@ msgstr "" #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 #: archaeological_finds/models_finds.py:1976 -#: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:754 +#: archaeological_finds/models_treatments.py:67 +#: archaeological_finds/models_treatments.py:843 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 #: archaeological_operations/models.py:3496 -#: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 +#: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:704 #: ishtar_common/models.py:760 ishtar_common/models.py:811 #: ishtar_common/models.py:1867 ishtar_common/models.py:3952 @@ -936,7 +935,7 @@ msgstr "" #: archaeological_context_records/models.py:499 #: archaeological_context_records/models.py:500 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1397 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 @@ -1126,7 +1125,7 @@ msgstr "" #: archaeological_operations/models.py:467 #: archaeological_operations/models.py:1290 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "" @@ -1141,12 +1140,12 @@ msgid "Bulk update" msgstr "" #: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1062 +#: archaeological_context_records/models.py:1065 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 #: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/models_finds.py:2610 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:2627 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 #: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 #: archaeological_operations/models.py:672 @@ -1157,18 +1156,18 @@ msgstr "" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1693 #: ishtar_common/admin.py:1836 ishtar_common/models.py:4543 -#: ishtar_common/models.py:4922 ishtar_common/views.py:3135 -#: ishtar_common/views.py:3153 +#: ishtar_common/models.py:4922 ishtar_common/views.py:3154 +#: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:719 #: archaeological_files/models.py:567 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:1970 -#: archaeological_finds/models_treatments.py:261 +#: archaeological_finds/models_treatments.py:270 #: archaeological_operations/models.py:3160 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4569 +#: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4569 msgid "External ID" msgstr "" @@ -1177,7 +1176,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1972 #: archaeological_operations/models.py:3163 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1189 +#: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "" @@ -1216,9 +1215,9 @@ msgstr "" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2247 -#: archaeological_finds/models_treatments.py:281 -#: archaeological_finds/models_treatments.py:1159 +#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2255 +#: archaeological_finds/models_treatments.py:290 +#: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 @@ -1228,7 +1227,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1194 +#: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1254,20 +1253,20 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2253 -#: archaeological_finds/models_treatments.py:287 -#: archaeological_finds/models_treatments.py:1166 +#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2261 +#: archaeological_finds/models_treatments.py:296 +#: archaeological_finds/models_treatments.py:1255 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:1479 #: archaeological_operations/models.py:2914 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2426 +#: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2426 #: ishtar_common/models_common.py:3410 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:856 -#: archaeological_finds/models_finds.py:2265 +#: archaeological_finds/models_finds.py:2274 #: archaeological_operations/models.py:559 #: archaeological_operations/models.py:1570 msgid "Cached periods label" @@ -1275,9 +1274,9 @@ msgstr "" #: archaeological_context_records/models.py:859 #: archaeological_context_records/models.py:865 -#: archaeological_finds/models_finds.py:2268 -#: archaeological_finds/models_finds.py:2274 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2283 +#: archaeological_finds/models_finds.py:2289 #: archaeological_operations/models.py:556 #: archaeological_operations/models.py:562 #: archaeological_operations/models.py:568 @@ -1306,78 +1305,78 @@ msgid "Context record" msgstr "" #: archaeological_context_records/models.py:926 -#: archaeological_finds/models_finds.py:2482 +#: archaeological_finds/models_finds.py:2499 #, fuzzy #| msgid "email address" msgid "List of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1050 +#: archaeological_context_records/models.py:1053 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1052 +#: archaeological_context_records/models.py:1055 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1236 +#: archaeological_context_records/models.py:1239 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1283 +#: archaeological_context_records/models.py:1286 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1319 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1320 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1321 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1322 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1323 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1322 +#: archaeological_context_records/models.py:1325 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1326 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1327 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1328 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1329 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1335 +#: archaeological_context_records/models.py:1338 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1339 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1527 +#: archaeological_context_records/models.py:1530 msgid "Context record parent" msgstr "" @@ -1452,9 +1451,9 @@ msgstr "" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2294 -#: archaeological_finds/models_finds.py:2305 -#: archaeological_finds/models_finds.py:3578 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2314 +#: archaeological_finds/models_finds.py:3701 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 @@ -1478,7 +1477,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:72 -#: archaeological_finds/templates/ishtar/sheet_find.html:546 +#: archaeological_finds/templates/ishtar/sheet_find.html:554 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1506,6 +1505,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:81 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: cd17_app/templates/ishtar/sheet_find.html:83 #: man_app/templates/ishtar/sheet_museum_find.html:83 @@ -1538,8 +1538,8 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:270 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 +#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 #: na_app/templates/ishtar/sheet_operation.html:212 @@ -1563,7 +1563,7 @@ msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 -#: archaeological_files/templates/ishtar/sheet_file.html:240 +#: archaeological_files/templates/ishtar/sheet_file.html:239 #: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 #: archaeological_finds/forms.py:977 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 @@ -1571,7 +1571,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: archaeological_operations/templates/ishtar/sheet_site.html:108 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 @@ -1608,11 +1608,11 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:232 #: archaeological_finds/forms_treatments.py:144 -#: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:221 -#: archaeological_finds/templates/ishtar/sheet_find.html:388 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/models_treatments.py:141 +#: archaeological_finds/models_treatments.py:230 +#: archaeological_finds/templates/ishtar/sheet_find.html:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -1622,8 +1622,8 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3644 #: ishtar_common/models.py:5480 ishtar_common/models.py:5617 #: ishtar_common/models.py:5696 ishtar_common/models_common.py:2028 -#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 -#: ishtar_common/models_imports.py:1962 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1564 +#: ishtar_common/models_imports.py:1964 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 #: man_app/templates/ishtar/sheet_museum_find.html:502 @@ -1753,18 +1753,18 @@ msgstr "" #: archaeological_files/forms.py:234 archaeological_files/forms.py:656 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:213 +#: archaeological_files/templates/ishtar/sheet_file.html:212 #: archaeological_finds/forms.py:1707 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 -#: archaeological_finds/forms_treatments.py:426 -#: archaeological_finds/forms_treatments.py:563 -#: archaeological_finds/forms_treatments.py:639 -#: archaeological_finds/forms_treatments.py:710 -#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:407 +#: archaeological_finds/forms_treatments.py:561 +#: archaeological_finds/forms_treatments.py:637 +#: archaeological_finds/forms_treatments.py:708 +#: archaeological_finds/forms_treatments.py:819 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:206 -#: archaeological_finds/models_treatments.py:1103 +#: archaeological_finds/models_treatments.py:215 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:726 #: archaeological_operations/forms.py:1442 @@ -1833,7 +1833,7 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:464 #: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_files/templates/ishtar/sheet_file.html:130 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" @@ -1843,9 +1843,9 @@ msgstr "" #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 #: archaeological_finds/forms.py:2457 #: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/forms_treatments.py:747 -#: archaeological_finds/models_treatments.py:263 -#: archaeological_finds/models_treatments.py:1155 +#: archaeological_finds/forms_treatments.py:745 +#: archaeological_finds/models_treatments.py:272 +#: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:542 #: archaeological_operations/forms.py:740 #: archaeological_operations/forms.py:1238 @@ -1855,9 +1855,9 @@ msgstr "" #: archaeological_operations/models.py:513 #: archaeological_operations/models.py:1468 #: archaeological_operations/models.py:2903 -#: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 -#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2162 +#: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 +#: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 +#: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 #: ishtar_common/forms_common.py:2485 ishtar_common/forms_common.py:3042 #: ishtar_common/models.py:2962 ishtar_common/models.py:3836 #: ishtar_common/models.py:4685 ishtar_common/models_common.py:185 @@ -1870,8 +1870,8 @@ msgstr "" #: archaeological_files/forms.py:108 archaeological_files/forms.py:375 #: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms_treatments.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "" @@ -1891,8 +1891,8 @@ msgid "Created by" msgstr "" #: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 -#: archaeological_finds/forms_treatments.py:580 -#: archaeological_finds/forms_treatments.py:842 +#: archaeological_finds/forms_treatments.py:578 +#: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "" @@ -1907,7 +1907,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:642 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1143 +#: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:1344 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4670 ishtar_common/models_imports.py:1436 @@ -1917,9 +1917,9 @@ msgstr "" #: archaeological_files/forms.py:219 archaeological_files/forms.py:541 #: archaeological_files/models.py:644 -#: archaeological_finds/forms_treatments.py:750 -#: archaeological_finds/models_treatments.py:1145 -#: archaeological_finds/templates/ishtar/sheet_find.html:506 +#: archaeological_finds/forms_treatments.py:748 +#: archaeological_finds/models_treatments.py:1234 +#: archaeological_finds/templates/ishtar/sheet_find.html:514 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -2001,7 +2001,7 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:300 archaeological_files/forms.py:341 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:769 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3670 msgid "Postal code" msgstr "" @@ -2017,7 +2017,7 @@ msgstr "" #: archaeological_files/forms.py:323 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 -#: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 +#: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 #: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:3851 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 @@ -2071,7 +2071,7 @@ msgid "Responsible for planning service" msgstr "" #: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:144 +#: archaeological_files/templates/ishtar/sheet_file.html:143 msgid "Research archaeology" msgstr "" @@ -2093,7 +2093,7 @@ msgid "Lead organization" msgstr "" #: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:170 +#: archaeological_files/templates/ishtar/sheet_file.html:169 msgid "Research archaeology comment" msgstr "" @@ -2181,25 +2181,25 @@ msgid "Linear meter (m)" msgstr "" #: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: 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 msgid "Man by day" msgstr "" #: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Days" msgstr "" #: archaeological_files/forms.py:882 archaeological_files/models.py:116 #: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 msgid "Job" msgstr "" @@ -2218,7 +2218,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "" #: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:280 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Ground jobs" msgstr "" @@ -2227,13 +2227,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "" #: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:394 -#: archaeological_files/templates/ishtar/sheet_file.html:397 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 msgid "Quantity" msgstr "" #: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:387 msgid "Equipment / service" msgstr "" @@ -2241,21 +2241,21 @@ msgstr "" #: archaeological_files/forms.py:1278 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 -#: archaeological_finds/forms_treatments.py:564 -#: archaeological_finds/forms_treatments.py:623 -#: archaeological_finds/forms_treatments.py:640 -#: archaeological_finds/forms_treatments.py:780 -#: archaeological_finds/forms_treatments.py:822 -#: archaeological_finds/forms_treatments.py:886 -#: archaeological_finds/models_treatments.py:207 -#: archaeological_finds/models_treatments.py:1104 +#: archaeological_finds/forms_treatments.py:562 +#: archaeological_finds/forms_treatments.py:621 +#: archaeological_finds/forms_treatments.py:638 +#: archaeological_finds/forms_treatments.py:778 +#: archaeological_finds/forms_treatments.py:820 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 #: archaeological_operations/forms.py:1443 #: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2828 -#: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 +#: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:590 #: ishtar_common/models.py:4568 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2267,10 +2267,10 @@ msgstr "" #: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 #: archaeological_files/forms.py:1267 -#: archaeological_finds/forms_treatments.py:565 -#: archaeological_finds/forms_treatments.py:612 -#: archaeological_finds/forms_treatments.py:823 -#: archaeological_finds/forms_treatments.py:875 +#: archaeological_finds/forms_treatments.py:563 +#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:873 #: archaeological_operations/forms.py:1449 #: archaeological_operations/forms.py:1498 #: archaeological_operations/models.py:2564 @@ -2284,16 +2284,16 @@ msgid "Object (full text search)" msgstr "" #: archaeological_files/forms.py:1151 -#: archaeological_finds/forms_treatments.py:566 -#: archaeological_finds/forms_treatments.py:824 +#: archaeological_finds/forms_treatments.py:564 +#: archaeological_finds/forms_treatments.py:822 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1634 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1158 -#: archaeological_finds/forms_treatments.py:567 -#: archaeological_finds/forms_treatments.py:825 +#: archaeological_finds/forms_treatments.py:565 +#: archaeological_finds/forms_treatments.py:823 #: archaeological_operations/forms.py:1456 #: archaeological_operations/forms.py:1505 #: archaeological_operations/models.py:2887 @@ -2302,8 +2302,8 @@ msgid "Object" msgstr "" #: archaeological_files/forms.py:1160 -#: archaeological_finds/forms_treatments.py:570 -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:568 +#: archaeological_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:1459 #: archaeological_operations/forms.py:1507 #: archaeological_operations/models.py:2885 @@ -2355,7 +2355,7 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3560 +#: archaeological_finds/models_finds.py:3683 #: archaeological_operations/ishtar_menu.py:70 #: archaeological_operations/models.py:1715 #: archaeological_operations/models.py:2923 @@ -2458,7 +2458,7 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:207 +#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3279 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" @@ -2502,7 +2502,7 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:758 +#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1238 ishtar_common/models.py:2414 #: ishtar_common/models_common.py:748 msgid "Parent" @@ -2612,8 +2612,8 @@ msgid "Total developed surface (km2)" msgstr "" #: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1327 -#: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1067 +#: archaeological_finds/models_treatments.py:167 +#: archaeological_finds/models_treatments.py:1156 #: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1141 #: archaeological_operations/models.py:2686 #: archaeological_operations/tests.py:3091 @@ -2623,7 +2623,7 @@ msgid "year" msgstr "" #: archaeological_files/models.py:488 -#: archaeological_finds/models_treatments.py:1064 +#: archaeological_finds/models_treatments.py:1153 #: archaeological_operations/models.py:370 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4316 msgctxt "key for text search" @@ -2631,7 +2631,7 @@ msgid "reference" msgstr "" #: archaeological_files/models.py:491 -#: archaeological_finds/models_treatments.py:155 +#: archaeological_finds/models_treatments.py:164 #: archaeological_operations/models.py:376 msgctxt "key for text search" msgid "other-reference" @@ -2643,7 +2643,7 @@ msgid "department" msgstr "" #: archaeological_files/models.py:507 -#: archaeological_finds/models_treatments.py:1061 +#: archaeological_finds/models_treatments.py:1150 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1169 #: archaeological_operations/tests.py:3227 @@ -2654,8 +2654,8 @@ msgid "name" msgstr "" #: archaeological_files/models.py:510 -#: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1070 +#: archaeological_finds/models_treatments.py:170 +#: archaeological_finds/models_treatments.py:1159 #: archaeological_operations/models.py:1175 #: archaeological_operations/models.py:2697 #: archaeological_operations/tests.py:3240 @@ -2697,7 +2697,7 @@ msgid "comment" msgstr "" #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1632 -#: archaeological_finds/models_treatments.py:1073 +#: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" @@ -2714,17 +2714,17 @@ msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:564 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" #: archaeological_files/models.py:572 -#: archaeological_finds/forms_treatments.py:637 -#: archaeological_finds/forms_treatments.py:708 -#: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/forms_treatments.py:635 +#: archaeological_finds/forms_treatments.py:706 +#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:528 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1131 @@ -2734,7 +2734,7 @@ msgstr "" #: archaeological_operations/models.py:502 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 -#: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 +#: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/models.py:397 #: cd17_app/templates/ishtar/sheet_find.html:507 #: ishtar_common/forms_common.py:755 ishtar_common/forms_common.py:823 @@ -2775,10 +2775,10 @@ msgid "Name" msgstr "" #: archaeological_files/models.py:577 -#: archaeological_finds/models_treatments.py:1120 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 +#: archaeological_finds/models_treatments.py:1209 +#: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 -#: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 #: man_app/templates/ishtar/sheet_museum_find.html:541 #: na_app/templates/ishtar/sheet_find.html:511 @@ -2817,9 +2817,9 @@ msgstr "" #: archaeological_files/models.py:692 #: archaeological_finds/forms_treatments.py:169 -#: archaeological_finds/forms_treatments.py:437 -#: archaeological_finds/models_treatments.py:254 -#: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 +#: archaeological_finds/forms_treatments.py:418 +#: archaeological_finds/models_treatments.py:263 +#: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:747 ishtar_common/forms_common.py:1021 #: ishtar_common/forms_common.py:1083 ishtar_common/forms_common.py:1245 #: ishtar_common/forms_common.py:1434 ishtar_common/ishtar_menu.py:102 @@ -2881,15 +2881,15 @@ msgid "plan" msgstr "" #: archaeological_files/models.py:1305 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1227 +#: archaeological_finds/models_treatments.py:420 +#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:2008 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1307 -#: archaeological_finds/models_treatments.py:413 -#: archaeological_finds/models_treatments.py:1229 +#: archaeological_finds/models_treatments.py:422 +#: archaeological_finds/models_treatments.py:1318 #: archaeological_operations/models.py:2010 msgid "admin. act" msgstr "" @@ -2978,9 +2978,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Planned" msgstr "" @@ -3021,18 +3021,14 @@ msgstr "" msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:123 -msgid "Responsible for planning service address" -msgstr "" - -#: archaeological_files/templates/ishtar/sheet_file.html:177 +#: archaeological_files/templates/ishtar/sheet_file.html:176 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:180 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 @@ -3047,32 +3043,31 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_operations/models.py:2660 #: archaeological_operations/models.py:2959 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 #: ishtar_common/models.py:4570 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:189 -#: archaeological_files/templates/ishtar/sheet_file.html:215 -#: archaeological_finds/forms_treatments.py:641 -#: archaeological_finds/forms_treatments.py:719 -#: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:387 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_finds/forms_treatments.py:639 +#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/models_treatments.py:140 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:413 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:451 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:489 @@ -3124,66 +3119,66 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:192 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:539 #: archaeological_operations/forms.py:782 #: archaeological_operations/models.py:1348 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:206 +#: archaeological_files/templates/ishtar/sheet_file.html:205 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:210 +#: archaeological_files/templates/ishtar/sheet_file.html:209 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:706 ishtar_common/admin.py:768 +#: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:768 #: ishtar_common/models.py:727 ishtar_common/models.py:3410 #: ishtar_common/models_imports.py:1122 msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:226 +#: archaeological_files/templates/ishtar/sheet_file.html:225 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:231 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:262 +#: archaeological_files/templates/ishtar/sheet_file.html:261 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:276 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:295 -#: archaeological_files/templates/ishtar/sheet_file.html:344 -#: archaeological_files/templates/ishtar/sheet_file.html:347 -#: archaeological_files/templates/ishtar/sheet_file.html:396 -#: archaeological_files/templates/ishtar/sheet_file.html:399 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:398 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:310 -#: archaeological_files/templates/ishtar/sheet_file.html:362 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:309 +#: archaeological_files/templates/ishtar/sheet_file.html:361 +#: archaeological_files/templates/ishtar/sheet_file.html:417 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3194,13 +3189,13 @@ msgstr "" msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:321 -#: archaeological_files/templates/ishtar/sheet_file.html:373 -#: archaeological_files/templates/ishtar/sheet_file.html:425 +#: archaeological_files/templates/ishtar/sheet_file.html:320 +#: archaeological_files/templates/ishtar/sheet_file.html:372 +#: archaeological_files/templates/ishtar/sheet_file.html:424 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:332 +#: archaeological_files/templates/ishtar/sheet_file.html:331 msgid "Post-excavation jobs" msgstr "" @@ -3334,7 +3329,7 @@ msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2124 +#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2132 msgid "Previous ID" msgstr "" @@ -3349,17 +3344,17 @@ msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/models_finds.py:2182 msgid "Presence of inventory marking" msgstr "" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/models_finds.py:2186 msgid "Type of marking" msgstr "" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2129 msgid "Marking details" msgstr "" @@ -3374,56 +3369,56 @@ msgid "Museum" msgstr "" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2145 +#: archaeological_finds/models_finds.py:2153 msgid "Owner institution" msgstr "" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2150 +#: archaeological_finds/models_finds.py:2158 msgid "Assigned institution" msgstr "" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2155 +#: archaeological_finds/models_finds.py:2163 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2165 msgid "Depositor inventory number" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/models_finds.py:2168 msgid "Collections entry mode" msgstr "" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/models_finds.py:2170 msgid "Comment on museum entry mode" msgstr "" #: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2163 +#: archaeological_finds/models_finds.py:2171 msgid "Museum entry date (exact or start)" msgstr "" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2172 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2165 +#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2173 msgid "Comment on museum entry date" msgstr "" #: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/models_finds.py:2177 msgid "Donor, testator or vendor" msgstr "" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2138 -#: archaeological_finds/models_finds.py:2185 +#: archaeological_finds/models_finds.py:2146 +#: archaeological_finds/models_finds.py:2193 msgid "Collection" msgstr "" @@ -3432,41 +3427,41 @@ msgid "Former collections" msgstr "" #: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2201 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2197 +#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2205 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2207 msgid "Comment on conformity" msgstr "" #: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2211 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2205 +#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2213 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2206 +#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2214 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2200 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2208 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2252 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2061 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2069 msgid "Is complete?" msgstr "" @@ -3498,22 +3493,22 @@ msgstr "" #: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2071 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2067 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2075 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2083 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2089 msgid "Technical areas" msgstr "" @@ -3531,13 +3526,13 @@ msgstr "" #: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 #: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2215 msgid "Inventory quantity" msgstr "" #: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 #: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1844 -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2216 msgid "Observed quantity" msgstr "" @@ -3565,13 +3560,13 @@ msgstr "" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2099 +#: archaeological_finds/models_finds.py:2107 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 #: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1856 -#: archaeological_finds/models_finds.py:2123 +#: archaeological_finds/models_finds.py:2131 msgid "Comment on dating" msgstr "" @@ -3588,32 +3583,32 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2103 +#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2111 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2104 +#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2112 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2105 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2113 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2108 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2116 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2106 +#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2114 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2115 msgid "Circumference (cm)" msgstr "" @@ -3652,20 +3647,20 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2127 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1883 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2128 +#: archaeological_finds/models_finds.py:2136 msgid "Check" msgstr "" #: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1884 -#: archaeological_finds/models_finds.py:2133 +#: archaeological_finds/models_finds.py:2141 msgid "Check date" msgstr "" @@ -3783,21 +3778,21 @@ msgstr "" #: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 #: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2226 -#: archaeological_warehouse/forms.py:593 +#: archaeological_finds/models_finds.py:2234 +#: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 #: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2230 -#: archaeological_warehouse/forms.py:594 +#: archaeological_finds/models_finds.py:2238 +#: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 #: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2213 +#: archaeological_finds/models_finds.py:2221 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3806,33 +3801,33 @@ msgstr "" #: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 #: archaeological_finds/forms.py:1894 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2236 -#: archaeological_warehouse/forms.py:598 +#: archaeological_finds/models_finds.py:2244 +#: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 #: archaeological_finds/forms.py:1885 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2087 -#: archaeological_warehouse/forms.py:590 +#: archaeological_finds/models_finds.py:2095 +#: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 #: archaeological_finds/forms.py:1886 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2093 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/models_finds.py:2101 +#: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2242 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2250 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 #: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2241 +#: archaeological_finds/models_finds.py:2249 msgid "Insurance value" msgstr "" @@ -3903,18 +3898,18 @@ msgstr "" #: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1892 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/models_finds.py:2229 msgid "Recommended treatments" msgstr "" #: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1896 #: archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2134 +#: archaeological_finds/models_finds.py:2142 msgid "Estimated value" msgstr "" #: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1888 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2225 msgid "Conservatory comment" msgstr "" @@ -3934,7 +3929,7 @@ msgstr "" msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2283 +#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2292 msgid "Complete museum ID" msgstr "" @@ -3996,19 +3991,19 @@ msgstr "E-Mail-Adresse" msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "" @@ -4028,7 +4023,7 @@ msgstr "" #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 -#: archaeological_warehouse/forms.py:579 +#: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 #: sra_idf_app/templates/ishtar/sheet_operation.html:563 msgid "Material type" @@ -4037,7 +4032,7 @@ msgstr "" #: archaeological_finds/forms.py:1819 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 +#: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 #: sra_idf_app/templates/ishtar/sheet_operation.html:573 msgid "Object type" @@ -4148,7 +4143,7 @@ msgid "Museum - Purchase price" msgstr "" #: archaeological_finds/forms.py:2032 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2059 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4186,7 +4181,7 @@ msgid "Find search" msgstr "" #: archaeological_finds/forms.py:2201 archaeological_finds/forms.py:2364 -#: archaeological_finds/models_treatments.py:401 +#: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" @@ -4219,11 +4214,10 @@ msgstr "" #: archaeological_finds/forms.py:2453 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:211 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:386 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:412 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:450 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:488 @@ -4264,24 +4258,24 @@ msgstr "" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:204 +#: archaeological_finds/models_treatments.py:213 msgid "Other ref." msgstr "" #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 -#: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:246 +#: archaeological_finds/models_treatments.py:144 +#: archaeological_finds/models_treatments.py:255 msgid "Scientific monitoring manager" msgstr "" #: archaeological_finds/forms_treatments.py:65 #: archaeological_finds/forms_treatments.py:142 -#: archaeological_finds/forms_treatments.py:423 -#: archaeological_finds/forms_treatments.py:577 +#: archaeological_finds/forms_treatments.py:404 +#: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:217 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_finds/models_treatments.py:226 +#: archaeological_finds/models_treatments.py:848 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "" @@ -4297,8 +4291,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:294 -#: archaeological_finds/models_treatments.py:748 +#: archaeological_finds/models_treatments.py:303 +#: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2550 @@ -4311,10 +4305,10 @@ msgid "Treatment - 020 - General" msgstr "" #: archaeological_finds/forms_treatments.py:163 -#: archaeological_finds/forms_treatments.py:431 -#: archaeological_finds/forms_treatments.py:721 -#: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:238 +#: archaeological_finds/forms_treatments.py:412 +#: archaeological_finds/forms_treatments.py:719 +#: archaeological_finds/models_treatments.py:142 +#: archaeological_finds/models_treatments.py:247 msgid "Responsible" msgstr "" @@ -4323,7 +4317,7 @@ msgid "Destination container (relevant for treatment that change location)" msgstr "" #: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:274 msgid "Goal" msgstr "" @@ -4385,7 +4379,7 @@ msgid "Another treatment with this index exists for {}." msgstr "" #: archaeological_finds/forms_treatments.py:377 -#: archaeological_finds/models_treatments.py:214 +#: archaeological_finds/models_treatments.py:223 msgid "Associated request" msgstr "" @@ -4394,10 +4388,10 @@ msgid "Treatment - 010 - Request choice" msgstr "" #: archaeological_finds/forms_treatments.py:383 -#: archaeological_finds/forms_treatments.py:699 +#: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1180 -#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/models_treatments.py:1269 +#: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2549 #: archaeological_operations/models.py:2874 ishtar_common/views.py:510 @@ -4415,19 +4409,35 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:400 +msgid "Create a treatment" +msgstr "" + +#: archaeological_finds/forms_treatments.py:410 +msgid "Precise date" +msgstr "" + +#: archaeological_finds/forms_treatments.py:489 +msgid "At least a year is required." +msgstr "" + +#: archaeological_finds/forms_treatments.py:491 +msgid "Treatment type is required." +msgstr "" + +#: archaeological_finds/forms_treatments.py:498 #: archaeological_finds/models_finds.py:2047 -#: archaeological_finds/models_finds.py:3538 -#: archaeological_finds/models_treatments.py:271 -#: archaeological_finds/models_treatments.py:763 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 -#: archaeological_finds/templates/ishtar/sheet_find.html:429 -#: archaeological_finds/templates/ishtar/sheet_find.html:467 +#: archaeological_finds/models_finds.py:3606 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:852 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 +#: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 -#: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/models.py:2062 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/models.py:839 +#: archaeological_warehouse/models.py:1220 +#: archaeological_warehouse/models.py:2090 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4450,79 +4460,59 @@ msgstr "" msgid "Container" msgstr "" -#: archaeological_finds/forms_treatments.py:406 +#: archaeological_finds/forms_treatments.py:504 #: ishtar_common/forms_common.py:2757 msgid "Change " msgstr "" -#: archaeological_finds/forms_treatments.py:408 +#: archaeological_finds/forms_treatments.py:506 msgid "reference and current containers" msgstr "" -#: archaeological_finds/forms_treatments.py:409 +#: archaeological_finds/forms_treatments.py:507 #: ishtar_common/forms_common.py:2761 msgid "the reference container" msgstr "" -#: archaeological_finds/forms_treatments.py:410 +#: archaeological_finds/forms_treatments.py:508 #: ishtar_common/forms_common.py:2762 msgid "the current container" msgstr "" -#: archaeological_finds/forms_treatments.py:419 -msgid "Create a treatment" -msgstr "" - -#: archaeological_finds/forms_treatments.py:429 -msgid "Precise date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:499 -msgid "At least a year is required." -msgstr "" - -#: archaeological_finds/forms_treatments.py:501 -msgid "Treatment type is required." -msgstr "" - -#: archaeological_finds/forms_treatments.py:514 -msgid "Completed" -msgstr "" - -#: archaeological_finds/forms_treatments.py:572 +#: archaeological_finds/forms_treatments.py:570 msgid "Treatment name" msgstr "" -#: archaeological_finds/forms_treatments.py:573 +#: archaeological_finds/forms_treatments.py:571 msgid "Treatment year" msgstr "" -#: archaeological_finds/forms_treatments.py:574 +#: archaeological_finds/forms_treatments.py:572 msgid "Treatment index" msgstr "" -#: archaeological_finds/forms_treatments.py:576 +#: archaeological_finds/forms_treatments.py:574 msgid "Treatment internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:608 msgid "Treatment - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:630 +#: archaeological_finds/forms_treatments.py:628 msgid "Treatment file - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:638 -#: archaeological_finds/forms_treatments.py:715 ishtar_common/models.py:4571 +#: archaeological_finds/forms_treatments.py:636 +#: archaeological_finds/forms_treatments.py:713 ishtar_common/models.py:4571 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" -#: archaeological_finds/forms_treatments.py:650 -#: archaeological_finds/forms_treatments.py:727 -#: archaeological_finds/models_treatments.py:1128 -#: archaeological_finds/templates/ishtar/sheet_find.html:504 +#: archaeological_finds/forms_treatments.py:648 +#: archaeological_finds/forms_treatments.py:725 +#: archaeological_finds/models_treatments.py:1217 +#: archaeological_finds/templates/ishtar/sheet_find.html:512 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:530 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4533,10 +4523,10 @@ msgstr "" msgid "Applicant" msgstr "" -#: archaeological_finds/forms_treatments.py:656 -#: archaeological_finds/forms_treatments.py:733 -#: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:505 +#: archaeological_finds/forms_treatments.py:654 +#: archaeological_finds/forms_treatments.py:731 +#: archaeological_finds/models_treatments.py:1225 +#: archaeological_finds/templates/ishtar/sheet_find.html:513 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4547,72 +4537,72 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:663 -#: archaeological_finds/forms_treatments.py:745 -#: archaeological_finds/models_treatments.py:1149 +#: archaeological_finds/forms_treatments.py:661 +#: archaeological_finds/forms_treatments.py:743 +#: archaeological_finds/models_treatments.py:1238 msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:664 -#: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/models_treatments.py:1152 +#: archaeological_finds/forms_treatments.py:662 +#: archaeological_finds/forms_treatments.py:744 +#: archaeological_finds/models_treatments.py:1241 msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:674 -#: archaeological_finds/forms_treatments.py:686 +#: archaeological_finds/forms_treatments.py:672 +#: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/forms_treatments.py:715 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/forms_treatments.py:737 msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1147 +#: archaeological_finds/forms_treatments.py:741 +#: archaeological_finds/models_treatments.py:1236 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:803 +#: archaeological_finds/forms_treatments.py:801 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:809 +#: archaeological_finds/forms_treatments.py:807 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:810 +#: archaeological_finds/forms_treatments.py:808 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:829 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:833 +#: archaeological_finds/forms_treatments.py:831 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:835 +#: archaeological_finds/forms_treatments.py:833 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/forms_treatments.py:835 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:839 -#: archaeological_finds/models_treatments.py:1005 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/models_treatments.py:1094 +#: archaeological_finds/models_treatments.py:1203 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:873 +#: archaeological_finds/forms_treatments.py:871 msgid "Treatment request - Administrative act - General" msgstr "" @@ -4634,8 +4624,8 @@ msgstr "" #: archaeological_finds/models_finds.py:91 #: archaeological_operations/models.py:2554 -#: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4051 +#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4051 msgid "Code" msgstr "" @@ -4719,17 +4709,17 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:381 +#: archaeological_finds/models_treatments.py:390 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2259 -#: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:295 -#: archaeological_finds/models_treatments.py:307 -#: archaeological_finds/models_treatments.py:1008 -#: archaeological_finds/models_treatments.py:1193 +#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/models_treatments.py:76 +#: archaeological_finds/models_treatments.py:304 +#: archaeological_finds/models_treatments.py:316 +#: archaeological_finds/models_treatments.py:1097 +#: archaeological_finds/models_treatments.py:1282 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -4895,7 +4885,7 @@ msgid "Material index" msgstr "" #: archaeological_finds/models_finds.py:586 -#: ishtar_common/models_imports.py:2857 +#: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4907,7 +4897,7 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2287 ishtar_common/models.py:4696 +#: archaeological_finds/models_finds.py:2296 ishtar_common/models.py:4696 #: ishtar_common/models.py:4703 msgid "Cached value - do not edit" msgstr "" @@ -4950,7 +4940,7 @@ msgstr "E-Mail-Adresse" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3114 +#: ishtar_common/views.py:3133 msgid "Modify" msgstr "" @@ -4959,7 +4949,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1928 +#: archaeological_warehouse/models.py:1940 msgid "Add treatment" msgstr "" @@ -5572,13 +5562,13 @@ msgid "museum-observed-quantity" msgstr "" #: archaeological_finds/models_finds.py:1863 -#: archaeological_finds/models_finds.py:2645 +#: archaeological_finds/models_finds.py:2662 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 -#: archaeological_warehouse/views.py:303 ishtar_common/models.py:4550 +#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 +#: archaeological_warehouse/views.py:304 ishtar_common/models.py:4550 #: ishtar_common/models.py:4933 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3161 +#: ishtar_common/views.py:3180 msgid "Packaging" msgstr "" @@ -5595,7 +5585,7 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:2029 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5606,7 +5596,7 @@ msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2036 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -5616,87 +5606,144 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2110 +#: archaeological_finds/models_finds.py:2054 +msgid "Container - first full location" +msgstr "" + +#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2067 +msgid "Updated as long as no packaging is attached" +msgstr "" + +#: archaeological_finds/models_finds.py:2066 +msgid "Reference container - first full location" +msgstr "" + +#: archaeological_finds/models_finds.py:2118 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/models_finds.py:2121 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2116 +#: archaeological_finds/models_finds.py:2124 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2139 +#: archaeological_finds/models_finds.py:2147 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2190 +#: archaeological_finds/models_finds.py:2198 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/models_finds.py:2270 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/models_finds.py:2280 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2286 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2317 +#: archaeological_finds/models_finds.py:2326 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2483 +#: archaeological_finds/models_finds.py:2500 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2484 +#: archaeological_finds/models_finds.py:2501 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2485 +#: archaeological_finds/models_finds.py:2502 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2486 +#: archaeological_finds/models_finds.py:2503 #, fuzzy #| msgid "email address" msgid "Complete ID of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2487 +#: archaeological_finds/models_finds.py:2504 #, fuzzy #| msgid "email address" msgid "Label of associated context records" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2618 +#: archaeological_finds/models_finds.py:2635 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2626 +#: archaeological_finds/models_finds.py:2643 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2634 +#: archaeological_finds/models_finds.py:2651 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3112 +#: archaeological_finds/models_finds.py:3129 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3118 +#: archaeological_finds/models_finds.py:3135 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3565 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Current" +msgstr "" + +#: archaeological_finds/models_finds.py:3626 +#: archaeological_finds/models_treatments.py:1198 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_operations/forms.py:1130 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1802 +#: archaeological_operations/models.py:500 +#: archaeological_warehouse/forms.py:343 +#: archaeological_warehouse/models.py:2097 ishtar_common/forms_common.py:2150 +#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 +#: ishtar_common/models.py:2409 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "" + +#: archaeological_finds/models_finds.py:3627 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Reference/current" +msgstr "" + +#: archaeological_finds/models_finds.py:3647 +msgid "Full location" +msgstr "" + +#: archaeological_finds/models_finds.py:3648 +#, fuzzy +#| msgid "email address" +msgid "Location type" +msgstr "E-Mail-Adresse" + +#: archaeological_finds/models_finds.py:3652 +msgid "Find - Treatment" +msgstr "" + +#: archaeological_finds/models_finds.py:3653 +msgid "Find - Treatments" +msgstr "" + +#: archaeological_finds/models_finds.py:3688 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2978 #: ishtar_common/models.py:3297 ishtar_common/models.py:3395 @@ -5706,89 +5753,93 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3573 +#: archaeological_finds/models_finds.py:3696 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3574 +#: archaeological_finds/models_finds.py:3697 msgid "Properties" msgstr "" -#: archaeological_finds/models_treatments.py:65 +#: archaeological_finds/models_treatments.py:66 msgid "Treatment is executed" msgstr "" -#: archaeological_finds/models_treatments.py:69 +#: archaeological_finds/models_treatments.py:70 msgid "Treatment state type" msgstr "" -#: archaeological_finds/models_treatments.py:70 +#: archaeological_finds/models_treatments.py:71 msgid "Treatment state types" msgstr "" -#: archaeological_finds/models_treatments.py:129 +#: archaeological_finds/models_treatments.py:90 +msgid "Completed" +msgstr "" + +#: archaeological_finds/models_treatments.py:138 msgid "Downstream find" msgstr "" -#: archaeological_finds/models_treatments.py:130 +#: archaeological_finds/models_treatments.py:139 msgid "Upstream find" msgstr "" -#: archaeological_finds/models_treatments.py:152 +#: archaeological_finds/models_treatments.py:161 msgctxt "key for text search" msgid "label" msgstr "" -#: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1068 +#: archaeological_finds/models_treatments.py:168 +#: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:2688 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "" -#: archaeological_finds/models_treatments.py:165 +#: archaeological_finds/models_treatments.py:174 msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:225 +#: archaeological_finds/models_treatments.py:234 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:233 +#: archaeological_finds/models_treatments.py:242 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:285 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:286 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:278 +#: archaeological_finds/models_treatments.py:287 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:279 +#: archaeological_finds/models_treatments.py:288 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:314 +#: archaeological_finds/models_treatments.py:323 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:391 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_find.html:390 -#: archaeological_finds/templates/ishtar/sheet_find.html:428 -#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/models_treatments.py:853 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 +#: archaeological_finds/templates/ishtar/sheet_find.html:474 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -5810,61 +5861,47 @@ msgstr "" msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:765 -#: archaeological_finds/models_treatments.py:766 +#: archaeological_finds/models_treatments.py:854 +#: archaeological_finds/models_treatments.py:855 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:990 +#: archaeological_finds/models_treatments.py:1079 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1006 +#: archaeological_finds/models_treatments.py:1095 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1077 +#: archaeological_finds/models_treatments.py:1166 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1082 +#: archaeological_finds/models_treatments.py:1171 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1176 msgctxt "key for text search" msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1180 msgctxt "key for text search" msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1095 +#: archaeological_finds/models_treatments.py:1184 msgctxt "key for text search" msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1109 -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1345 -#: archaeological_operations/forms.py:1802 -#: archaeological_operations/models.py:500 -#: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2150 -#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 -#: ishtar_common/models.py:2409 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "" - -#: archaeological_finds/models_treatments.py:1181 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/models_treatments.py:1270 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:522 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -5874,7 +5911,7 @@ msgstr "" msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1249 +#: archaeological_finds/models_treatments.py:1338 msgid "Add associated treatment" msgstr "" @@ -5910,6 +5947,7 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:44 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:36 msgid "Associate a treatment" msgstr "" @@ -6038,9 +6076,9 @@ msgid "Simple treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:385 -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:411 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:449 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:487 @@ -6068,9 +6106,13 @@ msgstr "" msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:389 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +msgid "Label/type" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:435 +#: archaeological_finds/templates/ishtar/sheet_find.html:473 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -6092,7 +6134,16 @@ msgstr "" msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +msgid "Date start/end" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: archaeological_finds/templates/ishtar/sheet_find.html:419 +msgid "First packaging" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6107,8 +6158,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: archaeological_finds/templates/ishtar/sheet_find.html:492 +#: archaeological_finds/templates/ishtar/sheet_find.html:461 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:518 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6128,7 +6179,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:533 +#: archaeological_finds/templates/ishtar/sheet_find.html:541 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:559 #: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6236,7 +6287,7 @@ msgstr "" msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1678 msgid "The division {} {} do not exist for the location {}." msgstr "" @@ -7825,8 +7876,8 @@ msgid "" "the first step." msgstr "" -#: archaeological_warehouse/forms.py:85 archaeological_warehouse/forms.py:193 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:734 +#: archaeological_warehouse/forms.py:89 archaeological_warehouse/forms.py:197 +#: archaeological_warehouse/forms.py:517 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:935 @@ -7836,61 +7887,61 @@ msgstr "" msgid "Warehouse" msgstr "" -#: archaeological_warehouse/forms.py:98 +#: archaeological_warehouse/forms.py:102 msgid "Default divisions" msgstr "" -#: archaeological_warehouse/forms.py:105 +#: archaeological_warehouse/forms.py:109 msgid "Division type" msgstr "" -#: archaeological_warehouse/forms.py:121 +#: archaeological_warehouse/forms.py:125 msgid "There are identical divisions." msgstr "" -#: archaeological_warehouse/forms.py:123 +#: archaeological_warehouse/forms.py:127 msgid "Order fields must be different." msgstr "" -#: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 +#: archaeological_warehouse/forms.py:134 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" -#: archaeological_warehouse/forms.py:131 +#: archaeological_warehouse/forms.py:135 msgid "Warehouse - 020 - Divisions" msgstr "" -#: archaeological_warehouse/forms.py:137 +#: archaeological_warehouse/forms.py:141 msgid "Warehouse - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:261 +#: archaeological_warehouse/forms.py:149 archaeological_warehouse/forms.py:214 +#: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:261 #: archaeological_warehouse/models.py:400 ishtar_common/models_imports.py:1088 msgid "Warehouse type" msgstr "" -#: archaeological_warehouse/forms.py:156 archaeological_warehouse/forms.py:174 -#: archaeological_warehouse/views.py:309 +#: archaeological_warehouse/forms.py:160 archaeological_warehouse/forms.py:178 +#: archaeological_warehouse/views.py:310 msgid "Warehouse search" msgstr "" -#: archaeological_warehouse/forms.py:194 +#: archaeological_warehouse/forms.py:198 msgid "Warehouse - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:209 +#: archaeological_warehouse/forms.py:213 msgid "Auto filled if kept empty." msgstr "" -#: archaeological_warehouse/forms.py:230 +#: archaeological_warehouse/forms.py:234 msgid "Create a new organization from this warehouse" msgstr "" -#: archaeological_warehouse/forms.py:237 +#: archaeological_warehouse/forms.py:241 msgid "" "Only fill the following fields if no organization is provided or if the " "address of the warehouse is different from the one of the organization. If a " @@ -7898,23 +7949,23 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:767 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:767 #: ishtar_common/forms_common.py:1175 ishtar_common/models_common.py:3667 #: ishtar_common/models_common.py:3856 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:770 +#: archaeological_warehouse/forms.py:252 ishtar_common/forms_common.py:770 #: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3672 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:772 +#: archaeological_warehouse/forms.py:254 ishtar_common/forms_common.py:772 #: ishtar_common/forms_common.py:1180 ishtar_common/models_common.py:3678 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/forms.py:255 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1151 #: ishtar_common/models_common.py:3692 ishtar_common/models_common.py:3868 @@ -7923,7 +7974,7 @@ msgstr "" msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/forms.py:257 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:776 ishtar_common/forms_common.py:1161 #: ishtar_common/models_common.py:3708 @@ -7932,159 +7983,159 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:276 msgid "A new organization is not created if an organization is selected." msgstr "" -#: archaeological_warehouse/forms.py:307 archaeological_warehouse/forms.py:308 +#: archaeological_warehouse/forms.py:311 archaeological_warehouse/forms.py:312 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:316 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:334 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1186 +#: archaeological_warehouse/forms.py:346 archaeological_warehouse/forms.py:522 +#: archaeological_warehouse/models.py:1193 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 -#: archaeological_warehouse/forms.py:739 archaeological_warehouse/models.py:741 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:905 -#: archaeological_warehouse/models.py:1154 +#: archaeological_warehouse/models.py:1161 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:346 +#: archaeological_warehouse/forms.py:350 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1169 +#: archaeological_warehouse/forms.py:359 archaeological_warehouse/forms.py:530 +#: archaeological_warehouse/models.py:1176 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:750 -#: archaeological_warehouse/models.py:1145 +#: archaeological_warehouse/forms.py:369 archaeological_warehouse/forms.py:744 +#: archaeological_warehouse/models.py:1152 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:373 +#: archaeological_warehouse/forms.py:377 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1176 +#: archaeological_warehouse/forms.py:382 +#: archaeological_warehouse/models.py:1183 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:404 +#: archaeological_warehouse/forms.py:408 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:427 +#: archaeological_warehouse/forms.py:431 msgid "This reference/code already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:435 archaeological_warehouse/forms.py:812 +#: archaeological_warehouse/forms.py:439 archaeological_warehouse/forms.py:819 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:499 +#: archaeological_warehouse/forms.py:503 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:506 +#: archaeological_warehouse/forms.py:510 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:518 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/forms.py:525 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:524 +#: archaeological_warehouse/forms.py:528 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:563 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:561 +#: archaeological_warehouse/forms.py:565 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:566 +#: archaeological_warehouse/forms.py:570 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:575 +#: archaeological_warehouse/forms.py:579 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:576 +#: archaeological_warehouse/forms.py:580 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:577 +#: archaeological_warehouse/forms.py:581 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:592 ishtar_common/models_imports.py:1085 +#: archaeological_warehouse/forms.py:596 ishtar_common/models_imports.py:1085 msgid "Conservatory state" msgstr "" -#: archaeological_warehouse/forms.py:596 +#: archaeological_warehouse/forms.py:600 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:620 archaeological_warehouse/forms.py:633 -#: archaeological_warehouse/forms.py:647 archaeological_warehouse/views.py:379 +#: archaeological_warehouse/forms.py:624 archaeological_warehouse/forms.py:637 +#: archaeological_warehouse/forms.py:651 archaeological_warehouse/views.py:380 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:625 archaeological_warehouse/forms.py:638 -#: archaeological_warehouse/forms.py:652 +#: archaeological_warehouse/forms.py:629 archaeological_warehouse/forms.py:642 +#: archaeological_warehouse/forms.py:656 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:627 +#: archaeological_warehouse/forms.py:631 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:672 +#: archaeological_warehouse/forms.py:676 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:700 +#: archaeological_warehouse/forms.py:704 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:714 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:714 archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:718 archaeological_warehouse/forms.py:719 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:720 +#: archaeological_warehouse/forms.py:724 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:833 +#: archaeological_warehouse/forms.py:840 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -8092,7 +8143,8 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1214 +#: archaeological_warehouse/models.py:1221 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:11 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8138,7 +8190,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1625 +#: archaeological_warehouse/models.py:1637 msgid "No value" msgstr "" @@ -8189,7 +8241,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1140 +#: archaeological_warehouse/models.py:1147 msgid "Deprecated - do not use" msgstr "" @@ -8198,7 +8250,7 @@ msgid "Container parent" msgstr "" #: archaeological_warehouse/models.py:899 -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1137 msgid "Location (warehouse)" msgstr "" @@ -8274,91 +8326,98 @@ msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1136 +#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:16 +#: archaeological_warehouse/views.py:517 +msgctxt "action" +msgid "Move" +msgstr "" + +#: archaeological_warehouse/models.py:1143 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1149 +#: archaeological_warehouse/models.py:1156 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1165 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1162 +#: archaeological_warehouse/models.py:1169 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1165 +#: archaeological_warehouse/models.py:1172 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1178 +#: archaeological_warehouse/models.py:1185 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1181 +#: archaeological_warehouse/models.py:1188 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1184 +#: archaeological_warehouse/models.py:1191 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1386 +#: archaeological_warehouse/models.py:1398 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1390 +#: archaeological_warehouse/models.py:1402 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1810 +#: archaeological_warehouse/models.py:1822 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1817 +#: archaeological_warehouse/models.py:1829 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1833 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1834 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1835 #, fuzzy #| msgid "email address" msgid "List of associated finds" msgstr "E-Mail-Adresse" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1836 #, fuzzy #| msgid "email address" msgid "List of documents contained in this container" msgstr "E-Mail-Adresse" -#: archaeological_warehouse/models.py:1825 +#: archaeological_warehouse/models.py:1837 msgid "List of documents whose reference container is this container" msgstr "" -#: archaeological_warehouse/models.py:2067 +#: archaeological_warehouse/models.py:2095 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2102 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:2075 +#: archaeological_warehouse/models.py:2103 msgid "Container localisations" msgstr "" @@ -8493,43 +8552,43 @@ msgid "" "facilitate imports." msgstr "" -#: archaeological_warehouse/views.py:90 example_project/__init__.py:11 +#: archaeological_warehouse/views.py:91 example_project/__init__.py:11 msgid "New warehouse" msgstr "" -#: archaeological_warehouse/views.py:93 +#: archaeological_warehouse/views.py:94 msgid "New container" msgstr "" -#: archaeological_warehouse/views.py:322 +#: archaeological_warehouse/views.py:323 msgid "Warehouse creation" msgstr "" -#: archaeological_warehouse/views.py:333 +#: archaeological_warehouse/views.py:334 msgid "Warehouse modification" msgstr "" -#: archaeological_warehouse/views.py:355 +#: archaeological_warehouse/views.py:356 msgid "Warehouse deletion" msgstr "" -#: archaeological_warehouse/views.py:390 +#: archaeological_warehouse/views.py:391 msgid "Container creation" msgstr "" -#: archaeological_warehouse/views.py:400 +#: archaeological_warehouse/views.py:401 msgid "Container modification" msgstr "" -#: archaeological_warehouse/views.py:427 +#: archaeological_warehouse/views.py:428 msgid "Container deletion" msgstr "" -#: archaeological_warehouse/views.py:468 +#: archaeological_warehouse/views.py:469 msgid "Merge containers" msgstr "" -#: archaeological_warehouse/views.py:478 +#: archaeological_warehouse/views.py:479 msgid "Select the main container" msgstr "" @@ -8923,8 +8982,8 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1648 -#: ishtar_common/models_imports.py:2331 +#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1650 +#: ishtar_common/models_imports.py:2333 msgid "Launch import" msgstr "" @@ -9016,7 +9075,7 @@ msgstr "" #: ishtar_common/admin.py:2763 ishtar_common/models.py:746 #: ishtar_common/models_common.py:846 ishtar_common/models_imports.py:977 -#: ishtar_common/models_imports.py:2907 ishtar_common/models_rest.py:111 +#: ishtar_common/models_imports.py:2913 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -9110,178 +9169,178 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:282 +#: ishtar_common/data_importer.py:283 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:301 +#: ishtar_common/data_importer.py:302 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:313 +#: ishtar_common/data_importer.py:314 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:323 +#: ishtar_common/data_importer.py:324 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:380 ishtar_common/data_importer.py:394 -#: ishtar_common/data_importer.py:618 +#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 +#: ishtar_common/data_importer.py:619 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:407 +#: ishtar_common/data_importer.py:408 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:476 +#: ishtar_common/data_importer.py:477 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:483 +#: ishtar_common/data_importer.py:484 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:485 +#: ishtar_common/data_importer.py:486 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:641 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "" -#: ishtar_common/data_importer.py:669 +#: ishtar_common/data_importer.py:670 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:780 +#: ishtar_common/data_importer.py:781 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: ishtar_common/data_importer.py:786 +#: ishtar_common/data_importer.py:787 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 +#: ishtar_common/data_importer.py:789 ishtar_common/views.py:1892 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:789 +#: ishtar_common/data_importer.py:790 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:791 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:792 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:793 +#: ishtar_common/data_importer.py:794 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: ishtar_common/data_importer.py:797 +#: ishtar_common/data_importer.py:798 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:801 +#: ishtar_common/data_importer.py:802 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/data_importer.py:1470 ishtar_common/views.py:1970 #: ishtar_common/views.py:1980 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1734 +#: ishtar_common/data_importer.py:1765 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1739 +#: ishtar_common/data_importer.py:1770 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1823 +#: ishtar_common/data_importer.py:1854 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1954 +#: ishtar_common/data_importer.py:1985 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2024 +#: ishtar_common/data_importer.py:2055 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2032 +#: ishtar_common/data_importer.py:2063 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2037 +#: ishtar_common/data_importer.py:2068 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2125 +#: ishtar_common/data_importer.py:2156 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2128 +#: ishtar_common/data_importer.py:2159 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2242 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2264 +#: ishtar_common/data_importer.py:2295 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -9295,7 +9354,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "" #: ishtar_common/forms.py:114 ishtar_common/forms_common.py:1618 -#: ishtar_common/views.py:3062 +#: ishtar_common/views.py:3080 msgid "Confirm" msgstr "" @@ -9464,7 +9523,7 @@ msgstr "" msgid "You put either a file or a download link for media but not both." msgstr "" -#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3023 +#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3050 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -10250,9 +10309,9 @@ msgstr "" #: ishtar_common/models_imports.py:794 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:843 ishtar_common/models_imports.py:897 #: ishtar_common/models_imports.py:957 ishtar_common/models_imports.py:1000 -#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1574 -#: ishtar_common/models_imports.py:2003 ishtar_common/models_imports.py:2900 -#: ishtar_common/models_imports.py:2928 +#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1576 +#: ishtar_common/models_imports.py:2005 ishtar_common/models_imports.py:2906 +#: ishtar_common/models_imports.py:2934 msgid "Imports" msgstr "" @@ -10706,8 +10765,8 @@ msgstr "" #: ishtar_common/models.py:1187 msgid "" -"If provided a button is displayed on find search pages to create a \"No " -"context\" find" +"If provided a button is displayed on find add page to create a \"No context" +"\" find" msgstr "" #: ishtar_common/models.py:1193 @@ -11448,7 +11507,7 @@ msgstr "" msgid "Biographical notes" msgstr "" -#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2352 +#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2354 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "" @@ -12637,7 +12696,7 @@ msgid "" "break." msgstr "" -#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1992 +#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1994 msgid "Debug" msgstr "" @@ -13013,48 +13072,48 @@ msgid "" "or Shapefile)." msgstr "" -#: ishtar_common/models_imports.py:1525 +#: ishtar_common/models_imports.py:1527 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1559 +#: ishtar_common/models_imports.py:1561 msgid "Importer group type" msgstr "" -#: ishtar_common/models_imports.py:1560 +#: ishtar_common/models_imports.py:1562 msgid "Current import" msgstr "" -#: ishtar_common/models_imports.py:1566 +#: ishtar_common/models_imports.py:1568 msgid "Import - Group" msgstr "" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1569 msgid "Import - Groups" msgstr "" -#: ishtar_common/models_imports.py:1644 ishtar_common/models_imports.py:2327 +#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:2329 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:1650 -#: ishtar_common/models_imports.py:2329 ishtar_common/models_imports.py:2339 +#: ishtar_common/models_imports.py:1648 ishtar_common/models_imports.py:1652 +#: ishtar_common/models_imports.py:2331 ishtar_common/models_imports.py:2341 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1651 ishtar_common/models_imports.py:2340 +#: ishtar_common/models_imports.py:1653 ishtar_common/models_imports.py:2342 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1652 ishtar_common/models_imports.py:2347 +#: ishtar_common/models_imports.py:1654 ishtar_common/models_imports.py:2349 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1655 ishtar_common/models_imports.py:2350 +#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2352 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2354 +#: ishtar_common/models_imports.py:1659 ishtar_common/models_imports.py:2356 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -13063,164 +13122,164 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1918 +#: ishtar_common/models_imports.py:1920 msgid "Importer type" msgstr "" -#: ishtar_common/models_imports.py:1926 +#: ishtar_common/models_imports.py:1928 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:1930 +#: ishtar_common/models_imports.py:1932 msgid "Imported values" msgstr "" -#: ishtar_common/models_imports.py:1938 +#: ishtar_common/models_imports.py:1940 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1946 +#: ishtar_common/models_imports.py:1948 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1954 +#: ishtar_common/models_imports.py:1956 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1965 +#: ishtar_common/models_imports.py:1967 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1967 +#: ishtar_common/models_imports.py:1969 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1970 +#: ishtar_common/models_imports.py:1972 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1972 +#: ishtar_common/models_imports.py:1974 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1973 +#: ishtar_common/models_imports.py:1975 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1975 +#: ishtar_common/models_imports.py:1977 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1980 +#: ishtar_common/models_imports.py:1982 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1982 +#: ishtar_common/models_imports.py:1984 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1988 +#: ishtar_common/models_imports.py:1990 #: ishtar_common/templates/ishtar/import_table.html:60 msgid "Group" msgstr "" -#: ishtar_common/models_imports.py:1991 +#: ishtar_common/models_imports.py:1993 msgid "Next import" msgstr "" -#: ishtar_common/models_imports.py:1995 +#: ishtar_common/models_imports.py:1997 msgid "Import - Import" msgstr "" -#: ishtar_common/models_imports.py:1996 +#: ishtar_common/models_imports.py:1998 msgid "Import - Imports" msgstr "" -#: ishtar_common/models_imports.py:2205 +#: ishtar_common/models_imports.py:2207 msgid "" "Error while opening the file. Particularly check the number of columns of " "your file." msgstr "" -#: ishtar_common/models_imports.py:2256 ishtar_common/models_imports.py:2404 +#: ishtar_common/models_imports.py:2258 ishtar_common/models_imports.py:2406 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:2334 +#: ishtar_common/models_imports.py:2336 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:2335 ishtar_common/models_imports.py:2344 +#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 +#: ishtar_common/models_imports.py:2339 ishtar_common/models_imports.py:2348 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:2343 +#: ishtar_common/models_imports.py:2345 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:2448 ishtar_common/models_imports.py:2451 -#: ishtar_common/models_imports.py:2515 +#: ishtar_common/models_imports.py:2450 ishtar_common/models_imports.py:2453 +#: ishtar_common/models_imports.py:2517 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:2461 +#: ishtar_common/models_imports.py:2463 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:2483 +#: ishtar_common/models_imports.py:2485 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:2512 +#: ishtar_common/models_imports.py:2514 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:2553 +#: ishtar_common/models_imports.py:2555 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:2639 +#: ishtar_common/models_imports.py:2643 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:2678 +#: ishtar_common/models_imports.py:2682 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:2686 +#: ishtar_common/models_imports.py:2690 msgid "Import {} finished with no errors" msgstr "" -#: ishtar_common/models_imports.py:2858 +#: ishtar_common/models_imports.py:2864 msgid "Ignored" msgstr "" -#: ishtar_common/models_imports.py:2861 ishtar_common/models_imports.py:2862 +#: ishtar_common/models_imports.py:2867 ishtar_common/models_imports.py:2868 msgid "Import - Ignored error" msgstr "" -#: ishtar_common/models_imports.py:2897 +#: ishtar_common/models_imports.py:2903 msgid "Import - Pre-import value" msgstr "" -#: ishtar_common/models_imports.py:2898 +#: ishtar_common/models_imports.py:2904 msgid "Import - Pre-import values" msgstr "" -#: ishtar_common/models_imports.py:2915 +#: ishtar_common/models_imports.py:2921 msgid "Specific key to an import" msgstr "" -#: ishtar_common/models_imports.py:2926 +#: ishtar_common/models_imports.py:2932 msgid "Import - Item key" msgstr "" -#: ishtar_common/models_imports.py:2927 +#: ishtar_common/models_imports.py:2933 msgid "Import - Item keys" msgstr "" @@ -15248,23 +15307,23 @@ msgstr "" msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:3078 -msgid "lock/unlock" +#: ishtar_common/views.py:3096 +msgid "Lock/unlock" msgstr "" -#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 +#: ishtar_common/views.py:3235 ishtar_common/views.py:3330 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 +#: ishtar_common/views.py:3367 ishtar_common/views.py:3421 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:3362 +#: ishtar_common/views.py:3381 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:3415 +#: ishtar_common/views.py:3434 msgid "Delete geographic item" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index c6b4fa518..d3ec745c9 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: 2024-07-15 16:31+0200\n" +"POT-Creation-Date: 2024-09-10 12:47+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" @@ -25,7 +25,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2716 +#: archaeological_finds/models_finds.py:2733 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:381 @@ -83,13 +83,13 @@ msgstr "" #: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 #: archaeological_finds/forms.py:1692 archaeological_finds/forms.py:2406 #: archaeological_finds/forms_treatments.py:52 -#: archaeological_finds/forms_treatments.py:559 -#: archaeological_finds/forms_treatments.py:634 -#: archaeological_finds/forms_treatments.py:817 +#: archaeological_finds/forms_treatments.py:557 +#: archaeological_finds/forms_treatments.py:632 +#: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:1225 #: archaeological_operations/forms.py:1438 -#: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 +#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" @@ -100,7 +100,7 @@ msgstr "" #: archaeological_context_records/forms.py:560 #: archaeological_context_records/forms.py:614 #: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/models.py:1393 msgid "ID" msgstr "" @@ -184,7 +184,7 @@ msgstr "" #: archaeological_context_records/models.py:510 #: archaeological_context_records/models.py:511 #: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1395 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 #: archaeological_finds/models_finds.py:1154 @@ -258,7 +258,7 @@ msgstr "" #: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:3152 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 -#: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 +#: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 #: ishtar_common/models_common.py:3417 ishtar_common/models_common.py:4202 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 @@ -277,13 +277,13 @@ msgstr "" #: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1394 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:300 #: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1396 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 #: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 @@ -292,7 +292,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:192 #: archaeological_finds/models_finds.py:556 #: archaeological_finds/models_finds.py:1985 -#: archaeological_finds/models_treatments.py:264 +#: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -316,7 +316,7 @@ msgstr "" #: archaeological_context_records/forms.py:304 #: archaeological_context_records/models.py:755 #: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1851 -#: archaeological_finds/models_finds.py:2122 +#: archaeological_finds/models_finds.py:2130 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 @@ -370,10 +370,10 @@ msgstr "" #: archaeological_files/models.py:629 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 -#: archaeological_finds/forms_treatments.py:662 -#: archaeological_finds/forms_treatments.py:755 -#: archaeological_finds/models_treatments.py:267 -#: archaeological_finds/models_treatments.py:1141 +#: archaeological_finds/forms_treatments.py:660 +#: archaeological_finds/forms_treatments.py:753 +#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1044 ishtar_common/forms.py:1045 @@ -390,9 +390,9 @@ msgstr "" #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:768 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:228 -#: archaeological_finds/models_treatments.py:762 -#: archaeological_warehouse/forms.py:742 +#: archaeological_finds/models_treatments.py:237 +#: archaeological_finds/models_treatments.py:851 +#: archaeological_warehouse/forms.py:769 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" @@ -447,16 +447,15 @@ msgstr "" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:775 archaeological_files/models.py:76 #: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1550 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:753 -#: archaeological_finds/models_finds.py:3569 -#: archaeological_finds/models_treatments.py:266 -#: archaeological_finds/models_treatments.py:760 -#: archaeological_finds/templates/ishtar/sheet_find.html:392 -#: archaeological_finds/templates/ishtar/sheet_find.html:430 -#: archaeological_finds/templates/ishtar/sheet_find.html:468 +#: archaeological_finds/forms_treatments.py:751 +#: archaeological_finds/models_finds.py:3692 +#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:849 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 +#: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 @@ -494,12 +493,11 @@ msgstr "" #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:664 archaeological_files/forms.py:780 #: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3570 -#: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:393 -#: archaeological_finds/templates/ishtar/sheet_find.html:431 -#: archaeological_finds/templates/ishtar/sheet_find.html:469 -#: archaeological_finds/templates/ishtar/sheet_find.html:507 +#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3693 +#: archaeological_finds/models_treatments.py:850 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: archaeological_finds/templates/ishtar/sheet_find.html:477 +#: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 @@ -579,15 +577,15 @@ msgstr "" #: archaeological_context_records/forms.py:469 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:268 -#: archaeological_context_records/models.py:1521 +#: archaeological_context_records/models.py:1524 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 #: archaeological_finds/forms.py:1773 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2708 +#: archaeological_finds/models_finds.py:2725 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1720 -#: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2528 +#: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5588 ishtar_common/views.py:504 msgid "Context record" msgstr "" @@ -684,9 +682,9 @@ msgid "Context record - Quick action - Modify" msgstr "" #: archaeological_context_records/forms.py:700 -#: archaeological_context_records/models.py:1282 -#: archaeological_context_records/models.py:1321 -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1285 +#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1392 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" @@ -838,10 +836,11 @@ msgstr "" #: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2293 -#: archaeological_finds/models_finds.py:3531 -#: archaeological_finds/models_finds.py:3557 -#: archaeological_finds/models_treatments.py:742 +#: archaeological_finds/models_finds.py:2302 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_finds.py:3639 +#: archaeological_finds/models_finds.py:3680 +#: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -864,14 +863,14 @@ msgstr "" #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 #: archaeological_finds/models_finds.py:1976 -#: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:754 +#: archaeological_finds/models_treatments.py:67 +#: archaeological_finds/models_treatments.py:843 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 #: archaeological_operations/models.py:3496 -#: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 +#: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:704 #: ishtar_common/models.py:760 ishtar_common/models.py:811 #: ishtar_common/models.py:1867 ishtar_common/models.py:3952 @@ -929,7 +928,7 @@ msgstr "" #: archaeological_context_records/models.py:499 #: archaeological_context_records/models.py:500 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1397 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 @@ -1119,7 +1118,7 @@ msgstr "" #: archaeological_operations/models.py:467 #: archaeological_operations/models.py:1290 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "" @@ -1134,12 +1133,12 @@ msgid "Bulk update" msgstr "" #: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1062 +#: archaeological_context_records/models.py:1065 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 #: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/models_finds.py:2610 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:2627 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 #: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 #: archaeological_operations/models.py:672 @@ -1150,18 +1149,18 @@ msgstr "" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1693 #: ishtar_common/admin.py:1836 ishtar_common/models.py:4543 -#: ishtar_common/models.py:4922 ishtar_common/views.py:3135 -#: ishtar_common/views.py:3153 +#: ishtar_common/models.py:4922 ishtar_common/views.py:3154 +#: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:719 #: archaeological_files/models.py:567 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:1970 -#: archaeological_finds/models_treatments.py:261 +#: archaeological_finds/models_treatments.py:270 #: archaeological_operations/models.py:3160 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4569 +#: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4569 msgid "External ID" msgstr "" @@ -1170,7 +1169,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1972 #: archaeological_operations/models.py:3163 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1189 +#: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "" @@ -1209,9 +1208,9 @@ msgstr "" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2247 -#: archaeological_finds/models_treatments.py:281 -#: archaeological_finds/models_treatments.py:1159 +#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2255 +#: archaeological_finds/models_treatments.py:290 +#: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 @@ -1221,7 +1220,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1194 +#: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1247,20 +1246,20 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2253 -#: archaeological_finds/models_treatments.py:287 -#: archaeological_finds/models_treatments.py:1166 +#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2261 +#: archaeological_finds/models_treatments.py:296 +#: archaeological_finds/models_treatments.py:1255 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:1479 #: archaeological_operations/models.py:2914 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2426 +#: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2426 #: ishtar_common/models_common.py:3410 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:856 -#: archaeological_finds/models_finds.py:2265 +#: archaeological_finds/models_finds.py:2274 #: archaeological_operations/models.py:559 #: archaeological_operations/models.py:1570 msgid "Cached periods label" @@ -1268,9 +1267,9 @@ msgstr "" #: archaeological_context_records/models.py:859 #: archaeological_context_records/models.py:865 -#: archaeological_finds/models_finds.py:2268 -#: archaeological_finds/models_finds.py:2274 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2283 +#: archaeological_finds/models_finds.py:2289 #: archaeological_operations/models.py:556 #: archaeological_operations/models.py:562 #: archaeological_operations/models.py:568 @@ -1299,76 +1298,76 @@ msgid "Context record" msgstr "" #: archaeological_context_records/models.py:926 -#: archaeological_finds/models_finds.py:2482 +#: archaeological_finds/models_finds.py:2499 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1050 +#: archaeological_context_records/models.py:1053 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1052 +#: archaeological_context_records/models.py:1055 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1236 +#: archaeological_context_records/models.py:1239 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1283 +#: archaeological_context_records/models.py:1286 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1319 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1320 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1321 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1322 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1323 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1322 +#: archaeological_context_records/models.py:1325 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1326 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1327 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1328 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1329 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1335 +#: archaeological_context_records/models.py:1338 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1339 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1527 +#: archaeological_context_records/models.py:1530 msgid "Context record parent" msgstr "" @@ -1443,9 +1442,9 @@ msgstr "" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2294 -#: archaeological_finds/models_finds.py:2305 -#: archaeological_finds/models_finds.py:3578 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2314 +#: archaeological_finds/models_finds.py:3701 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 @@ -1469,7 +1468,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:72 -#: archaeological_finds/templates/ishtar/sheet_find.html:546 +#: archaeological_finds/templates/ishtar/sheet_find.html:554 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1497,6 +1496,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:81 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: cd17_app/templates/ishtar/sheet_find.html:83 #: man_app/templates/ishtar/sheet_museum_find.html:83 @@ -1529,8 +1529,8 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:270 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 +#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 #: na_app/templates/ishtar/sheet_operation.html:212 @@ -1554,7 +1554,7 @@ msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 -#: archaeological_files/templates/ishtar/sheet_file.html:240 +#: archaeological_files/templates/ishtar/sheet_file.html:239 #: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 #: archaeological_finds/forms.py:977 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 @@ -1562,7 +1562,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: archaeological_operations/templates/ishtar/sheet_site.html:108 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 @@ -1599,11 +1599,11 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:232 #: archaeological_finds/forms_treatments.py:144 -#: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:221 -#: archaeological_finds/templates/ishtar/sheet_find.html:388 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/models_treatments.py:141 +#: archaeological_finds/models_treatments.py:230 +#: archaeological_finds/templates/ishtar/sheet_find.html:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -1613,8 +1613,8 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3644 #: ishtar_common/models.py:5480 ishtar_common/models.py:5617 #: ishtar_common/models.py:5696 ishtar_common/models_common.py:2028 -#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 -#: ishtar_common/models_imports.py:1962 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1564 +#: ishtar_common/models_imports.py:1964 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 #: man_app/templates/ishtar/sheet_museum_find.html:502 @@ -1742,18 +1742,18 @@ msgstr "" #: archaeological_files/forms.py:234 archaeological_files/forms.py:656 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:213 +#: archaeological_files/templates/ishtar/sheet_file.html:212 #: archaeological_finds/forms.py:1707 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 -#: archaeological_finds/forms_treatments.py:426 -#: archaeological_finds/forms_treatments.py:563 -#: archaeological_finds/forms_treatments.py:639 -#: archaeological_finds/forms_treatments.py:710 -#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:407 +#: archaeological_finds/forms_treatments.py:561 +#: archaeological_finds/forms_treatments.py:637 +#: archaeological_finds/forms_treatments.py:708 +#: archaeological_finds/forms_treatments.py:819 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:206 -#: archaeological_finds/models_treatments.py:1103 +#: archaeological_finds/models_treatments.py:215 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:726 #: archaeological_operations/forms.py:1442 @@ -1822,7 +1822,7 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:464 #: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_files/templates/ishtar/sheet_file.html:130 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" @@ -1832,9 +1832,9 @@ msgstr "" #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 #: archaeological_finds/forms.py:2457 #: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/forms_treatments.py:747 -#: archaeological_finds/models_treatments.py:263 -#: archaeological_finds/models_treatments.py:1155 +#: archaeological_finds/forms_treatments.py:745 +#: archaeological_finds/models_treatments.py:272 +#: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:542 #: archaeological_operations/forms.py:740 #: archaeological_operations/forms.py:1238 @@ -1844,9 +1844,9 @@ msgstr "" #: archaeological_operations/models.py:513 #: archaeological_operations/models.py:1468 #: archaeological_operations/models.py:2903 -#: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 -#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2162 +#: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 +#: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 +#: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 #: ishtar_common/forms_common.py:2485 ishtar_common/forms_common.py:3042 #: ishtar_common/models.py:2962 ishtar_common/models.py:3836 #: ishtar_common/models.py:4685 ishtar_common/models_common.py:185 @@ -1859,8 +1859,8 @@ msgstr "" #: archaeological_files/forms.py:108 archaeological_files/forms.py:375 #: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms_treatments.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "" @@ -1880,8 +1880,8 @@ msgid "Created by" msgstr "" #: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 -#: archaeological_finds/forms_treatments.py:580 -#: archaeological_finds/forms_treatments.py:842 +#: archaeological_finds/forms_treatments.py:578 +#: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "" @@ -1896,7 +1896,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:642 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1143 +#: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:1344 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4670 ishtar_common/models_imports.py:1436 @@ -1906,9 +1906,9 @@ msgstr "" #: archaeological_files/forms.py:219 archaeological_files/forms.py:541 #: archaeological_files/models.py:644 -#: archaeological_finds/forms_treatments.py:750 -#: archaeological_finds/models_treatments.py:1145 -#: archaeological_finds/templates/ishtar/sheet_find.html:506 +#: archaeological_finds/forms_treatments.py:748 +#: archaeological_finds/models_treatments.py:1234 +#: archaeological_finds/templates/ishtar/sheet_find.html:514 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -1990,7 +1990,7 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:300 archaeological_files/forms.py:341 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:769 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3670 msgid "Postal code" msgstr "" @@ -2006,7 +2006,7 @@ msgstr "" #: archaeological_files/forms.py:323 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 -#: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 +#: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 #: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:3851 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 @@ -2060,7 +2060,7 @@ msgid "Responsible for planning service" msgstr "" #: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:144 +#: archaeological_files/templates/ishtar/sheet_file.html:143 msgid "Research archaeology" msgstr "" @@ -2082,7 +2082,7 @@ msgid "Lead organization" msgstr "" #: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:170 +#: archaeological_files/templates/ishtar/sheet_file.html:169 msgid "Research archaeology comment" msgstr "" @@ -2170,25 +2170,25 @@ msgid "Linear meter (m)" msgstr "" #: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: 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 msgid "Man by day" msgstr "" #: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Days" msgstr "" #: archaeological_files/forms.py:882 archaeological_files/models.py:116 #: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 msgid "Job" msgstr "" @@ -2207,7 +2207,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "" #: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:280 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Ground jobs" msgstr "" @@ -2216,13 +2216,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "" #: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:394 -#: archaeological_files/templates/ishtar/sheet_file.html:397 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 msgid "Quantity" msgstr "" #: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:387 msgid "Equipment / service" msgstr "" @@ -2230,21 +2230,21 @@ msgstr "" #: archaeological_files/forms.py:1278 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 -#: archaeological_finds/forms_treatments.py:564 -#: archaeological_finds/forms_treatments.py:623 -#: archaeological_finds/forms_treatments.py:640 -#: archaeological_finds/forms_treatments.py:780 -#: archaeological_finds/forms_treatments.py:822 -#: archaeological_finds/forms_treatments.py:886 -#: archaeological_finds/models_treatments.py:207 -#: archaeological_finds/models_treatments.py:1104 +#: archaeological_finds/forms_treatments.py:562 +#: archaeological_finds/forms_treatments.py:621 +#: archaeological_finds/forms_treatments.py:638 +#: archaeological_finds/forms_treatments.py:778 +#: archaeological_finds/forms_treatments.py:820 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 #: archaeological_operations/forms.py:1443 #: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2828 -#: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 +#: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:590 #: ishtar_common/models.py:4568 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2256,10 +2256,10 @@ msgstr "" #: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 #: archaeological_files/forms.py:1267 -#: archaeological_finds/forms_treatments.py:565 -#: archaeological_finds/forms_treatments.py:612 -#: archaeological_finds/forms_treatments.py:823 -#: archaeological_finds/forms_treatments.py:875 +#: archaeological_finds/forms_treatments.py:563 +#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:873 #: archaeological_operations/forms.py:1449 #: archaeological_operations/forms.py:1498 #: archaeological_operations/models.py:2564 @@ -2273,16 +2273,16 @@ msgid "Object (full text search)" msgstr "" #: archaeological_files/forms.py:1151 -#: archaeological_finds/forms_treatments.py:566 -#: archaeological_finds/forms_treatments.py:824 +#: archaeological_finds/forms_treatments.py:564 +#: archaeological_finds/forms_treatments.py:822 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1634 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1158 -#: archaeological_finds/forms_treatments.py:567 -#: archaeological_finds/forms_treatments.py:825 +#: archaeological_finds/forms_treatments.py:565 +#: archaeological_finds/forms_treatments.py:823 #: archaeological_operations/forms.py:1456 #: archaeological_operations/forms.py:1505 #: archaeological_operations/models.py:2887 @@ -2291,8 +2291,8 @@ msgid "Object" msgstr "" #: archaeological_files/forms.py:1160 -#: archaeological_finds/forms_treatments.py:570 -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:568 +#: archaeological_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:1459 #: archaeological_operations/forms.py:1507 #: archaeological_operations/models.py:2885 @@ -2344,7 +2344,7 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3560 +#: archaeological_finds/models_finds.py:3683 #: archaeological_operations/ishtar_menu.py:70 #: archaeological_operations/models.py:1715 #: archaeological_operations/models.py:2923 @@ -2447,7 +2447,7 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:207 +#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3279 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" @@ -2491,7 +2491,7 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:758 +#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1238 ishtar_common/models.py:2414 #: ishtar_common/models_common.py:748 msgid "Parent" @@ -2601,8 +2601,8 @@ msgid "Total developed surface (km2)" msgstr "" #: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1327 -#: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1067 +#: archaeological_finds/models_treatments.py:167 +#: archaeological_finds/models_treatments.py:1156 #: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1141 #: archaeological_operations/models.py:2686 #: archaeological_operations/tests.py:3091 @@ -2612,7 +2612,7 @@ msgid "year" msgstr "" #: archaeological_files/models.py:488 -#: archaeological_finds/models_treatments.py:1064 +#: archaeological_finds/models_treatments.py:1153 #: archaeological_operations/models.py:370 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4316 msgctxt "key for text search" @@ -2620,7 +2620,7 @@ msgid "reference" msgstr "" #: archaeological_files/models.py:491 -#: archaeological_finds/models_treatments.py:155 +#: archaeological_finds/models_treatments.py:164 #: archaeological_operations/models.py:376 msgctxt "key for text search" msgid "other-reference" @@ -2632,7 +2632,7 @@ msgid "department" msgstr "" #: archaeological_files/models.py:507 -#: archaeological_finds/models_treatments.py:1061 +#: archaeological_finds/models_treatments.py:1150 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1169 #: archaeological_operations/tests.py:3227 @@ -2643,8 +2643,8 @@ msgid "name" msgstr "" #: archaeological_files/models.py:510 -#: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1070 +#: archaeological_finds/models_treatments.py:170 +#: archaeological_finds/models_treatments.py:1159 #: archaeological_operations/models.py:1175 #: archaeological_operations/models.py:2697 #: archaeological_operations/tests.py:3240 @@ -2686,7 +2686,7 @@ msgid "comment" msgstr "" #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1632 -#: archaeological_finds/models_treatments.py:1073 +#: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" @@ -2703,17 +2703,17 @@ msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:564 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" #: archaeological_files/models.py:572 -#: archaeological_finds/forms_treatments.py:637 -#: archaeological_finds/forms_treatments.py:708 -#: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/forms_treatments.py:635 +#: archaeological_finds/forms_treatments.py:706 +#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:528 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1131 @@ -2723,7 +2723,7 @@ msgstr "" #: archaeological_operations/models.py:502 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 -#: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 +#: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/models.py:397 #: cd17_app/templates/ishtar/sheet_find.html:507 #: ishtar_common/forms_common.py:755 ishtar_common/forms_common.py:823 @@ -2764,10 +2764,10 @@ msgid "Name" msgstr "" #: archaeological_files/models.py:577 -#: archaeological_finds/models_treatments.py:1120 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 +#: archaeological_finds/models_treatments.py:1209 +#: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 -#: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 #: man_app/templates/ishtar/sheet_museum_find.html:541 #: na_app/templates/ishtar/sheet_find.html:511 @@ -2806,9 +2806,9 @@ msgstr "" #: archaeological_files/models.py:692 #: archaeological_finds/forms_treatments.py:169 -#: archaeological_finds/forms_treatments.py:437 -#: archaeological_finds/models_treatments.py:254 -#: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 +#: archaeological_finds/forms_treatments.py:418 +#: archaeological_finds/models_treatments.py:263 +#: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:747 ishtar_common/forms_common.py:1021 #: ishtar_common/forms_common.py:1083 ishtar_common/forms_common.py:1245 #: ishtar_common/forms_common.py:1434 ishtar_common/ishtar_menu.py:102 @@ -2870,15 +2870,15 @@ msgid "plan" msgstr "" #: archaeological_files/models.py:1305 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1227 +#: archaeological_finds/models_treatments.py:420 +#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:2008 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1307 -#: archaeological_finds/models_treatments.py:413 -#: archaeological_finds/models_treatments.py:1229 +#: archaeological_finds/models_treatments.py:422 +#: archaeological_finds/models_treatments.py:1318 #: archaeological_operations/models.py:2010 msgid "admin. act" msgstr "" @@ -2967,9 +2967,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Planned" msgstr "" @@ -3010,18 +3010,14 @@ msgstr "" msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:123 -msgid "Responsible for planning service address" -msgstr "" - -#: archaeological_files/templates/ishtar/sheet_file.html:177 +#: archaeological_files/templates/ishtar/sheet_file.html:176 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:180 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 @@ -3036,32 +3032,31 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_operations/models.py:2660 #: archaeological_operations/models.py:2959 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 #: ishtar_common/models.py:4570 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:189 -#: archaeological_files/templates/ishtar/sheet_file.html:215 -#: archaeological_finds/forms_treatments.py:641 -#: archaeological_finds/forms_treatments.py:719 -#: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:387 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_finds/forms_treatments.py:639 +#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/models_treatments.py:140 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:413 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:451 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:489 @@ -3113,66 +3108,66 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:192 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:539 #: archaeological_operations/forms.py:782 #: archaeological_operations/models.py:1348 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:206 +#: archaeological_files/templates/ishtar/sheet_file.html:205 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:210 +#: archaeological_files/templates/ishtar/sheet_file.html:209 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:706 ishtar_common/admin.py:768 +#: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:768 #: ishtar_common/models.py:727 ishtar_common/models.py:3410 #: ishtar_common/models_imports.py:1122 msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:226 +#: archaeological_files/templates/ishtar/sheet_file.html:225 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:231 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:262 +#: archaeological_files/templates/ishtar/sheet_file.html:261 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:276 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:295 -#: archaeological_files/templates/ishtar/sheet_file.html:344 -#: archaeological_files/templates/ishtar/sheet_file.html:347 -#: archaeological_files/templates/ishtar/sheet_file.html:396 -#: archaeological_files/templates/ishtar/sheet_file.html:399 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:398 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:310 -#: archaeological_files/templates/ishtar/sheet_file.html:362 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:309 +#: archaeological_files/templates/ishtar/sheet_file.html:361 +#: archaeological_files/templates/ishtar/sheet_file.html:417 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3183,13 +3178,13 @@ msgstr "" msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:321 -#: archaeological_files/templates/ishtar/sheet_file.html:373 -#: archaeological_files/templates/ishtar/sheet_file.html:425 +#: archaeological_files/templates/ishtar/sheet_file.html:320 +#: archaeological_files/templates/ishtar/sheet_file.html:372 +#: archaeological_files/templates/ishtar/sheet_file.html:424 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:332 +#: archaeological_files/templates/ishtar/sheet_file.html:331 msgid "Post-excavation jobs" msgstr "" @@ -3323,7 +3318,7 @@ msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2124 +#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2132 msgid "Previous ID" msgstr "" @@ -3338,17 +3333,17 @@ msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/models_finds.py:2182 msgid "Presence of inventory marking" msgstr "" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/models_finds.py:2186 msgid "Type of marking" msgstr "" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2129 msgid "Marking details" msgstr "" @@ -3363,56 +3358,56 @@ msgid "Museum" msgstr "" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2145 +#: archaeological_finds/models_finds.py:2153 msgid "Owner institution" msgstr "" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2150 +#: archaeological_finds/models_finds.py:2158 msgid "Assigned institution" msgstr "" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2155 +#: archaeological_finds/models_finds.py:2163 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2165 msgid "Depositor inventory number" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/models_finds.py:2168 msgid "Collections entry mode" msgstr "" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/models_finds.py:2170 msgid "Comment on museum entry mode" msgstr "" #: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2163 +#: archaeological_finds/models_finds.py:2171 msgid "Museum entry date (exact or start)" msgstr "" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2172 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2165 +#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2173 msgid "Comment on museum entry date" msgstr "" #: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/models_finds.py:2177 msgid "Donor, testator or vendor" msgstr "" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2138 -#: archaeological_finds/models_finds.py:2185 +#: archaeological_finds/models_finds.py:2146 +#: archaeological_finds/models_finds.py:2193 msgid "Collection" msgstr "" @@ -3421,41 +3416,41 @@ msgid "Former collections" msgstr "" #: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2201 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2197 +#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2205 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2207 msgid "Comment on conformity" msgstr "" #: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2211 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2205 +#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2213 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2206 +#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2214 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2200 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2208 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2252 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2061 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2069 msgid "Is complete?" msgstr "" @@ -3487,22 +3482,22 @@ msgstr "" #: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2071 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2067 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2075 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2083 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2089 msgid "Technical areas" msgstr "" @@ -3520,13 +3515,13 @@ msgstr "" #: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 #: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2215 msgid "Inventory quantity" msgstr "" #: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 #: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1844 -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2216 msgid "Observed quantity" msgstr "" @@ -3554,13 +3549,13 @@ msgstr "" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2099 +#: archaeological_finds/models_finds.py:2107 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 #: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1856 -#: archaeological_finds/models_finds.py:2123 +#: archaeological_finds/models_finds.py:2131 msgid "Comment on dating" msgstr "" @@ -3577,32 +3572,32 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2103 +#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2111 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2104 +#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2112 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2105 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2113 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2108 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2116 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2106 +#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2114 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2115 msgid "Circumference (cm)" msgstr "" @@ -3641,20 +3636,20 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2127 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1883 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2128 +#: archaeological_finds/models_finds.py:2136 msgid "Check" msgstr "" #: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1884 -#: archaeological_finds/models_finds.py:2133 +#: archaeological_finds/models_finds.py:2141 msgid "Check date" msgstr "" @@ -3772,21 +3767,21 @@ msgstr "" #: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 #: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2226 -#: archaeological_warehouse/forms.py:593 +#: archaeological_finds/models_finds.py:2234 +#: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 #: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2230 -#: archaeological_warehouse/forms.py:594 +#: archaeological_finds/models_finds.py:2238 +#: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 #: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2213 +#: archaeological_finds/models_finds.py:2221 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3795,33 +3790,33 @@ msgstr "" #: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 #: archaeological_finds/forms.py:1894 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2236 -#: archaeological_warehouse/forms.py:598 +#: archaeological_finds/models_finds.py:2244 +#: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 #: archaeological_finds/forms.py:1885 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2087 -#: archaeological_warehouse/forms.py:590 +#: archaeological_finds/models_finds.py:2095 +#: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 #: archaeological_finds/forms.py:1886 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2093 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/models_finds.py:2101 +#: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2242 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2250 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 #: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2241 +#: archaeological_finds/models_finds.py:2249 msgid "Insurance value" msgstr "" @@ -3892,18 +3887,18 @@ msgstr "" #: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1892 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/models_finds.py:2229 msgid "Recommended treatments" msgstr "" #: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1896 #: archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2134 +#: archaeological_finds/models_finds.py:2142 msgid "Estimated value" msgstr "" #: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1888 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2225 msgid "Conservatory comment" msgstr "" @@ -3923,7 +3918,7 @@ msgstr "" msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2283 +#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2292 msgid "Complete museum ID" msgstr "" @@ -3979,19 +3974,19 @@ msgstr "" msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "" @@ -4011,7 +4006,7 @@ msgstr "" #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 -#: archaeological_warehouse/forms.py:579 +#: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 #: sra_idf_app/templates/ishtar/sheet_operation.html:563 msgid "Material type" @@ -4020,7 +4015,7 @@ msgstr "" #: archaeological_finds/forms.py:1819 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 +#: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 #: sra_idf_app/templates/ishtar/sheet_operation.html:573 msgid "Object type" @@ -4131,7 +4126,7 @@ msgid "Museum - Purchase price" msgstr "" #: archaeological_finds/forms.py:2032 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2059 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4169,7 +4164,7 @@ msgid "Find search" msgstr "" #: archaeological_finds/forms.py:2201 archaeological_finds/forms.py:2364 -#: archaeological_finds/models_treatments.py:401 +#: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" @@ -4202,11 +4197,10 @@ msgstr "" #: archaeological_finds/forms.py:2453 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:211 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:386 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:412 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:450 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:488 @@ -4247,24 +4241,24 @@ msgstr "" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:204 +#: archaeological_finds/models_treatments.py:213 msgid "Other ref." msgstr "" #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 -#: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:246 +#: archaeological_finds/models_treatments.py:144 +#: archaeological_finds/models_treatments.py:255 msgid "Scientific monitoring manager" msgstr "" #: archaeological_finds/forms_treatments.py:65 #: archaeological_finds/forms_treatments.py:142 -#: archaeological_finds/forms_treatments.py:423 -#: archaeological_finds/forms_treatments.py:577 +#: archaeological_finds/forms_treatments.py:404 +#: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:217 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_finds/models_treatments.py:226 +#: archaeological_finds/models_treatments.py:848 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "" @@ -4280,8 +4274,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:294 -#: archaeological_finds/models_treatments.py:748 +#: archaeological_finds/models_treatments.py:303 +#: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2550 @@ -4294,10 +4288,10 @@ msgid "Treatment - 020 - General" msgstr "" #: archaeological_finds/forms_treatments.py:163 -#: archaeological_finds/forms_treatments.py:431 -#: archaeological_finds/forms_treatments.py:721 -#: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:238 +#: archaeological_finds/forms_treatments.py:412 +#: archaeological_finds/forms_treatments.py:719 +#: archaeological_finds/models_treatments.py:142 +#: archaeological_finds/models_treatments.py:247 msgid "Responsible" msgstr "" @@ -4306,7 +4300,7 @@ msgid "Destination container (relevant for treatment that change location)" msgstr "" #: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:274 msgid "Goal" msgstr "" @@ -4368,7 +4362,7 @@ msgid "Another treatment with this index exists for {}." msgstr "" #: archaeological_finds/forms_treatments.py:377 -#: archaeological_finds/models_treatments.py:214 +#: archaeological_finds/models_treatments.py:223 msgid "Associated request" msgstr "" @@ -4377,10 +4371,10 @@ msgid "Treatment - 010 - Request choice" msgstr "" #: archaeological_finds/forms_treatments.py:383 -#: archaeological_finds/forms_treatments.py:699 +#: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1180 -#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/models_treatments.py:1269 +#: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2549 #: archaeological_operations/models.py:2874 ishtar_common/views.py:510 @@ -4398,19 +4392,35 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:400 +msgid "Create a treatment" +msgstr "" + +#: archaeological_finds/forms_treatments.py:410 +msgid "Precise date" +msgstr "" + +#: archaeological_finds/forms_treatments.py:489 +msgid "At least a year is required." +msgstr "" + +#: archaeological_finds/forms_treatments.py:491 +msgid "Treatment type is required." +msgstr "" + +#: archaeological_finds/forms_treatments.py:498 #: archaeological_finds/models_finds.py:2047 -#: archaeological_finds/models_finds.py:3538 -#: archaeological_finds/models_treatments.py:271 -#: archaeological_finds/models_treatments.py:763 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 -#: archaeological_finds/templates/ishtar/sheet_find.html:429 -#: archaeological_finds/templates/ishtar/sheet_find.html:467 +#: archaeological_finds/models_finds.py:3606 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:852 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 +#: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 -#: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/models.py:2062 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/models.py:839 +#: archaeological_warehouse/models.py:1220 +#: archaeological_warehouse/models.py:2090 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4433,79 +4443,59 @@ msgstr "" msgid "Container" msgstr "" -#: archaeological_finds/forms_treatments.py:406 +#: archaeological_finds/forms_treatments.py:504 #: ishtar_common/forms_common.py:2757 msgid "Change " msgstr "" -#: archaeological_finds/forms_treatments.py:408 +#: archaeological_finds/forms_treatments.py:506 msgid "reference and current containers" msgstr "" -#: archaeological_finds/forms_treatments.py:409 +#: archaeological_finds/forms_treatments.py:507 #: ishtar_common/forms_common.py:2761 msgid "the reference container" msgstr "" -#: archaeological_finds/forms_treatments.py:410 +#: archaeological_finds/forms_treatments.py:508 #: ishtar_common/forms_common.py:2762 msgid "the current container" msgstr "" -#: archaeological_finds/forms_treatments.py:419 -msgid "Create a treatment" -msgstr "" - -#: archaeological_finds/forms_treatments.py:429 -msgid "Precise date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:499 -msgid "At least a year is required." -msgstr "" - -#: archaeological_finds/forms_treatments.py:501 -msgid "Treatment type is required." -msgstr "" - -#: archaeological_finds/forms_treatments.py:514 -msgid "Completed" -msgstr "" - -#: archaeological_finds/forms_treatments.py:572 +#: archaeological_finds/forms_treatments.py:570 msgid "Treatment name" msgstr "" -#: archaeological_finds/forms_treatments.py:573 +#: archaeological_finds/forms_treatments.py:571 msgid "Treatment year" msgstr "" -#: archaeological_finds/forms_treatments.py:574 +#: archaeological_finds/forms_treatments.py:572 msgid "Treatment index" msgstr "" -#: archaeological_finds/forms_treatments.py:576 +#: archaeological_finds/forms_treatments.py:574 msgid "Treatment internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:608 msgid "Treatment - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:630 +#: archaeological_finds/forms_treatments.py:628 msgid "Treatment file - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:638 -#: archaeological_finds/forms_treatments.py:715 ishtar_common/models.py:4571 +#: archaeological_finds/forms_treatments.py:636 +#: archaeological_finds/forms_treatments.py:713 ishtar_common/models.py:4571 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" -#: archaeological_finds/forms_treatments.py:650 -#: archaeological_finds/forms_treatments.py:727 -#: archaeological_finds/models_treatments.py:1128 -#: archaeological_finds/templates/ishtar/sheet_find.html:504 +#: archaeological_finds/forms_treatments.py:648 +#: archaeological_finds/forms_treatments.py:725 +#: archaeological_finds/models_treatments.py:1217 +#: archaeological_finds/templates/ishtar/sheet_find.html:512 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:530 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4516,10 +4506,10 @@ msgstr "" msgid "Applicant" msgstr "" -#: archaeological_finds/forms_treatments.py:656 -#: archaeological_finds/forms_treatments.py:733 -#: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:505 +#: archaeological_finds/forms_treatments.py:654 +#: archaeological_finds/forms_treatments.py:731 +#: archaeological_finds/models_treatments.py:1225 +#: archaeological_finds/templates/ishtar/sheet_find.html:513 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4530,72 +4520,72 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:663 -#: archaeological_finds/forms_treatments.py:745 -#: archaeological_finds/models_treatments.py:1149 +#: archaeological_finds/forms_treatments.py:661 +#: archaeological_finds/forms_treatments.py:743 +#: archaeological_finds/models_treatments.py:1238 msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:664 -#: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/models_treatments.py:1152 +#: archaeological_finds/forms_treatments.py:662 +#: archaeological_finds/forms_treatments.py:744 +#: archaeological_finds/models_treatments.py:1241 msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:674 -#: archaeological_finds/forms_treatments.py:686 +#: archaeological_finds/forms_treatments.py:672 +#: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/forms_treatments.py:715 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/forms_treatments.py:737 msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1147 +#: archaeological_finds/forms_treatments.py:741 +#: archaeological_finds/models_treatments.py:1236 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:803 +#: archaeological_finds/forms_treatments.py:801 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:809 +#: archaeological_finds/forms_treatments.py:807 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:810 +#: archaeological_finds/forms_treatments.py:808 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:829 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:833 +#: archaeological_finds/forms_treatments.py:831 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:835 +#: archaeological_finds/forms_treatments.py:833 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/forms_treatments.py:835 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:839 -#: archaeological_finds/models_treatments.py:1005 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/models_treatments.py:1094 +#: archaeological_finds/models_treatments.py:1203 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:873 +#: archaeological_finds/forms_treatments.py:871 msgid "Treatment request - Administrative act - General" msgstr "" @@ -4617,8 +4607,8 @@ msgstr "" #: archaeological_finds/models_finds.py:91 #: archaeological_operations/models.py:2554 -#: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4051 +#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4051 msgid "Code" msgstr "" @@ -4702,17 +4692,17 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:381 +#: archaeological_finds/models_treatments.py:390 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2259 -#: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:295 -#: archaeological_finds/models_treatments.py:307 -#: archaeological_finds/models_treatments.py:1008 -#: archaeological_finds/models_treatments.py:1193 +#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/models_treatments.py:76 +#: archaeological_finds/models_treatments.py:304 +#: archaeological_finds/models_treatments.py:316 +#: archaeological_finds/models_treatments.py:1097 +#: archaeological_finds/models_treatments.py:1282 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -4878,7 +4868,7 @@ msgid "Material index" msgstr "" #: archaeological_finds/models_finds.py:586 -#: ishtar_common/models_imports.py:2857 +#: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4890,7 +4880,7 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2287 ishtar_common/models.py:4696 +#: archaeological_finds/models_finds.py:2296 ishtar_common/models.py:4696 #: ishtar_common/models.py:4703 msgid "Cached value - do not edit" msgstr "" @@ -4931,7 +4921,7 @@ msgstr "" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3114 +#: ishtar_common/views.py:3133 msgid "Modify" msgstr "" @@ -4940,7 +4930,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1928 +#: archaeological_warehouse/models.py:1940 msgid "Add treatment" msgstr "" @@ -5549,13 +5539,13 @@ msgid "museum-observed-quantity" msgstr "" #: archaeological_finds/models_finds.py:1863 -#: archaeological_finds/models_finds.py:2645 +#: archaeological_finds/models_finds.py:2662 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 -#: archaeological_warehouse/views.py:303 ishtar_common/models.py:4550 +#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 +#: archaeological_warehouse/views.py:304 ishtar_common/models.py:4550 #: ishtar_common/models.py:4933 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3161 +#: ishtar_common/views.py:3180 msgid "Packaging" msgstr "" @@ -5572,7 +5562,7 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:2029 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5583,7 +5573,7 @@ msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2036 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -5593,83 +5583,138 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2110 +#: archaeological_finds/models_finds.py:2054 +msgid "Container - first full location" +msgstr "" + +#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2067 +msgid "Updated as long as no packaging is attached" +msgstr "" + +#: archaeological_finds/models_finds.py:2066 +msgid "Reference container - first full location" +msgstr "" + +#: archaeological_finds/models_finds.py:2118 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/models_finds.py:2121 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2116 +#: archaeological_finds/models_finds.py:2124 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2139 +#: archaeological_finds/models_finds.py:2147 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2190 +#: archaeological_finds/models_finds.py:2198 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/models_finds.py:2270 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/models_finds.py:2280 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2286 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2317 +#: archaeological_finds/models_finds.py:2326 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2483 +#: archaeological_finds/models_finds.py:2500 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2484 +#: archaeological_finds/models_finds.py:2501 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2485 +#: archaeological_finds/models_finds.py:2502 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2486 +#: archaeological_finds/models_finds.py:2503 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2487 +#: archaeological_finds/models_finds.py:2504 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2618 +#: archaeological_finds/models_finds.py:2635 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2626 +#: archaeological_finds/models_finds.py:2643 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2634 +#: archaeological_finds/models_finds.py:2651 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3112 +#: archaeological_finds/models_finds.py:3129 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3118 +#: archaeological_finds/models_finds.py:3135 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3565 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Current" +msgstr "" + +#: archaeological_finds/models_finds.py:3626 +#: archaeological_finds/models_treatments.py:1198 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_operations/forms.py:1130 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1802 +#: archaeological_operations/models.py:500 +#: archaeological_warehouse/forms.py:343 +#: archaeological_warehouse/models.py:2097 ishtar_common/forms_common.py:2150 +#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 +#: ishtar_common/models.py:2409 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "" + +#: archaeological_finds/models_finds.py:3627 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Reference/current" +msgstr "" + +#: archaeological_finds/models_finds.py:3647 +msgid "Full location" +msgstr "" + +#: archaeological_finds/models_finds.py:3648 +msgid "Location type" +msgstr "" + +#: archaeological_finds/models_finds.py:3652 +msgid "Find - Treatment" +msgstr "" + +#: archaeological_finds/models_finds.py:3653 +msgid "Find - Treatments" +msgstr "" + +#: archaeological_finds/models_finds.py:3688 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2978 #: ishtar_common/models.py:3297 ishtar_common/models.py:3395 @@ -5679,89 +5724,93 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3573 +#: archaeological_finds/models_finds.py:3696 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3574 +#: archaeological_finds/models_finds.py:3697 msgid "Properties" msgstr "" -#: archaeological_finds/models_treatments.py:65 +#: archaeological_finds/models_treatments.py:66 msgid "Treatment is executed" msgstr "" -#: archaeological_finds/models_treatments.py:69 +#: archaeological_finds/models_treatments.py:70 msgid "Treatment state type" msgstr "" -#: archaeological_finds/models_treatments.py:70 +#: archaeological_finds/models_treatments.py:71 msgid "Treatment state types" msgstr "" -#: archaeological_finds/models_treatments.py:129 +#: archaeological_finds/models_treatments.py:90 +msgid "Completed" +msgstr "" + +#: archaeological_finds/models_treatments.py:138 msgid "Downstream find" msgstr "" -#: archaeological_finds/models_treatments.py:130 +#: archaeological_finds/models_treatments.py:139 msgid "Upstream find" msgstr "" -#: archaeological_finds/models_treatments.py:152 +#: archaeological_finds/models_treatments.py:161 msgctxt "key for text search" msgid "label" msgstr "" -#: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1068 +#: archaeological_finds/models_treatments.py:168 +#: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:2688 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "" -#: archaeological_finds/models_treatments.py:165 +#: archaeological_finds/models_treatments.py:174 msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:225 +#: archaeological_finds/models_treatments.py:234 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:233 +#: archaeological_finds/models_treatments.py:242 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:285 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:286 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:278 +#: archaeological_finds/models_treatments.py:287 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:279 +#: archaeological_finds/models_treatments.py:288 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:314 +#: archaeological_finds/models_treatments.py:323 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:391 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_find.html:390 -#: archaeological_finds/templates/ishtar/sheet_find.html:428 -#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/models_treatments.py:853 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 +#: archaeological_finds/templates/ishtar/sheet_find.html:474 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -5783,61 +5832,47 @@ msgstr "" msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:765 -#: archaeological_finds/models_treatments.py:766 +#: archaeological_finds/models_treatments.py:854 +#: archaeological_finds/models_treatments.py:855 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:990 +#: archaeological_finds/models_treatments.py:1079 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1006 +#: archaeological_finds/models_treatments.py:1095 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1077 +#: archaeological_finds/models_treatments.py:1166 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1082 +#: archaeological_finds/models_treatments.py:1171 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1176 msgctxt "key for text search" msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1180 msgctxt "key for text search" msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1095 +#: archaeological_finds/models_treatments.py:1184 msgctxt "key for text search" msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1109 -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1345 -#: archaeological_operations/forms.py:1802 -#: archaeological_operations/models.py:500 -#: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2150 -#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 -#: ishtar_common/models.py:2409 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "" - -#: archaeological_finds/models_treatments.py:1181 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/models_treatments.py:1270 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:522 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -5847,7 +5882,7 @@ msgstr "" msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1249 +#: archaeological_finds/models_treatments.py:1338 msgid "Add associated treatment" msgstr "" @@ -5883,6 +5918,7 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:44 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:36 msgid "Associate a treatment" msgstr "" @@ -6011,9 +6047,9 @@ msgid "Simple treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:385 -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:411 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:449 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:487 @@ -6041,9 +6077,13 @@ msgstr "" msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:389 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +msgid "Label/type" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:435 +#: archaeological_finds/templates/ishtar/sheet_find.html:473 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -6065,7 +6105,16 @@ msgstr "" msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +msgid "Date start/end" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: archaeological_finds/templates/ishtar/sheet_find.html:419 +msgid "First packaging" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6080,8 +6129,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: archaeological_finds/templates/ishtar/sheet_find.html:492 +#: archaeological_finds/templates/ishtar/sheet_find.html:461 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:518 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6101,7 +6150,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:533 +#: archaeological_finds/templates/ishtar/sheet_find.html:541 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:559 #: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6209,7 +6258,7 @@ msgstr "" msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1678 msgid "The division {} {} do not exist for the location {}." msgstr "" @@ -7784,8 +7833,8 @@ msgid "" "the first step." msgstr "" -#: archaeological_warehouse/forms.py:85 archaeological_warehouse/forms.py:193 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:734 +#: archaeological_warehouse/forms.py:89 archaeological_warehouse/forms.py:197 +#: archaeological_warehouse/forms.py:517 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:935 @@ -7795,61 +7844,61 @@ msgstr "" msgid "Warehouse" msgstr "" -#: archaeological_warehouse/forms.py:98 +#: archaeological_warehouse/forms.py:102 msgid "Default divisions" msgstr "" -#: archaeological_warehouse/forms.py:105 +#: archaeological_warehouse/forms.py:109 msgid "Division type" msgstr "" -#: archaeological_warehouse/forms.py:121 +#: archaeological_warehouse/forms.py:125 msgid "There are identical divisions." msgstr "" -#: archaeological_warehouse/forms.py:123 +#: archaeological_warehouse/forms.py:127 msgid "Order fields must be different." msgstr "" -#: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 +#: archaeological_warehouse/forms.py:134 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" -#: archaeological_warehouse/forms.py:131 +#: archaeological_warehouse/forms.py:135 msgid "Warehouse - 020 - Divisions" msgstr "" -#: archaeological_warehouse/forms.py:137 +#: archaeological_warehouse/forms.py:141 msgid "Warehouse - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:261 +#: archaeological_warehouse/forms.py:149 archaeological_warehouse/forms.py:214 +#: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:261 #: archaeological_warehouse/models.py:400 ishtar_common/models_imports.py:1088 msgid "Warehouse type" msgstr "" -#: archaeological_warehouse/forms.py:156 archaeological_warehouse/forms.py:174 -#: archaeological_warehouse/views.py:309 +#: archaeological_warehouse/forms.py:160 archaeological_warehouse/forms.py:178 +#: archaeological_warehouse/views.py:310 msgid "Warehouse search" msgstr "" -#: archaeological_warehouse/forms.py:194 +#: archaeological_warehouse/forms.py:198 msgid "Warehouse - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:209 +#: archaeological_warehouse/forms.py:213 msgid "Auto filled if kept empty." msgstr "" -#: archaeological_warehouse/forms.py:230 +#: archaeological_warehouse/forms.py:234 msgid "Create a new organization from this warehouse" msgstr "" -#: archaeological_warehouse/forms.py:237 +#: archaeological_warehouse/forms.py:241 msgid "" "Only fill the following fields if no organization is provided or if the " "address of the warehouse is different from the one of the organization. If a " @@ -7857,23 +7906,23 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:767 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:767 #: ishtar_common/forms_common.py:1175 ishtar_common/models_common.py:3667 #: ishtar_common/models_common.py:3856 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:770 +#: archaeological_warehouse/forms.py:252 ishtar_common/forms_common.py:770 #: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3672 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:772 +#: archaeological_warehouse/forms.py:254 ishtar_common/forms_common.py:772 #: ishtar_common/forms_common.py:1180 ishtar_common/models_common.py:3678 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/forms.py:255 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1151 #: ishtar_common/models_common.py:3692 ishtar_common/models_common.py:3868 @@ -7882,7 +7931,7 @@ msgstr "" msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/forms.py:257 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:776 ishtar_common/forms_common.py:1161 #: ishtar_common/models_common.py:3708 @@ -7891,159 +7940,159 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:276 msgid "A new organization is not created if an organization is selected." msgstr "" -#: archaeological_warehouse/forms.py:307 archaeological_warehouse/forms.py:308 +#: archaeological_warehouse/forms.py:311 archaeological_warehouse/forms.py:312 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:316 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:334 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1186 +#: archaeological_warehouse/forms.py:346 archaeological_warehouse/forms.py:522 +#: archaeological_warehouse/models.py:1193 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 -#: archaeological_warehouse/forms.py:739 archaeological_warehouse/models.py:741 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:905 -#: archaeological_warehouse/models.py:1154 +#: archaeological_warehouse/models.py:1161 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:346 +#: archaeological_warehouse/forms.py:350 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1169 +#: archaeological_warehouse/forms.py:359 archaeological_warehouse/forms.py:530 +#: archaeological_warehouse/models.py:1176 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:750 -#: archaeological_warehouse/models.py:1145 +#: archaeological_warehouse/forms.py:369 archaeological_warehouse/forms.py:744 +#: archaeological_warehouse/models.py:1152 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:373 +#: archaeological_warehouse/forms.py:377 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1176 +#: archaeological_warehouse/forms.py:382 +#: archaeological_warehouse/models.py:1183 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:404 +#: archaeological_warehouse/forms.py:408 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:427 +#: archaeological_warehouse/forms.py:431 msgid "This reference/code already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:435 archaeological_warehouse/forms.py:812 +#: archaeological_warehouse/forms.py:439 archaeological_warehouse/forms.py:819 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:499 +#: archaeological_warehouse/forms.py:503 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:506 +#: archaeological_warehouse/forms.py:510 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:518 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/forms.py:525 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:524 +#: archaeological_warehouse/forms.py:528 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:563 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:561 +#: archaeological_warehouse/forms.py:565 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:566 +#: archaeological_warehouse/forms.py:570 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:575 +#: archaeological_warehouse/forms.py:579 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:576 +#: archaeological_warehouse/forms.py:580 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:577 +#: archaeological_warehouse/forms.py:581 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:592 ishtar_common/models_imports.py:1085 +#: archaeological_warehouse/forms.py:596 ishtar_common/models_imports.py:1085 msgid "Conservatory state" msgstr "" -#: archaeological_warehouse/forms.py:596 +#: archaeological_warehouse/forms.py:600 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:620 archaeological_warehouse/forms.py:633 -#: archaeological_warehouse/forms.py:647 archaeological_warehouse/views.py:379 +#: archaeological_warehouse/forms.py:624 archaeological_warehouse/forms.py:637 +#: archaeological_warehouse/forms.py:651 archaeological_warehouse/views.py:380 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:625 archaeological_warehouse/forms.py:638 -#: archaeological_warehouse/forms.py:652 +#: archaeological_warehouse/forms.py:629 archaeological_warehouse/forms.py:642 +#: archaeological_warehouse/forms.py:656 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:627 +#: archaeological_warehouse/forms.py:631 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:672 +#: archaeological_warehouse/forms.py:676 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:700 +#: archaeological_warehouse/forms.py:704 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:714 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:714 archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:718 archaeological_warehouse/forms.py:719 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:720 +#: archaeological_warehouse/forms.py:724 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:833 +#: archaeological_warehouse/forms.py:840 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -8051,7 +8100,8 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1214 +#: archaeological_warehouse/models.py:1221 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:11 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8097,7 +8147,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1625 +#: archaeological_warehouse/models.py:1637 msgid "No value" msgstr "" @@ -8148,7 +8198,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1140 +#: archaeological_warehouse/models.py:1147 msgid "Deprecated - do not use" msgstr "" @@ -8157,7 +8207,7 @@ msgid "Container parent" msgstr "" #: archaeological_warehouse/models.py:899 -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1137 msgid "Location (warehouse)" msgstr "" @@ -8233,87 +8283,94 @@ msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1136 +#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:16 +#: archaeological_warehouse/views.py:517 +msgctxt "action" +msgid "Move" +msgstr "" + +#: archaeological_warehouse/models.py:1143 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1149 +#: archaeological_warehouse/models.py:1156 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1165 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1162 +#: archaeological_warehouse/models.py:1169 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1165 +#: archaeological_warehouse/models.py:1172 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1178 +#: archaeological_warehouse/models.py:1185 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1181 +#: archaeological_warehouse/models.py:1188 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1184 +#: archaeological_warehouse/models.py:1191 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1386 +#: archaeological_warehouse/models.py:1398 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1390 +#: archaeological_warehouse/models.py:1402 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1810 +#: archaeological_warehouse/models.py:1822 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1817 +#: archaeological_warehouse/models.py:1829 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1833 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1834 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1835 msgid "List of associated finds" msgstr "" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1836 msgid "List of documents contained in this container" msgstr "" -#: archaeological_warehouse/models.py:1825 +#: archaeological_warehouse/models.py:1837 msgid "List of documents whose reference container is this container" msgstr "" -#: archaeological_warehouse/models.py:2067 +#: archaeological_warehouse/models.py:2095 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2102 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:2075 +#: archaeological_warehouse/models.py:2103 msgid "Container localisations" msgstr "" @@ -8448,43 +8505,43 @@ msgid "" "facilitate imports." msgstr "" -#: archaeological_warehouse/views.py:90 example_project/__init__.py:11 +#: archaeological_warehouse/views.py:91 example_project/__init__.py:11 msgid "New warehouse" msgstr "" -#: archaeological_warehouse/views.py:93 +#: archaeological_warehouse/views.py:94 msgid "New container" msgstr "" -#: archaeological_warehouse/views.py:322 +#: archaeological_warehouse/views.py:323 msgid "Warehouse creation" msgstr "" -#: archaeological_warehouse/views.py:333 +#: archaeological_warehouse/views.py:334 msgid "Warehouse modification" msgstr "" -#: archaeological_warehouse/views.py:355 +#: archaeological_warehouse/views.py:356 msgid "Warehouse deletion" msgstr "" -#: archaeological_warehouse/views.py:390 +#: archaeological_warehouse/views.py:391 msgid "Container creation" msgstr "" -#: archaeological_warehouse/views.py:400 +#: archaeological_warehouse/views.py:401 msgid "Container modification" msgstr "" -#: archaeological_warehouse/views.py:427 +#: archaeological_warehouse/views.py:428 msgid "Container deletion" msgstr "" -#: archaeological_warehouse/views.py:468 +#: archaeological_warehouse/views.py:469 msgid "Merge containers" msgstr "" -#: archaeological_warehouse/views.py:478 +#: archaeological_warehouse/views.py:479 msgid "Select the main container" msgstr "" @@ -8876,8 +8933,8 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1648 -#: ishtar_common/models_imports.py:2331 +#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1650 +#: ishtar_common/models_imports.py:2333 msgid "Launch import" msgstr "" @@ -8969,7 +9026,7 @@ msgstr "" #: ishtar_common/admin.py:2763 ishtar_common/models.py:746 #: ishtar_common/models_common.py:846 ishtar_common/models_imports.py:977 -#: ishtar_common/models_imports.py:2907 ishtar_common/models_rest.py:111 +#: ishtar_common/models_imports.py:2913 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -9063,178 +9120,178 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:282 +#: ishtar_common/data_importer.py:283 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:301 +#: ishtar_common/data_importer.py:302 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:313 +#: ishtar_common/data_importer.py:314 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:323 +#: ishtar_common/data_importer.py:324 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:380 ishtar_common/data_importer.py:394 -#: ishtar_common/data_importer.py:618 +#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 +#: ishtar_common/data_importer.py:619 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:407 +#: ishtar_common/data_importer.py:408 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:476 +#: ishtar_common/data_importer.py:477 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:483 +#: ishtar_common/data_importer.py:484 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:485 +#: ishtar_common/data_importer.py:486 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:641 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "" -#: ishtar_common/data_importer.py:669 +#: ishtar_common/data_importer.py:670 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:780 +#: ishtar_common/data_importer.py:781 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: ishtar_common/data_importer.py:786 +#: ishtar_common/data_importer.py:787 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 +#: ishtar_common/data_importer.py:789 ishtar_common/views.py:1892 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:789 +#: ishtar_common/data_importer.py:790 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:791 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:792 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:793 +#: ishtar_common/data_importer.py:794 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: ishtar_common/data_importer.py:797 +#: ishtar_common/data_importer.py:798 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:801 +#: ishtar_common/data_importer.py:802 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/data_importer.py:1470 ishtar_common/views.py:1970 #: ishtar_common/views.py:1980 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1734 +#: ishtar_common/data_importer.py:1765 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1739 +#: ishtar_common/data_importer.py:1770 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1823 +#: ishtar_common/data_importer.py:1854 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1954 +#: ishtar_common/data_importer.py:1985 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2024 +#: ishtar_common/data_importer.py:2055 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2032 +#: ishtar_common/data_importer.py:2063 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2037 +#: ishtar_common/data_importer.py:2068 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2125 +#: ishtar_common/data_importer.py:2156 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2128 +#: ishtar_common/data_importer.py:2159 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2242 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2264 +#: ishtar_common/data_importer.py:2295 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -9248,7 +9305,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "" #: ishtar_common/forms.py:114 ishtar_common/forms_common.py:1618 -#: ishtar_common/views.py:3062 +#: ishtar_common/views.py:3080 msgid "Confirm" msgstr "" @@ -9413,7 +9470,7 @@ msgstr "" msgid "You put either a file or a download link for media but not both." msgstr "" -#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3023 +#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3050 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -10189,9 +10246,9 @@ msgstr "" #: ishtar_common/models_imports.py:794 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:843 ishtar_common/models_imports.py:897 #: ishtar_common/models_imports.py:957 ishtar_common/models_imports.py:1000 -#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1574 -#: ishtar_common/models_imports.py:2003 ishtar_common/models_imports.py:2900 -#: ishtar_common/models_imports.py:2928 +#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1576 +#: ishtar_common/models_imports.py:2005 ishtar_common/models_imports.py:2906 +#: ishtar_common/models_imports.py:2934 msgid "Imports" msgstr "" @@ -10645,8 +10702,8 @@ msgstr "" #: ishtar_common/models.py:1187 msgid "" -"If provided a button is displayed on find search pages to create a \"No " -"context\" find" +"If provided a button is displayed on find add page to create a \"No context" +"\" find" msgstr "" #: ishtar_common/models.py:1193 @@ -11385,7 +11442,7 @@ msgstr "" msgid "Biographical notes" msgstr "" -#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2352 +#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2354 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "" @@ -12556,7 +12613,7 @@ msgid "" "break." msgstr "" -#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1992 +#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1994 msgid "Debug" msgstr "" @@ -12928,48 +12985,48 @@ msgid "" "or Shapefile)." msgstr "" -#: ishtar_common/models_imports.py:1525 +#: ishtar_common/models_imports.py:1527 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1559 +#: ishtar_common/models_imports.py:1561 msgid "Importer group type" msgstr "" -#: ishtar_common/models_imports.py:1560 +#: ishtar_common/models_imports.py:1562 msgid "Current import" msgstr "" -#: ishtar_common/models_imports.py:1566 +#: ishtar_common/models_imports.py:1568 msgid "Import - Group" msgstr "" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1569 msgid "Import - Groups" msgstr "" -#: ishtar_common/models_imports.py:1644 ishtar_common/models_imports.py:2327 +#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:2329 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:1650 -#: ishtar_common/models_imports.py:2329 ishtar_common/models_imports.py:2339 +#: ishtar_common/models_imports.py:1648 ishtar_common/models_imports.py:1652 +#: ishtar_common/models_imports.py:2331 ishtar_common/models_imports.py:2341 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1651 ishtar_common/models_imports.py:2340 +#: ishtar_common/models_imports.py:1653 ishtar_common/models_imports.py:2342 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1652 ishtar_common/models_imports.py:2347 +#: ishtar_common/models_imports.py:1654 ishtar_common/models_imports.py:2349 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1655 ishtar_common/models_imports.py:2350 +#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2352 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2354 +#: ishtar_common/models_imports.py:1659 ishtar_common/models_imports.py:2356 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -12978,164 +13035,164 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1918 +#: ishtar_common/models_imports.py:1920 msgid "Importer type" msgstr "" -#: ishtar_common/models_imports.py:1926 +#: ishtar_common/models_imports.py:1928 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:1930 +#: ishtar_common/models_imports.py:1932 msgid "Imported values" msgstr "" -#: ishtar_common/models_imports.py:1938 +#: ishtar_common/models_imports.py:1940 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1946 +#: ishtar_common/models_imports.py:1948 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1954 +#: ishtar_common/models_imports.py:1956 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1965 +#: ishtar_common/models_imports.py:1967 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1967 +#: ishtar_common/models_imports.py:1969 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1970 +#: ishtar_common/models_imports.py:1972 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1972 +#: ishtar_common/models_imports.py:1974 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1973 +#: ishtar_common/models_imports.py:1975 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1975 +#: ishtar_common/models_imports.py:1977 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1980 +#: ishtar_common/models_imports.py:1982 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1982 +#: ishtar_common/models_imports.py:1984 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1988 +#: ishtar_common/models_imports.py:1990 #: ishtar_common/templates/ishtar/import_table.html:60 msgid "Group" msgstr "" -#: ishtar_common/models_imports.py:1991 +#: ishtar_common/models_imports.py:1993 msgid "Next import" msgstr "" -#: ishtar_common/models_imports.py:1995 +#: ishtar_common/models_imports.py:1997 msgid "Import - Import" msgstr "" -#: ishtar_common/models_imports.py:1996 +#: ishtar_common/models_imports.py:1998 msgid "Import - Imports" msgstr "" -#: ishtar_common/models_imports.py:2205 +#: ishtar_common/models_imports.py:2207 msgid "" "Error while opening the file. Particularly check the number of columns of " "your file." msgstr "" -#: ishtar_common/models_imports.py:2256 ishtar_common/models_imports.py:2404 +#: ishtar_common/models_imports.py:2258 ishtar_common/models_imports.py:2406 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:2334 +#: ishtar_common/models_imports.py:2336 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:2335 ishtar_common/models_imports.py:2344 +#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 +#: ishtar_common/models_imports.py:2339 ishtar_common/models_imports.py:2348 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:2343 +#: ishtar_common/models_imports.py:2345 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:2448 ishtar_common/models_imports.py:2451 -#: ishtar_common/models_imports.py:2515 +#: ishtar_common/models_imports.py:2450 ishtar_common/models_imports.py:2453 +#: ishtar_common/models_imports.py:2517 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:2461 +#: ishtar_common/models_imports.py:2463 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:2483 +#: ishtar_common/models_imports.py:2485 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:2512 +#: ishtar_common/models_imports.py:2514 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:2553 +#: ishtar_common/models_imports.py:2555 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:2639 +#: ishtar_common/models_imports.py:2643 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:2678 +#: ishtar_common/models_imports.py:2682 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:2686 +#: ishtar_common/models_imports.py:2690 msgid "Import {} finished with no errors" msgstr "" -#: ishtar_common/models_imports.py:2858 +#: ishtar_common/models_imports.py:2864 msgid "Ignored" msgstr "" -#: ishtar_common/models_imports.py:2861 ishtar_common/models_imports.py:2862 +#: ishtar_common/models_imports.py:2867 ishtar_common/models_imports.py:2868 msgid "Import - Ignored error" msgstr "" -#: ishtar_common/models_imports.py:2897 +#: ishtar_common/models_imports.py:2903 msgid "Import - Pre-import value" msgstr "" -#: ishtar_common/models_imports.py:2898 +#: ishtar_common/models_imports.py:2904 msgid "Import - Pre-import values" msgstr "" -#: ishtar_common/models_imports.py:2915 +#: ishtar_common/models_imports.py:2921 msgid "Specific key to an import" msgstr "" -#: ishtar_common/models_imports.py:2926 +#: ishtar_common/models_imports.py:2932 msgid "Import - Item key" msgstr "" -#: ishtar_common/models_imports.py:2927 +#: ishtar_common/models_imports.py:2933 msgid "Import - Item keys" msgstr "" @@ -15147,23 +15204,23 @@ msgstr "" msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:3078 -msgid "lock/unlock" +#: ishtar_common/views.py:3096 +msgid "Lock/unlock" msgstr "" -#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 +#: ishtar_common/views.py:3235 ishtar_common/views.py:3330 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 +#: ishtar_common/views.py:3367 ishtar_common/views.py:3421 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:3362 +#: ishtar_common/views.py:3381 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:3415 +#: ishtar_common/views.py:3434 msgid "Delete geographic item" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index aad34d3b3..47a88a3aa 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-15 16:31+0200\n" +"POT-Creation-Date: 2024-09-10 12:47+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-" @@ -26,7 +26,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2716 +#: archaeological_finds/models_finds.py:2733 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:381 @@ -84,13 +84,13 @@ msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 #: archaeological_finds/forms.py:1692 archaeological_finds/forms.py:2406 #: archaeological_finds/forms_treatments.py:52 -#: archaeological_finds/forms_treatments.py:559 -#: archaeological_finds/forms_treatments.py:634 -#: archaeological_finds/forms_treatments.py:817 +#: archaeological_finds/forms_treatments.py:557 +#: archaeological_finds/forms_treatments.py:632 +#: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:1225 #: archaeological_operations/forms.py:1438 -#: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 +#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" @@ -101,7 +101,7 @@ msgstr "Recherche en texte intégral" #: archaeological_context_records/forms.py:560 #: archaeological_context_records/forms.py:614 #: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/models.py:1393 msgid "ID" msgstr "Identifiant" @@ -185,7 +185,7 @@ msgstr "Attribution culturelle" #: archaeological_context_records/models.py:510 #: archaeological_context_records/models.py:511 #: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1395 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 #: archaeological_finds/models_finds.py:1154 @@ -259,7 +259,7 @@ msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:3152 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 -#: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 +#: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 #: ishtar_common/models_common.py:3417 ishtar_common/models_common.py:4202 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 @@ -278,13 +278,13 @@ msgstr "Seuls les éléments associés à l'opération peuvent être sélectionn #: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1394 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" #: archaeological_context_records/forms.py:300 #: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1396 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 #: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 @@ -293,7 +293,7 @@ msgstr "Type d'Unité d'Enregistrement" #: archaeological_finds/forms_treatments.py:192 #: archaeological_finds/models_finds.py:556 #: archaeological_finds/models_finds.py:1985 -#: archaeological_finds/models_treatments.py:264 +#: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -317,7 +317,7 @@ msgstr "Remplissage" #: archaeological_context_records/forms.py:304 #: archaeological_context_records/models.py:755 #: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1851 -#: archaeological_finds/models_finds.py:2122 +#: archaeological_finds/models_finds.py:2130 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 @@ -371,10 +371,10 @@ msgstr "Date d'ouverture" #: archaeological_files/models.py:629 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 -#: archaeological_finds/forms_treatments.py:662 -#: archaeological_finds/forms_treatments.py:755 -#: archaeological_finds/models_treatments.py:267 -#: archaeological_finds/models_treatments.py:1141 +#: archaeological_finds/forms_treatments.py:660 +#: archaeological_finds/forms_treatments.py:753 +#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1044 ishtar_common/forms.py:1045 @@ -391,9 +391,9 @@ msgstr "Documentation" #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:768 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:228 -#: archaeological_finds/models_treatments.py:762 -#: archaeological_warehouse/forms.py:742 +#: archaeological_finds/models_treatments.py:237 +#: archaeological_finds/models_treatments.py:851 +#: archaeological_warehouse/forms.py:769 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" @@ -448,16 +448,15 @@ msgstr "Période chronologique" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:775 archaeological_files/models.py:76 #: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1550 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:753 -#: archaeological_finds/models_finds.py:3569 -#: archaeological_finds/models_treatments.py:266 -#: archaeological_finds/models_treatments.py:760 -#: archaeological_finds/templates/ishtar/sheet_find.html:392 -#: archaeological_finds/templates/ishtar/sheet_find.html:430 -#: archaeological_finds/templates/ishtar/sheet_find.html:468 +#: archaeological_finds/forms_treatments.py:751 +#: archaeological_finds/models_finds.py:3692 +#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:849 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 +#: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 @@ -495,12 +494,11 @@ msgstr "Date de début" #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:664 archaeological_files/forms.py:780 #: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3570 -#: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:393 -#: archaeological_finds/templates/ishtar/sheet_find.html:431 -#: archaeological_finds/templates/ishtar/sheet_find.html:469 -#: archaeological_finds/templates/ishtar/sheet_find.html:507 +#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3693 +#: archaeological_finds/models_treatments.py:850 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: archaeological_finds/templates/ishtar/sheet_find.html:477 +#: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 @@ -580,15 +578,15 @@ msgstr "Unité d'enregistrement - 030 - Datation" #: archaeological_context_records/forms.py:469 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:268 -#: archaeological_context_records/models.py:1521 +#: archaeological_context_records/models.py:1524 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 #: archaeological_finds/forms.py:1773 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2708 +#: archaeological_finds/models_finds.py:2725 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1720 -#: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2528 +#: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5588 ishtar_common/views.py:504 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -685,9 +683,9 @@ msgid "Context record - Quick action - Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" #: archaeological_context_records/forms.py:700 -#: archaeological_context_records/models.py:1282 -#: archaeological_context_records/models.py:1321 -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1285 +#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1392 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "Type de relation" @@ -843,10 +841,11 @@ msgstr "Datations" #: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2293 -#: archaeological_finds/models_finds.py:3531 -#: archaeological_finds/models_finds.py:3557 -#: archaeological_finds/models_treatments.py:742 +#: archaeological_finds/models_finds.py:2302 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_finds.py:3639 +#: archaeological_finds/models_finds.py:3680 +#: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -869,14 +868,14 @@ msgstr "Mobilier" #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 #: archaeological_finds/models_finds.py:1976 -#: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:754 +#: archaeological_finds/models_treatments.py:67 +#: archaeological_finds/models_treatments.py:843 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 #: archaeological_operations/models.py:3496 -#: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 +#: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:704 #: ishtar_common/models.py:760 ishtar_common/models.py:811 #: ishtar_common/models.py:1867 ishtar_common/models.py:3952 @@ -934,7 +933,7 @@ msgstr "Types de documentation" #: archaeological_context_records/models.py:499 #: archaeological_context_records/models.py:500 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1397 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 @@ -1124,7 +1123,7 @@ msgstr "identification" #: archaeological_operations/models.py:467 #: archaeological_operations/models.py:1290 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" @@ -1139,12 +1138,12 @@ msgid "Bulk update" msgstr "Modification par lot" #: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1062 +#: archaeological_context_records/models.py:1065 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 #: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/models_finds.py:2610 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:2627 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 #: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 #: archaeological_operations/models.py:672 @@ -1155,18 +1154,18 @@ msgstr "Modification par lot" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1693 #: ishtar_common/admin.py:1836 ishtar_common/models.py:4543 -#: ishtar_common/models.py:4922 ishtar_common/views.py:3135 -#: ishtar_common/views.py:3153 +#: ishtar_common/models.py:4922 ishtar_common/views.py:3154 +#: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "Dupliquer" #: archaeological_context_records/models.py:719 #: archaeological_files/models.py:567 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:1970 -#: archaeological_finds/models_treatments.py:261 +#: archaeological_finds/models_treatments.py:270 #: archaeological_operations/models.py:3160 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4569 +#: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4569 msgid "External ID" msgstr "Identifiant" @@ -1175,7 +1174,7 @@ msgstr "Identifiant" #: archaeological_finds/models_finds.py:1972 #: archaeological_operations/models.py:3163 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1189 +#: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" @@ -1218,9 +1217,9 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2247 -#: archaeological_finds/models_treatments.py:281 -#: archaeological_finds/models_treatments.py:1159 +#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2255 +#: archaeological_finds/models_treatments.py:290 +#: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 @@ -1230,7 +1229,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1194 +#: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1256,20 +1255,20 @@ msgid "Documents" msgstr "Documents" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2253 -#: archaeological_finds/models_treatments.py:287 -#: archaeological_finds/models_treatments.py:1166 +#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2261 +#: archaeological_finds/models_treatments.py:296 +#: archaeological_finds/models_treatments.py:1255 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:1479 #: archaeological_operations/models.py:2914 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2426 +#: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2426 #: ishtar_common/models_common.py:3410 msgid "Main image" msgstr "Image principale" #: archaeological_context_records/models.py:856 -#: archaeological_finds/models_finds.py:2265 +#: archaeological_finds/models_finds.py:2274 #: archaeological_operations/models.py:559 #: archaeological_operations/models.py:1570 msgid "Cached periods label" @@ -1277,9 +1276,9 @@ msgstr "Nom en cache des périodes" #: archaeological_context_records/models.py:859 #: archaeological_context_records/models.py:865 -#: archaeological_finds/models_finds.py:2268 -#: archaeological_finds/models_finds.py:2274 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2283 +#: archaeological_finds/models_finds.py:2289 #: archaeological_operations/models.py:556 #: archaeological_operations/models.py:562 #: archaeological_operations/models.py:568 @@ -1308,76 +1307,76 @@ msgid "Context record" msgstr "UE" #: archaeological_context_records/models.py:926 -#: archaeological_finds/models_finds.py:2482 +#: archaeological_finds/models_finds.py:2499 msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" -#: archaeological_context_records/models.py:1050 +#: archaeological_context_records/models.py:1053 msgid "Add find" msgstr "Ajout mobilier" -#: archaeological_context_records/models.py:1052 +#: archaeological_context_records/models.py:1055 msgid "find" msgstr "mobilier" -#: archaeological_context_records/models.py:1236 +#: archaeological_context_records/models.py:1239 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "Mobilier d'origine" -#: archaeological_context_records/models.py:1283 +#: archaeological_context_records/models.py:1286 msgid "Relation types" msgstr "Types de relation" -#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1319 msgid "ID (left)" msgstr "Identifiant (gauche)" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1320 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1321 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1322 msgid "Description (left)" msgstr "Description (gauche)" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1323 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: archaeological_context_records/models.py:1322 +#: archaeological_context_records/models.py:1325 msgid "ID (right)" msgstr "Identifiant (droit)" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1326 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1327 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1328 msgid "Description (right)" msgstr "Description (droite)" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1329 msgid "Periods (right)" msgstr "Périodes (droite)" -#: archaeological_context_records/models.py:1335 +#: archaeological_context_records/models.py:1338 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1339 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1527 +#: archaeological_context_records/models.py:1530 msgid "Context record parent" msgstr "Unité d'Enregistrement parente" @@ -1455,9 +1454,9 @@ msgstr "Opération / Site" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2294 -#: archaeological_finds/models_finds.py:2305 -#: archaeological_finds/models_finds.py:3578 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2314 +#: archaeological_finds/models_finds.py:3701 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 @@ -1481,7 +1480,7 @@ msgstr "Mobilier" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:72 -#: archaeological_finds/templates/ishtar/sheet_find.html:546 +#: archaeological_finds/templates/ishtar/sheet_find.html:554 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1509,6 +1508,7 @@ msgstr "Données géographiques" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:81 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: cd17_app/templates/ishtar/sheet_find.html:83 #: man_app/templates/ishtar/sheet_museum_find.html:83 @@ -1541,8 +1541,8 @@ msgstr "Identifiant complet" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:270 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 +#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 #: na_app/templates/ishtar/sheet_operation.html:212 @@ -1566,7 +1566,7 @@ msgid "Geographic localisation" msgstr "Localisation géographique" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 -#: archaeological_files/templates/ishtar/sheet_file.html:240 +#: archaeological_files/templates/ishtar/sheet_file.html:239 #: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 #: archaeological_finds/forms.py:977 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 @@ -1574,7 +1574,7 @@ msgstr "Localisation géographique" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: archaeological_operations/templates/ishtar/sheet_site.html:108 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 @@ -1611,11 +1611,11 @@ msgstr "Référence numérique" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:232 #: archaeological_finds/forms_treatments.py:144 -#: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:221 -#: archaeological_finds/templates/ishtar/sheet_find.html:388 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/models_treatments.py:141 +#: archaeological_finds/models_treatments.py:230 +#: archaeological_finds/templates/ishtar/sheet_find.html:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -1625,8 +1625,8 @@ msgstr "Référence numérique" #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3644 #: ishtar_common/models.py:5480 ishtar_common/models.py:5617 #: ishtar_common/models.py:5696 ishtar_common/models_common.py:2028 -#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 -#: ishtar_common/models_imports.py:1962 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1564 +#: ishtar_common/models_imports.py:1964 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 #: man_app/templates/ishtar/sheet_museum_find.html:502 @@ -1754,18 +1754,18 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:234 archaeological_files/forms.py:656 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:213 +#: archaeological_files/templates/ishtar/sheet_file.html:212 #: archaeological_finds/forms.py:1707 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 -#: archaeological_finds/forms_treatments.py:426 -#: archaeological_finds/forms_treatments.py:563 -#: archaeological_finds/forms_treatments.py:639 -#: archaeological_finds/forms_treatments.py:710 -#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:407 +#: archaeological_finds/forms_treatments.py:561 +#: archaeological_finds/forms_treatments.py:637 +#: archaeological_finds/forms_treatments.py:708 +#: archaeological_finds/forms_treatments.py:819 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:206 -#: archaeological_finds/models_treatments.py:1103 +#: archaeological_finds/models_treatments.py:215 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:726 #: archaeological_operations/forms.py:1442 @@ -1834,7 +1834,7 @@ msgstr "Type de permis" #: archaeological_files/forms.py:105 archaeological_files/forms.py:464 #: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_files/templates/ishtar/sheet_file.html:130 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "Référence du permis / de l'arrêté" @@ -1844,9 +1844,9 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 #: archaeological_finds/forms.py:2457 #: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/forms_treatments.py:747 -#: archaeological_finds/models_treatments.py:263 -#: archaeological_finds/models_treatments.py:1155 +#: archaeological_finds/forms_treatments.py:745 +#: archaeological_finds/models_treatments.py:272 +#: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:542 #: archaeological_operations/forms.py:740 #: archaeological_operations/forms.py:1238 @@ -1856,9 +1856,9 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_operations/models.py:513 #: archaeological_operations/models.py:1468 #: archaeological_operations/models.py:2903 -#: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 -#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2162 +#: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 +#: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 +#: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 #: ishtar_common/forms_common.py:2485 ishtar_common/forms_common.py:3042 #: ishtar_common/models.py:2962 ishtar_common/models.py:3836 #: ishtar_common/models.py:4685 ishtar_common/models_common.py:185 @@ -1871,8 +1871,8 @@ msgstr "Commentaire" #: archaeological_files/forms.py:108 archaeological_files/forms.py:375 #: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms_treatments.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "Responsable" @@ -1892,8 +1892,8 @@ msgid "Created by" msgstr "Créée par" #: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 -#: archaeological_finds/forms_treatments.py:580 -#: archaeological_finds/forms_treatments.py:842 +#: archaeological_finds/forms_treatments.py:578 +#: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "Modifiée par" @@ -1908,7 +1908,7 @@ msgstr "Dossier archéologique - 010 - Général" #: archaeological_files/forms.py:218 archaeological_files/models.py:642 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1143 +#: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:1344 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4670 ishtar_common/models_imports.py:1436 @@ -1918,9 +1918,9 @@ msgstr "Date de création" #: archaeological_files/forms.py:219 archaeological_files/forms.py:541 #: archaeological_files/models.py:644 -#: archaeological_finds/forms_treatments.py:750 -#: archaeological_finds/models_treatments.py:1145 -#: archaeological_finds/templates/ishtar/sheet_find.html:506 +#: archaeological_finds/forms_treatments.py:748 +#: archaeological_finds/models_treatments.py:1234 +#: archaeological_finds/templates/ishtar/sheet_find.html:514 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -2002,7 +2002,7 @@ msgid "Number/street" msgstr "N° / voie" #: archaeological_files/forms.py:300 archaeological_files/forms.py:341 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:769 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3670 msgid "Postal code" msgstr "Code postal" @@ -2018,7 +2018,7 @@ msgstr "Surface totale aménagée (m2)" #: archaeological_files/forms.py:323 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 -#: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 +#: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 #: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:3851 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 @@ -2075,7 +2075,7 @@ msgid "Responsible for planning service" msgstr "Responsable pour le service instructeur" #: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:144 +#: archaeological_files/templates/ishtar/sheet_file.html:143 msgid "Research archaeology" msgstr "Archéologie programmée" @@ -2097,7 +2097,7 @@ msgid "Lead organization" msgstr "Organisation porteuse du projet" #: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:170 +#: archaeological_files/templates/ishtar/sheet_file.html:169 msgid "Research archaeology comment" msgstr "Précisions sur l'archéologie programmée" @@ -2185,25 +2185,25 @@ msgid "Linear meter (m)" msgstr "Mètre linéaire (m)" #: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: 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 msgid "Man by day" msgstr "Personnes par jour" #: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Days" msgstr "Jours" #: archaeological_files/forms.py:882 archaeological_files/models.py:116 #: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 msgid "Job" msgstr "Emploi" @@ -2222,7 +2222,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "Dossier préventif - 030 - Post-fouille" #: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:280 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Ground jobs" msgstr "Emplois de terrain" @@ -2231,13 +2231,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "Dossier préventif - 040 - Emplois de terrain" #: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:394 -#: archaeological_files/templates/ishtar/sheet_file.html:397 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 msgid "Quantity" msgstr "Quantité" #: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:387 msgid "Equipment / service" msgstr "Équipement / service" @@ -2245,21 +2245,21 @@ msgstr "Équipement / service" #: archaeological_files/forms.py:1278 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 -#: archaeological_finds/forms_treatments.py:564 -#: archaeological_finds/forms_treatments.py:623 -#: archaeological_finds/forms_treatments.py:640 -#: archaeological_finds/forms_treatments.py:780 -#: archaeological_finds/forms_treatments.py:822 -#: archaeological_finds/forms_treatments.py:886 -#: archaeological_finds/models_treatments.py:207 -#: archaeological_finds/models_treatments.py:1104 +#: archaeological_finds/forms_treatments.py:562 +#: archaeological_finds/forms_treatments.py:621 +#: archaeological_finds/forms_treatments.py:638 +#: archaeological_finds/forms_treatments.py:778 +#: archaeological_finds/forms_treatments.py:820 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 #: archaeological_operations/forms.py:1443 #: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2828 -#: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 +#: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:590 #: ishtar_common/models.py:4568 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2271,10 +2271,10 @@ msgstr "Index" #: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 #: archaeological_files/forms.py:1267 -#: archaeological_finds/forms_treatments.py:565 -#: archaeological_finds/forms_treatments.py:612 -#: archaeological_finds/forms_treatments.py:823 -#: archaeological_finds/forms_treatments.py:875 +#: archaeological_finds/forms_treatments.py:563 +#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:873 #: archaeological_operations/forms.py:1449 #: archaeological_operations/forms.py:1498 #: archaeological_operations/models.py:2564 @@ -2288,16 +2288,16 @@ msgid "Object (full text search)" msgstr "Objet (recherche en texte intégral)" #: archaeological_files/forms.py:1151 -#: archaeological_finds/forms_treatments.py:566 -#: archaeological_finds/forms_treatments.py:824 +#: archaeological_finds/forms_treatments.py:564 +#: archaeological_finds/forms_treatments.py:822 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1634 msgid "Indexed?" msgstr "Indexé ?" #: archaeological_files/forms.py:1158 -#: archaeological_finds/forms_treatments.py:567 -#: archaeological_finds/forms_treatments.py:825 +#: archaeological_finds/forms_treatments.py:565 +#: archaeological_finds/forms_treatments.py:823 #: archaeological_operations/forms.py:1456 #: archaeological_operations/forms.py:1505 #: archaeological_operations/models.py:2887 @@ -2306,8 +2306,8 @@ msgid "Object" msgstr "Objet" #: archaeological_files/forms.py:1160 -#: archaeological_finds/forms_treatments.py:570 -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:568 +#: archaeological_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:1459 #: archaeological_operations/forms.py:1507 #: archaeological_operations/models.py:2885 @@ -2359,7 +2359,7 @@ msgstr "Clôture" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3560 +#: archaeological_finds/models_finds.py:3683 #: archaeological_operations/ishtar_menu.py:70 #: archaeological_operations/models.py:1715 #: archaeological_operations/models.py:2923 @@ -2462,7 +2462,7 @@ msgstr "m. linéaire" msgid "Equipment/Service" msgstr "Équipement/Service" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:207 +#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3279 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" @@ -2509,7 +2509,7 @@ msgstr "Quantité par défaut par jour" msgid "Available" msgstr "Disponible" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:758 +#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1238 ishtar_common/models.py:2414 #: ishtar_common/models_common.py:748 msgid "Parent" @@ -2619,8 +2619,8 @@ msgid "Total developed surface (km2)" msgstr "Surface totale aménagée (km²)" #: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1327 -#: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1067 +#: archaeological_finds/models_treatments.py:167 +#: archaeological_finds/models_treatments.py:1156 #: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1141 #: archaeological_operations/models.py:2686 #: archaeological_operations/tests.py:3091 @@ -2630,7 +2630,7 @@ msgid "year" msgstr "annee" #: archaeological_files/models.py:488 -#: archaeological_finds/models_treatments.py:1064 +#: archaeological_finds/models_treatments.py:1153 #: archaeological_operations/models.py:370 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4316 msgctxt "key for text search" @@ -2638,7 +2638,7 @@ msgid "reference" msgstr "reference" #: archaeological_files/models.py:491 -#: archaeological_finds/models_treatments.py:155 +#: archaeological_finds/models_treatments.py:164 #: archaeological_operations/models.py:376 msgctxt "key for text search" msgid "other-reference" @@ -2650,7 +2650,7 @@ msgid "department" msgstr "departement" #: archaeological_files/models.py:507 -#: archaeological_finds/models_treatments.py:1061 +#: archaeological_finds/models_treatments.py:1150 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1169 #: archaeological_operations/tests.py:3227 @@ -2661,8 +2661,8 @@ msgid "name" msgstr "nom" #: archaeological_files/models.py:510 -#: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1070 +#: archaeological_finds/models_treatments.py:170 +#: archaeological_finds/models_treatments.py:1159 #: archaeological_operations/models.py:1175 #: archaeological_operations/models.py:2697 #: archaeological_operations/tests.py:3240 @@ -2704,7 +2704,7 @@ msgid "comment" msgstr "commentaire" #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1632 -#: archaeological_finds/models_treatments.py:1073 +#: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" @@ -2721,17 +2721,17 @@ msgid "general-contractor-organization" msgstr "amenageur-organisation" #: archaeological_files/models.py:564 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" #: archaeological_files/models.py:572 -#: archaeological_finds/forms_treatments.py:637 -#: archaeological_finds/forms_treatments.py:708 -#: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/forms_treatments.py:635 +#: archaeological_finds/forms_treatments.py:706 +#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:528 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1131 @@ -2741,7 +2741,7 @@ msgstr "Référence interne" #: archaeological_operations/models.py:502 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 -#: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 +#: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/models.py:397 #: cd17_app/templates/ishtar/sheet_find.html:507 #: ishtar_common/forms_common.py:755 ishtar_common/forms_common.py:823 @@ -2782,10 +2782,10 @@ msgid "Name" msgstr "Nom" #: archaeological_files/models.py:577 -#: archaeological_finds/models_treatments.py:1120 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 +#: archaeological_finds/models_treatments.py:1209 +#: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 -#: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 #: man_app/templates/ishtar/sheet_museum_find.html:541 #: na_app/templates/ishtar/sheet_find.html:511 @@ -2824,9 +2824,9 @@ msgstr "Adresse des terrains - code postal" #: archaeological_files/models.py:692 #: archaeological_finds/forms_treatments.py:169 -#: archaeological_finds/forms_treatments.py:437 -#: archaeological_finds/models_treatments.py:254 -#: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 +#: archaeological_finds/forms_treatments.py:418 +#: archaeological_finds/models_treatments.py:263 +#: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:747 ishtar_common/forms_common.py:1021 #: ishtar_common/forms_common.py:1083 ishtar_common/forms_common.py:1245 #: ishtar_common/forms_common.py:1434 ishtar_common/ishtar_menu.py:102 @@ -2888,15 +2888,15 @@ msgid "plan" msgstr "plan d'intervention" #: archaeological_files/models.py:1305 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1227 +#: archaeological_finds/models_treatments.py:420 +#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:2008 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" #: archaeological_files/models.py:1307 -#: archaeological_finds/models_treatments.py:413 -#: archaeological_finds/models_treatments.py:1229 +#: archaeological_finds/models_treatments.py:422 +#: archaeological_finds/models_treatments.py:1318 #: archaeological_operations/models.py:2010 msgid "admin. act" msgstr "acte admin." @@ -2985,9 +2985,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:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Planned" msgstr "Planifié" @@ -3028,18 +3028,14 @@ msgstr "Dossier d'archéologie préventive" msgid "Developed surface" msgstr "Surface aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:123 -msgid "Responsible for planning service address" -msgstr "Responsable pour le service instructeur - adresse" - -#: archaeological_files/templates/ishtar/sheet_file.html:177 +#: archaeological_files/templates/ishtar/sheet_file.html:176 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "Parcelles associées" -#: archaeological_files/templates/ishtar/sheet_file.html:180 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 @@ -3054,32 +3050,31 @@ msgstr "Parcelles associées" msgid "Administrative acts" msgstr "Actes administratifs" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "Opérations associées" -#: archaeological_files/templates/ishtar/sheet_file.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_operations/models.py:2660 #: archaeological_operations/models.py:2959 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 #: ishtar_common/models.py:4570 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "Réf." -#: archaeological_files/templates/ishtar/sheet_file.html:189 -#: archaeological_files/templates/ishtar/sheet_file.html:215 -#: archaeological_finds/forms_treatments.py:641 -#: archaeological_finds/forms_treatments.py:719 -#: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:387 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_finds/forms_treatments.py:639 +#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/models_treatments.py:140 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:413 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:451 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:489 @@ -3131,66 +3126,66 @@ msgstr "Réf." msgid "Type" msgstr "Type" -#: archaeological_files/templates/ishtar/sheet_file.html:192 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:539 #: archaeological_operations/forms.py:782 #: archaeological_operations/models.py:1348 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: archaeological_files/templates/ishtar/sheet_file.html:206 +#: archaeological_files/templates/ishtar/sheet_file.html:205 msgid "No operation associated to this archaeological file" msgstr "Pas d'opération associée à ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:210 +#: archaeological_files/templates/ishtar/sheet_file.html:209 msgid "Admninistrative acts linked to associated operations" msgstr "Actes administratifs associés à ces opérations" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:706 ishtar_common/admin.py:768 +#: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:768 #: ishtar_common/models.py:727 ishtar_common/models.py:3410 #: ishtar_common/models_imports.py:1122 msgid "Date" msgstr "Date" -#: archaeological_files/templates/ishtar/sheet_file.html:226 +#: archaeological_files/templates/ishtar/sheet_file.html:225 msgid "No administrative act linked to operations" msgstr "Pas d'acte administratif associé à ces opérations" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:231 msgid "Document for this archaeological file" msgstr "Document pour ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:262 +#: archaeological_files/templates/ishtar/sheet_file.html:261 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:276 msgid "Human and technical requirements" msgstr "Besoins humains et techniques" -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Effective" msgstr "Effectif" -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:295 -#: archaeological_files/templates/ishtar/sheet_file.html:344 -#: archaeological_files/templates/ishtar/sheet_file.html:347 -#: archaeological_files/templates/ishtar/sheet_file.html:396 -#: archaeological_files/templates/ishtar/sheet_file.html:399 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:398 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "Coût" -#: archaeological_files/templates/ishtar/sheet_file.html:310 -#: archaeological_files/templates/ishtar/sheet_file.html:362 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:309 +#: archaeological_files/templates/ishtar/sheet_file.html:361 +#: archaeological_files/templates/ishtar/sheet_file.html:417 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3201,13 +3196,13 @@ msgstr "Coût" msgid "Total" msgstr "Total" -#: archaeological_files/templates/ishtar/sheet_file.html:321 -#: archaeological_files/templates/ishtar/sheet_file.html:373 -#: archaeological_files/templates/ishtar/sheet_file.html:425 +#: archaeological_files/templates/ishtar/sheet_file.html:320 +#: archaeological_files/templates/ishtar/sheet_file.html:372 +#: archaeological_files/templates/ishtar/sheet_file.html:424 msgid "Difference" msgstr "Différence" -#: archaeological_files/templates/ishtar/sheet_file.html:332 +#: archaeological_files/templates/ishtar/sheet_file.html:331 msgid "Post-excavation jobs" msgstr "Emplois post-fouille" @@ -3341,7 +3336,7 @@ msgid "Denomination" msgstr "Dénomination" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2124 +#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2132 msgid "Previous ID" msgstr "Identifiant précédent" @@ -3356,17 +3351,17 @@ msgid "Seal number" msgstr "Numéro de scellé" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/models_finds.py:2182 msgid "Presence of inventory marking" msgstr "Présence d’un marquage inventaire" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/models_finds.py:2186 msgid "Type of marking" msgstr "Type de marquage" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2129 msgid "Marking details" msgstr "Précisions sur le marquage" @@ -3381,56 +3376,56 @@ msgid "Museum" msgstr "Musée" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2145 +#: archaeological_finds/models_finds.py:2153 msgid "Owner institution" msgstr "Institution propriétaire" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2150 +#: archaeological_finds/models_finds.py:2158 msgid "Assigned institution" msgstr "Institution affectataire" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2155 +#: archaeological_finds/models_finds.py:2163 msgid "Custodian institution" msgstr "Institution dépositaire" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2165 msgid "Depositor inventory number" msgstr "Numéro d’inventaire du déposant" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/models_finds.py:2168 msgid "Collections entry mode" msgstr "Mode d’entrée dans les collections" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/models_finds.py:2170 msgid "Comment on museum entry mode" msgstr "Précisions sur le mode d'entrée" #: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2163 +#: archaeological_finds/models_finds.py:2171 msgid "Museum entry date (exact or start)" msgstr "Date d’entrée au musée (exacte ou début)" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2172 msgid "Museum entry date (end)" msgstr "Date d’entrée au musée (fin)" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2165 +#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2173 msgid "Comment on museum entry date" msgstr "Précisions sur la date d’entrée au musée" #: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/models_finds.py:2177 msgid "Donor, testator or vendor" msgstr "Donateur, testateur ou vendeur" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2138 -#: archaeological_finds/models_finds.py:2185 +#: archaeological_finds/models_finds.py:2146 +#: archaeological_finds/models_finds.py:2193 msgid "Collection" msgstr "Collection" @@ -3439,41 +3434,41 @@ msgid "Former collections" msgstr "Anciennes collections" #: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2201 msgid "Inventory entry year" msgstr "Année d’inscription à l’inventaire" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2197 +#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2205 msgid "Conformity with inventory" msgstr "Conformité avec l’inventaire" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2207 msgid "Comment on conformity" msgstr "Précisions sur la conformité" #: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2211 msgid "Original/reproduction" msgstr "Original/reproduction" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2205 +#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2213 msgid "Date of museum allocation" msgstr "Date d’affectation au musée" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2206 +#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2214 msgid "Purchase price" msgstr "Prix d’achat" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2200 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2208 msgid "Inventory transcript" msgstr "Transcription de l’inventaire" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2252 msgid "Public description" msgstr "Description publique" #: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2061 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2069 msgid "Is complete?" msgstr "Est complet ?" @@ -3505,22 +3500,22 @@ msgstr "Précisions sur le matériau" #: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2071 msgid "Object types" msgstr "Types d'objet" #: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2067 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2075 msgid "Object type quality" msgstr "Qualité du type d'objet" #: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2083 msgid "Functional areas" msgstr "Domaines fonctionnels" #: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2089 msgid "Technical areas" msgstr "Domaines techniques" @@ -3538,13 +3533,13 @@ msgstr "Nombre minimum d'individus (NMI)" #: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 #: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2215 msgid "Inventory quantity" msgstr "Quantité à l’inventaire" #: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 #: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1844 -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2216 msgid "Observed quantity" msgstr "Quantité vue" @@ -3572,13 +3567,13 @@ msgstr "Lieu de fabrication" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2099 +#: archaeological_finds/models_finds.py:2107 msgid "Communicability" msgstr "Communicabilité" #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 #: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1856 -#: archaeological_finds/models_finds.py:2123 +#: archaeological_finds/models_finds.py:2131 msgid "Comment on dating" msgstr "Précisions sur les datations" @@ -3595,32 +3590,32 @@ msgid "Dimensions" msgstr "Dimensions" #: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2103 +#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2111 msgid "Length (cm)" msgstr "Longueur (cm)" #: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2104 +#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2112 msgid "Width (cm)" msgstr "Largeur (cm)" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2105 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2113 msgid "Height (cm)" msgstr "Hauteur (cm)" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2108 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2116 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2106 +#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2114 msgid "Diameter (cm)" msgstr "Diamètre (cm)" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2115 msgid "Circumference (cm)" msgstr "Circonférence (cm)" @@ -3659,20 +3654,20 @@ msgid "Clutter height (cm)" msgstr "Encombrement hauteur (cm)" #: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2127 msgid "Dimensions comment" msgstr "Précisions sur les dimensions" #: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1883 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2128 +#: archaeological_finds/models_finds.py:2136 msgid "Check" msgstr "Vérification" #: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1884 -#: archaeological_finds/models_finds.py:2133 +#: archaeological_finds/models_finds.py:2141 msgid "Check date" msgstr "Date de vérification" @@ -3794,21 +3789,21 @@ msgstr "Conservation" #: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 #: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2226 -#: archaeological_warehouse/forms.py:593 +#: archaeological_finds/models_finds.py:2234 +#: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "Altération" #: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 #: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2230 -#: archaeological_warehouse/forms.py:594 +#: archaeological_finds/models_finds.py:2238 +#: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "Cause d'altération" #: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 #: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2213 +#: archaeological_finds/models_finds.py:2221 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3817,33 +3812,33 @@ msgstr "États de conservation" #: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 #: archaeological_finds/forms.py:1894 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2236 -#: archaeological_warehouse/forms.py:598 +#: archaeological_finds/models_finds.py:2244 +#: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "Urgence du traitement" #: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 #: archaeological_finds/forms.py:1885 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2087 -#: archaeological_warehouse/forms.py:590 +#: archaeological_finds/models_finds.py:2095 +#: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "Intégrité" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 #: archaeological_finds/forms.py:1886 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2093 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/models_finds.py:2101 +#: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "Remarquabilité" #: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2242 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2250 msgid "Appraisal date" msgstr "Date d'évaluation" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 #: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2241 +#: archaeological_finds/models_finds.py:2249 msgid "Insurance value" msgstr "Valeur d'assurance" @@ -3914,18 +3909,18 @@ msgstr "Mobilier - 030 - Conservation" #: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1892 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/models_finds.py:2229 msgid "Recommended treatments" msgstr "Traitements recommandés" #: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1896 #: archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2134 +#: archaeological_finds/models_finds.py:2142 msgid "Estimated value" msgstr "Valeur estimée" #: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1888 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2225 msgid "Conservatory comment" msgstr "Précisions sur la conservation" @@ -3945,7 +3940,7 @@ msgstr "Origine du mobilier" msgid "Discovery" msgstr "Découverte" -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2283 +#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2292 msgid "Complete museum ID" msgstr "Numéro d’inventaire complet" @@ -4001,19 +3996,19 @@ msgstr "Opération - Vestiges" msgid "Areas" msgstr "Zones" -#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "Site archéologique (rattaché à l'opération)" -#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "Site archéologique nom (rattaché à l'opération)" -#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "Site archéologique (rattaché à l'UE)" -#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "Site archéologique nom (rattaché à l'UE)" @@ -4033,7 +4028,7 @@ msgstr "Précisions sur les circonstances de découvertes" #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 -#: archaeological_warehouse/forms.py:579 +#: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 #: sra_idf_app/templates/ishtar/sheet_operation.html:563 msgid "Material type" @@ -4042,7 +4037,7 @@ msgstr "Type de matériau" #: archaeological_finds/forms.py:1819 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 +#: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 #: sra_idf_app/templates/ishtar/sheet_operation.html:573 msgid "Object type" @@ -4153,7 +4148,7 @@ msgid "Museum - Purchase price" msgstr "Musée - Prix d’achat" #: archaeological_finds/forms.py:2032 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2059 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4191,7 +4186,7 @@ msgid "Find search" msgstr "Rechercher un mobilier" #: archaeological_finds/forms.py:2201 archaeological_finds/forms.py:2364 -#: archaeological_finds/models_treatments.py:401 +#: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "Mobilier amont" @@ -4224,11 +4219,10 @@ msgstr "Panier de mobilier" #: archaeological_finds/forms.py:2453 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:211 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:386 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:412 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:450 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:488 @@ -4269,24 +4263,24 @@ msgstr "Traitement - 001 - Recherche" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:204 +#: archaeological_finds/models_treatments.py:213 msgid "Other ref." msgstr "Autre réf." #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 -#: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:246 +#: archaeological_finds/models_treatments.py:144 +#: archaeological_finds/models_treatments.py:255 msgid "Scientific monitoring manager" msgstr "Responsable de suivi scientifique" #: archaeological_finds/forms_treatments.py:65 #: archaeological_finds/forms_treatments.py:142 -#: archaeological_finds/forms_treatments.py:423 -#: archaeological_finds/forms_treatments.py:577 +#: archaeological_finds/forms_treatments.py:404 +#: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:217 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_finds/models_treatments.py:226 +#: archaeological_finds/models_treatments.py:848 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "Type de traitement" @@ -4302,8 +4296,8 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:294 -#: archaeological_finds/models_treatments.py:748 +#: archaeological_finds/models_treatments.py:303 +#: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2550 @@ -4316,10 +4310,10 @@ msgid "Treatment - 020 - General" msgstr "Traitement - 020 - Général" #: archaeological_finds/forms_treatments.py:163 -#: archaeological_finds/forms_treatments.py:431 -#: archaeological_finds/forms_treatments.py:721 -#: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:238 +#: archaeological_finds/forms_treatments.py:412 +#: archaeological_finds/forms_treatments.py:719 +#: archaeological_finds/models_treatments.py:142 +#: archaeological_finds/models_treatments.py:247 msgid "Responsible" msgstr "Responsable" @@ -4330,7 +4324,7 @@ msgstr "" "localisation)" #: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:274 msgid "Goal" msgstr "But" @@ -4396,7 +4390,7 @@ msgid "Another treatment with this index exists for {}." msgstr "Un autre traitement avec cet index existe pour {}." #: archaeological_finds/forms_treatments.py:377 -#: archaeological_finds/models_treatments.py:214 +#: archaeological_finds/models_treatments.py:223 msgid "Associated request" msgstr "Demande associée" @@ -4405,10 +4399,10 @@ msgid "Treatment - 010 - Request choice" msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/forms_treatments.py:383 -#: archaeological_finds/forms_treatments.py:699 +#: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1180 -#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/models_treatments.py:1269 +#: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2549 #: archaeological_operations/models.py:2874 ishtar_common/views.py:510 @@ -4429,19 +4423,35 @@ msgid "Would you like to delete this treatment?" msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_finds/forms_treatments.py:400 +msgid "Create a treatment" +msgstr "Créer un traitement" + +#: archaeological_finds/forms_treatments.py:410 +msgid "Precise date" +msgstr "Date précise" + +#: archaeological_finds/forms_treatments.py:489 +msgid "At least a year is required." +msgstr "Au minimum une année doit être précisée." + +#: archaeological_finds/forms_treatments.py:491 +msgid "Treatment type is required." +msgstr "Type de traitement est requis." + +#: archaeological_finds/forms_treatments.py:498 #: archaeological_finds/models_finds.py:2047 -#: archaeological_finds/models_finds.py:3538 -#: archaeological_finds/models_treatments.py:271 -#: archaeological_finds/models_treatments.py:763 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 -#: archaeological_finds/templates/ishtar/sheet_find.html:429 -#: archaeological_finds/templates/ishtar/sheet_find.html:467 +#: archaeological_finds/models_finds.py:3606 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:852 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 +#: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 -#: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/models.py:2062 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/models.py:839 +#: archaeological_warehouse/models.py:1220 +#: archaeological_warehouse/models.py:2090 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4464,79 +4474,59 @@ msgstr "Voulez-vous supprimer ce traitement ?" msgid "Container" msgstr "Contenant" -#: archaeological_finds/forms_treatments.py:406 +#: archaeological_finds/forms_treatments.py:504 #: ishtar_common/forms_common.py:2757 msgid "Change " msgstr "Changer " -#: archaeological_finds/forms_treatments.py:408 +#: archaeological_finds/forms_treatments.py:506 msgid "reference and current containers" msgstr "le contenant de référence et le contenant actuel" -#: archaeological_finds/forms_treatments.py:409 +#: archaeological_finds/forms_treatments.py:507 #: ishtar_common/forms_common.py:2761 msgid "the reference container" msgstr "le contenant de référence" -#: archaeological_finds/forms_treatments.py:410 +#: archaeological_finds/forms_treatments.py:508 #: ishtar_common/forms_common.py:2762 msgid "the current container" msgstr "le contenant actuel" -#: archaeological_finds/forms_treatments.py:419 -msgid "Create a treatment" -msgstr "Créer un traitement" - -#: archaeological_finds/forms_treatments.py:429 -msgid "Precise date" -msgstr "Date précise" - -#: archaeological_finds/forms_treatments.py:499 -msgid "At least a year is required." -msgstr "Au minimum une année doit être précisée." - -#: archaeological_finds/forms_treatments.py:501 -msgid "Treatment type is required." -msgstr "Type de traitement est requis." - -#: archaeological_finds/forms_treatments.py:514 -msgid "Completed" -msgstr "Achevé" - -#: archaeological_finds/forms_treatments.py:572 +#: archaeological_finds/forms_treatments.py:570 msgid "Treatment name" msgstr "Nom du traitement" -#: archaeological_finds/forms_treatments.py:573 +#: archaeological_finds/forms_treatments.py:571 msgid "Treatment year" msgstr "Année du traitement" -#: archaeological_finds/forms_treatments.py:574 +#: archaeological_finds/forms_treatments.py:572 msgid "Treatment index" msgstr "Index du traitement" -#: archaeological_finds/forms_treatments.py:576 +#: archaeological_finds/forms_treatments.py:574 msgid "Treatment internal reference" msgstr "Référence interne du traitement" -#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:608 msgid "Treatment - Administrative act - General" msgstr "Traitement - Acte administratif - Général" -#: archaeological_finds/forms_treatments.py:630 +#: archaeological_finds/forms_treatments.py:628 msgid "Treatment file - 001 - Search" msgstr "Dossier de traitement - 001 - Recherche" -#: archaeological_finds/forms_treatments.py:638 -#: archaeological_finds/forms_treatments.py:715 ishtar_common/models.py:4571 +#: archaeological_finds/forms_treatments.py:636 +#: archaeological_finds/forms_treatments.py:713 ishtar_common/models.py:4571 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "Réf. interne" -#: archaeological_finds/forms_treatments.py:650 -#: archaeological_finds/forms_treatments.py:727 -#: archaeological_finds/models_treatments.py:1128 -#: archaeological_finds/templates/ishtar/sheet_find.html:504 +#: archaeological_finds/forms_treatments.py:648 +#: archaeological_finds/forms_treatments.py:725 +#: archaeological_finds/models_treatments.py:1217 +#: archaeological_finds/templates/ishtar/sheet_find.html:512 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:530 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4547,10 +4537,10 @@ msgstr "Réf. interne" msgid "Applicant" msgstr "Demandeur" -#: archaeological_finds/forms_treatments.py:656 -#: archaeological_finds/forms_treatments.py:733 -#: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:505 +#: archaeological_finds/forms_treatments.py:654 +#: archaeological_finds/forms_treatments.py:731 +#: archaeological_finds/models_treatments.py:1225 +#: archaeological_finds/templates/ishtar/sheet_find.html:513 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4561,72 +4551,72 @@ msgstr "Demandeur" msgid "Applicant organisation" msgstr "Organisation demandeuse" -#: archaeological_finds/forms_treatments.py:663 -#: archaeological_finds/forms_treatments.py:745 -#: archaeological_finds/models_treatments.py:1149 +#: archaeological_finds/forms_treatments.py:661 +#: archaeological_finds/forms_treatments.py:743 +#: archaeological_finds/models_treatments.py:1238 msgid "Exhibition start date" msgstr "Date de commencement de l'exposition" -#: archaeological_finds/forms_treatments.py:664 -#: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/models_treatments.py:1152 +#: archaeological_finds/forms_treatments.py:662 +#: archaeological_finds/forms_treatments.py:744 +#: archaeological_finds/models_treatments.py:1241 msgid "Exhibition end date" msgstr "Date de fin de l'exposition" -#: archaeological_finds/forms_treatments.py:674 -#: archaeological_finds/forms_treatments.py:686 +#: archaeological_finds/forms_treatments.py:672 +#: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" -#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/forms_treatments.py:715 msgid "External ref." msgstr "Référence" -#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/forms_treatments.py:737 msgid "Associated basket" msgstr "Panier associé" -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1147 +#: archaeological_finds/forms_treatments.py:741 +#: archaeological_finds/models_treatments.py:1236 msgid "Exhibition name" msgstr "Nom d'exposition" -#: archaeological_finds/forms_treatments.py:803 +#: archaeological_finds/forms_treatments.py:801 msgid "Another treatment request with this index exists for {}." msgstr "Une autre demande de traitement avec cet index existe pour {}." -#: archaeological_finds/forms_treatments.py:809 +#: archaeological_finds/forms_treatments.py:807 msgid "Are you sure you want to delete this treatment request?" msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ?" -#: archaeological_finds/forms_treatments.py:810 +#: archaeological_finds/forms_treatments.py:808 msgid "Would you like to delete this treatment request?" msgstr "Voulez-vous supprimer cette demande de traitement ?" -#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:829 msgid "Treatment request name" msgstr "Nom du dossier de traitement" -#: archaeological_finds/forms_treatments.py:833 +#: archaeological_finds/forms_treatments.py:831 msgid "Treatment request year" msgstr "Année du dossier de traitement" -#: archaeological_finds/forms_treatments.py:835 +#: archaeological_finds/forms_treatments.py:833 msgid "Treatment request index" msgstr "Index de la demande de traitement" -#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/forms_treatments.py:835 msgid "Treatment request internal reference" msgstr "Référence interne de la demande de traitement" -#: archaeological_finds/forms_treatments.py:839 -#: archaeological_finds/models_treatments.py:1005 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/models_treatments.py:1094 +#: archaeological_finds/models_treatments.py:1203 msgid "Treatment request type" msgstr "Type de demande de traitement" -#: archaeological_finds/forms_treatments.py:873 +#: archaeological_finds/forms_treatments.py:871 msgid "Treatment request - Administrative act - General" msgstr "Demande de traitement - Acte administratif - Général" @@ -4648,8 +4638,8 @@ msgstr "Traitement de un à plusieurs - création" #: archaeological_finds/models_finds.py:91 #: archaeological_operations/models.py:2554 -#: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4051 +#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4051 msgid "Code" msgstr "Code" @@ -4741,17 +4731,17 @@ msgstr "" "actuelle." #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:381 +#: archaeological_finds/models_treatments.py:390 msgid "Treatment types" msgstr "Types de traitement" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2259 -#: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:295 -#: archaeological_finds/models_treatments.py:307 -#: archaeological_finds/models_treatments.py:1008 -#: archaeological_finds/models_treatments.py:1193 +#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/models_treatments.py:76 +#: archaeological_finds/models_treatments.py:304 +#: archaeological_finds/models_treatments.py:316 +#: archaeological_finds/models_treatments.py:1097 +#: archaeological_finds/models_treatments.py:1282 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -4917,7 +4907,7 @@ msgid "Material index" msgstr "Index matériel" #: archaeological_finds/models_finds.py:586 -#: ishtar_common/models_imports.py:2857 +#: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4929,7 +4919,7 @@ msgstr "Identifiant court" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2287 ishtar_common/models.py:4696 +#: archaeological_finds/models_finds.py:2296 ishtar_common/models.py:4696 #: ishtar_common/models.py:4703 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" @@ -4970,7 +4960,7 @@ msgstr "Mobilier associé" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3114 +#: ishtar_common/views.py:3133 msgid "Modify" msgstr "Modifier" @@ -4979,7 +4969,7 @@ msgid "Manage basket" msgstr "Gérer un panier" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1928 +#: archaeological_warehouse/models.py:1940 msgid "Add treatment" msgstr "Ajouter un traitement" @@ -5588,13 +5578,13 @@ msgid "museum-observed-quantity" msgstr "musee-quantite-vue" #: archaeological_finds/models_finds.py:1863 -#: archaeological_finds/models_finds.py:2645 +#: archaeological_finds/models_finds.py:2662 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 -#: archaeological_warehouse/views.py:303 ishtar_common/models.py:4550 +#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 +#: archaeological_warehouse/views.py:304 ishtar_common/models.py:4550 #: ishtar_common/models.py:4933 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3161 +#: ishtar_common/views.py:3180 msgid "Packaging" msgstr "Conditionnement" @@ -5611,7 +5601,7 @@ msgid "Weight unit" msgstr "Unité de poids" #: archaeological_finds/models_finds.py:2029 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5622,7 +5612,7 @@ msgid "Upstream treatment" msgstr "Traitement amont" #: archaeological_finds/models_finds.py:2036 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -5632,86 +5622,141 @@ msgstr "Traitement amont" msgid "Downstream treatment" msgstr "Traitement aval" -#: archaeological_finds/models_finds.py:2110 +#: archaeological_finds/models_finds.py:2054 +msgid "Container - first full location" +msgstr "Contenant - Localisation complète" + +#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2067 +msgid "Updated as long as no packaging is attached" +msgstr "Mis à jour tant qu'aucun conditionnement n'ai attaché" + +#: archaeological_finds/models_finds.py:2066 +msgid "Reference container - first full location" +msgstr "Contenant de référence - Localisation complète" + +#: archaeological_finds/models_finds.py:2118 msgid "Clutter - long side (cm)" msgstr "Encombrement - grand côté (cm)" -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/models_finds.py:2121 msgid "Clutter - short side (cm)" msgstr "Encombrement - petit côté (cm)" -#: archaeological_finds/models_finds.py:2116 +#: archaeological_finds/models_finds.py:2124 msgid "Clutter - height (cm)" msgstr "Encombrement - hauteur (cm)" -#: archaeological_finds/models_finds.py:2139 +#: archaeological_finds/models_finds.py:2147 msgid "Do not use - need evolutions" msgstr "Ne pas utiliser - Nécessite des évolutions" -#: archaeological_finds/models_finds.py:2190 +#: archaeological_finds/models_finds.py:2198 msgid "Former collection" msgstr "Ancienne collection" -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/models_finds.py:2270 msgid "Related treatments when no new find is created" msgstr "" "Traitements associés quand il n'y a pas de création de nouveau mobilier" -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/models_finds.py:2280 msgid "Cached object types label" msgstr "Nom en cache des types d'objet" -#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2286 msgid "Cached material types label" msgstr "Nom en cache des types de matériaux" -#: archaeological_finds/models_finds.py:2317 +#: archaeological_finds/models_finds.py:2326 msgid "FIND" msgstr "MOBILIER" -#: archaeological_finds/models_finds.py:2483 +#: archaeological_finds/models_finds.py:2500 msgid "Material types string" msgstr "Chaîne de caractère des types de matériau" -#: archaeological_finds/models_finds.py:2484 +#: archaeological_finds/models_finds.py:2501 msgid "Material types code string" msgstr "Code des types de matériau" -#: archaeological_finds/models_finds.py:2485 +#: archaeological_finds/models_finds.py:2502 msgid "Recommendations string from material" msgstr "Chaîne de caractères - recommandations pour le matériau" -#: archaeological_finds/models_finds.py:2486 +#: archaeological_finds/models_finds.py:2503 msgid "Complete ID of associated base finds" msgstr "Identifiant complet du mobilier d'origine associé" -#: archaeological_finds/models_finds.py:2487 +#: archaeological_finds/models_finds.py:2504 msgid "Label of associated context records" msgstr "Dénomination des unités d'enregistrement associées" -#: archaeological_finds/models_finds.py:2618 +#: archaeological_finds/models_finds.py:2635 msgid "Add to basket" msgstr "Ajouter au panier" -#: archaeological_finds/models_finds.py:2626 +#: archaeological_finds/models_finds.py:2643 msgid "Simple treatment" msgstr "Traitement simple" -#: archaeological_finds/models_finds.py:2634 +#: archaeological_finds/models_finds.py:2651 msgid "Divide treatment" msgstr "Traitement de division" -#: archaeological_finds/models_finds.py:3112 +#: archaeological_finds/models_finds.py:3129 msgid "No reference container have been set - the localisation cannot be set." msgstr "" "Aucun contenant de référence n'a été défini - la localisation ne peut être " "paramétrée." -#: archaeological_finds/models_finds.py:3118 +#: archaeological_finds/models_finds.py:3135 msgid "No container have been set - the localisation cannot be set." msgstr "Aucun contenant n'a été défini - la localisation ne peut être définie." -#: archaeological_finds/models_finds.py:3565 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Current" +msgstr "Actuel" + +#: archaeological_finds/models_finds.py:3626 +#: archaeological_finds/models_treatments.py:1198 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_operations/forms.py:1130 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1802 +#: archaeological_operations/models.py:500 +#: archaeological_warehouse/forms.py:343 +#: archaeological_warehouse/models.py:2097 ishtar_common/forms_common.py:2150 +#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 +#: ishtar_common/models.py:2409 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "Référence" + +#: archaeological_finds/models_finds.py:3627 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Reference/current" +msgstr "Référence/actuel" + +#: archaeological_finds/models_finds.py:3647 +msgid "Full location" +msgstr "Localisation complète" + +#: archaeological_finds/models_finds.py:3648 +msgid "Location type" +msgstr "Type de localisation" + +#: archaeological_finds/models_finds.py:3652 +msgid "Find - Treatment" +msgstr "Mobilier - Traitement" + +#: archaeological_finds/models_finds.py:3653 +msgid "Find - Treatments" +msgstr "Mobilier - Traitements" + +#: archaeological_finds/models_finds.py:3688 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2978 #: ishtar_common/models.py:3297 ishtar_common/models.py:3395 @@ -5721,91 +5766,95 @@ msgstr "Aucun contenant n'a été défini - la localisation ne peut être défin msgid "Person" msgstr "Personne" -#: archaeological_finds/models_finds.py:3573 +#: archaeological_finds/models_finds.py:3696 msgid "Property" msgstr "Propriété" -#: archaeological_finds/models_finds.py:3574 +#: archaeological_finds/models_finds.py:3697 msgid "Properties" msgstr "Propriétés" -#: archaeological_finds/models_treatments.py:65 +#: archaeological_finds/models_treatments.py:66 msgid "Treatment is executed" msgstr "Le traitement est réalisé" -#: archaeological_finds/models_treatments.py:69 +#: archaeological_finds/models_treatments.py:70 msgid "Treatment state type" msgstr "Type d'état de traitement" -#: archaeological_finds/models_treatments.py:70 +#: archaeological_finds/models_treatments.py:71 msgid "Treatment state types" msgstr "Types d'état de traitement" -#: archaeological_finds/models_treatments.py:129 +#: archaeological_finds/models_treatments.py:90 +msgid "Completed" +msgstr "Achevé" + +#: archaeological_finds/models_treatments.py:138 msgid "Downstream find" msgstr "Mobilier aval" -#: archaeological_finds/models_treatments.py:130 +#: archaeological_finds/models_treatments.py:139 msgid "Upstream find" msgstr "Mobilier amont" -#: archaeological_finds/models_treatments.py:152 +#: archaeological_finds/models_treatments.py:161 msgctxt "key for text search" msgid "label" msgstr "libelle" -#: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1068 +#: archaeological_finds/models_treatments.py:168 +#: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:2688 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "index" -#: archaeological_finds/models_treatments.py:165 +#: archaeological_finds/models_treatments.py:174 msgctxt "key for text search" msgid "scientific-manager" msgstr "responsable-suivi-scientifique" -#: archaeological_finds/models_treatments.py:225 +#: archaeological_finds/models_treatments.py:234 msgid "Treatment have been executed" msgstr "Le traitement a été réalisé" -#: archaeological_finds/models_treatments.py:233 +#: archaeological_finds/models_treatments.py:242 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" "Endroit où le traitement est réalisé. Renseignez le lieu de conservation de " "destination pour un déplacement." -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:285 msgid "Estimated cost" msgstr "Coût estimé" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:286 msgid "Quoted cost" msgstr "Coût devisé" -#: archaeological_finds/models_treatments.py:278 +#: archaeological_finds/models_treatments.py:287 msgid "Realized cost" msgstr "Coût réalisé" -#: archaeological_finds/models_treatments.py:279 +#: archaeological_finds/models_treatments.py:288 msgid "Insurance cost" msgstr "Coût d'assurance" -#: archaeological_finds/models_treatments.py:314 +#: archaeological_finds/models_treatments.py:323 msgid "TREATMENT" msgstr "TRAITEMENT" -#: archaeological_finds/models_treatments.py:391 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "Mobilier aval" -#: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_find.html:390 -#: archaeological_finds/templates/ishtar/sheet_find.html:428 -#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/models_treatments.py:853 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 +#: archaeological_finds/templates/ishtar/sheet_find.html:474 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -5827,61 +5876,47 @@ msgstr "Mobilier aval" msgid "Doer" msgstr "Opérateur" -#: archaeological_finds/models_treatments.py:765 -#: archaeological_finds/models_treatments.py:766 +#: archaeological_finds/models_treatments.py:854 +#: archaeological_finds/models_treatments.py:855 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "Mobilier associé" -#: archaeological_finds/models_treatments.py:990 +#: archaeological_finds/models_treatments.py:1079 msgid "Is upstream" msgstr "Est en amont" -#: archaeological_finds/models_treatments.py:1006 +#: archaeological_finds/models_treatments.py:1095 msgid "Treatment request types" msgstr "Types de demande de traitement" -#: archaeological_finds/models_treatments.py:1077 +#: archaeological_finds/models_treatments.py:1166 msgctxt "key for text search" msgid "applicant" msgstr "demandeur" -#: archaeological_finds/models_treatments.py:1082 +#: archaeological_finds/models_treatments.py:1171 msgctxt "key for text search" msgid "applicant-organisation" msgstr "demandeur-organisation" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1176 msgctxt "key for text search" msgid "end-date" msgstr "date-fin" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1180 msgctxt "key for text search" msgid "exhibition-start" msgstr "exposition-debut" -#: archaeological_finds/models_treatments.py:1095 +#: archaeological_finds/models_treatments.py:1184 msgctxt "key for text search" msgid "exhibition-end" msgstr "exposition-fin" -#: archaeological_finds/models_treatments.py:1109 -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1345 -#: archaeological_operations/forms.py:1802 -#: archaeological_operations/models.py:500 -#: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2150 -#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 -#: ishtar_common/models.py:2409 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "Référence" - -#: archaeological_finds/models_treatments.py:1181 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/models_treatments.py:1270 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:522 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -5891,7 +5926,7 @@ msgstr "Référence" msgid "Treatment requests" msgstr "Demandes de traitement" -#: archaeological_finds/models_treatments.py:1249 +#: archaeological_finds/models_treatments.py:1338 msgid "Add associated treatment" msgstr "Ajouter un traitement associé" @@ -5931,6 +5966,7 @@ msgstr "" "terrain)." #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:44 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:36 msgid "Associate a treatment" msgstr "Associer un traitement" @@ -6063,9 +6099,9 @@ msgid "Simple treatments" msgstr "Traitements simples" #: archaeological_finds/templates/ishtar/sheet_find.html:385 -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:411 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:449 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:487 @@ -6093,9 +6129,13 @@ msgstr "Traitements simples" msgid "Year - index" msgstr "Année - index" -#: archaeological_finds/templates/ishtar/sheet_find.html:389 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +msgid "Label/type" +msgstr "Dénomination/type" + +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:435 +#: archaeological_finds/templates/ishtar/sheet_find.html:473 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -6117,7 +6157,16 @@ msgstr "Année - index" msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +msgid "Date start/end" +msgstr "Date de début/fin" + +#: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: archaeological_finds/templates/ishtar/sheet_find.html:419 +msgid "First packaging" +msgstr "Premier conditionnement" + +#: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6132,8 +6181,8 @@ msgstr "Mobilier associé (max. 15 affichés)" msgid "Export as CSV" msgstr "Export en CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: archaeological_finds/templates/ishtar/sheet_find.html:492 +#: archaeological_finds/templates/ishtar/sheet_find.html:461 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:518 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6153,7 +6202,7 @@ msgstr "Export en CSV" msgid "CSV" msgstr "CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:533 +#: archaeological_finds/templates/ishtar/sheet_find.html:541 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:559 #: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6270,7 +6319,7 @@ msgstr "Informations sur le traitement :" msgid "This importer need a document archive." msgstr "Cet import nécessite une archive de documents." -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1678 msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." @@ -7871,8 +7920,8 @@ msgstr "" "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un " "oubli, définissez-le à la première étape." -#: archaeological_warehouse/forms.py:85 archaeological_warehouse/forms.py:193 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:734 +#: archaeological_warehouse/forms.py:89 archaeological_warehouse/forms.py:197 +#: archaeological_warehouse/forms.py:517 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:935 @@ -7882,61 +7931,61 @@ msgstr "" msgid "Warehouse" msgstr "Lieu de conservation" -#: archaeological_warehouse/forms.py:98 +#: archaeological_warehouse/forms.py:102 msgid "Default divisions" msgstr "Divisions par défaut" -#: archaeological_warehouse/forms.py:105 +#: archaeological_warehouse/forms.py:109 msgid "Division type" msgstr "Type de division" -#: archaeological_warehouse/forms.py:121 +#: archaeological_warehouse/forms.py:125 msgid "There are identical divisions." msgstr "Il y a des divisions identiques." -#: archaeological_warehouse/forms.py:123 +#: archaeological_warehouse/forms.py:127 msgid "Order fields must be different." msgstr "Les champs « ordre » doivent être différents." -#: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 +#: archaeological_warehouse/forms.py:134 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "Divisions" -#: archaeological_warehouse/forms.py:131 +#: archaeological_warehouse/forms.py:135 msgid "Warehouse - 020 - Divisions" msgstr "Lieu de conservation - 020 - Divisions" -#: archaeological_warehouse/forms.py:137 +#: archaeological_warehouse/forms.py:141 msgid "Warehouse - 001 - Search" msgstr "Lieu de conservation - 001 - Recherche" -#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:261 +#: archaeological_warehouse/forms.py:149 archaeological_warehouse/forms.py:214 +#: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:261 #: archaeological_warehouse/models.py:400 ishtar_common/models_imports.py:1088 msgid "Warehouse type" msgstr "Type de lieu de conservation" -#: archaeological_warehouse/forms.py:156 archaeological_warehouse/forms.py:174 -#: archaeological_warehouse/views.py:309 +#: archaeological_warehouse/forms.py:160 archaeological_warehouse/forms.py:178 +#: archaeological_warehouse/views.py:310 msgid "Warehouse search" msgstr "Rechercher un lieu de conservation" -#: archaeological_warehouse/forms.py:194 +#: archaeological_warehouse/forms.py:198 msgid "Warehouse - 010 - General" msgstr "Lieu de conservation - 010 - Général" -#: archaeological_warehouse/forms.py:209 +#: archaeological_warehouse/forms.py:213 msgid "Auto filled if kept empty." msgstr "Auto-rempli si laissé vide." -#: archaeological_warehouse/forms.py:230 +#: archaeological_warehouse/forms.py:234 msgid "Create a new organization from this warehouse" msgstr "Créer une nouvelle organisation depuis ce lieu de conservation" -#: archaeological_warehouse/forms.py:237 +#: archaeological_warehouse/forms.py:241 msgid "" "Only fill the following fields if no organization is provided or if the " "address of the warehouse is different from the one of the organization. If a " @@ -7948,23 +7997,23 @@ msgstr "" "l'organisation. Si une nouvelle organisation est créée depuis ce lieu de " "conservation, les champs suivants sont utilisés pour cette organisation." -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:767 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:767 #: ishtar_common/forms_common.py:1175 ishtar_common/models_common.py:3667 #: ishtar_common/models_common.py:3856 msgid "Address complement" msgstr "Complément d'adresse" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:770 +#: archaeological_warehouse/forms.py:252 ishtar_common/forms_common.py:770 #: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3672 msgid "Town (freeform)" msgstr "Commune (saisie libre)" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:772 +#: archaeological_warehouse/forms.py:254 ishtar_common/forms_common.py:772 #: ishtar_common/forms_common.py:1180 ishtar_common/models_common.py:3678 msgid "Country" msgstr "Pays" -#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/forms.py:255 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1151 #: ishtar_common/models_common.py:3692 ishtar_common/models_common.py:3868 @@ -7973,7 +8022,7 @@ msgstr "Pays" msgid "Phone" msgstr "Téléphone" -#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/forms.py:257 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:776 ishtar_common/forms_common.py:1161 #: ishtar_common/models_common.py:3708 @@ -7982,161 +8031,161 @@ msgstr "Téléphone" msgid "Mobile phone" msgstr "Téléphone mobile" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:276 msgid "A new organization is not created if an organization is selected." msgstr "" "Une nouvelle organisation ne peut être créée si une organisation est " "sélectionnée." -#: archaeological_warehouse/forms.py:307 archaeological_warehouse/forms.py:308 +#: archaeological_warehouse/forms.py:311 archaeological_warehouse/forms.py:312 msgid "Would you like to delete this warehouse?" msgstr "Voulez-vous supprimer ce lieu de conservation ?" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:316 msgid "Context record - Quick action -Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:334 msgid "Container - 010 - General" msgstr "Contenant - 010 - Général" -#: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1186 +#: archaeological_warehouse/forms.py:346 archaeological_warehouse/forms.py:522 +#: archaeological_warehouse/models.py:1193 msgid "Old reference" msgstr "Ancienne référence" -#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 -#: archaeological_warehouse/forms.py:739 archaeological_warehouse/models.py:741 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:905 -#: archaeological_warehouse/models.py:1154 +#: archaeological_warehouse/models.py:1161 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "Type de contenant" -#: archaeological_warehouse/forms.py:346 +#: archaeological_warehouse/forms.py:350 msgid "Current location (warehouse)" msgstr "Lieu de conservation actuel" -#: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1169 +#: archaeological_warehouse/forms.py:359 archaeological_warehouse/forms.py:530 +#: archaeological_warehouse/models.py:1176 msgid "Parent container" msgstr "Contenant parent" -#: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:750 -#: archaeological_warehouse/models.py:1145 +#: archaeological_warehouse/forms.py:369 archaeological_warehouse/forms.py:744 +#: archaeological_warehouse/models.py:1152 msgid "Responsibility" msgstr "Responsabilité" -#: archaeological_warehouse/forms.py:373 +#: archaeological_warehouse/forms.py:377 msgid "Automatically attached to the current warehouse if not filled." msgstr "Rattaché au lieu de conservation actuel si ce champ n'est pas rempli." -#: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1176 +#: archaeological_warehouse/forms.py:382 +#: archaeological_warehouse/models.py:1183 msgid "Measured weight (g)" msgstr "Poids mesuré (g)" -#: archaeological_warehouse/forms.py:404 +#: archaeological_warehouse/forms.py:408 msgid "The parent container is not attached to the same warehouse." msgstr "Le contenant parent n'est pas rattaché au même lieu de conservation." -#: archaeological_warehouse/forms.py:427 +#: archaeological_warehouse/forms.py:431 msgid "This reference/code already exists for this warehouse." msgstr "Cette référence/ce code existe déjà pour ce lieu de conservation." -#: archaeological_warehouse/forms.py:435 archaeological_warehouse/forms.py:812 +#: archaeological_warehouse/forms.py:439 archaeological_warehouse/forms.py:819 msgid "A container cannot be a parent of himself." msgstr "Un contenant ne peut être associé à lui-même." -#: archaeological_warehouse/forms.py:499 +#: archaeological_warehouse/forms.py:503 msgid "This ID already exists for this warehouse." msgstr "Cet identifiant existe déjà pour ce lieu de conservation." -#: archaeological_warehouse/forms.py:506 +#: archaeological_warehouse/forms.py:510 msgid "Container - 001 - Search" msgstr "Contenant - 001 - Recherche" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:518 msgid "Warehouse (responsibility)" msgstr "Lieu de conservation (responsabilité)" -#: archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/forms.py:525 msgid "Contain containers" msgstr "Contient des contenants" -#: archaeological_warehouse/forms.py:524 +#: archaeological_warehouse/forms.py:528 msgid "Is stationary" msgstr "Est immobile" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:563 msgid "Operation - Code PATRIARCHE" msgstr "Opération - Code PATRIARCHE" -#: archaeological_warehouse/forms.py:561 +#: archaeological_warehouse/forms.py:565 msgid "Operation - town" msgstr "Opération - Commune" -#: archaeological_warehouse/forms.py:566 +#: archaeological_warehouse/forms.py:570 msgid "Operation - Scientist" msgstr "Opération - Responsable d'opération" -#: archaeological_warehouse/forms.py:575 +#: archaeological_warehouse/forms.py:579 msgid "Find - Label" msgstr "Mobilier - ID libre" -#: archaeological_warehouse/forms.py:576 +#: archaeological_warehouse/forms.py:580 msgid "Find - Denomination" msgstr "Mobilier - Dénomination" -#: archaeological_warehouse/forms.py:577 +#: archaeological_warehouse/forms.py:581 msgid "Find - Description" msgstr "Mobilier - Description" -#: archaeological_warehouse/forms.py:592 ishtar_common/models_imports.py:1085 +#: archaeological_warehouse/forms.py:596 ishtar_common/models_imports.py:1085 msgid "Conservatory state" msgstr "État de conservation" -#: archaeological_warehouse/forms.py:596 +#: archaeological_warehouse/forms.py:600 msgid "Preservation type" msgstr "Type de conservation" -#: archaeological_warehouse/forms.py:620 archaeological_warehouse/forms.py:633 -#: archaeological_warehouse/forms.py:647 archaeological_warehouse/views.py:379 +#: archaeological_warehouse/forms.py:624 archaeological_warehouse/forms.py:637 +#: archaeological_warehouse/forms.py:651 archaeological_warehouse/views.py:380 msgid "Container search" msgstr "Rechercher un contenant" -#: archaeological_warehouse/forms.py:625 archaeological_warehouse/forms.py:638 -#: archaeological_warehouse/forms.py:652 +#: archaeological_warehouse/forms.py:629 archaeological_warehouse/forms.py:642 +#: archaeological_warehouse/forms.py:656 msgid "You should select a container." msgstr "Vous devez sélectionner un contenant." -#: archaeological_warehouse/forms.py:627 +#: archaeological_warehouse/forms.py:631 msgid "Add a new container" msgstr "Ajouter un nouveau contenant" -#: archaeological_warehouse/forms.py:672 +#: archaeological_warehouse/forms.py:676 msgid "Container to merge" msgstr "Contenant à fusionner" -#: archaeological_warehouse/forms.py:700 +#: archaeological_warehouse/forms.py:704 msgid "Packager" msgstr "Personne assurant le conditionnement" -#: archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:714 msgid "Packaged finds" msgstr "Mobilier conditionné" -#: archaeological_warehouse/forms.py:714 archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:718 archaeological_warehouse/forms.py:719 msgid "Would you like to delete this container?" msgstr "Voulez-vous supprimer ce contenant ?" -#: archaeological_warehouse/forms.py:720 +#: archaeological_warehouse/forms.py:724 msgid "Container - Quick action - Modify" msgstr "Contenant - Action rapide - Modification" -#: archaeological_warehouse/forms.py:833 +#: archaeological_warehouse/forms.py:840 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -8147,7 +8196,8 @@ msgstr "" "parent : {} {} et référence : {}. Fusionner ces contenants d'abord ?" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1214 +#: archaeological_warehouse/models.py:1221 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:11 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8194,7 +8244,7 @@ msgid "Warehouses" msgstr "Lieux de conservation" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1625 +#: archaeological_warehouse/models.py:1637 msgid "No value" msgstr "Pas de valeur" @@ -8250,7 +8300,7 @@ msgid "Container types" msgstr "Types de contenant" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1140 +#: archaeological_warehouse/models.py:1147 msgid "Deprecated - do not use" msgstr "Obsolète - ne pas utiliser" @@ -8259,7 +8309,7 @@ msgid "Container parent" msgstr "Contenant parent" #: archaeological_warehouse/models.py:899 -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1137 msgid "Location (warehouse)" msgstr "Lieu de conservation" @@ -8335,47 +8385,54 @@ msgctxt "key for text search" msgid "is-stationary" msgstr "est-immobile" -#: archaeological_warehouse/models.py:1136 +#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:16 +#: archaeological_warehouse/views.py:517 +msgctxt "action" +msgid "Move" +msgstr "Déplacement" + +#: archaeological_warehouse/models.py:1143 msgid "Responsible warehouse" msgstr "Lieu de conservation responsable" -#: archaeological_warehouse/models.py:1149 +#: archaeological_warehouse/models.py:1156 msgid "Warehouse that owns the container" msgstr "Lieu de conservation auquel le contenant appartient" -#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1165 msgid "Container ref." msgstr "Réf. du contenant" -#: archaeological_warehouse/models.py:1162 +#: archaeological_warehouse/models.py:1169 msgid "Cached location" msgstr "Localisation - en cache" -#: archaeological_warehouse/models.py:1165 +#: archaeological_warehouse/models.py:1172 msgid "Cached division" msgstr "Division mise en cache" -#: archaeological_warehouse/models.py:1178 +#: archaeological_warehouse/models.py:1185 msgid "Calculated weight (g)" msgstr "Poids calculé (g)" -#: archaeological_warehouse/models.py:1181 +#: archaeological_warehouse/models.py:1188 msgid "Cached weight (g)" msgstr "Poids mis en cache (g)" -#: archaeological_warehouse/models.py:1184 +#: archaeological_warehouse/models.py:1191 msgid "Entered weight if available otherwise calculated weight." msgstr "Poids saisi si disponible sinon poids calculé." -#: archaeological_warehouse/models.py:1386 +#: archaeological_warehouse/models.py:1398 msgid "Document with {}: {} does not exists" msgstr "Le document avec {} : {} n'existe pas" -#: archaeological_warehouse/models.py:1390 +#: archaeological_warehouse/models.py:1402 msgid "Multiple document with {}: {}" msgstr "Plusieurs documents avec {} : {}" -#: archaeological_warehouse/models.py:1810 +#: archaeological_warehouse/models.py:1822 msgid "" "Associated operation - use it with caution, only return the first found " "operation" @@ -8383,7 +8440,7 @@ msgstr "" "Opération associée - à utiliser avec précaution seule la première opération " "trouvée est retournée" -#: archaeological_warehouse/models.py:1817 +#: archaeological_warehouse/models.py:1829 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" @@ -8391,35 +8448,35 @@ msgstr "" "Unité d'Enregistrement associée - à utiliser avec précaution seule la " "première unité d'enregistrement trouvée est retournée" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1833 msgid "Material types inside the container - string" msgstr "Types de matériaux dans le contenant - chaîne de caractères" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1834 msgid "Material types code - string" msgstr "Code des types de matériau - chaîne de caractères" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1835 msgid "List of associated finds" msgstr "Liste du mobilier associé" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1836 msgid "List of documents contained in this container" msgstr "Liste des documents contenus dans ce contenant" -#: archaeological_warehouse/models.py:1825 +#: archaeological_warehouse/models.py:1837 msgid "List of documents whose reference container is this container" msgstr "Liste des documents dont le contenant de référence est ce contenant" -#: archaeological_warehouse/models.py:2067 +#: archaeological_warehouse/models.py:2095 msgid "Division" msgstr "Niveau" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2102 msgid "Container localisation" msgstr "Localisation de contenant" -#: archaeological_warehouse/models.py:2075 +#: archaeological_warehouse/models.py:2103 msgid "Container localisations" msgstr "Localisations de contenant" @@ -8565,43 +8622,43 @@ msgstr "" "Division par défaut pour ce lieu de conservation. Ces divisions sont " "uniquement utilisées pour faciliter les imports." -#: archaeological_warehouse/views.py:90 example_project/__init__.py:11 +#: archaeological_warehouse/views.py:91 example_project/__init__.py:11 msgid "New warehouse" msgstr "Nouveau lieu de conservation" -#: archaeological_warehouse/views.py:93 +#: archaeological_warehouse/views.py:94 msgid "New container" msgstr "Nouveau contenant" -#: archaeological_warehouse/views.py:322 +#: archaeological_warehouse/views.py:323 msgid "Warehouse creation" msgstr "Ajouter un lieu de conservation" -#: archaeological_warehouse/views.py:333 +#: archaeological_warehouse/views.py:334 msgid "Warehouse modification" msgstr "Modifier un lieu de conservation" -#: archaeological_warehouse/views.py:355 +#: archaeological_warehouse/views.py:356 msgid "Warehouse deletion" msgstr "Supprimer un lieu de conservation" -#: archaeological_warehouse/views.py:390 +#: archaeological_warehouse/views.py:391 msgid "Container creation" msgstr "Ajouter un contenant" -#: archaeological_warehouse/views.py:400 +#: archaeological_warehouse/views.py:401 msgid "Container modification" msgstr "Modifier un contenant" -#: archaeological_warehouse/views.py:427 +#: archaeological_warehouse/views.py:428 msgid "Container deletion" msgstr "Supprimer un contenant" -#: archaeological_warehouse/views.py:468 +#: archaeological_warehouse/views.py:469 msgid "Merge containers" msgstr "Fusionner les contenants" -#: archaeological_warehouse/views.py:478 +#: archaeological_warehouse/views.py:479 msgid "Select the main container" msgstr "Sélectionner le contenant principal" @@ -9002,8 +9059,8 @@ msgstr "Lancer l'export" msgid "Import already imported/scheduled." msgstr "Import déjà réalisé/planifié." -#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1648 -#: ishtar_common/models_imports.py:2331 +#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1650 +#: ishtar_common/models_imports.py:2333 msgid "Launch import" msgstr "Lancer l'import" @@ -9105,7 +9162,7 @@ msgstr "API - Accès distant - Modèle de recherche" #: ishtar_common/admin.py:2763 ishtar_common/models.py:746 #: ishtar_common/models_common.py:846 ishtar_common/models_imports.py:977 -#: ishtar_common/models_imports.py:2907 ishtar_common/models_rest.py:111 +#: ishtar_common/models_imports.py:2913 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -9207,65 +9264,65 @@ msgstr "" msgid "changelog" msgstr "journal des modifications" -#: ishtar_common/data_importer.py:282 +#: ishtar_common/data_importer.py:283 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" "\"%(value)s\" est trop long. La longueur maximum est de %(length)d " "caractères." -#: ishtar_common/data_importer.py:301 +#: ishtar_common/data_importer.py:302 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "\"%(value)s\" diffère de oui ou non" -#: ishtar_common/data_importer.py:313 +#: ishtar_common/data_importer.py:314 #, python-format msgid "\"%(value)s\" is not a float" msgstr "\"%(value)s\" n'est pas un nombre à virgule" -#: ishtar_common/data_importer.py:323 +#: ishtar_common/data_importer.py:324 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "\"{value}\" n'est pas un code INSEE approprié" -#: ishtar_common/data_importer.py:380 ishtar_common/data_importer.py:394 -#: ishtar_common/data_importer.py:618 +#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 +#: ishtar_common/data_importer.py:619 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "\"%(value)s\" n'est pas une date valide" -#: ishtar_common/data_importer.py:407 +#: ishtar_common/data_importer.py:408 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "\"%(value)s\" n'est pas un entier" -#: ishtar_common/data_importer.py:476 +#: ishtar_common/data_importer.py:477 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n" -#: ishtar_common/data_importer.py:483 +#: ishtar_common/data_importer.py:484 #, python-format msgid "%d. None of the above - create new" msgstr "%d. Aucun de ceux-là - créer un nouveau" -#: ishtar_common/data_importer.py:485 +#: ishtar_common/data_importer.py:486 #, python-format msgid "%d. None of the above - skip" msgstr "%d. Aucun de ceux-là - passer" -#: ishtar_common/data_importer.py:641 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "\"%(full_link)s\" n'est pas un chemin valide" -#: ishtar_common/data_importer.py:669 +#: ishtar_common/data_importer.py:670 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "\"%(value)s\" n'est pas un chemin valide pour cette archive" -#: ishtar_common/data_importer.py:780 +#: ishtar_common/data_importer.py:781 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " @@ -9275,29 +9332,29 @@ msgstr "" "utilisez un fichier CSV : vérifiez que le séparateur de colonnes et " "l'encodage sont similaires à ceux du fichier de référence." -#: ishtar_common/data_importer.py:786 +#: ishtar_common/data_importer.py:787 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 +#: ishtar_common/data_importer.py:789 ishtar_common/views.py:1892 msgid "No data provided" msgstr "Aucune donnée fournie" -#: ishtar_common/data_importer.py:789 +#: ishtar_common/data_importer.py:790 msgid "Value is required" msgstr "Valeur requise" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:791 #, python-format msgid "At least %d columns must be filled" msgstr "Au moins %d colonnes doivent être remplies" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:792 msgid "The regexp doesn't match." msgstr "L'expression régulière ne fonctionne pas." -#: ishtar_common/data_importer.py:793 +#: ishtar_common/data_importer.py:794 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." @@ -9305,7 +9362,7 @@ msgstr "" "La création forcée est possible pour le modèle {} mais ce modèle ne fait pas " "partie de la liste des créations de modèle autorisées." -#: ishtar_common/data_importer.py:797 +#: ishtar_common/data_importer.py:798 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." @@ -9313,85 +9370,85 @@ msgstr "" "L'élément {} avec les valeurs {} n'existe pas dans la base de données. Créez-" "le d'abord ou corrigez votre fichier source." -#: ishtar_common/data_importer.py:801 +#: ishtar_common/data_importer.py:802 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" "Objet lié non trouvé. Création de l'élément géographique impossible. " "Contexte {}." -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/data_importer.py:1470 ishtar_common/views.py:1970 #: ishtar_common/views.py:1980 msgid "Not imported" msgstr "Non importé" -#: ishtar_common/data_importer.py:1734 +#: ishtar_common/data_importer.py:1765 msgid "Importer configuration error: \"{}\"." msgstr "Erreur de configuration de l'importeur : \"{}\"." -#: ishtar_common/data_importer.py:1739 +#: ishtar_common/data_importer.py:1770 msgid "Import error: {} - \"{}\"." msgstr "Erreur d'import : {} - \"{}\"." -#: ishtar_common/data_importer.py:1823 +#: ishtar_common/data_importer.py:1854 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" "Erreur de configuration de l'importeur : le champ \"{}\" n'existe pas pour " "{}." -#: ishtar_common/data_importer.py:1954 +#: ishtar_common/data_importer.py:1985 msgid "* created *" msgstr "* créé *" -#: ishtar_common/data_importer.py:2024 +#: ishtar_common/data_importer.py:2055 msgid "* match not find *" msgstr "* correspondance non trouvée *" -#: ishtar_common/data_importer.py:2032 +#: ishtar_common/data_importer.py:2063 msgid "* the query match more than 10 results*" msgstr "* la requête correspond à plus de 10 résultats *" -#: ishtar_common/data_importer.py:2037 +#: ishtar_common/data_importer.py:2068 msgid " or " msgstr " ou " -#: ishtar_common/data_importer.py:2125 +#: ishtar_common/data_importer.py:2156 msgid "unicity key(s) \"{}\" is/are missing" msgstr "clé(s) d'unicité \"{}\" manquante(s)" -#: ishtar_common/data_importer.py:2128 +#: ishtar_common/data_importer.py:2159 msgid "Import error {}, {}" msgstr "Erreur d'import {}, {}" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2242 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "Erreur d'import {}, chemin \"{}\", contexte : {}, erreur : {}" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "line" msgstr "ligne" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "col" msgstr "colonne" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "error" msgstr "erreur" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "field" msgstr "champ" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "source" msgstr "source" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "result" msgstr "résultat" -#: ishtar_common/data_importer.py:2264 +#: ishtar_common/data_importer.py:2295 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -9405,7 +9462,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "Fichier trop gros. La taille ne doit pas excéder {} Mo." #: ishtar_common/forms.py:114 ishtar_common/forms_common.py:1618 -#: ishtar_common/views.py:3062 +#: ishtar_common/views.py:3080 msgid "Confirm" msgstr "Confirmer" @@ -9582,7 +9639,7 @@ msgstr "" "Vous devez soit déposer un fichier soit renseigner un lien pour les médias " "mais pas les deux." -#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3023 +#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3050 msgid "\"Associated images\" field must be a valid zip file." msgstr "Le champ « images associées » doit être un fichier zip valide." @@ -10374,9 +10431,9 @@ msgstr "Ajout/modification" #: ishtar_common/models_imports.py:794 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:843 ishtar_common/models_imports.py:897 #: ishtar_common/models_imports.py:957 ishtar_common/models_imports.py:1000 -#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1574 -#: ishtar_common/models_imports.py:2003 ishtar_common/models_imports.py:2900 -#: ishtar_common/models_imports.py:2928 +#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1576 +#: ishtar_common/models_imports.py:2005 ishtar_common/models_imports.py:2906 +#: ishtar_common/models_imports.py:2934 msgid "Imports" msgstr "Imports" @@ -10847,15 +10904,16 @@ msgstr "Module sous-marin / subaquatique" #: ishtar_common/models.py:1186 msgid "Context record for no context button" -msgstr "Unité d'Enregistrement pour le bouton d'ajout de mobilier sans contexte" +msgstr "" +"Unité d'Enregistrement pour le bouton d'ajout de mobilier sans contexte" #: ishtar_common/models.py:1187 msgid "" -"If provided a button is displayed on find add page to create a \"No " -"context\" find" +"If provided a button is displayed on find add page to create a \"No context" +"\" find" msgstr "" -"Si renseigné un bouton est affiché sur la page d'ajout de mobilier afin " -"de créer un « mobilier sans contexte »" +"Si renseigné un bouton est affiché sur la page d'ajout de mobilier afin de " +"créer un « mobilier sans contexte »" #: ishtar_common/models.py:1193 msgid "Parcel are mandatory for context records" @@ -11660,7 +11718,7 @@ msgstr "Notice biographique" msgid "Biographical notes" msgstr "Notices biographiques" -#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2352 +#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2354 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "Modifier" @@ -12864,7 +12922,7 @@ msgstr "" "suivantes, elle n'est pas reportée dans le fichier d'erreur. Chaque message " "est séparé par un retour à la ligne." -#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1992 +#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1994 msgid "Debug" msgstr "Débogage" @@ -13256,48 +13314,48 @@ msgstr "" "Nombre de lignes d'entête dans votre fichier (peut être égal à zéro et doit " "être égal à zéro pour geopackage et Shapefile)." -#: ishtar_common/models_imports.py:1525 +#: ishtar_common/models_imports.py:1527 msgid "Import {} added to the queue" msgstr "Import {} ajouté à la file d'attente" -#: ishtar_common/models_imports.py:1559 +#: ishtar_common/models_imports.py:1561 msgid "Importer group type" msgstr "Type de groupe d'importeur" -#: ishtar_common/models_imports.py:1560 +#: ishtar_common/models_imports.py:1562 msgid "Current import" msgstr "Import en cours" -#: ishtar_common/models_imports.py:1566 +#: ishtar_common/models_imports.py:1568 msgid "Import - Group" msgstr "Import - Groupe" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1569 msgid "Import - Groups" msgstr "Import - Groupes" -#: ishtar_common/models_imports.py:1644 ishtar_common/models_imports.py:2327 +#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:2329 msgid "Analyse" msgstr "Analyser" -#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:1650 -#: ishtar_common/models_imports.py:2329 ishtar_common/models_imports.py:2339 +#: ishtar_common/models_imports.py:1648 ishtar_common/models_imports.py:1652 +#: ishtar_common/models_imports.py:2331 ishtar_common/models_imports.py:2341 msgid "Re-analyse" msgstr "Analyser de nouveau" -#: ishtar_common/models_imports.py:1651 ishtar_common/models_imports.py:2340 +#: ishtar_common/models_imports.py:1653 ishtar_common/models_imports.py:2342 msgid "Re-import" msgstr "Ré-importer" -#: ishtar_common/models_imports.py:1652 ishtar_common/models_imports.py:2347 +#: ishtar_common/models_imports.py:1654 ishtar_common/models_imports.py:2349 msgid "Archive" msgstr "Archiver" -#: ishtar_common/models_imports.py:1655 ishtar_common/models_imports.py:2350 +#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2352 msgid "Unarchive" msgstr "Désarchiver" -#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2354 +#: ishtar_common/models_imports.py:1659 ishtar_common/models_imports.py:2356 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -13306,82 +13364,82 @@ msgstr "Désarchiver" msgid "Delete" msgstr "Supprimer" -#: ishtar_common/models_imports.py:1918 +#: ishtar_common/models_imports.py:1920 msgid "Importer type" msgstr "Type d'importeur" -#: ishtar_common/models_imports.py:1926 +#: ishtar_common/models_imports.py:1928 msgid "If a group is selected, target key saved in this group will be used." msgstr "" "Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce " "groupe sont utilisées." -#: ishtar_common/models_imports.py:1930 +#: ishtar_common/models_imports.py:1932 msgid "Imported values" msgstr "Valeurs importées" -#: ishtar_common/models_imports.py:1938 +#: ishtar_common/models_imports.py:1940 msgid "Error file" msgstr "Fichier erreur" -#: ishtar_common/models_imports.py:1946 +#: ishtar_common/models_imports.py:1948 msgid "Result file" msgstr "Fichier résultant" -#: ishtar_common/models_imports.py:1954 +#: ishtar_common/models_imports.py:1956 msgid "Match file" msgstr "Fichier de correspondance" -#: ishtar_common/models_imports.py:1965 +#: ishtar_common/models_imports.py:1967 msgid "Conservative import" msgstr "Import conservateur" -#: ishtar_common/models_imports.py:1967 +#: ishtar_common/models_imports.py:1969 msgid "If set to true, do not overload existing values." msgstr "Si coché, ne surchargera pas les valeurs existantes." -#: ishtar_common/models_imports.py:1970 +#: ishtar_common/models_imports.py:1972 msgid "Remaining seconds" msgstr "Secondes restantes" -#: ishtar_common/models_imports.py:1972 +#: ishtar_common/models_imports.py:1974 msgid "Current line" msgstr "Ligne actuelle" -#: ishtar_common/models_imports.py:1973 +#: ishtar_common/models_imports.py:1975 msgid "Number of line" msgstr "Nombre de lignes" -#: ishtar_common/models_imports.py:1975 +#: ishtar_common/models_imports.py:1977 msgid "Imported line numbers" msgstr "Numéros des lignes importées" -#: ishtar_common/models_imports.py:1980 +#: ishtar_common/models_imports.py:1982 msgid "Changed have been checked" msgstr "Les changements ont été vérifiés" -#: ishtar_common/models_imports.py:1982 +#: ishtar_common/models_imports.py:1984 msgid "Changed line numbers" msgstr "Numéro des lignes modifiées" -#: ishtar_common/models_imports.py:1988 +#: ishtar_common/models_imports.py:1990 #: ishtar_common/templates/ishtar/import_table.html:60 msgid "Group" msgstr "Groupe" -#: ishtar_common/models_imports.py:1991 +#: ishtar_common/models_imports.py:1993 msgid "Next import" msgstr "Import suivant" -#: ishtar_common/models_imports.py:1995 +#: ishtar_common/models_imports.py:1997 msgid "Import - Import" msgstr "Import - Import" -#: ishtar_common/models_imports.py:1996 +#: ishtar_common/models_imports.py:1998 msgid "Import - Imports" msgstr "Import - Imports" -#: ishtar_common/models_imports.py:2205 +#: ishtar_common/models_imports.py:2207 msgid "" "Error while opening the file. Particularly check the number of columns of " "your file." @@ -13389,85 +13447,85 @@ msgstr "" "Erreur en ouvrant le fichier. Vérifiez notamment le nombre de colonnes de " "votre fichier." -#: ishtar_common/models_imports.py:2256 ishtar_common/models_imports.py:2404 +#: ishtar_common/models_imports.py:2258 ishtar_common/models_imports.py:2406 msgid "Error in the CSV file." msgstr "Erreur dans le fichier CSV." -#: ishtar_common/models_imports.py:2334 +#: ishtar_common/models_imports.py:2336 msgid "Step by step import" msgstr "Import pas à pas" -#: ishtar_common/models_imports.py:2335 ishtar_common/models_imports.py:2344 +#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 msgid "Re-check for changes" msgstr "Re-vérifier les changements" -#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 +#: ishtar_common/models_imports.py:2339 ishtar_common/models_imports.py:2348 msgid "Check for changes" msgstr "Vérifier les changements" -#: ishtar_common/models_imports.py:2343 +#: ishtar_common/models_imports.py:2345 msgid "Step by step re-import" msgstr "Ré-import pas à pas" -#: ishtar_common/models_imports.py:2448 ishtar_common/models_imports.py:2451 -#: ishtar_common/models_imports.py:2515 +#: ishtar_common/models_imports.py:2450 ishtar_common/models_imports.py:2453 +#: ishtar_common/models_imports.py:2517 msgid "Invalid GIS file." msgstr "Fichier SIG invalide." -#: ishtar_common/models_imports.py:2461 +#: ishtar_common/models_imports.py:2463 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "Géométrie \"{geometry}\" non gérée." -#: ishtar_common/models_imports.py:2483 +#: ishtar_common/models_imports.py:2485 msgid "CRS not managed." msgstr "CRS non géré." -#: ishtar_common/models_imports.py:2512 +#: ishtar_common/models_imports.py:2514 msgid "Error reading feature {idx + 1} - {e}" msgstr "Erreur en lisant l'entité geographique {idx + 1} - {e}" -#: ishtar_common/models_imports.py:2553 +#: ishtar_common/models_imports.py:2555 msgid "Modification check {} added to the queue" msgstr "Vérification des changements {} ajoutée à la file d'attente" -#: ishtar_common/models_imports.py:2639 +#: ishtar_common/models_imports.py:2643 msgid "Error on imported file: {}" msgstr "Erreur sur le fichier d'import : {}" -#: ishtar_common/models_imports.py:2678 +#: ishtar_common/models_imports.py:2682 msgid "Import {} finished with errors" msgstr "Import {} fini avec des erreurs" -#: ishtar_common/models_imports.py:2686 +#: ishtar_common/models_imports.py:2690 msgid "Import {} finished with no errors" msgstr "Import {} fini avec aucune erreur" -#: ishtar_common/models_imports.py:2858 +#: ishtar_common/models_imports.py:2864 msgid "Ignored" msgstr "Ignoré" -#: ishtar_common/models_imports.py:2861 ishtar_common/models_imports.py:2862 +#: ishtar_common/models_imports.py:2867 ishtar_common/models_imports.py:2868 msgid "Import - Ignored error" msgstr "Import - Erreur ignorée" -#: ishtar_common/models_imports.py:2897 +#: ishtar_common/models_imports.py:2903 msgid "Import - Pre-import value" msgstr "Importeur - Valeur de pré-import" -#: ishtar_common/models_imports.py:2898 +#: ishtar_common/models_imports.py:2904 msgid "Import - Pre-import values" msgstr "Importeur - Valeurs de pré-import" -#: ishtar_common/models_imports.py:2915 +#: ishtar_common/models_imports.py:2921 msgid "Specific key to an import" msgstr "Clé spécifique à un import" -#: ishtar_common/models_imports.py:2926 +#: ishtar_common/models_imports.py:2932 msgid "Import - Item key" msgstr "Import - Clé de rapprochement" -#: ishtar_common/models_imports.py:2927 +#: ishtar_common/models_imports.py:2933 msgid "Import - Item keys" msgstr "Import - Clés de rapprochement" @@ -15585,23 +15643,23 @@ msgstr "Non disponible" msgid "Action not available for these items." msgstr "Action non disponible pour ces éléments." -#: ishtar_common/views.py:3078 -msgid "lock/unlock" -msgstr "verrouiller/déverrouiller" +#: ishtar_common/views.py:3096 +msgid "Lock/unlock" +msgstr "Verrouiller/déverrouiller" -#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 +#: ishtar_common/views.py:3235 ishtar_common/views.py:3330 msgid "Geo item creation" msgstr "Élément géographique création" -#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 +#: ishtar_common/views.py:3367 ishtar_common/views.py:3421 msgid "Main geo item for" msgstr "Élément géo. principal pour" -#: ishtar_common/views.py:3362 +#: ishtar_common/views.py:3381 msgid "Geo item modification" msgstr "Élément géographique modification" -#: ishtar_common/views.py:3415 +#: ishtar_common/views.py:3434 msgid "Delete geographic item" msgstr "Supprimer des données géographiques" @@ -15686,6 +15744,12 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "Both" +#~ msgstr "Les deux" + +#~ msgid "Responsible for planning service address" +#~ msgstr "Responsable pour le service instructeur - adresse" + #~ msgctxt "key for text search" #~ msgid "length-lower" #~ msgstr "longueur-plus-petit" @@ -16266,9 +16330,6 @@ msgstr "Surcharges de traductions" #~ msgid "Date get from" #~ msgstr "Date obtenue depuis" -#~ msgid "Date after" -#~ msgstr "Date après" - #~ msgid "Main address - complement" #~ msgstr "Adresse des terrains - complément" @@ -16640,9 +16701,6 @@ msgstr "Surcharges de traductions" #~ msgid "no-associated-finds" #~ msgstr "sans-mobilier-associe" -#~ msgid "Reference content" -#~ msgstr "Contenu de référence" - #~ msgid "Attached containers" #~ msgstr "Contenants associés" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index c6b4fa518..d3ec745c9 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: 2024-07-15 16:31+0200\n" +"POT-Creation-Date: 2024-09-10 12:47+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" @@ -25,7 +25,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2716 +#: archaeological_finds/models_finds.py:2733 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:381 @@ -83,13 +83,13 @@ msgstr "" #: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 #: archaeological_finds/forms.py:1692 archaeological_finds/forms.py:2406 #: archaeological_finds/forms_treatments.py:52 -#: archaeological_finds/forms_treatments.py:559 -#: archaeological_finds/forms_treatments.py:634 -#: archaeological_finds/forms_treatments.py:817 +#: archaeological_finds/forms_treatments.py:557 +#: archaeological_finds/forms_treatments.py:632 +#: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:1225 #: archaeological_operations/forms.py:1438 -#: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 +#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" @@ -100,7 +100,7 @@ msgstr "" #: archaeological_context_records/forms.py:560 #: archaeological_context_records/forms.py:614 #: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/models.py:1393 msgid "ID" msgstr "" @@ -184,7 +184,7 @@ msgstr "" #: archaeological_context_records/models.py:510 #: archaeological_context_records/models.py:511 #: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1395 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 #: archaeological_finds/models_finds.py:1154 @@ -258,7 +258,7 @@ msgstr "" #: archaeological_operations/forms.py:1047 #: archaeological_operations/models.py:3152 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 -#: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 +#: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 #: ishtar_common/models_common.py:3417 ishtar_common/models_common.py:4202 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 @@ -277,13 +277,13 @@ msgstr "" #: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 #: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1394 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:300 #: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1396 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 #: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 @@ -292,7 +292,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:192 #: archaeological_finds/models_finds.py:556 #: archaeological_finds/models_finds.py:1985 -#: archaeological_finds/models_treatments.py:264 +#: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -316,7 +316,7 @@ msgstr "" #: archaeological_context_records/forms.py:304 #: archaeological_context_records/models.py:755 #: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1851 -#: archaeological_finds/models_finds.py:2122 +#: archaeological_finds/models_finds.py:2130 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 @@ -370,10 +370,10 @@ msgstr "" #: archaeological_files/models.py:629 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 -#: archaeological_finds/forms_treatments.py:662 -#: archaeological_finds/forms_treatments.py:755 -#: archaeological_finds/models_treatments.py:267 -#: archaeological_finds/models_treatments.py:1141 +#: archaeological_finds/forms_treatments.py:660 +#: archaeological_finds/forms_treatments.py:753 +#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:1230 #: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1044 ishtar_common/forms.py:1045 @@ -390,9 +390,9 @@ msgstr "" #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:768 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:228 -#: archaeological_finds/models_treatments.py:762 -#: archaeological_warehouse/forms.py:742 +#: archaeological_finds/models_treatments.py:237 +#: archaeological_finds/models_treatments.py:851 +#: archaeological_warehouse/forms.py:769 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" @@ -447,16 +447,15 @@ msgstr "" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:775 archaeological_files/models.py:76 #: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1550 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:753 -#: archaeological_finds/models_finds.py:3569 -#: archaeological_finds/models_treatments.py:266 -#: archaeological_finds/models_treatments.py:760 -#: archaeological_finds/templates/ishtar/sheet_find.html:392 -#: archaeological_finds/templates/ishtar/sheet_find.html:430 -#: archaeological_finds/templates/ishtar/sheet_find.html:468 +#: archaeological_finds/forms_treatments.py:751 +#: archaeological_finds/models_finds.py:3692 +#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:849 +#: archaeological_finds/templates/ishtar/sheet_find.html:438 +#: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 @@ -494,12 +493,11 @@ msgstr "" #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:664 archaeological_files/forms.py:780 #: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3570 -#: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:393 -#: archaeological_finds/templates/ishtar/sheet_find.html:431 -#: archaeological_finds/templates/ishtar/sheet_find.html:469 -#: archaeological_finds/templates/ishtar/sheet_find.html:507 +#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3693 +#: archaeological_finds/models_treatments.py:850 +#: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: archaeological_finds/templates/ishtar/sheet_find.html:477 +#: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 @@ -579,15 +577,15 @@ msgstr "" #: archaeological_context_records/forms.py:469 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:268 -#: archaeological_context_records/models.py:1521 +#: archaeological_context_records/models.py:1524 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 #: archaeological_finds/forms.py:1773 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2708 +#: archaeological_finds/models_finds.py:2725 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1720 -#: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2528 +#: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5588 ishtar_common/views.py:504 msgid "Context record" msgstr "" @@ -684,9 +682,9 @@ msgid "Context record - Quick action - Modify" msgstr "" #: archaeological_context_records/forms.py:700 -#: archaeological_context_records/models.py:1282 -#: archaeological_context_records/models.py:1321 -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1285 +#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1392 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" @@ -838,10 +836,11 @@ msgstr "" #: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2293 -#: archaeological_finds/models_finds.py:3531 -#: archaeological_finds/models_finds.py:3557 -#: archaeological_finds/models_treatments.py:742 +#: archaeological_finds/models_finds.py:2302 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_finds.py:3639 +#: archaeological_finds/models_finds.py:3680 +#: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -864,14 +863,14 @@ msgstr "" #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 #: archaeological_finds/models_finds.py:1976 -#: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:754 +#: archaeological_finds/models_treatments.py:67 +#: archaeological_finds/models_treatments.py:843 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 #: archaeological_operations/models.py:3496 -#: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 +#: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:704 #: ishtar_common/models.py:760 ishtar_common/models.py:811 #: ishtar_common/models.py:1867 ishtar_common/models.py:3952 @@ -929,7 +928,7 @@ msgstr "" #: archaeological_context_records/models.py:499 #: archaeological_context_records/models.py:500 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1397 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 @@ -1119,7 +1118,7 @@ msgstr "" #: archaeological_operations/models.py:467 #: archaeological_operations/models.py:1290 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "" @@ -1134,12 +1133,12 @@ msgid "Bulk update" msgstr "" #: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1062 +#: archaeological_context_records/models.py:1065 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 #: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/models_finds.py:2610 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:2627 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 #: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 #: archaeological_operations/models.py:672 @@ -1150,18 +1149,18 @@ msgstr "" #: archaeological_operations/views.py:926 #: archaeological_operations/views.py:943 ishtar_common/admin.py:1693 #: ishtar_common/admin.py:1836 ishtar_common/models.py:4543 -#: ishtar_common/models.py:4922 ishtar_common/views.py:3135 -#: ishtar_common/views.py:3153 +#: ishtar_common/models.py:4922 ishtar_common/views.py:3154 +#: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:719 #: archaeological_files/models.py:567 archaeological_finds/models_finds.py:551 #: archaeological_finds/models_finds.py:1970 -#: archaeological_finds/models_treatments.py:261 +#: archaeological_finds/models_treatments.py:270 #: archaeological_operations/models.py:3160 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4569 +#: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4569 msgid "External ID" msgstr "" @@ -1170,7 +1169,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1972 #: archaeological_operations/models.py:3163 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1189 +#: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "" @@ -1209,9 +1208,9 @@ msgstr "" #: archaeological_context_records/models.py:844 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2247 -#: archaeological_finds/models_treatments.py:281 -#: archaeological_finds/models_treatments.py:1159 +#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2255 +#: archaeological_finds/models_treatments.py:290 +#: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 @@ -1221,7 +1220,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1194 +#: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1247,20 +1246,20 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:851 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2253 -#: archaeological_finds/models_treatments.py:287 -#: archaeological_finds/models_treatments.py:1166 +#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2261 +#: archaeological_finds/models_treatments.py:296 +#: archaeological_finds/models_treatments.py:1255 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:1479 #: archaeological_operations/models.py:2914 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2426 +#: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2426 #: ishtar_common/models_common.py:3410 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:856 -#: archaeological_finds/models_finds.py:2265 +#: archaeological_finds/models_finds.py:2274 #: archaeological_operations/models.py:559 #: archaeological_operations/models.py:1570 msgid "Cached periods label" @@ -1268,9 +1267,9 @@ msgstr "" #: archaeological_context_records/models.py:859 #: archaeological_context_records/models.py:865 -#: archaeological_finds/models_finds.py:2268 -#: archaeological_finds/models_finds.py:2274 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2283 +#: archaeological_finds/models_finds.py:2289 #: archaeological_operations/models.py:556 #: archaeological_operations/models.py:562 #: archaeological_operations/models.py:568 @@ -1299,76 +1298,76 @@ msgid "Context record" msgstr "" #: archaeological_context_records/models.py:926 -#: archaeological_finds/models_finds.py:2482 +#: archaeological_finds/models_finds.py:2499 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1050 +#: archaeological_context_records/models.py:1053 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1052 +#: archaeological_context_records/models.py:1055 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1236 +#: archaeological_context_records/models.py:1239 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1283 +#: archaeological_context_records/models.py:1286 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1319 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1320 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1321 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1322 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1323 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1322 +#: archaeological_context_records/models.py:1325 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1326 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1327 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1328 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1329 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1335 +#: archaeological_context_records/models.py:1338 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1339 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1527 +#: archaeological_context_records/models.py:1530 msgid "Context record parent" msgstr "" @@ -1443,9 +1442,9 @@ msgstr "" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2294 -#: archaeological_finds/models_finds.py:2305 -#: archaeological_finds/models_finds.py:3578 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2314 +#: archaeological_finds/models_finds.py:3701 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 @@ -1469,7 +1468,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:72 -#: archaeological_finds/templates/ishtar/sheet_find.html:546 +#: archaeological_finds/templates/ishtar/sheet_find.html:554 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1497,6 +1496,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:81 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: cd17_app/templates/ishtar/sheet_find.html:83 #: man_app/templates/ishtar/sheet_museum_find.html:83 @@ -1529,8 +1529,8 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:270 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 +#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 #: na_app/templates/ishtar/sheet_operation.html:212 @@ -1554,7 +1554,7 @@ msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 -#: archaeological_files/templates/ishtar/sheet_file.html:240 +#: archaeological_files/templates/ishtar/sheet_file.html:239 #: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 #: archaeological_finds/forms.py:977 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 @@ -1562,7 +1562,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 -#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:83 +#: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: archaeological_operations/templates/ishtar/sheet_site.html:108 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 @@ -1599,11 +1599,11 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:232 #: archaeological_finds/forms_treatments.py:144 -#: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:221 -#: archaeological_finds/templates/ishtar/sheet_find.html:388 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/models_treatments.py:141 +#: archaeological_finds/models_treatments.py:230 +#: archaeological_finds/templates/ishtar/sheet_find.html:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -1613,8 +1613,8 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3644 #: ishtar_common/models.py:5480 ishtar_common/models.py:5617 #: ishtar_common/models.py:5696 ishtar_common/models_common.py:2028 -#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 -#: ishtar_common/models_imports.py:1962 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1564 +#: ishtar_common/models_imports.py:1964 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 #: man_app/templates/ishtar/sheet_museum_find.html:502 @@ -1742,18 +1742,18 @@ msgstr "" #: archaeological_files/forms.py:234 archaeological_files/forms.py:656 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 #: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:213 +#: archaeological_files/templates/ishtar/sheet_file.html:212 #: archaeological_finds/forms.py:1707 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 -#: archaeological_finds/forms_treatments.py:426 -#: archaeological_finds/forms_treatments.py:563 -#: archaeological_finds/forms_treatments.py:639 -#: archaeological_finds/forms_treatments.py:710 -#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:407 +#: archaeological_finds/forms_treatments.py:561 +#: archaeological_finds/forms_treatments.py:637 +#: archaeological_finds/forms_treatments.py:708 +#: archaeological_finds/forms_treatments.py:819 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:206 -#: archaeological_finds/models_treatments.py:1103 +#: archaeological_finds/models_treatments.py:215 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:726 #: archaeological_operations/forms.py:1442 @@ -1822,7 +1822,7 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:464 #: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_files/templates/ishtar/sheet_file.html:130 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" @@ -1832,9 +1832,9 @@ msgstr "" #: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 #: archaeological_finds/forms.py:2457 #: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/forms_treatments.py:747 -#: archaeological_finds/models_treatments.py:263 -#: archaeological_finds/models_treatments.py:1155 +#: archaeological_finds/forms_treatments.py:745 +#: archaeological_finds/models_treatments.py:272 +#: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:542 #: archaeological_operations/forms.py:740 #: archaeological_operations/forms.py:1238 @@ -1844,9 +1844,9 @@ msgstr "" #: archaeological_operations/models.py:513 #: archaeological_operations/models.py:1468 #: archaeological_operations/models.py:2903 -#: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 -#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2162 +#: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 +#: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 +#: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 #: ishtar_common/forms_common.py:2485 ishtar_common/forms_common.py:3042 #: ishtar_common/models.py:2962 ishtar_common/models.py:3836 #: ishtar_common/models.py:4685 ishtar_common/models_common.py:185 @@ -1859,8 +1859,8 @@ msgstr "" #: archaeological_files/forms.py:108 archaeological_files/forms.py:375 #: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms_treatments.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "" @@ -1880,8 +1880,8 @@ msgid "Created by" msgstr "" #: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 -#: archaeological_finds/forms_treatments.py:580 -#: archaeological_finds/forms_treatments.py:842 +#: archaeological_finds/forms_treatments.py:578 +#: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "" @@ -1896,7 +1896,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:642 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1143 +#: archaeological_finds/models_treatments.py:1232 #: archaeological_operations/models.py:1344 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4670 ishtar_common/models_imports.py:1436 @@ -1906,9 +1906,9 @@ msgstr "" #: archaeological_files/forms.py:219 archaeological_files/forms.py:541 #: archaeological_files/models.py:644 -#: archaeological_finds/forms_treatments.py:750 -#: archaeological_finds/models_treatments.py:1145 -#: archaeological_finds/templates/ishtar/sheet_find.html:506 +#: archaeological_finds/forms_treatments.py:748 +#: archaeological_finds/models_treatments.py:1234 +#: archaeological_finds/templates/ishtar/sheet_find.html:514 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -1990,7 +1990,7 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:300 archaeological_files/forms.py:341 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:769 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3670 msgid "Postal code" msgstr "" @@ -2006,7 +2006,7 @@ msgstr "" #: archaeological_files/forms.py:323 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 -#: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 +#: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 #: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:3851 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 @@ -2060,7 +2060,7 @@ msgid "Responsible for planning service" msgstr "" #: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:144 +#: archaeological_files/templates/ishtar/sheet_file.html:143 msgid "Research archaeology" msgstr "" @@ -2082,7 +2082,7 @@ msgid "Lead organization" msgstr "" #: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:170 +#: archaeological_files/templates/ishtar/sheet_file.html:169 msgid "Research archaeology comment" msgstr "" @@ -2170,25 +2170,25 @@ msgid "Linear meter (m)" msgstr "" #: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: 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 msgid "Man by day" msgstr "" #: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/templates/ishtar/sheet_file.html:293 +#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:345 msgid "Days" msgstr "" #: archaeological_files/forms.py:882 archaeological_files/models.py:116 #: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:335 msgid "Job" msgstr "" @@ -2207,7 +2207,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "" #: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:280 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Ground jobs" msgstr "" @@ -2216,13 +2216,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "" #: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:394 -#: archaeological_files/templates/ishtar/sheet_file.html:397 +#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/templates/ishtar/sheet_file.html:396 msgid "Quantity" msgstr "" #: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:387 msgid "Equipment / service" msgstr "" @@ -2230,21 +2230,21 @@ msgstr "" #: archaeological_files/forms.py:1278 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 -#: archaeological_finds/forms_treatments.py:564 -#: archaeological_finds/forms_treatments.py:623 -#: archaeological_finds/forms_treatments.py:640 -#: archaeological_finds/forms_treatments.py:780 -#: archaeological_finds/forms_treatments.py:822 -#: archaeological_finds/forms_treatments.py:886 -#: archaeological_finds/models_treatments.py:207 -#: archaeological_finds/models_treatments.py:1104 +#: archaeological_finds/forms_treatments.py:562 +#: archaeological_finds/forms_treatments.py:621 +#: archaeological_finds/forms_treatments.py:638 +#: archaeological_finds/forms_treatments.py:778 +#: archaeological_finds/forms_treatments.py:820 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 #: archaeological_operations/forms.py:1443 #: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2828 -#: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 +#: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:590 #: ishtar_common/models.py:4568 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2256,10 +2256,10 @@ msgstr "" #: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 #: archaeological_files/forms.py:1267 -#: archaeological_finds/forms_treatments.py:565 -#: archaeological_finds/forms_treatments.py:612 -#: archaeological_finds/forms_treatments.py:823 -#: archaeological_finds/forms_treatments.py:875 +#: archaeological_finds/forms_treatments.py:563 +#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:821 +#: archaeological_finds/forms_treatments.py:873 #: archaeological_operations/forms.py:1449 #: archaeological_operations/forms.py:1498 #: archaeological_operations/models.py:2564 @@ -2273,16 +2273,16 @@ msgid "Object (full text search)" msgstr "" #: archaeological_files/forms.py:1151 -#: archaeological_finds/forms_treatments.py:566 -#: archaeological_finds/forms_treatments.py:824 +#: archaeological_finds/forms_treatments.py:564 +#: archaeological_finds/forms_treatments.py:822 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1634 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1158 -#: archaeological_finds/forms_treatments.py:567 -#: archaeological_finds/forms_treatments.py:825 +#: archaeological_finds/forms_treatments.py:565 +#: archaeological_finds/forms_treatments.py:823 #: archaeological_operations/forms.py:1456 #: archaeological_operations/forms.py:1505 #: archaeological_operations/models.py:2887 @@ -2291,8 +2291,8 @@ msgid "Object" msgstr "" #: archaeological_files/forms.py:1160 -#: archaeological_finds/forms_treatments.py:570 -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:568 +#: archaeological_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:1459 #: archaeological_operations/forms.py:1507 #: archaeological_operations/models.py:2885 @@ -2344,7 +2344,7 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3560 +#: archaeological_finds/models_finds.py:3683 #: archaeological_operations/ishtar_menu.py:70 #: archaeological_operations/models.py:1715 #: archaeological_operations/models.py:2923 @@ -2447,7 +2447,7 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:207 +#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3279 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" @@ -2491,7 +2491,7 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:758 +#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1238 ishtar_common/models.py:2414 #: ishtar_common/models_common.py:748 msgid "Parent" @@ -2601,8 +2601,8 @@ msgid "Total developed surface (km2)" msgstr "" #: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1327 -#: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1067 +#: archaeological_finds/models_treatments.py:167 +#: archaeological_finds/models_treatments.py:1156 #: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1141 #: archaeological_operations/models.py:2686 #: archaeological_operations/tests.py:3091 @@ -2612,7 +2612,7 @@ msgid "year" msgstr "" #: archaeological_files/models.py:488 -#: archaeological_finds/models_treatments.py:1064 +#: archaeological_finds/models_treatments.py:1153 #: archaeological_operations/models.py:370 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4316 msgctxt "key for text search" @@ -2620,7 +2620,7 @@ msgid "reference" msgstr "" #: archaeological_files/models.py:491 -#: archaeological_finds/models_treatments.py:155 +#: archaeological_finds/models_treatments.py:164 #: archaeological_operations/models.py:376 msgctxt "key for text search" msgid "other-reference" @@ -2632,7 +2632,7 @@ msgid "department" msgstr "" #: archaeological_files/models.py:507 -#: archaeological_finds/models_treatments.py:1061 +#: archaeological_finds/models_treatments.py:1150 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1169 #: archaeological_operations/tests.py:3227 @@ -2643,8 +2643,8 @@ msgid "name" msgstr "" #: archaeological_files/models.py:510 -#: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1070 +#: archaeological_finds/models_treatments.py:170 +#: archaeological_finds/models_treatments.py:1159 #: archaeological_operations/models.py:1175 #: archaeological_operations/models.py:2697 #: archaeological_operations/tests.py:3240 @@ -2686,7 +2686,7 @@ msgid "comment" msgstr "" #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1632 -#: archaeological_finds/models_treatments.py:1073 +#: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" @@ -2703,17 +2703,17 @@ msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:564 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" #: archaeological_files/models.py:572 -#: archaeological_finds/forms_treatments.py:637 -#: archaeological_finds/forms_treatments.py:708 -#: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/forms_treatments.py:635 +#: archaeological_finds/forms_treatments.py:706 +#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:528 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1131 @@ -2723,7 +2723,7 @@ msgstr "" #: archaeological_operations/models.py:502 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 -#: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 +#: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/models.py:397 #: cd17_app/templates/ishtar/sheet_find.html:507 #: ishtar_common/forms_common.py:755 ishtar_common/forms_common.py:823 @@ -2764,10 +2764,10 @@ msgid "Name" msgstr "" #: archaeological_files/models.py:577 -#: archaeological_finds/models_treatments.py:1120 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 +#: archaeological_finds/models_treatments.py:1209 +#: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 -#: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 #: man_app/templates/ishtar/sheet_museum_find.html:541 #: na_app/templates/ishtar/sheet_find.html:511 @@ -2806,9 +2806,9 @@ msgstr "" #: archaeological_files/models.py:692 #: archaeological_finds/forms_treatments.py:169 -#: archaeological_finds/forms_treatments.py:437 -#: archaeological_finds/models_treatments.py:254 -#: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 +#: archaeological_finds/forms_treatments.py:418 +#: archaeological_finds/models_treatments.py:263 +#: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:747 ishtar_common/forms_common.py:1021 #: ishtar_common/forms_common.py:1083 ishtar_common/forms_common.py:1245 #: ishtar_common/forms_common.py:1434 ishtar_common/ishtar_menu.py:102 @@ -2870,15 +2870,15 @@ msgid "plan" msgstr "" #: archaeological_files/models.py:1305 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1227 +#: archaeological_finds/models_treatments.py:420 +#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:2008 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1307 -#: archaeological_finds/models_treatments.py:413 -#: archaeological_finds/models_treatments.py:1229 +#: archaeological_finds/models_treatments.py:422 +#: archaeological_finds/models_treatments.py:1318 #: archaeological_operations/models.py:2010 msgid "admin. act" msgstr "" @@ -2967,9 +2967,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:388 msgid "Planned" msgstr "" @@ -3010,18 +3010,14 @@ msgstr "" msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:123 -msgid "Responsible for planning service address" -msgstr "" - -#: archaeological_files/templates/ishtar/sheet_file.html:177 +#: archaeological_files/templates/ishtar/sheet_file.html:176 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:180 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 @@ -3036,32 +3032,31 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_operations/models.py:2660 #: archaeological_operations/models.py:2959 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 +#: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 #: ishtar_common/models.py:4570 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:189 -#: archaeological_files/templates/ishtar/sheet_file.html:215 -#: archaeological_finds/forms_treatments.py:641 -#: archaeological_finds/forms_treatments.py:719 -#: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:387 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_finds/forms_treatments.py:639 +#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/models_treatments.py:140 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:413 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:451 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:489 @@ -3113,66 +3108,66 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:192 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:539 #: archaeological_operations/forms.py:782 #: archaeological_operations/models.py:1348 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:206 +#: archaeological_files/templates/ishtar/sheet_file.html:205 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:210 +#: archaeological_files/templates/ishtar/sheet_file.html:209 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:706 ishtar_common/admin.py:768 +#: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:768 #: ishtar_common/models.py:727 ishtar_common/models.py:3410 #: ishtar_common/models_imports.py:1122 msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:226 +#: archaeological_files/templates/ishtar/sheet_file.html:225 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:231 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:262 +#: archaeological_files/templates/ishtar/sheet_file.html:261 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:276 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:286 -#: archaeological_files/templates/ishtar/sheet_file.html:338 -#: archaeological_files/templates/ishtar/sheet_file.html:390 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:389 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:295 -#: archaeological_files/templates/ishtar/sheet_file.html:344 -#: archaeological_files/templates/ishtar/sheet_file.html:347 -#: archaeological_files/templates/ishtar/sheet_file.html:396 -#: archaeological_files/templates/ishtar/sheet_file.html:399 +#: archaeological_files/templates/ishtar/sheet_file.html:291 +#: archaeological_files/templates/ishtar/sheet_file.html:294 +#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:346 +#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:398 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:310 -#: archaeological_files/templates/ishtar/sheet_file.html:362 -#: archaeological_files/templates/ishtar/sheet_file.html:418 +#: archaeological_files/templates/ishtar/sheet_file.html:309 +#: archaeological_files/templates/ishtar/sheet_file.html:361 +#: archaeological_files/templates/ishtar/sheet_file.html:417 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3183,13 +3178,13 @@ msgstr "" msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:321 -#: archaeological_files/templates/ishtar/sheet_file.html:373 -#: archaeological_files/templates/ishtar/sheet_file.html:425 +#: archaeological_files/templates/ishtar/sheet_file.html:320 +#: archaeological_files/templates/ishtar/sheet_file.html:372 +#: archaeological_files/templates/ishtar/sheet_file.html:424 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:332 +#: archaeological_files/templates/ishtar/sheet_file.html:331 msgid "Post-excavation jobs" msgstr "" @@ -3323,7 +3318,7 @@ msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2124 +#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2132 msgid "Previous ID" msgstr "" @@ -3338,17 +3333,17 @@ msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/models_finds.py:2182 msgid "Presence of inventory marking" msgstr "" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/models_finds.py:2186 msgid "Type of marking" msgstr "" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:2129 msgid "Marking details" msgstr "" @@ -3363,56 +3358,56 @@ msgid "Museum" msgstr "" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2145 +#: archaeological_finds/models_finds.py:2153 msgid "Owner institution" msgstr "" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2150 +#: archaeological_finds/models_finds.py:2158 msgid "Assigned institution" msgstr "" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2155 +#: archaeological_finds/models_finds.py:2163 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2165 msgid "Depositor inventory number" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/models_finds.py:2168 msgid "Collections entry mode" msgstr "" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/models_finds.py:2170 msgid "Comment on museum entry mode" msgstr "" #: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2163 +#: archaeological_finds/models_finds.py:2171 msgid "Museum entry date (exact or start)" msgstr "" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2172 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2165 +#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2173 msgid "Comment on museum entry date" msgstr "" #: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/models_finds.py:2177 msgid "Donor, testator or vendor" msgstr "" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2138 -#: archaeological_finds/models_finds.py:2185 +#: archaeological_finds/models_finds.py:2146 +#: archaeological_finds/models_finds.py:2193 msgid "Collection" msgstr "" @@ -3421,41 +3416,41 @@ msgid "Former collections" msgstr "" #: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2201 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2197 +#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2205 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2207 msgid "Comment on conformity" msgstr "" #: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2211 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2205 +#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2213 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2206 +#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2214 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2200 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2208 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2252 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2061 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:2069 msgid "Is complete?" msgstr "" @@ -3487,22 +3482,22 @@ msgstr "" #: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2071 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2067 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2075 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2083 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:1833 archaeological_finds/models_finds.py:2089 msgid "Technical areas" msgstr "" @@ -3520,13 +3515,13 @@ msgstr "" #: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 #: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2215 msgid "Inventory quantity" msgstr "" #: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 #: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1844 -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2216 msgid "Observed quantity" msgstr "" @@ -3554,13 +3549,13 @@ msgstr "" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2099 +#: archaeological_finds/models_finds.py:2107 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 #: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1856 -#: archaeological_finds/models_finds.py:2123 +#: archaeological_finds/models_finds.py:2131 msgid "Comment on dating" msgstr "" @@ -3577,32 +3572,32 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2103 +#: archaeological_finds/forms.py:1858 archaeological_finds/models_finds.py:2111 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2104 +#: archaeological_finds/forms.py:1859 archaeological_finds/models_finds.py:2112 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2105 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2113 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2108 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2116 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2106 +#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2114 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2115 msgid "Circumference (cm)" msgstr "" @@ -3641,20 +3636,20 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2127 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1883 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2128 +#: archaeological_finds/models_finds.py:2136 msgid "Check" msgstr "" #: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1884 -#: archaeological_finds/models_finds.py:2133 +#: archaeological_finds/models_finds.py:2141 msgid "Check date" msgstr "" @@ -3772,21 +3767,21 @@ msgstr "" #: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 #: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2226 -#: archaeological_warehouse/forms.py:593 +#: archaeological_finds/models_finds.py:2234 +#: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 #: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2230 -#: archaeological_warehouse/forms.py:594 +#: archaeological_finds/models_finds.py:2238 +#: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 #: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2213 +#: archaeological_finds/models_finds.py:2221 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3795,33 +3790,33 @@ msgstr "" #: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 #: archaeological_finds/forms.py:1894 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2236 -#: archaeological_warehouse/forms.py:598 +#: archaeological_finds/models_finds.py:2244 +#: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 #: archaeological_finds/forms.py:1885 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2087 -#: archaeological_warehouse/forms.py:590 +#: archaeological_finds/models_finds.py:2095 +#: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 #: archaeological_finds/forms.py:1886 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2093 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/models_finds.py:2101 +#: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2242 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:2250 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 #: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2241 +#: archaeological_finds/models_finds.py:2249 msgid "Insurance value" msgstr "" @@ -3892,18 +3887,18 @@ msgstr "" #: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1892 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/models_finds.py:2229 msgid "Recommended treatments" msgstr "" #: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1896 #: archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2134 +#: archaeological_finds/models_finds.py:2142 msgid "Estimated value" msgstr "" #: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1888 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2225 msgid "Conservatory comment" msgstr "" @@ -3923,7 +3918,7 @@ msgstr "" msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2283 +#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:2292 msgid "Complete museum ID" msgstr "" @@ -3979,19 +3974,19 @@ msgstr "" msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1748 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1756 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "" @@ -4011,7 +4006,7 @@ msgstr "" #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 -#: archaeological_warehouse/forms.py:579 +#: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 #: sra_idf_app/templates/ishtar/sheet_operation.html:563 msgid "Material type" @@ -4020,7 +4015,7 @@ msgstr "" #: archaeological_finds/forms.py:1819 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 +#: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 #: sra_idf_app/templates/ishtar/sheet_operation.html:573 msgid "Object type" @@ -4131,7 +4126,7 @@ msgid "Museum - Purchase price" msgstr "" #: archaeological_finds/forms.py:2032 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2059 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4169,7 +4164,7 @@ msgid "Find search" msgstr "" #: archaeological_finds/forms.py:2201 archaeological_finds/forms.py:2364 -#: archaeological_finds/models_treatments.py:401 +#: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" @@ -4202,11 +4197,10 @@ msgstr "" #: archaeological_finds/forms.py:2453 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:211 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:386 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:412 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:450 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:488 @@ -4247,24 +4241,24 @@ msgstr "" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:204 +#: archaeological_finds/models_treatments.py:213 msgid "Other ref." msgstr "" #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 -#: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:246 +#: archaeological_finds/models_treatments.py:144 +#: archaeological_finds/models_treatments.py:255 msgid "Scientific monitoring manager" msgstr "" #: archaeological_finds/forms_treatments.py:65 #: archaeological_finds/forms_treatments.py:142 -#: archaeological_finds/forms_treatments.py:423 -#: archaeological_finds/forms_treatments.py:577 +#: archaeological_finds/forms_treatments.py:404 +#: archaeological_finds/forms_treatments.py:575 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:217 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_finds/models_treatments.py:226 +#: archaeological_finds/models_treatments.py:848 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "" @@ -4280,8 +4274,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:294 -#: archaeological_finds/models_treatments.py:748 +#: archaeological_finds/models_treatments.py:303 +#: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2550 @@ -4294,10 +4288,10 @@ msgid "Treatment - 020 - General" msgstr "" #: archaeological_finds/forms_treatments.py:163 -#: archaeological_finds/forms_treatments.py:431 -#: archaeological_finds/forms_treatments.py:721 -#: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:238 +#: archaeological_finds/forms_treatments.py:412 +#: archaeological_finds/forms_treatments.py:719 +#: archaeological_finds/models_treatments.py:142 +#: archaeological_finds/models_treatments.py:247 msgid "Responsible" msgstr "" @@ -4306,7 +4300,7 @@ msgid "Destination container (relevant for treatment that change location)" msgstr "" #: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:274 msgid "Goal" msgstr "" @@ -4368,7 +4362,7 @@ msgid "Another treatment with this index exists for {}." msgstr "" #: archaeological_finds/forms_treatments.py:377 -#: archaeological_finds/models_treatments.py:214 +#: archaeological_finds/models_treatments.py:223 msgid "Associated request" msgstr "" @@ -4377,10 +4371,10 @@ msgid "Treatment - 010 - Request choice" msgstr "" #: archaeological_finds/forms_treatments.py:383 -#: archaeological_finds/forms_treatments.py:699 +#: archaeological_finds/forms_treatments.py:697 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1180 -#: archaeological_finds/models_treatments.py:1200 +#: archaeological_finds/models_treatments.py:1269 +#: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2549 #: archaeological_operations/models.py:2874 ishtar_common/views.py:510 @@ -4398,19 +4392,35 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:400 +msgid "Create a treatment" +msgstr "" + +#: archaeological_finds/forms_treatments.py:410 +msgid "Precise date" +msgstr "" + +#: archaeological_finds/forms_treatments.py:489 +msgid "At least a year is required." +msgstr "" + +#: archaeological_finds/forms_treatments.py:491 +msgid "Treatment type is required." +msgstr "" + +#: archaeological_finds/forms_treatments.py:498 #: archaeological_finds/models_finds.py:2047 -#: archaeological_finds/models_finds.py:3538 -#: archaeological_finds/models_treatments.py:271 -#: archaeological_finds/models_treatments.py:763 -#: archaeological_finds/templates/ishtar/sheet_find.html:391 -#: archaeological_finds/templates/ishtar/sheet_find.html:429 -#: archaeological_finds/templates/ishtar/sheet_find.html:467 +#: archaeological_finds/models_finds.py:3606 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:852 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:437 +#: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 -#: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1213 -#: archaeological_warehouse/models.py:2062 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/models.py:839 +#: archaeological_warehouse/models.py:1220 +#: archaeological_warehouse/models.py:2090 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4433,79 +4443,59 @@ msgstr "" msgid "Container" msgstr "" -#: archaeological_finds/forms_treatments.py:406 +#: archaeological_finds/forms_treatments.py:504 #: ishtar_common/forms_common.py:2757 msgid "Change " msgstr "" -#: archaeological_finds/forms_treatments.py:408 +#: archaeological_finds/forms_treatments.py:506 msgid "reference and current containers" msgstr "" -#: archaeological_finds/forms_treatments.py:409 +#: archaeological_finds/forms_treatments.py:507 #: ishtar_common/forms_common.py:2761 msgid "the reference container" msgstr "" -#: archaeological_finds/forms_treatments.py:410 +#: archaeological_finds/forms_treatments.py:508 #: ishtar_common/forms_common.py:2762 msgid "the current container" msgstr "" -#: archaeological_finds/forms_treatments.py:419 -msgid "Create a treatment" -msgstr "" - -#: archaeological_finds/forms_treatments.py:429 -msgid "Precise date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:499 -msgid "At least a year is required." -msgstr "" - -#: archaeological_finds/forms_treatments.py:501 -msgid "Treatment type is required." -msgstr "" - -#: archaeological_finds/forms_treatments.py:514 -msgid "Completed" -msgstr "" - -#: archaeological_finds/forms_treatments.py:572 +#: archaeological_finds/forms_treatments.py:570 msgid "Treatment name" msgstr "" -#: archaeological_finds/forms_treatments.py:573 +#: archaeological_finds/forms_treatments.py:571 msgid "Treatment year" msgstr "" -#: archaeological_finds/forms_treatments.py:574 +#: archaeological_finds/forms_treatments.py:572 msgid "Treatment index" msgstr "" -#: archaeological_finds/forms_treatments.py:576 +#: archaeological_finds/forms_treatments.py:574 msgid "Treatment internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:610 +#: archaeological_finds/forms_treatments.py:608 msgid "Treatment - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:630 +#: archaeological_finds/forms_treatments.py:628 msgid "Treatment file - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:638 -#: archaeological_finds/forms_treatments.py:715 ishtar_common/models.py:4571 +#: archaeological_finds/forms_treatments.py:636 +#: archaeological_finds/forms_treatments.py:713 ishtar_common/models.py:4571 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" -#: archaeological_finds/forms_treatments.py:650 -#: archaeological_finds/forms_treatments.py:727 -#: archaeological_finds/models_treatments.py:1128 -#: archaeological_finds/templates/ishtar/sheet_find.html:504 +#: archaeological_finds/forms_treatments.py:648 +#: archaeological_finds/forms_treatments.py:725 +#: archaeological_finds/models_treatments.py:1217 +#: archaeological_finds/templates/ishtar/sheet_find.html:512 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:530 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4516,10 +4506,10 @@ msgstr "" msgid "Applicant" msgstr "" -#: archaeological_finds/forms_treatments.py:656 -#: archaeological_finds/forms_treatments.py:733 -#: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:505 +#: archaeological_finds/forms_treatments.py:654 +#: archaeological_finds/forms_treatments.py:731 +#: archaeological_finds/models_treatments.py:1225 +#: archaeological_finds/templates/ishtar/sheet_find.html:513 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4530,72 +4520,72 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:663 -#: archaeological_finds/forms_treatments.py:745 -#: archaeological_finds/models_treatments.py:1149 +#: archaeological_finds/forms_treatments.py:661 +#: archaeological_finds/forms_treatments.py:743 +#: archaeological_finds/models_treatments.py:1238 msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:664 -#: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/models_treatments.py:1152 +#: archaeological_finds/forms_treatments.py:662 +#: archaeological_finds/forms_treatments.py:744 +#: archaeological_finds/models_treatments.py:1241 msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:674 -#: archaeological_finds/forms_treatments.py:686 +#: archaeological_finds/forms_treatments.py:672 +#: archaeological_finds/forms_treatments.py:684 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:717 +#: archaeological_finds/forms_treatments.py:715 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/forms_treatments.py:737 msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1147 +#: archaeological_finds/forms_treatments.py:741 +#: archaeological_finds/models_treatments.py:1236 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:803 +#: archaeological_finds/forms_treatments.py:801 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:809 +#: archaeological_finds/forms_treatments.py:807 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:810 +#: archaeological_finds/forms_treatments.py:808 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:829 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:833 +#: archaeological_finds/forms_treatments.py:831 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:835 +#: archaeological_finds/forms_treatments.py:833 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/forms_treatments.py:835 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:839 -#: archaeological_finds/models_treatments.py:1005 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:837 +#: archaeological_finds/models_treatments.py:1094 +#: archaeological_finds/models_treatments.py:1203 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:873 +#: archaeological_finds/forms_treatments.py:871 msgid "Treatment request - Administrative act - General" msgstr "" @@ -4617,8 +4607,8 @@ msgstr "" #: archaeological_finds/models_finds.py:91 #: archaeological_operations/models.py:2554 -#: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4051 +#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4051 msgid "Code" msgstr "" @@ -4702,17 +4692,17 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:381 +#: archaeological_finds/models_treatments.py:390 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2259 -#: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:295 -#: archaeological_finds/models_treatments.py:307 -#: archaeological_finds/models_treatments.py:1008 -#: archaeological_finds/models_treatments.py:1193 +#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/models_treatments.py:76 +#: archaeological_finds/models_treatments.py:304 +#: archaeological_finds/models_treatments.py:316 +#: archaeological_finds/models_treatments.py:1097 +#: archaeological_finds/models_treatments.py:1282 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -4878,7 +4868,7 @@ msgid "Material index" msgstr "" #: archaeological_finds/models_finds.py:586 -#: ishtar_common/models_imports.py:2857 +#: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4890,7 +4880,7 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2287 ishtar_common/models.py:4696 +#: archaeological_finds/models_finds.py:2296 ishtar_common/models.py:4696 #: ishtar_common/models.py:4703 msgid "Cached value - do not edit" msgstr "" @@ -4931,7 +4921,7 @@ msgstr "" #: ishtar_common/templates/ishtar/organization_form.html:37 #: ishtar_common/templates/ishtar/organization_person_form.html:32 #: ishtar_common/templates/ishtar/person_form.html:43 -#: ishtar_common/views.py:3114 +#: ishtar_common/views.py:3133 msgid "Modify" msgstr "" @@ -4940,7 +4930,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1928 +#: archaeological_warehouse/models.py:1940 msgid "Add treatment" msgstr "" @@ -5549,13 +5539,13 @@ msgid "museum-observed-quantity" msgstr "" #: archaeological_finds/models_finds.py:1863 -#: archaeological_finds/models_finds.py:2645 +#: archaeological_finds/models_finds.py:2662 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 -#: archaeological_warehouse/views.py:303 ishtar_common/models.py:4550 +#: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 +#: archaeological_warehouse/views.py:304 ishtar_common/models.py:4550 #: ishtar_common/models.py:4933 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:3161 +#: ishtar_common/views.py:3180 msgid "Packaging" msgstr "" @@ -5572,7 +5562,7 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:2029 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5583,7 +5573,7 @@ msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2036 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -5593,83 +5583,138 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2110 +#: archaeological_finds/models_finds.py:2054 +msgid "Container - first full location" +msgstr "" + +#: archaeological_finds/models_finds.py:2055 +#: archaeological_finds/models_finds.py:2067 +msgid "Updated as long as no packaging is attached" +msgstr "" + +#: archaeological_finds/models_finds.py:2066 +msgid "Reference container - first full location" +msgstr "" + +#: archaeological_finds/models_finds.py:2118 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/models_finds.py:2121 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2116 +#: archaeological_finds/models_finds.py:2124 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2139 +#: archaeological_finds/models_finds.py:2147 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2190 +#: archaeological_finds/models_finds.py:2198 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/models_finds.py:2270 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/models_finds.py:2280 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2277 +#: archaeological_finds/models_finds.py:2286 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2317 +#: archaeological_finds/models_finds.py:2326 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2483 +#: archaeological_finds/models_finds.py:2500 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2484 +#: archaeological_finds/models_finds.py:2501 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2485 +#: archaeological_finds/models_finds.py:2502 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2486 +#: archaeological_finds/models_finds.py:2503 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2487 +#: archaeological_finds/models_finds.py:2504 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2618 +#: archaeological_finds/models_finds.py:2635 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2626 +#: archaeological_finds/models_finds.py:2643 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2634 +#: archaeological_finds/models_finds.py:2651 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3112 +#: archaeological_finds/models_finds.py:3129 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3118 +#: archaeological_finds/models_finds.py:3135 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3565 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Current" +msgstr "" + +#: archaeological_finds/models_finds.py:3626 +#: archaeological_finds/models_treatments.py:1198 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_operations/forms.py:1130 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1802 +#: archaeological_operations/models.py:500 +#: archaeological_warehouse/forms.py:343 +#: archaeological_warehouse/models.py:2097 ishtar_common/forms_common.py:2150 +#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 +#: ishtar_common/models.py:2409 +#: ishtar_common/templates/ishtar/sheet_document.html:40 +msgid "Reference" +msgstr "" + +#: archaeological_finds/models_finds.py:3627 +#: archaeological_finds/templates/ishtar/sheet_find.html:414 +msgid "Reference/current" +msgstr "" + +#: archaeological_finds/models_finds.py:3647 +msgid "Full location" +msgstr "" + +#: archaeological_finds/models_finds.py:3648 +msgid "Location type" +msgstr "" + +#: archaeological_finds/models_finds.py:3652 +msgid "Find - Treatment" +msgstr "" + +#: archaeological_finds/models_finds.py:3653 +msgid "Find - Treatments" +msgstr "" + +#: archaeological_finds/models_finds.py:3688 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2978 #: ishtar_common/models.py:3297 ishtar_common/models.py:3395 @@ -5679,89 +5724,93 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3573 +#: archaeological_finds/models_finds.py:3696 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3574 +#: archaeological_finds/models_finds.py:3697 msgid "Properties" msgstr "" -#: archaeological_finds/models_treatments.py:65 +#: archaeological_finds/models_treatments.py:66 msgid "Treatment is executed" msgstr "" -#: archaeological_finds/models_treatments.py:69 +#: archaeological_finds/models_treatments.py:70 msgid "Treatment state type" msgstr "" -#: archaeological_finds/models_treatments.py:70 +#: archaeological_finds/models_treatments.py:71 msgid "Treatment state types" msgstr "" -#: archaeological_finds/models_treatments.py:129 +#: archaeological_finds/models_treatments.py:90 +msgid "Completed" +msgstr "" + +#: archaeological_finds/models_treatments.py:138 msgid "Downstream find" msgstr "" -#: archaeological_finds/models_treatments.py:130 +#: archaeological_finds/models_treatments.py:139 msgid "Upstream find" msgstr "" -#: archaeological_finds/models_treatments.py:152 +#: archaeological_finds/models_treatments.py:161 msgctxt "key for text search" msgid "label" msgstr "" -#: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1068 +#: archaeological_finds/models_treatments.py:168 +#: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:2688 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "" -#: archaeological_finds/models_treatments.py:165 +#: archaeological_finds/models_treatments.py:174 msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:225 +#: archaeological_finds/models_treatments.py:234 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:233 +#: archaeological_finds/models_treatments.py:242 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:285 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:286 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:278 +#: archaeological_finds/models_treatments.py:287 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:279 +#: archaeological_finds/models_treatments.py:288 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:314 +#: archaeological_finds/models_treatments.py:323 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:391 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:764 -#: archaeological_finds/templates/ishtar/sheet_find.html:390 -#: archaeological_finds/templates/ishtar/sheet_find.html:428 -#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/models_treatments.py:853 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:436 +#: archaeological_finds/templates/ishtar/sheet_find.html:474 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -5783,61 +5832,47 @@ msgstr "" msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:765 -#: archaeological_finds/models_treatments.py:766 +#: archaeological_finds/models_treatments.py:854 +#: archaeological_finds/models_treatments.py:855 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:990 +#: archaeological_finds/models_treatments.py:1079 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1006 +#: archaeological_finds/models_treatments.py:1095 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1077 +#: archaeological_finds/models_treatments.py:1166 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1082 +#: archaeological_finds/models_treatments.py:1171 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1176 msgctxt "key for text search" msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1180 msgctxt "key for text search" msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1095 +#: archaeological_finds/models_treatments.py:1184 msgctxt "key for text search" msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1109 -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1345 -#: archaeological_operations/forms.py:1802 -#: archaeological_operations/models.py:500 -#: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2150 -#: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 -#: ishtar_common/models.py:2409 -#: ishtar_common/templates/ishtar/sheet_document.html:40 -msgid "Reference" -msgstr "" - -#: archaeological_finds/models_treatments.py:1181 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/models_treatments.py:1270 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:522 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -5847,7 +5882,7 @@ msgstr "" msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1249 +#: archaeological_finds/models_treatments.py:1338 msgid "Add associated treatment" msgstr "" @@ -5883,6 +5918,7 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:44 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:36 msgid "Associate a treatment" msgstr "" @@ -6011,9 +6047,9 @@ msgid "Simple treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:385 -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:411 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:449 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:487 @@ -6041,9 +6077,13 @@ msgstr "" msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:389 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +msgid "Label/type" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:435 +#: archaeological_finds/templates/ishtar/sheet_find.html:473 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -6065,7 +6105,16 @@ msgstr "" msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +msgid "Date start/end" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: archaeological_finds/templates/ishtar/sheet_find.html:419 +msgid "First packaging" +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6080,8 +6129,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:453 -#: archaeological_finds/templates/ishtar/sheet_find.html:492 +#: archaeological_finds/templates/ishtar/sheet_find.html:461 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:479 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:518 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6101,7 +6150,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:533 +#: archaeological_finds/templates/ishtar/sheet_find.html:541 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:559 #: archaeological_finds/templates/ishtar/sheet_treatment.html:139 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6209,7 +6258,7 @@ msgstr "" msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1678 msgid "The division {} {} do not exist for the location {}." msgstr "" @@ -7784,8 +7833,8 @@ msgid "" "the first step." msgstr "" -#: archaeological_warehouse/forms.py:85 archaeological_warehouse/forms.py:193 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:734 +#: archaeological_warehouse/forms.py:89 archaeological_warehouse/forms.py:197 +#: archaeological_warehouse/forms.py:517 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 #: archaeological_warehouse/models.py:935 @@ -7795,61 +7844,61 @@ msgstr "" msgid "Warehouse" msgstr "" -#: archaeological_warehouse/forms.py:98 +#: archaeological_warehouse/forms.py:102 msgid "Default divisions" msgstr "" -#: archaeological_warehouse/forms.py:105 +#: archaeological_warehouse/forms.py:109 msgid "Division type" msgstr "" -#: archaeological_warehouse/forms.py:121 +#: archaeological_warehouse/forms.py:125 msgid "There are identical divisions." msgstr "" -#: archaeological_warehouse/forms.py:123 +#: archaeological_warehouse/forms.py:127 msgid "Order fields must be different." msgstr "" -#: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 +#: archaeological_warehouse/forms.py:134 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" -#: archaeological_warehouse/forms.py:131 +#: archaeological_warehouse/forms.py:135 msgid "Warehouse - 020 - Divisions" msgstr "" -#: archaeological_warehouse/forms.py:137 +#: archaeological_warehouse/forms.py:141 msgid "Warehouse - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:261 +#: archaeological_warehouse/forms.py:149 archaeological_warehouse/forms.py:214 +#: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:261 #: archaeological_warehouse/models.py:400 ishtar_common/models_imports.py:1088 msgid "Warehouse type" msgstr "" -#: archaeological_warehouse/forms.py:156 archaeological_warehouse/forms.py:174 -#: archaeological_warehouse/views.py:309 +#: archaeological_warehouse/forms.py:160 archaeological_warehouse/forms.py:178 +#: archaeological_warehouse/views.py:310 msgid "Warehouse search" msgstr "" -#: archaeological_warehouse/forms.py:194 +#: archaeological_warehouse/forms.py:198 msgid "Warehouse - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:209 +#: archaeological_warehouse/forms.py:213 msgid "Auto filled if kept empty." msgstr "" -#: archaeological_warehouse/forms.py:230 +#: archaeological_warehouse/forms.py:234 msgid "Create a new organization from this warehouse" msgstr "" -#: archaeological_warehouse/forms.py:237 +#: archaeological_warehouse/forms.py:241 msgid "" "Only fill the following fields if no organization is provided or if the " "address of the warehouse is different from the one of the organization. If a " @@ -7857,23 +7906,23 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:767 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:767 #: ishtar_common/forms_common.py:1175 ishtar_common/models_common.py:3667 #: ishtar_common/models_common.py:3856 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:770 +#: archaeological_warehouse/forms.py:252 ishtar_common/forms_common.py:770 #: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3672 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:772 +#: archaeological_warehouse/forms.py:254 ishtar_common/forms_common.py:772 #: ishtar_common/forms_common.py:1180 ishtar_common/models_common.py:3678 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/forms.py:255 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1151 #: ishtar_common/models_common.py:3692 ishtar_common/models_common.py:3868 @@ -7882,7 +7931,7 @@ msgstr "" msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/forms.py:257 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:776 ishtar_common/forms_common.py:1161 #: ishtar_common/models_common.py:3708 @@ -7891,159 +7940,159 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:276 msgid "A new organization is not created if an organization is selected." msgstr "" -#: archaeological_warehouse/forms.py:307 archaeological_warehouse/forms.py:308 +#: archaeological_warehouse/forms.py:311 archaeological_warehouse/forms.py:312 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:316 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:334 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1186 +#: archaeological_warehouse/forms.py:346 archaeological_warehouse/forms.py:522 +#: archaeological_warehouse/models.py:1193 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 -#: archaeological_warehouse/forms.py:739 archaeological_warehouse/models.py:741 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 #: archaeological_warehouse/models.py:905 -#: archaeological_warehouse/models.py:1154 +#: archaeological_warehouse/models.py:1161 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:346 +#: archaeological_warehouse/forms.py:350 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1169 +#: archaeological_warehouse/forms.py:359 archaeological_warehouse/forms.py:530 +#: archaeological_warehouse/models.py:1176 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:750 -#: archaeological_warehouse/models.py:1145 +#: archaeological_warehouse/forms.py:369 archaeological_warehouse/forms.py:744 +#: archaeological_warehouse/models.py:1152 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:373 +#: archaeological_warehouse/forms.py:377 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1176 +#: archaeological_warehouse/forms.py:382 +#: archaeological_warehouse/models.py:1183 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:404 +#: archaeological_warehouse/forms.py:408 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:427 +#: archaeological_warehouse/forms.py:431 msgid "This reference/code already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:435 archaeological_warehouse/forms.py:812 +#: archaeological_warehouse/forms.py:439 archaeological_warehouse/forms.py:819 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:499 +#: archaeological_warehouse/forms.py:503 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:506 +#: archaeological_warehouse/forms.py:510 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:518 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/forms.py:525 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:524 +#: archaeological_warehouse/forms.py:528 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:563 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:561 +#: archaeological_warehouse/forms.py:565 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:566 +#: archaeological_warehouse/forms.py:570 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:575 +#: archaeological_warehouse/forms.py:579 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:576 +#: archaeological_warehouse/forms.py:580 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:577 +#: archaeological_warehouse/forms.py:581 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:592 ishtar_common/models_imports.py:1085 +#: archaeological_warehouse/forms.py:596 ishtar_common/models_imports.py:1085 msgid "Conservatory state" msgstr "" -#: archaeological_warehouse/forms.py:596 +#: archaeological_warehouse/forms.py:600 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:620 archaeological_warehouse/forms.py:633 -#: archaeological_warehouse/forms.py:647 archaeological_warehouse/views.py:379 +#: archaeological_warehouse/forms.py:624 archaeological_warehouse/forms.py:637 +#: archaeological_warehouse/forms.py:651 archaeological_warehouse/views.py:380 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:625 archaeological_warehouse/forms.py:638 -#: archaeological_warehouse/forms.py:652 +#: archaeological_warehouse/forms.py:629 archaeological_warehouse/forms.py:642 +#: archaeological_warehouse/forms.py:656 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:627 +#: archaeological_warehouse/forms.py:631 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:672 +#: archaeological_warehouse/forms.py:676 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:700 +#: archaeological_warehouse/forms.py:704 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:714 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:714 archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:718 archaeological_warehouse/forms.py:719 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:720 +#: archaeological_warehouse/forms.py:724 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:833 +#: archaeological_warehouse/forms.py:840 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -8051,7 +8100,8 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1214 +#: archaeological_warehouse/models.py:1221 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:11 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8097,7 +8147,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1625 +#: archaeological_warehouse/models.py:1637 msgid "No value" msgstr "" @@ -8148,7 +8198,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1140 +#: archaeological_warehouse/models.py:1147 msgid "Deprecated - do not use" msgstr "" @@ -8157,7 +8207,7 @@ msgid "Container parent" msgstr "" #: archaeological_warehouse/models.py:899 -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1137 msgid "Location (warehouse)" msgstr "" @@ -8233,87 +8283,94 @@ msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1136 +#: archaeological_warehouse/models.py:1112 +#: archaeological_warehouse/templates/ishtar/forms/qa_container_move.html:16 +#: archaeological_warehouse/views.py:517 +msgctxt "action" +msgid "Move" +msgstr "" + +#: archaeological_warehouse/models.py:1143 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1149 +#: archaeological_warehouse/models.py:1156 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1165 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1162 +#: archaeological_warehouse/models.py:1169 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1165 +#: archaeological_warehouse/models.py:1172 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1178 +#: archaeological_warehouse/models.py:1185 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1181 +#: archaeological_warehouse/models.py:1188 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1184 +#: archaeological_warehouse/models.py:1191 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1386 +#: archaeological_warehouse/models.py:1398 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1390 +#: archaeological_warehouse/models.py:1402 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1810 +#: archaeological_warehouse/models.py:1822 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1817 +#: archaeological_warehouse/models.py:1829 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1833 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1834 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1835 msgid "List of associated finds" msgstr "" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1836 msgid "List of documents contained in this container" msgstr "" -#: archaeological_warehouse/models.py:1825 +#: archaeological_warehouse/models.py:1837 msgid "List of documents whose reference container is this container" msgstr "" -#: archaeological_warehouse/models.py:2067 +#: archaeological_warehouse/models.py:2095 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2102 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:2075 +#: archaeological_warehouse/models.py:2103 msgid "Container localisations" msgstr "" @@ -8448,43 +8505,43 @@ msgid "" "facilitate imports." msgstr "" -#: archaeological_warehouse/views.py:90 example_project/__init__.py:11 +#: archaeological_warehouse/views.py:91 example_project/__init__.py:11 msgid "New warehouse" msgstr "" -#: archaeological_warehouse/views.py:93 +#: archaeological_warehouse/views.py:94 msgid "New container" msgstr "" -#: archaeological_warehouse/views.py:322 +#: archaeological_warehouse/views.py:323 msgid "Warehouse creation" msgstr "" -#: archaeological_warehouse/views.py:333 +#: archaeological_warehouse/views.py:334 msgid "Warehouse modification" msgstr "" -#: archaeological_warehouse/views.py:355 +#: archaeological_warehouse/views.py:356 msgid "Warehouse deletion" msgstr "" -#: archaeological_warehouse/views.py:390 +#: archaeological_warehouse/views.py:391 msgid "Container creation" msgstr "" -#: archaeological_warehouse/views.py:400 +#: archaeological_warehouse/views.py:401 msgid "Container modification" msgstr "" -#: archaeological_warehouse/views.py:427 +#: archaeological_warehouse/views.py:428 msgid "Container deletion" msgstr "" -#: archaeological_warehouse/views.py:468 +#: archaeological_warehouse/views.py:469 msgid "Merge containers" msgstr "" -#: archaeological_warehouse/views.py:478 +#: archaeological_warehouse/views.py:479 msgid "Select the main container" msgstr "" @@ -8876,8 +8933,8 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1648 -#: ishtar_common/models_imports.py:2331 +#: ishtar_common/admin.py:2375 ishtar_common/models_imports.py:1650 +#: ishtar_common/models_imports.py:2333 msgid "Launch import" msgstr "" @@ -8969,7 +9026,7 @@ msgstr "" #: ishtar_common/admin.py:2763 ishtar_common/models.py:746 #: ishtar_common/models_common.py:846 ishtar_common/models_imports.py:977 -#: ishtar_common/models_imports.py:2907 ishtar_common/models_rest.py:111 +#: ishtar_common/models_imports.py:2913 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -9063,178 +9120,178 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:282 +#: ishtar_common/data_importer.py:283 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:301 +#: ishtar_common/data_importer.py:302 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:313 +#: ishtar_common/data_importer.py:314 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:323 +#: ishtar_common/data_importer.py:324 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:380 ishtar_common/data_importer.py:394 -#: ishtar_common/data_importer.py:618 +#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 +#: ishtar_common/data_importer.py:619 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:407 +#: ishtar_common/data_importer.py:408 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:476 +#: ishtar_common/data_importer.py:477 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:483 +#: ishtar_common/data_importer.py:484 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:485 +#: ishtar_common/data_importer.py:486 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:641 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "" -#: ishtar_common/data_importer.py:669 +#: ishtar_common/data_importer.py:670 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:780 +#: ishtar_common/data_importer.py:781 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: ishtar_common/data_importer.py:786 +#: ishtar_common/data_importer.py:787 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:788 ishtar_common/views.py:1892 +#: ishtar_common/data_importer.py:789 ishtar_common/views.py:1892 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:789 +#: ishtar_common/data_importer.py:790 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:791 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:792 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:793 +#: ishtar_common/data_importer.py:794 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: ishtar_common/data_importer.py:797 +#: ishtar_common/data_importer.py:798 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:801 +#: ishtar_common/data_importer.py:802 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1439 ishtar_common/views.py:1970 +#: ishtar_common/data_importer.py:1470 ishtar_common/views.py:1970 #: ishtar_common/views.py:1980 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1734 +#: ishtar_common/data_importer.py:1765 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1739 +#: ishtar_common/data_importer.py:1770 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1823 +#: ishtar_common/data_importer.py:1854 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1954 +#: ishtar_common/data_importer.py:1985 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2024 +#: ishtar_common/data_importer.py:2055 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2032 +#: ishtar_common/data_importer.py:2063 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2037 +#: ishtar_common/data_importer.py:2068 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2125 +#: ishtar_common/data_importer.py:2156 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2128 +#: ishtar_common/data_importer.py:2159 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2242 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2241 +#: ishtar_common/data_importer.py:2272 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2248 +#: ishtar_common/data_importer.py:2279 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2264 +#: ishtar_common/data_importer.py:2295 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -9248,7 +9305,7 @@ msgid "File too large. Size should not exceed {} Mo." msgstr "" #: ishtar_common/forms.py:114 ishtar_common/forms_common.py:1618 -#: ishtar_common/views.py:3062 +#: ishtar_common/views.py:3080 msgid "Confirm" msgstr "" @@ -9413,7 +9470,7 @@ msgstr "" msgid "You put either a file or a download link for media but not both." msgstr "" -#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3023 +#: ishtar_common/forms_common.py:389 ishtar_common/tests.py:3050 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -10189,9 +10246,9 @@ msgstr "" #: ishtar_common/models_imports.py:794 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:843 ishtar_common/models_imports.py:897 #: ishtar_common/models_imports.py:957 ishtar_common/models_imports.py:1000 -#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1574 -#: ishtar_common/models_imports.py:2003 ishtar_common/models_imports.py:2900 -#: ishtar_common/models_imports.py:2928 +#: ishtar_common/models_imports.py:1194 ishtar_common/models_imports.py:1576 +#: ishtar_common/models_imports.py:2005 ishtar_common/models_imports.py:2906 +#: ishtar_common/models_imports.py:2934 msgid "Imports" msgstr "" @@ -10645,8 +10702,8 @@ msgstr "" #: ishtar_common/models.py:1187 msgid "" -"If provided a button is displayed on find search pages to create a \"No " -"context\" find" +"If provided a button is displayed on find add page to create a \"No context" +"\" find" msgstr "" #: ishtar_common/models.py:1193 @@ -11385,7 +11442,7 @@ msgstr "" msgid "Biographical notes" msgstr "" -#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2352 +#: ishtar_common/models.py:3361 ishtar_common/models_imports.py:2354 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "" @@ -12556,7 +12613,7 @@ msgid "" "break." msgstr "" -#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1992 +#: ishtar_common/models_imports.py:215 ishtar_common/models_imports.py:1994 msgid "Debug" msgstr "" @@ -12928,48 +12985,48 @@ msgid "" "or Shapefile)." msgstr "" -#: ishtar_common/models_imports.py:1525 +#: ishtar_common/models_imports.py:1527 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1559 +#: ishtar_common/models_imports.py:1561 msgid "Importer group type" msgstr "" -#: ishtar_common/models_imports.py:1560 +#: ishtar_common/models_imports.py:1562 msgid "Current import" msgstr "" -#: ishtar_common/models_imports.py:1566 +#: ishtar_common/models_imports.py:1568 msgid "Import - Group" msgstr "" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1569 msgid "Import - Groups" msgstr "" -#: ishtar_common/models_imports.py:1644 ishtar_common/models_imports.py:2327 +#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:2329 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1646 ishtar_common/models_imports.py:1650 -#: ishtar_common/models_imports.py:2329 ishtar_common/models_imports.py:2339 +#: ishtar_common/models_imports.py:1648 ishtar_common/models_imports.py:1652 +#: ishtar_common/models_imports.py:2331 ishtar_common/models_imports.py:2341 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1651 ishtar_common/models_imports.py:2340 +#: ishtar_common/models_imports.py:1653 ishtar_common/models_imports.py:2342 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1652 ishtar_common/models_imports.py:2347 +#: ishtar_common/models_imports.py:1654 ishtar_common/models_imports.py:2349 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1655 ishtar_common/models_imports.py:2350 +#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2352 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1657 ishtar_common/models_imports.py:2354 +#: ishtar_common/models_imports.py:1659 ishtar_common/models_imports.py:2356 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 #: ishtar_common/templates/ishtar/blocks/window_nav.html:76 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -12978,164 +13035,164 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1918 +#: ishtar_common/models_imports.py:1920 msgid "Importer type" msgstr "" -#: ishtar_common/models_imports.py:1926 +#: ishtar_common/models_imports.py:1928 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:1930 +#: ishtar_common/models_imports.py:1932 msgid "Imported values" msgstr "" -#: ishtar_common/models_imports.py:1938 +#: ishtar_common/models_imports.py:1940 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1946 +#: ishtar_common/models_imports.py:1948 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1954 +#: ishtar_common/models_imports.py:1956 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1965 +#: ishtar_common/models_imports.py:1967 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1967 +#: ishtar_common/models_imports.py:1969 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1970 +#: ishtar_common/models_imports.py:1972 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1972 +#: ishtar_common/models_imports.py:1974 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1973 +#: ishtar_common/models_imports.py:1975 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1975 +#: ishtar_common/models_imports.py:1977 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1980 +#: ishtar_common/models_imports.py:1982 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1982 +#: ishtar_common/models_imports.py:1984 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1988 +#: ishtar_common/models_imports.py:1990 #: ishtar_common/templates/ishtar/import_table.html:60 msgid "Group" msgstr "" -#: ishtar_common/models_imports.py:1991 +#: ishtar_common/models_imports.py:1993 msgid "Next import" msgstr "" -#: ishtar_common/models_imports.py:1995 +#: ishtar_common/models_imports.py:1997 msgid "Import - Import" msgstr "" -#: ishtar_common/models_imports.py:1996 +#: ishtar_common/models_imports.py:1998 msgid "Import - Imports" msgstr "" -#: ishtar_common/models_imports.py:2205 +#: ishtar_common/models_imports.py:2207 msgid "" "Error while opening the file. Particularly check the number of columns of " "your file." msgstr "" -#: ishtar_common/models_imports.py:2256 ishtar_common/models_imports.py:2404 +#: ishtar_common/models_imports.py:2258 ishtar_common/models_imports.py:2406 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:2334 +#: ishtar_common/models_imports.py:2336 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:2335 ishtar_common/models_imports.py:2344 +#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:2337 ishtar_common/models_imports.py:2346 +#: ishtar_common/models_imports.py:2339 ishtar_common/models_imports.py:2348 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:2343 +#: ishtar_common/models_imports.py:2345 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:2448 ishtar_common/models_imports.py:2451 -#: ishtar_common/models_imports.py:2515 +#: ishtar_common/models_imports.py:2450 ishtar_common/models_imports.py:2453 +#: ishtar_common/models_imports.py:2517 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:2461 +#: ishtar_common/models_imports.py:2463 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:2483 +#: ishtar_common/models_imports.py:2485 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:2512 +#: ishtar_common/models_imports.py:2514 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:2553 +#: ishtar_common/models_imports.py:2555 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:2639 +#: ishtar_common/models_imports.py:2643 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:2678 +#: ishtar_common/models_imports.py:2682 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:2686 +#: ishtar_common/models_imports.py:2690 msgid "Import {} finished with no errors" msgstr "" -#: ishtar_common/models_imports.py:2858 +#: ishtar_common/models_imports.py:2864 msgid "Ignored" msgstr "" -#: ishtar_common/models_imports.py:2861 ishtar_common/models_imports.py:2862 +#: ishtar_common/models_imports.py:2867 ishtar_common/models_imports.py:2868 msgid "Import - Ignored error" msgstr "" -#: ishtar_common/models_imports.py:2897 +#: ishtar_common/models_imports.py:2903 msgid "Import - Pre-import value" msgstr "" -#: ishtar_common/models_imports.py:2898 +#: ishtar_common/models_imports.py:2904 msgid "Import - Pre-import values" msgstr "" -#: ishtar_common/models_imports.py:2915 +#: ishtar_common/models_imports.py:2921 msgid "Specific key to an import" msgstr "" -#: ishtar_common/models_imports.py:2926 +#: ishtar_common/models_imports.py:2932 msgid "Import - Item key" msgstr "" -#: ishtar_common/models_imports.py:2927 +#: ishtar_common/models_imports.py:2933 msgid "Import - Item keys" msgstr "" @@ -15147,23 +15204,23 @@ msgstr "" msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:3078 -msgid "lock/unlock" +#: ishtar_common/views.py:3096 +msgid "Lock/unlock" msgstr "" -#: ishtar_common/views.py:3216 ishtar_common/views.py:3311 +#: ishtar_common/views.py:3235 ishtar_common/views.py:3330 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:3348 ishtar_common/views.py:3402 +#: ishtar_common/views.py:3367 ishtar_common/views.py:3421 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:3362 +#: ishtar_common/views.py:3381 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:3415 +#: ishtar_common/views.py:3434 msgid "Delete geographic item" msgstr "" |