diff options
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 3325 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 3321 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 3335 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 3321 |
4 files changed, 6825 insertions, 6477 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 0c8095257..35251574b 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-29 11:29+0200\n" +"POT-Creation-Date: 2022-11-10 11:43+0100\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-" @@ -21,23 +21,23 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:527 -#: archaeological_context_records/models.py:721 +#: archaeological_context_records/models.py:531 +#: archaeological_context_records/models.py:728 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1139 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:2420 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1311 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1482 -#: archaeological_operations/models.py:2336 -#: archaeological_operations/models.py:2354 -#: archaeological_operations/models.py:2470 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2958 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:2379 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2513 +#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:3001 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 @@ -88,15 +88,15 @@ msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 #: archaeological_files/forms.py:883 archaeological_files/forms.py:919 -#: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 +#: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 #: archaeological_finds/forms_treatments.py:683 #: archaeological_finds/forms_treatments.py:926 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1312 -#: archaeological_operations/forms.py:1547 -#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 +#: archaeological_operations/forms.py:1289 +#: archaeological_operations/forms.py:1500 +#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:499 #: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 #: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" @@ -104,16 +104,16 @@ msgstr "" #: archaeological_context_records/forms.py:145 #: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:576 -#: archaeological_context_records/forms.py:630 -#: archaeological_context_records/models.py:733 -#: archaeological_context_records/models.py:1414 -#: archaeological_warehouse/forms.py:454 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/forms.py:604 +#: archaeological_context_records/models.py:740 +#: archaeological_context_records/models.py:1427 +#: archaeological_warehouse/forms.py:448 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 +#: archaeological_finds/forms.py:1354 archaeological_operations/forms.py:1815 msgid "Code PATRIARCHE" msgstr "" @@ -131,44 +131,44 @@ msgid "Operation - year" msgstr "E-Mail-Adresse" #: archaeological_context_records/forms.py:154 -#: archaeological_finds/forms.py:1379 +#: archaeological_finds/forms.py:1351 msgid "Operation's number (index by year)" msgstr "" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:737 -#: archaeological_context_records/models.py:727 +#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/models.py:734 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1444 +#: archaeological_finds/forms.py:1416 msgid "Search within related operations" msgstr "" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:702 msgid "Unit type" msgstr "" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:288 -#: archaeological_context_records/forms.py:578 -#: archaeological_context_records/forms.py:631 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:517 -#: archaeological_context_records/models.py:705 -#: archaeological_context_records/models.py:1416 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/forms.py:605 +#: archaeological_context_records/models.py:520 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:712 +#: archaeological_context_records/models.py:1429 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:89 archaeological_files/forms.py:932 -#: archaeological_finds/models_finds.py:1097 +#: archaeological_finds/models_finds.py:1100 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/models.py:2982 -#: archaeological_operations/models.py:3229 +#: archaeological_operations/forms.py:1514 +#: archaeological_operations/models.py:3025 +#: archaeological_operations/models.py:3272 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -185,8 +185,8 @@ msgstr "" #: archaeological_context_records/forms.py:173 #: archaeological_context_records/forms.py:308 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:815 +#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:820 msgid "Excavation technique" msgstr "" @@ -202,8 +202,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1616 +#: archaeological_operations/forms.py:1397 +#: archaeological_operations/forms.py:1569 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -217,56 +217,56 @@ msgid "Context record - 020 - General" msgstr "" #: archaeological_context_records/forms.py:289 -#: archaeological_context_records/forms.py:568 -#: archaeological_context_records/forms.py:632 -#: archaeological_context_records/forms.py:730 -#: archaeological_context_records/models.py:513 -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:713 -#: archaeological_finds/models_finds.py:1094 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:606 +#: archaeological_context_records/forms.py:704 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:720 +#: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2963 +#: archaeological_operations/models.py:3006 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 -#: ishtar_common/models_common.py:3517 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2824 +#: ishtar_common/models_common.py:3700 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" #: archaeological_context_records/forms.py:294 -#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:547 msgid "Only the items associated to the operation can be selected." msgstr "" #: archaeological_context_records/forms.py:299 -#: archaeological_context_records/forms.py:579 -#: archaeological_context_records/forms.py:634 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:526 -#: archaeological_context_records/models.py:758 -#: archaeological_context_records/models.py:1415 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:608 +#: archaeological_context_records/models.py:522 +#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:1428 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:301 -#: archaeological_context_records/models.py:734 -#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:1430 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:295 archaeological_finds/forms.py:297 -#: archaeological_finds/forms.py:648 archaeological_finds/forms.py:650 -#: archaeological_finds/forms.py:818 archaeological_finds/forms.py:864 -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:620 archaeological_finds/forms.py:622 +#: archaeological_finds/forms.py:790 archaeological_finds/forms.py:836 +#: archaeological_finds/forms.py:1430 #: archaeological_finds/forms_treatments.py:193 -#: archaeological_finds/models_finds.py:409 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:411 +#: archaeological_finds/models_finds.py:1814 #: archaeological_finds/models_treatments.py:255 -#: archaeological_finds/templates/ishtar/sheet_find.html:180 +#: archaeological_finds/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 #: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 @@ -275,59 +275,59 @@ msgid "Description" msgstr "" #: archaeological_context_records/forms.py:303 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/models.py:771 msgid "Filling" msgstr "" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:735 +#: archaeological_context_records/models.py:742 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:313 +#: archaeological_context_records/forms.py:316 #: archaeological_files/forms.py:298 archaeological_files/forms.py:595 #: archaeological_files/models.py:629 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:812 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:319 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/forms.py:322 +#: archaeological_context_records/models.py:745 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:739 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:746 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:321 -#: archaeological_context_records/models.py:740 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:747 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:748 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:323 -#: archaeological_context_records/models.py:742 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:749 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:325 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:751 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:736 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:743 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:737 +#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/models.py:744 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/models.py:592 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -338,108 +338,49 @@ msgstr "" #: archaeological_finds/forms_treatments.py:879 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1242 +#: archaeological_operations/models.py:1277 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:992 ishtar_common/forms.py:993 msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/forms.py:337 #: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:748 +#: archaeological_context_records/forms.py:343 +#: archaeological_context_records/models.py:755 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 -#: archaeological_warehouse/forms.py:737 +#: archaeological_warehouse/forms.py:731 #: archaeological_warehouse/templates/ishtar/sheet_container.html:81 msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:346 -#: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 -msgid "Coordinates" -msgstr "" - -#: archaeological_context_records/forms.py:347 -#: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 -#: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3520 -msgid "X" -msgstr "" - -#: archaeological_context_records/forms.py:349 -#: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 -#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 -msgid "Estimated error for X" -msgstr "" - -#: archaeological_context_records/forms.py:351 -#: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3521 -msgid "Y" -msgstr "" - -#: archaeological_context_records/forms.py:353 -#: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 -#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 -msgid "Estimated error for Y" -msgstr "" - -#: archaeological_context_records/forms.py:355 -#: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:3522 -msgid "Z" -msgstr "" - -#: archaeological_context_records/forms.py:357 -#: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 -msgid "Estimated error for Z" -msgstr "" - -#: archaeological_context_records/forms.py:360 -#: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 -#: ishtar_common/models_common.py:3534 -msgid "Spatial Reference System" -msgstr "" - -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:427 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:432 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:463 -#: archaeological_context_records/forms.py:485 +#: archaeological_context_records/forms.py:437 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1247 +#: archaeological_finds/models_finds.py:1857 #: archaeological_finds/templates/ishtar/sheet_find.html:248 msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:470 +#: archaeological_context_records/forms.py:444 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:528 -#: archaeological_finds/forms.py:910 archaeological_finds/forms.py:1261 -#: archaeological_finds/models_finds.py:1147 +#: archaeological_context_records/models.py:532 +#: archaeological_finds/forms.py:882 archaeological_finds/forms.py:1233 +#: archaeological_finds/models_finds.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:256 #: archaeological_operations/forms.py:903 #: archaeological_operations/templates/ishtar/sheet_operation.html:517 @@ -448,89 +389,89 @@ msgstr "" msgid "Period" msgstr "" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:445 #: archaeological_context_records/models.py:109 #: archaeological_files/forms.py:559 archaeological_files/models.py:75 #: archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1262 +#: archaeological_finds/forms.py:1235 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:556 #: archaeological_finds/forms_treatments.py:814 -#: archaeological_finds/models_finds.py:3346 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: 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:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_operations/forms.py:858 -#: archaeological_operations/models.py:103 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3233 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:3276 msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:472 +#: archaeological_context_records/forms.py:446 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:564 archaeological_files/models.py:76 -#: archaeological_files/models.py:699 archaeological_finds/forms.py:1263 -#: archaeological_finds/models_finds.py:3347 +#: archaeological_files/models.py:699 archaeological_finds/forms.py:1236 +#: archaeological_finds/models_finds.py:3355 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:258 -#: 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/templates/ishtar/sheet_find.html:502 -#: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3234 +#: 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/templates/ishtar/sheet_find.html:504 +#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:3277 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:473 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1237 #: archaeological_finds/templates/ishtar/sheet_find.html:260 msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:474 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1265 +#: archaeological_finds/forms.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:259 msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:475 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1266 +#: archaeological_finds/forms.py:1238 #: archaeological_finds/templates/ishtar/sheet_find.html:261 msgid "Precise dating" msgstr "" -#: archaeological_context_records/forms.py:486 +#: archaeological_context_records/forms.py:460 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:472 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1545 +#: archaeological_context_records/models.py:1558 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:177 archaeological_finds/forms.py:183 -#: archaeological_finds/forms.py:816 archaeological_finds/forms.py:834 -#: archaeological_finds/forms.py:1437 archaeological_finds/models_finds.py:1090 -#: archaeological_finds/models_finds.py:2404 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:806 +#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:2412 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 +#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 #: ishtar_common/views.py:401 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:516 +#: archaeological_context_records/forms.py:490 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 @@ -538,34 +479,34 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:491 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:522 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/forms.py:496 +#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/models.py:772 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:497 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:533 -#: archaeological_context_records/models.py:530 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/forms.py:507 +#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:815 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:801 -#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 -#: archaeological_finds/forms.py:817 -#: archaeological_finds/templates/ishtar/sheet_find.html:158 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:533 +#: archaeological_context_records/models.py:808 +#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:613 +#: archaeological_finds/forms.py:789 +#: archaeological_finds/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -573,82 +514,82 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:767 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:774 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:776 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:783 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:789 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:540 -#: archaeological_context_records/models.py:791 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:798 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:516 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:527 #: archaeological_operations/forms.py:613 #: archaeological_operations/forms.py:626 #: archaeological_operations/views.py:204 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:558 +#: archaeological_context_records/forms.py:532 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:538 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:666 -#: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: archaeological_context_records/forms.py:640 +#: archaeological_finds/forms.py:1042 archaeological_finds/forms.py:1067 +#: archaeological_operations/forms.py:1885 ishtar_common/forms_common.py:2310 #: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:696 +#: archaeological_context_records/forms.py:670 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:716 -#: archaeological_context_records/models.py:1308 -#: archaeological_context_records/models.py:1347 -#: archaeological_context_records/models.py:1413 +#: archaeological_context_records/forms.py:690 +#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1426 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:720 +#: archaeological_context_records/forms.py:694 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:745 +#: archaeological_context_records/forms.py:719 #, fuzzy #| msgid "email address" msgid "Associated parcel" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:770 +#: archaeological_context_records/forms.py:744 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:763 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -744,8 +685,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:909 -#: archaeological_finds/tests.py:1272 +#: archaeological_context_records/tests.py:911 +#: archaeological_finds/tests.py:1274 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -792,9 +733,9 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:214 archaeological_finds/forms.py:443 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2040 -#: archaeological_finds/models_finds.py:3312 -#: archaeological_finds/models_finds.py:3334 +#: archaeological_finds/models_finds.py:2044 +#: archaeological_finds/models_finds.py:3320 +#: archaeological_finds/models_finds.py:3342 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -807,20 +748,20 @@ msgstr "" #: archaeological_context_records/models.py:344 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 -#: archaeological_finds/models_finds.py:111 -#: archaeological_finds/models_finds.py:127 -#: archaeological_finds/models_finds.py:247 -#: archaeological_finds/models_finds.py:288 -#: archaeological_finds/models_finds.py:354 -#: archaeological_finds/models_finds.py:1805 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:100 +#: archaeological_finds/models_finds.py:113 +#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:249 +#: archaeological_finds/models_finds.py:290 +#: archaeological_finds/models_finds.py:356 +#: archaeological_finds/models_finds.py:1809 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:127 -#: archaeological_operations/models.py:145 -#: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3791 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:155 +#: archaeological_operations/models.py:3834 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 @@ -876,279 +817,279 @@ msgstr "" msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:505 -#: archaeological_context_records/models.py:506 -#: archaeological_context_records/models.py:1418 -#: archaeological_finds/models_finds.py:1109 -#: archaeological_finds/models_finds.py:1110 +#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:1431 +#: archaeological_finds/models_finds.py:1112 +#: archaeological_finds/models_finds.py:1113 #: archaeological_operations/forms.py:534 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1319 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/models.py:277 -#: archaeological_operations/models.py:286 -#: archaeological_operations/models.py:456 -#: archaeological_operations/models.py:913 -#: archaeological_operations/models.py:998 -#: archaeological_operations/models.py:1304 +#: archaeological_operations/forms.py:1296 +#: archaeological_operations/forms.py:1412 +#: archaeological_operations/models.py:305 +#: archaeological_operations/models.py:314 +#: archaeological_operations/models.py:485 +#: archaeological_operations/models.py:948 +#: archaeological_operations/models.py:1032 +#: archaeological_operations/models.py:1339 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:511 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:513 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:514 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:511 -#: archaeological_finds/models_finds.py:1095 +#: archaeological_context_records/models.py:515 +#: archaeological_finds/models_finds.py:1098 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:516 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:519 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:532 -#: archaeological_finds/models_finds.py:1159 -#: archaeological_operations/models.py:288 -#: archaeological_operations/models.py:917 +#: archaeological_context_records/models.py:536 +#: archaeological_finds/models_finds.py:1162 +#: archaeological_operations/models.py:316 +#: archaeological_operations/models.py:952 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:533 -#: archaeological_finds/models_finds.py:1160 -#: archaeological_operations/models.py:289 -#: archaeological_operations/models.py:918 +#: archaeological_context_records/models.py:537 +#: archaeological_finds/models_finds.py:1163 +#: archaeological_operations/models.py:317 +#: archaeological_operations/models.py:953 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:572 +#: archaeological_context_records/models.py:576 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/tests.py:735 -#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1245 -#: archaeological_operations/models.py:349 -#: archaeological_operations/models.py:1057 -#: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/tests.py:737 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1091 +#: archaeological_operations/tests.py:2989 +#: archaeological_warehouse/models.py:316 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 +#: archaeological_context_records/models.py:582 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1618 archaeological_finds/tests.py:1303 +#: archaeological_context_records/models.py:585 +#: archaeological_finds/models_finds.py:1621 archaeological_finds/tests.py:1305 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:585 -#: archaeological_operations/models.py:1053 -#: archaeological_operations/models.py:2500 -#: archaeological_operations/tests.py:4581 +#: archaeological_context_records/models.py:589 +#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:2543 +#: archaeological_operations/tests.py:4463 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:589 -#: archaeological_finds/models_finds.py:1253 -#: archaeological_operations/models.py:1050 +#: archaeological_context_records/models.py:593 +#: archaeological_finds/models_finds.py:1256 +#: archaeological_operations/models.py:1084 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:593 -#: archaeological_context_records/models.py:647 -#: archaeological_finds/models_finds.py:1354 -#: archaeological_finds/models_finds.py:1726 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: archaeological_context_records/models.py:597 +#: archaeological_context_records/models.py:654 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_finds/models_finds.py:1730 +#: archaeological_operations/models.py:412 +#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:597 -#: archaeological_context_records/models.py:650 -#: archaeological_finds/models_finds.py:1269 -#: archaeological_operations/models.py:1141 -#: archaeological_operations/models.py:1205 +#: archaeological_context_records/models.py:601 +#: archaeological_context_records/models.py:657 +#: archaeological_finds/models_finds.py:1272 +#: archaeological_operations/models.py:1175 +#: archaeological_operations/models.py:1240 #: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:601 -#: archaeological_context_records/tests.py:802 -#: archaeological_finds/models_finds.py:1292 +#: archaeological_context_records/models.py:605 +#: archaeological_context_records/tests.py:804 +#: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:605 -#: archaeological_operations/models.py:343 -#: archaeological_operations/models.py:1099 -#: archaeological_operations/tests.py:2973 -#: archaeological_operations/tests.py:3155 +#: archaeological_context_records/models.py:609 +#: archaeological_operations/models.py:371 +#: archaeological_operations/models.py:1133 +#: archaeological_operations/tests.py:2972 +#: archaeological_operations/tests.py:3154 msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:609 -#: archaeological_context_records/tests.py:861 +#: archaeological_context_records/models.py:613 +#: archaeological_context_records/tests.py:863 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:612 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1063 -#: archaeological_operations/models.py:2518 +#: archaeological_context_records/models.py:616 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 +#: archaeological_operations/models.py:2561 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:616 -#: archaeological_operations/models.py:1160 +#: archaeological_context_records/models.py:620 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:619 -#: archaeological_context_records/tests.py:767 +#: archaeological_context_records/models.py:623 +#: archaeological_context_records/tests.py:769 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:623 +#: archaeological_context_records/models.py:627 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:665 -#: archaeological_finds/models_finds.py:1685 -#: archaeological_operations/models.py:428 -#: archaeological_operations/models.py:1188 +#: archaeological_context_records/models.py:672 +#: archaeological_finds/models_finds.py:1689 +#: archaeological_operations/models.py:457 +#: archaeological_operations/models.py:1223 #: archaeological_warehouse/models.py:335 #: archaeological_warehouse/models.py:1056 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:672 -#: archaeological_finds/models_finds.py:1678 -#: archaeological_operations/models.py:435 -#: archaeological_operations/models.py:1181 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1682 +#: archaeological_operations/models.py:464 +#: archaeological_operations/models.py:1216 #: archaeological_warehouse/models.py:327 #: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:682 -#: archaeological_context_records/models.py:1108 +#: archaeological_context_records/models.py:689 +#: archaeological_context_records/models.py:1120 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:874 -#: archaeological_finds/models_finds.py:1695 -#: archaeological_finds/models_finds.py:2310 archaeological_finds/views.py:1245 +#: archaeological_finds/models_finds.py:877 +#: archaeological_finds/models_finds.py:1699 +#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1245 #: archaeological_finds/views.py:1260 archaeological_finds/views.py:1298 -#: archaeological_finds/views.py:1314 archaeological_operations/models.py:445 -#: archaeological_operations/models.py:600 -#: archaeological_operations/models.py:1198 -#: archaeological_operations/models.py:1831 +#: archaeological_finds/views.py:1314 archaeological_operations/models.py:474 +#: archaeological_operations/models.py:632 +#: archaeological_operations/models.py:1233 +#: archaeological_operations/models.py:1873 #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 -#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1454 +#: ishtar_common/admin.py:1574 ishtar_common/models.py:4064 #: ishtar_common/models.py:4408 ishtar_common/views.py:2637 #: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:699 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:404 -#: archaeological_finds/models_finds.py:1799 +#: archaeological_context_records/models.py:706 +#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 +#: archaeological_finds/models_finds.py:1803 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2971 +#: archaeological_operations/models.py:3014 #: archaeological_warehouse/models.py:388 #: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:701 -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2974 +#: archaeological_context_records/models.py:708 +#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 +#: archaeological_finds/models_finds.py:1805 +#: archaeological_operations/models.py:3017 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 +#: archaeological_context_records/models.py:753 +#: archaeological_operations/models.py:1331 ishtar_common/models_common.py:2794 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:751 +#: archaeological_context_records/models.py:758 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:762 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:778 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:779 +#: archaeological_context_records/models.py:786 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:786 +#: archaeological_context_records/models.py:793 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:801 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:823 +#: archaeological_context_records/models.py:829 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1994 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_finds/templates/ishtar/sheet_find.html:74 +#: archaeological_finds/templates/ishtar/sheet_find.html:71 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2718 +#: archaeological_operations/models.py:524 +#: archaeological_operations/models.py:1405 +#: archaeological_operations/models.py:2761 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1162,138 +1103,138 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:830 -#: archaeological_finds/models_finds.py:2000 +#: archaeological_context_records/models.py:836 +#: archaeological_finds/models_finds.py:2004 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:530 +#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:2768 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:835 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2012 +#: archaeological_context_records/models.py:841 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:506 -#: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1416 +#: archaeological_operations/models.py:3021 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2819 ishtar_common/models_common.py:2842 msgid "Cached name" msgstr "" -#: archaeological_context_records/models.py:838 -#: archaeological_finds/models_finds.py:2019 -#: archaeological_operations/models.py:519 -#: archaeological_operations/models.py:1467 +#: archaeological_context_records/models.py:844 +#: archaeological_finds/models_finds.py:2023 +#: archaeological_operations/models.py:548 +#: archaeological_operations/models.py:1502 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:841 #: archaeological_context_records/models.py:847 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2016 -#: archaeological_finds/models_finds.py:2022 -#: archaeological_finds/models_finds.py:2028 -#: archaeological_finds/models_finds.py:2034 -#: archaeological_operations/models.py:510 -#: archaeological_operations/models.py:516 -#: archaeological_operations/models.py:522 -#: archaeological_operations/models.py:528 -#: archaeological_operations/models.py:1383 -#: archaeological_operations/models.py:1464 -#: archaeological_operations/models.py:1470 -#: archaeological_operations/models.py:1476 +#: archaeological_context_records/models.py:853 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2026 +#: archaeological_finds/models_finds.py:2032 +#: archaeological_finds/models_finds.py:2038 +#: archaeological_operations/models.py:539 +#: archaeological_operations/models.py:545 +#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:557 +#: archaeological_operations/models.py:1418 +#: archaeological_operations/models.py:1499 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:1511 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:850 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:858 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:417 +#: archaeological_finds/models_finds.py:419 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:873 +#: archaeological_context_records/models.py:879 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:905 -#: archaeological_finds/models_finds.py:2200 +#: archaeological_context_records/models.py:914 +#: archaeological_finds/models_finds.py:2204 #, fuzzy #| msgid "email address" msgid "List of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1096 +#: archaeological_context_records/models.py:1108 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1098 +#: archaeological_context_records/models.py:1110 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1309 +#: archaeological_context_records/models.py:1322 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1342 +#: archaeological_context_records/models.py:1355 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1343 +#: archaeological_context_records/models.py:1356 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1344 +#: archaeological_context_records/models.py:1357 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1345 +#: archaeological_context_records/models.py:1358 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1346 +#: archaeological_context_records/models.py:1359 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1348 +#: archaeological_context_records/models.py:1361 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1349 +#: archaeological_context_records/models.py:1362 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1350 +#: archaeological_context_records/models.py:1363 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1351 +#: archaeological_context_records/models.py:1364 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1365 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1359 +#: archaeological_context_records/models.py:1372 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1373 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1551 +#: archaeological_context_records/models.py:1564 msgid "Context record parent" msgstr "" @@ -1341,7 +1282,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2045 #: 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:90 @@ -1356,26 +1297,26 @@ msgid "Finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 -#: archaeological_finds/templates/ishtar/sheet_find.html:83 +#: archaeological_finds/templates/ishtar/sheet_find.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 -#: archaeological_finds/templates/ishtar/sheet_find.html:92 +#: archaeological_finds/templates/ishtar/sheet_find.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 msgid "Custom fields" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 #: archaeological_files/templates/ishtar/sheet_file.html:46 -#: archaeological_finds/templates/ishtar/sheet_find.html:163 +#: archaeological_finds/templates/ishtar/sheet_find.html:160 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3725 +#: ishtar_common/models_common.py:3872 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1391,21 +1332,21 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_files_pdl/forms.py:121 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:73 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2635 +#: ishtar_common/models_common.py:2796 msgid "Localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 -#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:714 -#: archaeological_finds/forms.py:819 +#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:686 +#: archaeological_finds/forms.py:791 #: archaeological_finds/templates/ishtar/sheet_basefind.html:52 -#: archaeological_finds/templates/ishtar/sheet_find.html:219 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 msgid "Sheet" @@ -1429,9 +1370,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:126 #: archaeological_finds/models_treatments.py:212 -#: archaeological_finds/templates/ishtar/sheet_find.html:383 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 +#: 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_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1516,7 +1457,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1820 +#: archaeological_operations/models.py:1862 msgid "Add context record" msgstr "" @@ -1550,7 +1491,7 @@ msgstr "" #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 -#: archaeological_finds/forms.py:1377 +#: archaeological_finds/forms.py:1349 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1558,18 +1499,18 @@ msgstr "" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/forms_treatments.py:930 -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:197 #: archaeological_finds/models_treatments.py:1094 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 -#: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:909 -#: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:2468 -#: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2961 +#: archaeological_operations/forms.py:1504 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:944 +#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2740 +#: archaeological_operations/models.py:3004 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1579,33 +1520,33 @@ msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 #: archaeological_files/forms.py:332 archaeological_files/models.py:524 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1316 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 #: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1432 -#: archaeological_operations/forms.py:1553 -#: archaeological_operations/forms.py:1630 -#: archaeological_operations/models.py:454 -#: archaeological_operations/models.py:2700 +#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:1583 +#: archaeological_operations/models.py:483 +#: archaeological_operations/models.py:2743 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:898 #: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1564 -#: archaeological_operations/models.py:2340 +#: archaeological_operations/forms.py:1517 +#: archaeological_operations/models.py:2383 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2802 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1644,26 +1585,26 @@ msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 #: archaeological_files/forms.py:479 archaeological_files/models.py:638 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 -#: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 -#: archaeological_finds/forms.py:2111 +#: archaeological_finds/forms.py:658 archaeological_finds/forms.py:869 +#: archaeological_finds/forms.py:1096 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:2083 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:809 -#: archaeological_finds/models_finds.py:410 -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:1936 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:817 -#: archaeological_operations/forms.py:1325 -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1629 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2714 -#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 +#: archaeological_operations/forms.py:1302 +#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/forms.py:1582 +#: archaeological_operations/models.py:495 +#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:2757 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 +#: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 #: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 #: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 #: ishtar_common/models.py:2772 ishtar_common/models.py:3412 @@ -1671,6 +1612,7 @@ msgstr "" #: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 msgid "Comment" msgstr "" @@ -1693,7 +1635,7 @@ msgstr "" #: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1522 ishtar_common/forms.py:926 msgid "Created by" msgstr "" @@ -1701,7 +1643,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1575 +#: archaeological_operations/forms.py:1528 msgid "Modified by" msgstr "" @@ -1714,7 +1656,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1276 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1726,7 +1668,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 msgid "Reception date" msgstr "" @@ -1764,7 +1706,7 @@ msgstr "" #: archaeological_files/forms.py:256 archaeological_files/models.py:540 #: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:355 msgid "Person in charge" msgstr "" @@ -1773,13 +1715,13 @@ msgstr "" #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1102 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1920 -#: archaeological_operations/models.py:455 +#: archaeological_operations/forms.py:1293 +#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1873 +#: archaeological_operations/models.py:484 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 @@ -1793,12 +1735,13 @@ msgstr "" #: ishtar_common/models.py:2482 ishtar_common/models.py:2767 #: ishtar_common/models.py:3093 ishtar_common/models.py:3229 #: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 -#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2793 ishtar_common/models_common.py:2842 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1837,7 +1780,7 @@ msgstr "" #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2983 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" @@ -1871,14 +1814,13 @@ msgstr "" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 +#: archaeological_operations/models.py:2746 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "" #: archaeological_files/forms.py:459 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:984 -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2697 msgid "Scientist in charge" msgstr "" @@ -2024,10 +1966,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:998 #: archaeological_finds/models_treatments.py:198 #: archaeological_finds/models_treatments.py:1095 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 -#: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1685 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1638 +#: archaeological_operations/models.py:2682 ishtar_common/models.py:4089 msgid "Index" msgstr "" @@ -2037,10 +1979,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1558 -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/models.py:2370 -#: archaeological_operations/models.py:2629 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1572 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2672 msgid "Act type" msgstr "" @@ -2051,17 +1993,17 @@ msgstr "" #: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1559 -#: archaeological_operations/forms.py:1755 +#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1708 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1565 -#: archaeological_operations/forms.py:1626 -#: archaeological_operations/models.py:2698 +#: archaeological_operations/forms.py:1518 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2741 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2107,10 +2049,10 @@ msgstr "" #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1840 -#: archaeological_operations/models.py:2353 -#: archaeological_operations/models.py:2469 -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:1882 +#: archaeological_operations/models.py:2396 +#: archaeological_operations/models.py:2512 +#: archaeological_operations/models.py:2720 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "" @@ -2123,9 +2065,9 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3337 +#: archaeological_finds/models_finds.py:3345 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2734 +#: archaeological_operations/models.py:2777 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2255,8 +2197,8 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 +#: ishtar_common/admin.py:1024 ishtar_common/models.py:2275 #: ishtar_common/models_common.py:714 msgid "Parent" msgstr "" @@ -2317,9 +2259,9 @@ msgstr "" msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1142 -#: archaeological_operations/models.py:284 -#: archaeological_operations/models.py:910 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 +#: archaeological_operations/models.py:312 +#: archaeological_operations/models.py:945 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:240 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:257 @@ -2327,17 +2269,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1194 +#: ishtar_common/admin.py:1193 msgid "Area" msgstr "" -#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1145 -#: archaeological_operations/models.py:285 -#: archaeological_operations/models.py:911 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 +#: archaeological_operations/models.py:313 +#: archaeological_operations/models.py:946 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1166 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1169 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2371,34 +2313,34 @@ msgstr "" #: archaeological_operations/forms.py:1110 #: archaeological_operations/forms.py:1126 #: archaeological_operations/forms.py:1131 -#: archaeological_operations/forms.py:1506 -#: archaeological_operations/models.py:276 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2709 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/models.py:304 +#: archaeological_operations/models.py:493 +#: archaeological_operations/models.py:1029 +#: archaeological_operations/models.py:1031 +#: archaeological_operations/models.py:1336 +#: archaeological_operations/models.py:2752 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 #: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2664 +#: ishtar_common/models_common.py:2825 msgid "Towns" msgstr "" -#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1249 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1048 -#: archaeological_operations/models.py:2493 -#: archaeological_operations/tests.py:2979 -#: archaeological_operations/tests.py:3055 +#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:2536 +#: archaeological_operations/tests.py:2978 +#: archaeological_operations/tests.py:3054 msgctxt "key for text search" msgid "year" msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:333 +#: archaeological_operations/models.py:361 #: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" @@ -2406,21 +2348,21 @@ msgstr "" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:339 +#: archaeological_operations/models.py:367 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1067 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 msgctxt "key for text search" msgid "department" msgstr "" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:336 -#: archaeological_operations/models.py:1071 -#: archaeological_operations/tests.py:3099 +#: archaeological_operations/models.py:364 +#: archaeological_operations/models.py:1105 +#: archaeological_operations/tests.py:3098 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" @@ -2430,9 +2372,9 @@ msgstr "" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:2504 -#: archaeological_operations/tests.py:3112 +#: archaeological_operations/models.py:1111 +#: archaeological_operations/models.py:2547 +#: archaeological_operations/tests.py:3111 #: archaeological_warehouse/models.py:312 #: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 #: ishtar_common/models.py:2719 ishtar_common/models.py:3295 @@ -2461,28 +2403,28 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1455 -#: archaeological_operations/models.py:355 -#: archaeological_operations/models.py:1119 -#: archaeological_operations/models.py:2614 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 +#: archaeological_operations/models.py:383 +#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:2657 #: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1606 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1609 #: archaeological_finds/models_treatments.py:1055 -#: archaeological_finds/tests.py:1327 +#: archaeological_finds/tests.py:1329 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2549 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2592 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2553 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" @@ -2587,11 +2529,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1228 archaeological_operations/models.py:1803 +#: archaeological_files/models.py:1228 archaeological_operations/models.py:1841 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1230 archaeological_operations/models.py:1805 +#: archaeological_files/models.py:1230 archaeological_operations/models.py:1843 msgid "parcels" msgstr "" @@ -2605,13 +2547,13 @@ msgstr "" #: archaeological_files/models.py:1247 #: archaeological_finds/models_treatments.py:401 -#: archaeological_finds/models_treatments.py:1216 +#: archaeological_finds/models_treatments.py:1220 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1249 #: archaeological_finds/models_treatments.py:403 -#: archaeological_finds/models_treatments.py:1218 +#: archaeological_finds/models_treatments.py:1222 msgid "admin. act" msgstr "" @@ -2624,8 +2566,8 @@ msgstr "" msgid "operation" msgstr "" -#: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2948 +#: archaeological_files/models.py:1327 archaeological_operations/models.py:1320 +#: archaeological_operations/models.py:2991 msgid "File" msgstr "" @@ -2823,7 +2765,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2778 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2836,11 +2778,11 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2813 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 #: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." @@ -2851,10 +2793,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:690 #: archaeological_finds/forms_treatments.py:779 #: archaeological_finds/models_treatments.py:125 -#: archaeological_finds/templates/ishtar/sheet_find.html:382 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:498 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 @@ -2863,7 +2805,7 @@ msgstr "" #: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 #: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 #: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 -#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/forms_common.py:2935 ishtar_common/models.py:744 #: ishtar_common/models.py:2484 ishtar_common/models.py:3813 #: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 @@ -2880,7 +2822,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:859 -#: archaeological_operations/models.py:1245 +#: archaeological_operations/models.py:1280 msgid "Excavation end date" msgstr "" @@ -2894,7 +2836,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:713 +#: archaeological_warehouse/forms.py:694 ishtar_common/models.py:713 #: ishtar_common/models_imports.py:935 msgid "Date" msgstr "" @@ -2918,7 +2860,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3331 msgid "Effective" msgstr "" @@ -3025,7 +2967,7 @@ msgstr "" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3033 msgid "Postal code" msgstr "" @@ -3033,7 +2975,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 #: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 +#: ishtar_common/models_common.py:3028 ishtar_common/models_common.py:3183 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -3134,213 +3076,213 @@ msgstr "" msgid "Simple find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:644 -#: archaeological_finds/forms.py:843 archaeological_finds/forms.py:1056 -#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1997 -#: archaeological_finds/models_finds.py:403 -#: archaeological_finds/models_finds.py:1806 +#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:616 +#: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1028 +#: archaeological_finds/forms.py:1337 archaeological_finds/forms.py:1969 +#: archaeological_finds/models_finds.py:405 +#: archaeological_finds/models_finds.py:1810 msgid "Free ID" msgstr "" -#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:646 -#: archaeological_finds/forms.py:847 archaeological_finds/forms.py:1058 -#: archaeological_finds/forms.py:1366 archaeological_finds/forms.py:2064 -#: archaeological_finds/models_finds.py:1807 +#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:618 +#: archaeological_finds/forms.py:819 archaeological_finds/forms.py:1030 +#: archaeological_finds/forms.py:1338 archaeological_finds/forms.py:2036 +#: archaeological_finds/models_finds.py:1811 msgid "Denomination" msgstr "" -#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:848 -#: archaeological_finds/forms.py:1367 archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1938 msgid "Previous ID" msgstr "" -#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:852 -#: archaeological_finds/forms.py:1370 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:824 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:1812 msgid "Museum ID" msgstr "" -#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:853 -#: archaeological_finds/forms.py:1371 archaeological_finds/models_finds.py:1809 +#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:825 +#: archaeological_finds/forms.py:1343 archaeological_finds/models_finds.py:1813 msgid "Laboratory ID" msgstr "" -#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:854 -#: archaeological_finds/forms.py:1369 archaeological_finds/models_finds.py:1804 +#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1808 msgid "Seal number" msgstr "" -#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:855 -#: archaeological_finds/forms.py:1372 archaeological_finds/models_finds.py:1931 +#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:827 +#: archaeological_finds/forms.py:1344 archaeological_finds/models_finds.py:1935 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1991 +#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1995 msgid "Public description" msgstr "" -#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:653 -#: archaeological_finds/forms.py:1478 archaeological_finds/models_finds.py:1874 +#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:625 +#: archaeological_finds/forms.py:1450 archaeological_finds/models_finds.py:1878 msgid "Is complete?" msgstr "" -#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:656 -#: archaeological_finds/forms.py:867 archaeological_finds/models_finds.py:89 -#: archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1112 -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:628 +#: archaeological_finds/forms.py:839 archaeological_finds/models_finds.py:91 +#: archaeological_finds/models_finds.py:1114 +#: archaeological_finds/models_finds.py:1115 +#: archaeological_finds/models_finds.py:1821 msgid "Material types" msgstr "" -#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:659 -#: archaeological_finds/forms.py:1487 archaeological_finds/models_finds.py:1821 +#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:631 +#: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:1825 #: ishtar_common/models_imports.py:914 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1489 -#: archaeological_finds/models_finds.py:1828 +#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1461 +#: archaeological_finds/models_finds.py:1832 msgid "Comment on the material" msgstr "" -#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:662 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:262 -#: archaeological_finds/models_finds.py:1113 -#: archaeological_finds/models_finds.py:1114 -#: archaeological_finds/models_finds.py:1876 +#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 +#: archaeological_finds/forms.py:842 archaeological_finds/models_finds.py:264 +#: archaeological_finds/models_finds.py:1116 +#: archaeological_finds/models_finds.py:1117 +#: archaeological_finds/models_finds.py:1880 msgid "Object types" msgstr "" -#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:666 -#: archaeological_finds/forms.py:1496 archaeological_finds/models_finds.py:1880 +#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:638 +#: archaeological_finds/forms.py:1468 archaeological_finds/models_finds.py:1884 msgid "Object type quality" msgstr "" -#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:874 -#: archaeological_finds/forms.py:1498 archaeological_finds/models_finds.py:276 +#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:846 +#: archaeological_finds/forms.py:1470 archaeological_finds/models_finds.py:278 msgid "Functional areas" msgstr "" -#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:668 -#: archaeological_finds/forms.py:1505 archaeological_finds/forms.py:2003 -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:640 +#: archaeological_finds/forms.py:1477 archaeological_finds/forms.py:1975 +#: archaeological_finds/models_finds.py:1839 msgid "Find number" msgstr "" -#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:670 -#: archaeological_finds/forms.py:1507 archaeological_finds/models_finds.py:1911 +#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1915 msgid "Minimum number of individuals (MNI)" msgstr "" -#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:674 -#: archaeological_finds/forms.py:1511 archaeological_finds/models_finds.py:1811 +#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:646 +#: archaeological_finds/forms.py:1483 archaeological_finds/models_finds.py:1815 msgid "Decoration" msgstr "" -#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:677 -#: archaeological_finds/forms.py:1512 archaeological_finds/models_finds.py:1812 +#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:649 +#: archaeological_finds/forms.py:1484 archaeological_finds/models_finds.py:1816 msgid "Inscription" msgstr "" -#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:680 -#: archaeological_finds/forms.py:878 archaeological_finds/forms.py:1510 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:652 +#: archaeological_finds/forms.py:850 archaeological_finds/forms.py:1482 +#: archaeological_finds/models_finds.py:1818 msgid "Manufacturing place" msgstr "" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:683 -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1514 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1906 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:655 +#: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1486 +#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1910 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1518 -#: archaeological_finds/models_finds.py:1856 -#: archaeological_operations/forms.py:1322 -#: archaeological_operations/models.py:461 +#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1490 +#: archaeological_finds/models_finds.py:1860 +#: archaeological_operations/forms.py:1299 +#: archaeological_operations/models.py:490 msgid "Cultural attribution" msgstr "" -#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:689 -#: archaeological_finds/forms.py:913 archaeological_finds/forms.py:1520 -#: archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:661 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1492 +#: archaeological_finds/models_finds.py:1937 msgid "Comment on dating" msgstr "" -#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 -#: archaeological_finds/forms.py:1319 -#: archaeological_finds/templates/ishtar/sheet_find.html:201 +#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:664 +#: archaeological_finds/forms.py:1291 +#: archaeological_finds/templates/ishtar/sheet_find.html:198 msgid "Dimensions" msgstr "" -#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:693 -#: archaeological_finds/models_finds.py:1913 +#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:665 +#: archaeological_finds/models_finds.py:1917 msgid "Length (cm)" msgstr "" -#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:694 -#: archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:666 +#: archaeological_finds/models_finds.py:1918 msgid "Width (cm)" msgstr "" -#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:695 -#: archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:667 +#: archaeological_finds/models_finds.py:1919 msgid "Height (cm)" msgstr "" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:698 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:670 +#: archaeological_finds/models_finds.py:1922 msgid "Thickness (cm)" msgstr "" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:696 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:668 +#: archaeological_finds/models_finds.py:1920 msgid "Diameter (cm)" msgstr "" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:697 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:669 +#: archaeological_finds/models_finds.py:1921 msgid "Circumference (cm)" msgstr "" -#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:699 -#: archaeological_finds/forms.py:2001 archaeological_finds/models_finds.py:1830 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:671 +#: archaeological_finds/forms.py:1973 archaeological_finds/models_finds.py:1834 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "" -#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 -#: archaeological_finds/forms.py:2002 -#: archaeological_finds/templates/ishtar/sheet_find.html:210 +#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:672 +#: archaeological_finds/forms.py:1974 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 msgid "Weight (g)" msgstr "" -#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:702 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:674 msgid "Clutter long side (cm)" msgstr "" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:705 +#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:677 msgid "Clutter short side (cm)" msgstr "" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:680 msgid "Clutter height (cm)" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:711 -#: archaeological_finds/forms.py:1591 archaeological_finds/models_finds.py:1929 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 +#: archaeological_finds/forms.py:1563 archaeological_finds/models_finds.py:1933 msgid "Dimensions comment" msgstr "" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:715 -#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1596 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:687 +#: archaeological_finds/forms.py:872 archaeological_finds/forms.py:1568 +#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1942 msgid "Check" msgstr "" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:717 -#: archaeological_finds/forms.py:902 archaeological_finds/models_finds.py:1943 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:689 +#: archaeological_finds/forms.py:874 archaeological_finds/models_finds.py:1947 msgid "Check date" msgstr "" @@ -3352,559 +3294,563 @@ msgstr "" msgid "Find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:850 -#: archaeological_finds/forms.py:1368 archaeological_finds/models_finds.py:408 +#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:822 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:410 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:421 +#: archaeological_finds/forms.py:514 archaeological_finds/models_finds.py:423 msgid "Discovery date (exact or TPQ)" msgstr "" -#: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 +#: archaeological_finds/forms.py:517 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:1477 -#: archaeological_finds/models_finds.py:428 +#: archaeological_finds/forms.py:520 archaeological_finds/forms.py:1449 +#: archaeological_finds/models_finds.py:430 msgid "Batch/object" msgstr "" -#: archaeological_finds/forms.py:539 archaeological_finds/forms.py:1594 -#: archaeological_finds/models_finds.py:436 +#: archaeological_finds/forms.py:523 +msgid "Topography" +msgstr "" + +#: archaeological_finds/forms.py:525 archaeological_finds/forms.py:1566 +#: archaeological_finds/models_finds.py:438 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:571 +#: archaeological_finds/forms.py:543 msgid "" "Discovery date: if a TAQ date is provided a TPQ date has to be informed. If " "you have a precise date fill only the TPQ - discovery date field." msgstr "" -#: archaeological_finds/forms.py:579 +#: archaeological_finds/forms.py:551 msgid "Discovery date: TAQ date must be older than TPQ date." msgstr "" -#: archaeological_finds/forms.py:596 +#: archaeological_finds/forms.py:568 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: archaeological_finds/forms.py:612 +#: archaeological_finds/forms.py:584 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: archaeological_finds/forms.py:628 archaeological_finds/forms.py:1994 +#: archaeological_finds/forms.py:600 archaeological_finds/forms.py:1966 msgid "Resulting find" msgstr "" -#: archaeological_finds/forms.py:629 +#: archaeological_finds/forms.py:601 msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:733 archaeological_finds/forms.py:2009 +#: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1981 msgid "Resulting finds" msgstr "" -#: archaeological_finds/forms.py:734 +#: archaeological_finds/forms.py:706 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "" -#: archaeological_finds/forms.py:739 +#: archaeological_finds/forms.py:711 msgid "Number of resulting finds" msgstr "" -#: archaeological_finds/forms.py:742 +#: archaeological_finds/forms.py:714 msgid "Prefix label for resulting finds" msgstr "" -#: archaeological_finds/forms.py:745 +#: archaeological_finds/forms.py:717 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" msgstr "" -#: archaeological_finds/forms.py:750 +#: archaeological_finds/forms.py:722 msgid "Numbering starting from" msgstr "" -#: archaeological_finds/forms.py:753 +#: archaeological_finds/forms.py:725 msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:772 archaeological_finds/forms.py:1036 -#: archaeological_finds/forms.py:1103 +#: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1008 +#: archaeological_finds/forms.py:1075 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1112 +#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:1084 msgid "Find - Quick action - Modify" msgstr "" -#: archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:792 msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 -#: archaeological_finds/forms.py:1347 -#: archaeological_finds/templates/ishtar/sheet_find.html:231 +#: archaeological_finds/forms.py:793 archaeological_finds/forms.py:1137 +#: archaeological_finds/forms.py:1319 +#: archaeological_finds/templates/ishtar/sheet_find.html:228 msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:883 archaeological_finds/forms.py:1200 -#: archaeological_finds/forms.py:1605 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1973 -#: archaeological_warehouse/forms.py:586 +#: archaeological_finds/forms.py:855 archaeological_finds/forms.py:1172 +#: archaeological_finds/forms.py:1577 archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1977 +#: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1206 -#: archaeological_finds/forms.py:1606 archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1977 -#: archaeological_warehouse/forms.py:587 +#: archaeological_finds/forms.py:857 archaeological_finds/forms.py:1178 +#: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1160 +#: archaeological_finds/models_finds.py:1981 +#: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:888 archaeological_finds/forms.py:1197 -#: archaeological_finds/forms.py:1603 archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1958 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:898 +#: archaeological_finds/forms.py:860 archaeological_finds/forms.py:1169 +#: archaeological_finds/forms.py:1575 archaeological_finds/models_finds.py:1154 +#: archaeological_finds/models_finds.py:1962 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:898 msgid "Conservatory state" msgstr "" -#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1218 -#: archaeological_finds/forms.py:1610 archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1983 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/forms.py:863 archaeological_finds/forms.py:1190 +#: archaeological_finds/forms.py:1582 archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1987 +#: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:894 archaeological_finds/forms.py:1191 -#: archaeological_finds/forms.py:1602 archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_warehouse/forms.py:584 +#: archaeological_finds/forms.py:866 archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1156 +#: archaeological_finds/models_finds.py:1904 +#: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:905 archaeological_finds/forms.py:1223 -#: archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:877 archaeological_finds/forms.py:1195 +#: archaeological_finds/models_finds.py:1993 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:907 archaeological_finds/forms.py:1221 -#: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:879 archaeological_finds/forms.py:1193 +#: archaeological_finds/models_finds.py:1172 +#: archaeological_finds/models_finds.py:1992 msgid "Insurance value" msgstr "" -#: archaeological_finds/forms.py:917 +#: archaeological_finds/forms.py:889 msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:979 +#: archaeological_finds/forms.py:951 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:999 archaeological_finds/forms.py:1451 -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2218 -#: archaeological_finds/forms.py:2235 archaeological_finds/forms.py:2240 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:1423 +#: archaeological_finds/forms.py:2185 archaeological_finds/forms.py:2190 +#: archaeological_finds/forms.py:2207 archaeological_finds/forms.py:2212 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:881 -#: archaeological_finds/models_finds.py:1702 +#: archaeological_finds/models_finds.py:884 +#: archaeological_finds/models_finds.py:1706 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1228 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:994 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:1029 +#: archaeological_finds/forms.py:1001 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:1033 archaeological_finds/forms.py:1100 +#: archaeological_finds/forms.py:1005 archaeological_finds/forms.py:1072 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:2081 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 #: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:2082 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 +#: archaeological_finds/forms.py:1100 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2129 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 +#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:2094 +#: archaeological_finds/forms.py:2136 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1138 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1185 archaeological_finds/forms.py:1601 -#: archaeological_finds/models_finds.py:1152 -#: archaeological_finds/models_finds.py:1894 -#: archaeological_warehouse/forms.py:583 +#: archaeological_finds/forms.py:1157 archaeological_finds/forms.py:1573 +#: archaeological_finds/models_finds.py:1155 +#: archaeological_finds/models_finds.py:1898 +#: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "" -#: archaeological_finds/forms.py:1212 archaeological_finds/forms.py:1608 -#: archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/forms.py:1184 archaeological_finds/forms.py:1580 +#: archaeological_finds/models_finds.py:1153 +#: archaeological_finds/models_finds.py:1972 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1220 archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1944 +#: archaeological_finds/forms.py:1192 archaeological_finds/models_finds.py:1171 +#: archaeological_finds/models_finds.py:1948 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1604 -#: archaeological_finds/models_finds.py:1964 +#: archaeological_finds/forms.py:1198 archaeological_finds/forms.py:1576 +#: archaeological_finds/models_finds.py:1968 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1276 +#: archaeological_finds/forms.py:1248 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1282 +#: archaeological_finds/forms.py:1254 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1258 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1308 +#: archaeological_finds/forms.py:1280 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "" -#: archaeological_finds/forms.py:1374 archaeological_finds/models_finds.py:1091 +#: archaeological_finds/forms.py:1346 archaeological_finds/models_finds.py:1094 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1375 archaeological_finds/models_finds.py:1092 +#: archaeological_finds/forms.py:1347 archaeological_finds/models_finds.py:1095 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1135 +#: archaeological_finds/forms.py:1357 archaeological_finds/models_finds.py:1138 #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1803 -#: archaeological_operations/forms.py:1869 -#: archaeological_operations/models.py:908 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 +#: archaeological_operations/forms.py:1756 +#: archaeological_operations/forms.py:1822 +#: archaeological_operations/models.py:943 +#: archaeological_operations/models.py:1030 +#: archaeological_operations/models.py:1328 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "" -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:1360 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1391 +#: archaeological_finds/forms.py:1363 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1402 +#: archaeological_finds/forms.py:1374 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1405 +#: archaeological_finds/forms.py:1377 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1409 +#: archaeological_finds/forms.py:1381 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: archaeological_finds/forms.py:1384 archaeological_operations/forms.py:499 +#: archaeological_operations/forms.py:1301 ishtar_common/forms_common.py:1233 #: ishtar_common/models.py:3098 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1415 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1387 archaeological_warehouse/forms.py:524 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1423 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1395 archaeological_warehouse/forms.py:532 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1426 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1398 archaeological_warehouse/forms.py:535 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1434 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1406 archaeological_warehouse/forms.py:543 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1447 +#: archaeological_finds/forms.py:1419 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1432 msgid "Discovery date after" msgstr "" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1435 msgid "Discovery date before" msgstr "" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1438 msgid "Discovery date (exact or TPQ) after" msgstr "" -#: archaeological_finds/forms.py:1469 +#: archaeological_finds/forms.py:1441 msgid "Discovery date (exact or TPQ) before" msgstr "" -#: archaeological_finds/forms.py:1472 +#: archaeological_finds/forms.py:1444 msgid "Discovery date (TAQ) after" msgstr "" -#: archaeological_finds/forms.py:1475 +#: archaeological_finds/forms.py:1447 msgid "Discovery date (TAQ) before" msgstr "" -#: archaeological_finds/forms.py:1480 archaeological_finds/forms.py:2000 -#: archaeological_finds/models_finds.py:88 -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1452 archaeological_finds/forms.py:1972 +#: archaeological_finds/models_finds.py:90 +#: archaeological_finds/models_finds.py:1151 #: archaeological_operations/templates/ishtar/sheet_operation.html:534 -#: archaeological_warehouse/forms.py:572 +#: archaeological_warehouse/forms.py:566 msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1491 archaeological_finds/models_finds.py:261 -#: archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1463 archaeological_finds/models_finds.py:263 +#: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:907 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:907 msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1495 msgid "Length - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1498 msgid "Length - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1529 +#: archaeological_finds/forms.py:1501 msgid "Width - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1532 +#: archaeological_finds/forms.py:1504 msgid "Width - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1535 +#: archaeological_finds/forms.py:1507 msgid "Height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1538 +#: archaeological_finds/forms.py:1510 msgid "Height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1541 +#: archaeological_finds/forms.py:1513 msgid "Thickness - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1544 +#: archaeological_finds/forms.py:1516 msgid "Thickness - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1547 +#: archaeological_finds/forms.py:1519 msgid "Diameter - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1550 +#: archaeological_finds/forms.py:1522 msgid "Diameter - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1553 +#: archaeological_finds/forms.py:1525 msgid "Circumference - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1556 +#: archaeological_finds/forms.py:1528 msgid "Circumference - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1559 +#: archaeological_finds/forms.py:1531 msgid "Volume - lower than (l)" msgstr "" -#: archaeological_finds/forms.py:1560 +#: archaeological_finds/forms.py:1532 msgid "Volume - higher than (l)" msgstr "" -#: archaeological_finds/forms.py:1562 +#: archaeological_finds/forms.py:1534 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1565 +#: archaeological_finds/forms.py:1537 msgid "Weight - higher than (g)" msgstr "" -#: archaeological_finds/forms.py:1568 +#: archaeological_finds/forms.py:1540 msgid "Clutter long side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1572 +#: archaeological_finds/forms.py:1544 msgid "Clutter long side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1576 +#: archaeological_finds/forms.py:1548 msgid "Clutter short side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1580 +#: archaeological_finds/forms.py:1552 msgid "Clutter short side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1584 +#: archaeological_finds/forms.py:1556 msgid "Clutter height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1588 +#: archaeological_finds/forms.py:1560 msgid "Clutter height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1597 +#: archaeological_finds/forms.py:1569 msgid "Check date after" msgstr "" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1571 msgid "Check date before" msgstr "" -#: archaeological_finds/forms.py:1612 +#: archaeological_finds/forms.py:1584 msgid "Estimated value - higher than" msgstr "" -#: archaeological_finds/forms.py:1613 +#: archaeological_finds/forms.py:1585 msgid "Estimated value - lower than" msgstr "" -#: archaeological_finds/forms.py:1614 +#: archaeological_finds/forms.py:1586 msgid "Insurance value - higher than" msgstr "" -#: archaeological_finds/forms.py:1615 +#: archaeological_finds/forms.py:1587 msgid "Insurance value - lower than" msgstr "" -#: archaeological_finds/forms.py:1617 +#: archaeological_finds/forms.py:1589 msgid "Appraisal date after" msgstr "" -#: archaeological_finds/forms.py:1620 +#: archaeological_finds/forms.py:1592 msgid "Appraisal date before" msgstr "" -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1595 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1597 msgid "Treatment file end date before" msgstr "" -#: archaeological_finds/forms.py:1628 +#: archaeological_finds/forms.py:1600 msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 -#: archaeological_finds/models_finds.py:1868 -#: archaeological_finds/templates/ishtar/sheet_find.html:306 +#: archaeological_finds/forms.py:1658 archaeological_finds/models_finds.py:1111 +#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:1693 +#: archaeological_finds/forms.py:1665 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:331 +#: archaeological_finds/forms.py:1684 archaeological_finds/models_finds.py:1110 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1691 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1739 archaeological_finds/forms.py:1760 -#: archaeological_finds/forms.py:1816 archaeological_finds/views.py:380 +#: archaeological_finds/forms.py:1711 archaeological_finds/forms.py:1732 +#: archaeological_finds/forms.py:1788 archaeological_finds/views.py:380 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:1855 archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1827 archaeological_finds/forms.py:1990 #: archaeological_finds/models_treatments.py:391 #: archaeological_finds/templates/ishtar/sheet_treatment.html:103 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:1878 +#: archaeological_finds/forms.py:1850 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:1999 +#: archaeological_finds/forms.py:1971 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2014 +#: archaeological_finds/forms.py:1986 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2057 +#: archaeological_finds/forms.py:2029 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2069 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2041 archaeological_finds/forms.py:2059 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2104 +#: archaeological_finds/forms.py:2076 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2107 +#: archaeological_finds/forms.py:2079 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:193 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:381 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:383 +#: archaeological_finds/templates/ishtar/sheet_find.html:421 +#: archaeological_finds/templates/ishtar/sheet_find.html:459 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 #: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 @@ -3913,11 +3859,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2149 archaeological_finds/forms.py:2204 +#: archaeological_finds/forms.py:2121 archaeological_finds/forms.py:2176 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2196 +#: archaeological_finds/forms.py:2168 msgid "Another basket already exists with this name." msgstr "" @@ -3943,7 +3889,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:626 -#: archaeological_finds/models_finds.py:172 +#: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 #: ishtar_common/models_imports.py:902 @@ -3965,8 +3911,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 +#: archaeological_operations/models.py:2399 +#: archaeological_operations/models.py:2736 ishtar_common/views.py:408 msgid "Treatment" msgstr "" @@ -4063,8 +4009,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2398 +#: archaeological_operations/models.py:2728 ishtar_common/views.py:407 msgid "Treatment request" msgstr "" @@ -4079,14 +4025,14 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1860 -#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:1864 +#: archaeological_finds/models_finds.py:3327 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 -#: 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_warehouse/forms.py:329 archaeological_warehouse/models.py:796 +#: 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_warehouse/forms.py:323 archaeological_warehouse/models.py:796 #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 @@ -4172,7 +4118,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:787 #: archaeological_finds/models_treatments.py:1119 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "" @@ -4180,7 +4126,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/forms_treatments.py:793 #: archaeological_finds/models_treatments.py:1127 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "" @@ -4285,222 +4231,222 @@ msgstr "" msgid "Treatment one to many - creation" msgstr "" -#: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 +#: archaeological_finds/models_finds.py:86 +#: archaeological_operations/models.py:2403 ishtar_common/models.py:3625 msgid "Code" msgstr "" -#: archaeological_finds/models_finds.py:85 +#: archaeological_finds/models_finds.py:87 msgid "Recommendation" msgstr "" -#: archaeological_finds/models_finds.py:101 +#: archaeological_finds/models_finds.py:103 msgid "Material type quality type" msgstr "" -#: archaeological_finds/models_finds.py:102 +#: archaeological_finds/models_finds.py:104 msgid "Material type quality types" msgstr "" -#: archaeological_finds/models_finds.py:114 +#: archaeological_finds/models_finds.py:116 msgid "Conservatory state type" msgstr "" -#: archaeological_finds/models_finds.py:115 +#: archaeological_finds/models_finds.py:117 msgid "Conservatory state types" msgstr "" -#: archaeological_finds/models_finds.py:128 +#: archaeological_finds/models_finds.py:130 msgid "Virtual" msgstr "" -#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:131 msgid "Destructive" msgstr "" -#: archaeological_finds/models_finds.py:131 +#: archaeological_finds/models_finds.py:133 msgid "Create a new find" msgstr "" -#: archaeological_finds/models_finds.py:134 +#: archaeological_finds/models_finds.py:136 msgid "" "If True when this treatment is applied a new version of the object will be " "created." msgstr "" -#: archaeological_finds/models_finds.py:139 +#: archaeological_finds/models_finds.py:141 msgid "Upstream is many" msgstr "" -#: archaeological_finds/models_finds.py:142 +#: archaeological_finds/models_finds.py:144 msgid "Check this if for this treatment from many finds you'll get one." msgstr "" -#: archaeological_finds/models_finds.py:146 +#: archaeological_finds/models_finds.py:148 msgid "Downstream is many" msgstr "" -#: archaeological_finds/models_finds.py:149 +#: archaeological_finds/models_finds.py:151 msgid "Check this if for this treatment from one find you'll get many." msgstr "" -#: archaeological_finds/models_finds.py:153 +#: archaeological_finds/models_finds.py:155 msgid "Change reference location" msgstr "" -#: archaeological_finds/models_finds.py:155 +#: archaeological_finds/models_finds.py:157 msgid "The treatment change the reference location." msgstr "" -#: archaeological_finds/models_finds.py:158 +#: archaeological_finds/models_finds.py:160 msgid "Change current location" msgstr "" -#: archaeological_finds/models_finds.py:160 +#: archaeological_finds/models_finds.py:162 msgid "The treatment change the current location." msgstr "" -#: archaeological_finds/models_finds.py:163 +#: archaeological_finds/models_finds.py:165 msgid "Restore the reference location" msgstr "" -#: archaeological_finds/models_finds.py:166 +#: archaeological_finds/models_finds.py:168 msgid "" "The treatment change restore reference location to the current location." msgstr "" -#: archaeological_finds/models_finds.py:173 +#: archaeological_finds/models_finds.py:175 #: archaeological_finds/models_treatments.py:371 msgid "Treatment types" msgstr "" -#: archaeological_finds/models_finds.py:226 +#: archaeological_finds/models_finds.py:228 msgid "Integrity / interest type" msgstr "" -#: archaeological_finds/models_finds.py:227 +#: archaeological_finds/models_finds.py:229 msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:909 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:909 msgid "Remarkability type" msgstr "" -#: archaeological_finds/models_finds.py:238 +#: archaeological_finds/models_finds.py:240 msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:912 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:912 msgid "Batch type" msgstr "" -#: archaeological_finds/models_finds.py:251 +#: archaeological_finds/models_finds.py:253 msgid "Batch types" msgstr "" -#: archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1888 +#: archaeological_finds/models_finds.py:277 +#: archaeological_finds/models_finds.py:1892 #: ishtar_common/models_imports.py:915 msgid "Functional area" msgstr "" -#: archaeological_finds/models_finds.py:291 +#: archaeological_finds/models_finds.py:293 msgid "Object type quality type" msgstr "" -#: archaeological_finds/models_finds.py:292 +#: archaeological_finds/models_finds.py:294 msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:910 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:910 msgid "Alteration type" msgstr "" -#: archaeological_finds/models_finds.py:303 +#: archaeological_finds/models_finds.py:305 msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:911 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:911 msgid "Alteration cause type" msgstr "" -#: archaeological_finds/models_finds.py:317 +#: archaeological_finds/models_finds.py:319 msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:905 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:905 msgid "Treatment emergency type" msgstr "" -#: archaeological_finds/models_finds.py:331 +#: archaeological_finds/models_finds.py:333 msgid "Treatment emergency types" msgstr "" -#: archaeological_finds/models_finds.py:341 +#: archaeological_finds/models_finds.py:343 msgid "Communicability type" msgstr "" -#: archaeological_finds/models_finds.py:342 +#: archaeological_finds/models_finds.py:344 msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:913 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:913 msgid "Checked type" msgstr "" -#: archaeological_finds/models_finds.py:358 +#: archaeological_finds/models_finds.py:360 msgid "Checked types" msgstr "" -#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:414 msgid "Special interest" msgstr "" -#: archaeological_finds/models_finds.py:434 +#: archaeological_finds/models_finds.py:436 msgid "Material index" msgstr "" -#: archaeological_finds/models_finds.py:439 +#: archaeological_finds/models_finds.py:441 #: ishtar_common/templates/blocks/DataTables-stats.html:25 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "" -#: archaeological_finds/models_finds.py:441 +#: archaeological_finds/models_finds.py:443 msgid "Short ID" msgstr "" -#: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 +#: archaeological_finds/models_finds.py:447 +#: archaeological_finds/models_finds.py:454 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "" -#: archaeological_finds/models_finds.py:448 +#: archaeological_finds/models_finds.py:450 msgid "Complete ID" msgstr "" -#: archaeological_finds/models_finds.py:469 +#: archaeological_finds/models_finds.py:471 msgid "Concatenation of associated material types codes" msgstr "" -#: archaeological_finds/models_finds.py:475 -#: archaeological_finds/models_finds.py:1797 +#: archaeological_finds/models_finds.py:477 +#: archaeological_finds/models_finds.py:1801 msgid "Base find" msgstr "" -#: archaeological_finds/models_finds.py:476 +#: archaeological_finds/models_finds.py:478 msgid "Base finds" msgstr "" -#: archaeological_finds/models_finds.py:852 +#: archaeological_finds/models_finds.py:855 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:853 +#: archaeological_finds/models_finds.py:856 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:865 +#: archaeological_finds/models_finds.py:868 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:12 #: ishtar_common/templates/ishtar/blocks/window_image.html:22 @@ -4512,563 +4458,563 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:920 archaeological_finds/views.py:535 +#: archaeological_finds/models_finds.py:923 archaeological_finds/views.py:535 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:932 +#: archaeological_finds/models_finds.py:935 #: archaeological_warehouse/models.py:1853 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:943 +#: archaeological_finds/models_finds.py:946 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:1096 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1098 +#: archaeological_finds/models_finds.py:1101 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1099 +#: archaeological_finds/models_finds.py:1102 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1100 +#: archaeological_finds/models_finds.py:1103 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1102 +#: archaeological_finds/models_finds.py:1105 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1104 +#: archaeological_finds/models_finds.py:1107 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1105 +#: archaeological_finds/models_finds.py:1108 msgid "Base find - Discovery date (exact or TPQ)" msgstr "" -#: archaeological_finds/models_finds.py:1106 +#: archaeological_finds/models_finds.py:1109 msgid "Base find - Discovery date (TAQ)" msgstr "" -#: archaeological_finds/models_finds.py:1167 +#: archaeological_finds/models_finds.py:1170 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:1234 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1235 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1239 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1242 +#: archaeological_finds/models_finds.py:1245 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1257 +#: archaeological_finds/models_finds.py:1260 #: archaeological_warehouse/models.py:933 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 +#: archaeological_finds/models_finds.py:1264 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1265 -#: archaeological_operations/models.py:352 -#: archaeological_operations/models.py:1060 +#: archaeological_finds/models_finds.py:1268 +#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:1094 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1274 +#: archaeological_finds/models_finds.py:1277 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1279 -#: archaeological_finds/models_finds.py:1735 +#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1739 #: archaeological_warehouse/models.py:947 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1284 +#: archaeological_finds/models_finds.py:1287 #: archaeological_warehouse/models.py:952 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1288 -#: archaeological_finds/models_finds.py:1730 +#: archaeological_finds/models_finds.py:1291 +#: archaeological_finds/models_finds.py:1734 #: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1296 +#: archaeological_finds/models_finds.py:1299 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1300 archaeological_finds/tests.py:1197 +#: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1199 #: archaeological_warehouse/models.py:968 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1304 +#: archaeological_finds/models_finds.py:1307 #: archaeological_warehouse/models.py:972 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1308 +#: archaeological_finds/models_finds.py:1311 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1312 archaeological_finds/tests.py:1375 +#: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1377 #: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1316 +#: archaeological_finds/models_finds.py:1319 #: archaeological_warehouse/models.py:984 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1320 +#: archaeological_finds/models_finds.py:1323 #: archaeological_warehouse/models.py:988 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 +#: archaeological_finds/models_finds.py:1327 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1327 +#: archaeological_finds/models_finds.py:1330 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1331 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 +#: archaeological_finds/models_finds.py:1338 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1339 -#: archaeological_finds/models_finds.py:1733 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_finds/models_finds.py:1737 #: archaeological_warehouse/models.py:902 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1343 +#: archaeological_finds/models_finds.py:1346 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1347 +#: archaeological_finds/models_finds.py:1350 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1351 +#: archaeological_finds/models_finds.py:1354 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1358 +#: archaeological_finds/models_finds.py:1361 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1362 +#: archaeological_finds/models_finds.py:1365 #: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1365 archaeological_finds/tests.py:1417 +#: archaeological_finds/models_finds.py:1368 archaeological_finds/tests.py:1419 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1370 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1374 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1378 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1382 +#: archaeological_finds/models_finds.py:1385 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1385 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1389 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1392 +#: archaeological_finds/models_finds.py:1395 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1396 +#: archaeological_finds/models_finds.py:1399 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1402 msgctxt "key for text search" msgid "discovery-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1403 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "discovery-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1410 msgctxt "key for text search" msgid "discovery-date-tpq-before" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1414 msgctxt "key for text search" msgid "discovery-date-tpq-after" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1418 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1422 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "" -#: archaeological_finds/models_finds.py:1423 +#: archaeological_finds/models_finds.py:1426 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1429 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1430 +#: archaeological_finds/models_finds.py:1433 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1434 +#: archaeological_finds/models_finds.py:1437 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1437 +#: archaeological_finds/models_finds.py:1440 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1441 +#: archaeological_finds/models_finds.py:1444 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1447 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1450 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1454 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1470 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1479 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1482 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1485 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1492 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1492 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1498 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1503 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1510 msgctxt "key for text search" msgid "length-higher" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "width-higher" msgstr "" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1516 +#: archaeological_finds/models_finds.py:1519 msgctxt "key for text search" msgid "thickness-higher" msgstr "" -#: archaeological_finds/models_finds.py:1519 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "diameter-higher" msgstr "" -#: archaeological_finds/models_finds.py:1522 +#: archaeological_finds/models_finds.py:1525 msgctxt "key for text search" msgid "circumference-higher" msgstr "" -#: archaeological_finds/models_finds.py:1526 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "volume-higher" msgstr "" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1532 msgctxt "key for text search" msgid "weight-higher" msgstr "" -#: archaeological_finds/models_finds.py:1532 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1540 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1544 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1551 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1555 msgctxt "key for text search" msgid "check-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "check-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1561 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1565 #: archaeological_warehouse/models.py:996 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1569 #: archaeological_warehouse/models.py:1000 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1573 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1574 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1578 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1585 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1586 +#: archaeological_finds/models_finds.py:1589 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1593 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1594 -#: archaeological_operations/models.py:400 +#: archaeological_finds/models_finds.py:1597 +#: archaeological_operations/models.py:428 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1602 archaeological_finds/tests.py:1315 +#: archaeological_finds/models_finds.py:1605 archaeological_finds/tests.py:1317 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-address" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:1610 -#: archaeological_operations/models.py:1088 +#: archaeological_finds/models_finds.py:1613 +#: archaeological_operations/models.py:1122 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1614 archaeological_finds/tests.py:1291 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/tests.py:2856 -#: archaeological_operations/tests.py:3274 +#: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1293 +#: archaeological_operations/models.py:1126 +#: archaeological_operations/tests.py:2855 +#: archaeological_operations/tests.py:3273 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1709 -#: archaeological_finds/models_finds.py:2345 +#: archaeological_finds/models_finds.py:1713 +#: archaeological_finds/models_finds.py:2353 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 +#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 #: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -5076,116 +5022,116 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1717 +#: archaeological_finds/models_finds.py:1721 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1831 +#: archaeological_finds/models_finds.py:1835 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1833 +#: archaeological_finds/models_finds.py:1837 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1842 -#: archaeological_finds/templates/ishtar/sheet_find.html:414 +#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/templates/ishtar/sheet_find.html:416 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/templates/ishtar/sheet_find.html:452 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/templates/ishtar/sheet_find.html:454 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1924 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1923 +#: archaeological_finds/models_finds.py:1927 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1926 +#: archaeological_finds/models_finds.py:1930 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1947 +#: archaeological_finds/models_finds.py:1951 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1952 +#: archaeological_finds/models_finds.py:1956 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2006 +#: archaeological_finds/models_finds.py:2010 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 #: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "" -#: archaeological_finds/models_finds.py:2009 +#: archaeological_finds/models_finds.py:2013 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2029 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2035 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2067 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2201 +#: archaeological_finds/models_finds.py:2205 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2202 +#: archaeological_finds/models_finds.py:2206 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2207 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2208 #, fuzzy #| msgid "email address" msgid "Complete ID of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2209 #, fuzzy #| msgid "email address" msgid "Label of associated context records" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2318 +#: archaeological_finds/models_finds.py:2326 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2334 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2342 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2899 +#: archaeological_finds/models_finds.py:2907 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2905 +#: archaeological_finds/models_finds.py:2913 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 #: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 #: ishtar_common/models.py:2788 ishtar_common/models.py:3117 #: ishtar_common/models.py:3310 ishtar_common/models.py:3547 @@ -5193,11 +5139,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3350 +#: archaeological_finds/models_finds.py:3358 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3351 +#: archaeological_finds/models_finds.py:3359 msgid "Properties" msgstr "" @@ -5228,7 +5174,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2495 +#: archaeological_operations/models.py:2538 msgctxt "key for text search" msgid "index" msgstr "" @@ -5272,9 +5218,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:756 -#: 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:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:425 +#: archaeological_finds/templates/ishtar/sheet_find.html:463 msgid "Doer" msgstr "" @@ -5323,12 +5269,12 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1175 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:493 #: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1238 +#: archaeological_finds/models_treatments.py:1242 msgid "Add associated treatment" msgstr "" @@ -5395,56 +5341,60 @@ msgid "" "the find." msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:41 +#: archaeological_finds/templates/ishtar/sheet_find.html:40 msgid "Image / Base find" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:48 +#: archaeological_finds/templates/ishtar/sheet_find.html:47 msgid "Identification / Description / Dimensions" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:56 +#: archaeological_finds/templates/ishtar/sheet_find.html:54 msgid "Datings / Preservation" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:65 +#: archaeological_finds/templates/ishtar/sheet_find.html:62 msgid "Warehouse / Treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:175 +#: archaeological_finds/templates/ishtar/sheet_find.html:172 msgid "Administrative index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:221 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 msgid "Checked" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:302 +#: archaeological_finds/templates/ishtar/sheet_find.html:244 +msgid "No datation or preservation info." +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:304 msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:332 +#: archaeological_finds/templates/ishtar/sheet_find.html:334 msgid "Reference container / current container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:376 +#: archaeological_finds/templates/ishtar/sheet_find.html:378 msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:380 -#: archaeological_finds/templates/ishtar/sheet_find.html:418 -#: archaeological_finds/templates/ishtar/sheet_find.html:456 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 +#: archaeological_finds/templates/ishtar/sheet_find.html:382 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_finds/templates/ishtar/sheet_find.html:458 +#: archaeological_finds/templates/ishtar/sheet_find.html:497 msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:384 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +#: archaeological_finds/templates/ishtar/sheet_find.html:424 +#: archaeological_finds/templates/ishtar/sheet_find.html:462 msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats-detail.html:41 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5453,8 +5403,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 +#: archaeological_finds/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5462,7 +5412,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:529 +#: archaeological_finds/templates/ishtar/sheet_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -5549,23 +5499,23 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:881 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:883 archaeological_warehouse/models.py:1623 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1420 archaeological_finds/tests.py:1446 -#: archaeological_finds/tests.py:1456 archaeological_operations/tests.py:3042 +#: archaeological_finds/tests.py:1422 archaeological_finds/tests.py:1448 +#: archaeological_finds/tests.py:1458 archaeological_operations/tests.py:3041 #: ishtar_common/forms.py:1159 ishtar_common/forms.py:1238 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:18 +#: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:581 ishtar_common/views_item.py:847 #: ishtar_common/views_item.py:884 ishtar_common/wizards.py:483 msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1421 archaeological_finds/tests.py:1447 -#: archaeological_finds/tests.py:1457 ishtar_common/forms.py:1160 -#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:23 +#: archaeological_finds/tests.py:1423 archaeological_finds/tests.py:1449 +#: archaeological_finds/tests.py:1459 ishtar_common/forms.py:1160 +#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:485 msgid "No" msgstr "" @@ -5662,20 +5612,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2965 +#: archaeological_operations/models.py:3008 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2967 +#: archaeological_operations/models.py:3010 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2969 -#: archaeological_operations/models.py:2997 -#: archaeological_operations/models.py:3062 +#: archaeological_operations/models.py:3012 +#: archaeological_operations/models.py:3040 +#: archaeological_operations/models.py:3105 msgid "Public domain" msgstr "" @@ -5733,13 +5683,13 @@ msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:789 -#: archaeological_operations/models.py:1429 +#: archaeological_operations/models.py:1464 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:794 -#: archaeological_operations/models.py:1364 +#: archaeological_operations/models.py:1399 msgid "Address / Locality" msgstr "" @@ -5749,28 +5699,29 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:845 -#: archaeological_operations/models.py:2636 +#: archaeological_operations/models.py:2679 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/models.py:1263 +#: archaeological_operations/forms.py:1760 +#: archaeological_operations/models.py:1298 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:533 #: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1320 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:278 -#: archaeological_operations/models.py:287 -#: archaeological_operations/models.py:458 -#: archaeological_operations/models.py:912 -#: archaeological_operations/models.py:999 -#: archaeological_operations/models.py:1298 +#: archaeological_operations/forms.py:1297 +#: archaeological_operations/forms.py:1415 +#: archaeological_operations/forms.py:1924 +#: archaeological_operations/models.py:306 +#: archaeological_operations/models.py:315 +#: archaeological_operations/models.py:487 +#: archaeological_operations/models.py:947 +#: archaeological_operations/models.py:1033 +#: archaeological_operations/models.py:1333 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -5797,34 +5748,34 @@ msgstr "" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:895 -#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:1402 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:897 -#: archaeological_operations/models.py:914 -#: archaeological_operations/models.py:1410 +#: archaeological_operations/models.py:949 +#: archaeological_operations/models.py:1445 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:863 -#: archaeological_operations/models.py:1319 +#: archaeological_operations/models.py:1354 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:816 -#: archaeological_operations/models.py:1401 +#: archaeological_operations/models.py:1436 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1815 -#: archaeological_operations/models.py:915 -#: archaeological_operations/models.py:1420 +#: archaeological_operations/forms.py:1768 +#: archaeological_operations/models.py:950 +#: archaeological_operations/models.py:1455 msgid "Documentation received" msgstr "" @@ -5838,9 +5789,9 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:916 -#: archaeological_operations/models.py:1425 +#: archaeological_operations/forms.py:1772 +#: archaeological_operations/models.py:951 +#: archaeological_operations/models.py:1460 msgid "Finds received" msgstr "" @@ -5885,13 +5836,13 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1867 -#: archaeological_operations/models.py:1363 +#: archaeological_operations/forms.py:1820 +#: archaeological_operations/models.py:1398 msgid "Generic name" msgstr "" #: archaeological_operations/forms.py:808 -#: archaeological_operations/models.py:1324 +#: archaeological_operations/models.py:1359 msgid "Old code" msgstr "" @@ -5904,16 +5855,16 @@ msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:842 -#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:1396 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:856 -#: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/forms.py:1960 -#: archaeological_operations/models.py:476 -#: archaeological_operations/models.py:1277 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/forms.py:1776 +#: archaeological_operations/forms.py:1913 +#: archaeological_operations/models.py:505 +#: archaeological_operations/models.py:1312 msgid "Collaborators" msgstr "" @@ -5922,17 +5873,17 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:861 -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1283 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:883 -#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:1452 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:888 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1458 msgid "Deadline for submission of the finds" msgstr "" @@ -5941,12 +5892,12 @@ msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:900 -#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:888 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:888 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:906 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1450 msgid "Abstract" msgstr "" @@ -5971,7 +5922,7 @@ msgid "Bad operation code" msgstr "" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1856 +#: archaeological_operations/models.py:1898 msgid "Operation code" msgstr "" @@ -5985,12 +5936,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1467 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:1053 -#: archaeological_operations/models.py:1434 +#: archaeological_operations/models.py:1469 msgid "Official report number" msgstr "" @@ -5999,12 +5950,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:1481 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:1071 -#: archaeological_operations/models.py:1454 +#: archaeological_operations/models.py:1489 msgid "Writer of the minutes" msgstr "" @@ -6017,23 +5968,23 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:1080 -#: archaeological_operations/models.py:1303 +#: archaeological_operations/models.py:1338 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:1307 +#: archaeological_operations/models.py:1342 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:1311 +#: archaeological_operations/models.py:1346 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:1085 -#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:1350 msgid "Effective man-days" msgstr "" @@ -6046,17 +5997,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1101 -#: archaeological_operations/models.py:1335 +#: archaeological_operations/models.py:1370 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1374 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1106 -#: archaeological_operations/models.py:1342 +#: archaeological_operations/models.py:1377 msgid "Prescription on geoarchaeological context" msgstr "" @@ -6077,10 +6028,10 @@ msgid "Operation - 050 - Parcels (2)" msgstr "" #: archaeological_operations/forms.py:1195 -#: archaeological_operations/forms.py:1314 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1919 -#: archaeological_operations/models.py:453 +#: archaeological_operations/forms.py:1291 +#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1872 +#: archaeological_operations/models.py:482 #: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 #: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 @@ -6089,178 +6040,178 @@ msgid "Reference" msgstr "" #: archaeological_operations/forms.py:1206 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1966 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/forms.py:1919 msgid "Cultural attributions" msgstr "" -#: archaeological_operations/forms.py:1251 -#: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1228 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1892 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1271 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1299 +#: archaeological_operations/forms.py:1276 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1308 +#: archaeological_operations/forms.py:1285 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1305 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/models.py:468 +#: archaeological_operations/forms.py:1317 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:497 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1343 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/models.py:471 +#: archaeological_operations/forms.py:1320 +#: archaeological_operations/forms.py:1430 +#: archaeological_operations/models.py:500 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:488 +#: archaeological_operations/forms.py:1324 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/models.py:517 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1349 -#: archaeological_operations/forms.py:1523 -#: archaeological_operations/models.py:491 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1476 +#: archaeological_operations/models.py:520 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1525 -#: archaeological_operations/models.py:480 +#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1478 +#: archaeological_operations/models.py:509 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1533 -#: archaeological_operations/models.py:482 +#: archaeological_operations/forms.py:1331 +#: archaeological_operations/forms.py:1486 +#: archaeological_operations/models.py:511 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1357 -#: archaeological_operations/forms.py:1527 -#: archaeological_operations/models.py:484 +#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1480 +#: archaeological_operations/models.py:513 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1359 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:485 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1482 +#: archaeological_operations/models.py:514 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1531 -#: archaeological_operations/models.py:486 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1484 +#: archaeological_operations/models.py:515 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1398 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1507 +#: archaeological_operations/forms.py:1460 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1469 #: archaeological_operations/templates/ishtar/sheet_site.html:54 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1470 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1596 +#: archaeological_operations/forms.py:1549 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1611 -#: archaeological_operations/forms.py:1713 -#: archaeological_operations/forms.py:1780 +#: archaeological_operations/forms.py:1564 +#: archaeological_operations/forms.py:1666 +#: archaeological_operations/forms.py:1733 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1621 -#: archaeological_operations/models.py:2661 +#: archaeological_operations/forms.py:1574 +#: archaeological_operations/models.py:2704 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1628 -#: archaeological_operations/models.py:2696 +#: archaeological_operations/forms.py:1581 +#: archaeological_operations/models.py:2739 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1592 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1673 +#: archaeological_operations/forms.py:1626 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1630 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1690 +#: archaeological_operations/forms.py:1643 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1648 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1719 -#: archaeological_operations/forms.py:1723 +#: archaeological_operations/forms.py:1672 +#: archaeological_operations/forms.py:1676 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:1694 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1696 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1738 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1894 +#: archaeological_operations/forms.py:1847 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1950 +#: archaeological_operations/forms.py:1903 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6268,315 +6219,315 @@ msgstr "" msgid "Administrative Act" msgstr "" -#: archaeological_operations/models.py:93 +#: archaeological_operations/models.py:94 msgid "Remain types" msgstr "" -#: archaeological_operations/models.py:107 +#: archaeological_operations/models.py:108 msgid "Parent period" msgstr "" -#: archaeological_operations/models.py:114 +#: archaeological_operations/models.py:115 msgid "Type Period" msgstr "" -#: archaeological_operations/models.py:115 +#: archaeological_operations/models.py:116 msgid "Types Period" msgstr "" -#: archaeological_operations/models.py:130 +#: archaeological_operations/models.py:131 msgid "Type of report state" msgstr "" -#: archaeological_operations/models.py:131 +#: archaeological_operations/models.py:132 msgid "Types of report state" msgstr "" -#: archaeological_operations/models.py:148 +#: archaeological_operations/models.py:149 msgid "Type of record quality" msgstr "" -#: archaeological_operations/models.py:149 +#: archaeological_operations/models.py:150 msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:157 +#: archaeological_operations/models.py:158 msgid "Cultural attribution type" msgstr "" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:159 msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:346 -#: archaeological_operations/models.py:1096 -#: archaeological_operations/tests.py:3033 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1130 +#: archaeological_operations/tests.py:3032 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:358 +#: archaeological_operations/models.py:386 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:361 +#: archaeological_operations/models.py:389 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:393 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:369 +#: archaeological_operations/models.py:397 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:401 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:405 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:408 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:388 +#: archaeological_operations/models.py:416 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:392 +#: archaeological_operations/models.py:420 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:396 +#: archaeological_operations/models.py:424 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:542 +#: archaeological_operations/models.py:1496 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:525 -#: archaeological_operations/models.py:1473 +#: archaeological_operations/models.py:554 +#: archaeological_operations/models.py:1508 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1390 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1425 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:580 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 +#: archaeological_operations/models.py:771 ishtar_common/forms.py:1158 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 #: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:741 +#: archaeological_operations/models.py:773 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:977 +#: archaeological_operations/models.py:1012 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:978 +#: archaeological_operations/models.py:1013 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:979 -msgid "Scientist (full name)" -msgstr "" - -#: archaeological_operations/models.py:980 +#: archaeological_operations/models.py:1014 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:981 +#: archaeological_operations/models.py:1015 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:982 +#: archaeological_operations/models.py:1016 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:983 +#: archaeological_operations/models.py:1017 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:985 +#: archaeological_operations/models.py:1018 +msgid "Scientist (full name)" +msgstr "" + +#: archaeological_operations/models.py:1019 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:986 +#: archaeological_operations/models.py:1020 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:987 +#: archaeological_operations/models.py:1021 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:988 +#: archaeological_operations/models.py:1022 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1023 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1028 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1108 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1081 -#: archaeological_operations/tests.py:3040 +#: archaeological_operations/models.py:1115 +#: archaeological_operations/tests.py:3039 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1118 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1102 +#: archaeological_operations/models.py:1136 msgctxt "key for text search" msgid "start-before" msgstr "" -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:1139 msgctxt "key for text search" msgid "start-after" msgstr "" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1142 msgctxt "key for text search" msgid "end-before" msgstr "" -#: archaeological_operations/models.py:1112 +#: archaeological_operations/models.py:1146 msgctxt "key for text search" msgid "end-after" msgstr "" -#: archaeological_operations/models.py:1116 -#: archaeological_operations/tests.py:3083 +#: archaeological_operations/models.py:1150 +#: archaeological_operations/tests.py:3082 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:1159 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1129 +#: archaeological_operations/models.py:1163 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1137 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1145 +#: archaeological_operations/models.py:1179 msgctxt "key for text search" msgid "documentation-received" msgstr "" -#: archaeological_operations/models.py:1149 +#: archaeological_operations/models.py:1183 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "" -#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "" -#: archaeological_operations/models.py:1157 +#: archaeological_operations/models.py:1191 msgctxt "key for text search" msgid "finds-received" msgstr "" -#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "" -#: archaeological_operations/models.py:1168 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1254 +#: archaeological_operations/models.py:1289 msgid "Scientific manager" msgstr "" -#: archaeological_operations/models.py:1270 +#: archaeological_operations/models.py:1305 msgid "Operation monitor" msgstr "" -#: archaeological_operations/models.py:1396 +#: archaeological_operations/models.py:1431 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1404 +#: archaeological_operations/models.py:1439 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1438 +#: archaeological_operations/models.py:1473 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1483 +#: archaeological_operations/models.py:1518 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1001 ishtar_common/views.py:1002 @@ -6584,297 +6535,297 @@ msgstr "" msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1520 +#: archaeological_operations/models.py:1558 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1521 +#: archaeological_operations/models.py:1559 #, fuzzy #| msgid "email address" msgid "List of associated containers" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1594 +#: archaeological_operations/models.py:1632 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1703 +#: archaeological_operations/models.py:1741 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1822 +#: archaeological_operations/models.py:1864 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1841 +#: archaeological_operations/models.py:1883 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1889 +#: archaeological_operations/models.py:1931 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:1950 +#: archaeological_operations/models.py:1992 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:1960 +#: archaeological_operations/models.py:2002 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:1968 +#: archaeological_operations/models.py:2010 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:1976 +#: archaeological_operations/models.py:2018 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2030 +#: archaeological_operations/models.py:2072 #: archaeological_warehouse/templates/ishtar/sheet_container.html:103 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2092 -#: archaeological_operations/models.py:2171 +#: archaeological_operations/models.py:2134 +#: archaeological_operations/models.py:2213 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2136 +#: archaeological_operations/models.py:2178 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2223 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:309 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:575 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2266 ishtar_common/models_imports.py:889 +#: archaeological_operations/models.py:2309 ishtar_common/models_imports.py:889 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2310 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2292 +#: archaeological_operations/models.py:2335 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2293 +#: archaeological_operations/models.py:2336 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2359 +#: archaeological_operations/models.py:2402 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2364 +#: archaeological_operations/models.py:2407 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2367 +#: archaeological_operations/models.py:2410 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2371 +#: archaeological_operations/models.py:2414 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2497 +#: archaeological_operations/models.py:2540 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2507 +#: archaeological_operations/models.py:2550 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2553 #: archaeological_warehouse/models.py:923 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2557 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2526 +#: archaeological_operations/models.py:2569 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2573 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2577 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2537 +#: archaeological_operations/models.py:2580 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2584 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2588 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2600 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2561 +#: archaeological_operations/models.py:2604 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2607 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2611 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2572 +#: archaeological_operations/models.py:2615 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2619 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2623 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2627 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2630 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2594 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2598 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2602 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2606 +#: archaeological_operations/models.py:2649 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2610 +#: archaeological_operations/models.py:2653 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2687 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2749 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:2755 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2886 +#: archaeological_operations/models.py:2929 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2976 +#: archaeological_operations/models.py:3019 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3266 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3238 +#: archaeological_operations/models.py:3281 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3282 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3287 +#: archaeological_operations/models.py:3330 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3332 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3333 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3334 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3335 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3336 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3835 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3795 +#: archaeological_operations/models.py:3838 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3839 msgid "Operation types old" msgstr "" @@ -7143,73 +7094,73 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:824 +#: archaeological_operations/tests.py:821 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:854 +#: archaeological_operations/tests.py:851 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:892 +#: archaeological_operations/tests.py:889 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" -#: archaeological_operations/tests.py:1803 -msgid "" -"This parcel is associated with a context record. It can't be deleted." +#: archaeological_operations/tests.py:1802 +#: archaeological_operations/views.py:474 +msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" -#: archaeological_operations/tests.py:2530 ishtar_common/forms.py:442 +#: archaeological_operations/tests.py:2529 ishtar_common/forms.py:442 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2543 +#: archaeological_operations/tests.py:2542 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4696 +#: archaeological_operations/tests.py:4578 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4704 +#: archaeological_operations/tests.py:4586 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4717 +#: archaeological_operations/tests.py:4599 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 +#: archaeological_operations/tests.py:4606 ishtar_common/admin.py:2274 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4730 +#: archaeological_operations/tests.py:4612 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 +#: archaeological_operations/tests.py:4685 ishtar_common/admin.py:2352 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4809 ishtar_common/models_rest.py:307 +#: archaeological_operations/tests.py:4691 ishtar_common/models_rest.py:307 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4816 ishtar_common/models_rest.py:286 +#: archaeological_operations/tests.py:4698 ishtar_common/models_rest.py:286 #: ishtar_common/models_rest.py:292 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -7235,10 +7186,6 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:474 -msgid "This parcel is associated with a context record. It can't be deleted." -msgstr "" - #: archaeological_operations/views.py:575 ishtar_common/models.py:1009 msgid "Site deletion" msgstr "" @@ -7268,7 +7215,7 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:84 archaeological_warehouse/forms.py:192 -#: archaeological_warehouse/forms.py:508 archaeological_warehouse/forms.py:729 +#: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 @@ -7309,7 +7256,7 @@ msgid "Warehouse - 001 - Search" msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:260 +#: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 #: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:901 msgid "Warehouse type" msgstr "" @@ -7336,59 +7283,59 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 -#: ishtar_common/models_common.py:3006 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:3188 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3035 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3043 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 -#: ishtar_common/models_common.py:3018 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3057 +#: ishtar_common/models_common.py:3200 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3073 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:266 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:301 archaeological_warehouse/forms.py:302 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:306 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:324 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:341 archaeological_warehouse/forms.py:512 +#: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 #: archaeological_warehouse/models.py:1132 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:343 archaeological_warehouse/forms.py:510 -#: archaeological_warehouse/forms.py:734 archaeological_warehouse/models.py:698 +#: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 +#: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 #: archaeological_warehouse/models.py:859 #: archaeological_warehouse/models.py:1098 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 @@ -7396,124 +7343,124 @@ msgstr "" msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:345 +#: archaeological_warehouse/forms.py:339 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:354 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 #: archaeological_warehouse/models.py:1115 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:364 archaeological_warehouse/forms.py:745 +#: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 #: archaeological_warehouse/models.py:1089 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:372 +#: archaeological_warehouse/forms.py:366 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:377 +#: archaeological_warehouse/forms.py:371 #: archaeological_warehouse/models.py:1122 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:403 +#: archaeological_warehouse/forms.py:397 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:422 +#: archaeological_warehouse/forms.py:416 msgid "This reference already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:430 archaeological_warehouse/forms.py:807 +#: archaeological_warehouse/forms.py:424 archaeological_warehouse/forms.py:801 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:494 +#: archaeological_warehouse/forms.py:488 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:501 +#: archaeological_warehouse/forms.py:495 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:509 +#: archaeological_warehouse/forms.py:503 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:508 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:517 +#: archaeological_warehouse/forms.py:511 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:552 +#: archaeological_warehouse/forms.py:546 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:554 +#: archaeological_warehouse/forms.py:548 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:553 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:568 +#: archaeological_warehouse/forms.py:562 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:569 +#: archaeological_warehouse/forms.py:563 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:570 +#: archaeological_warehouse/forms.py:564 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:589 +#: archaeological_warehouse/forms.py:583 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:613 archaeological_warehouse/forms.py:626 -#: archaeological_warehouse/forms.py:640 archaeological_warehouse/views.py:373 +#: archaeological_warehouse/forms.py:607 archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:634 archaeological_warehouse/views.py:373 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:618 archaeological_warehouse/forms.py:631 -#: archaeological_warehouse/forms.py:645 +#: archaeological_warehouse/forms.py:612 archaeological_warehouse/forms.py:625 +#: archaeological_warehouse/forms.py:639 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:614 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:665 +#: archaeological_warehouse/forms.py:659 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:693 +#: archaeological_warehouse/forms.py:687 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:705 +#: archaeological_warehouse/forms.py:699 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:709 archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:703 archaeological_warehouse/forms.py:704 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:709 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:828 +#: archaeological_warehouse/forms.py:822 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -7882,7 +7829,7 @@ msgid "" msgstr "" #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:36 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:44 #, fuzzy #| msgid "email address" msgid "Associated finds" @@ -7980,383 +7927,383 @@ msgstr "" msgid "Related item" msgstr "" -#: ishtar_common/admin.py:107 +#: ishtar_common/admin.py:106 msgid "CSV file" msgstr "" -#: ishtar_common/admin.py:108 +#: ishtar_common/admin.py:107 msgid "Only unicode encoding is managed - convert your file first" msgstr "" -#: ishtar_common/admin.py:148 +#: ishtar_common/admin.py:147 msgid "Export selected as CSV file" msgstr "" -#: ishtar_common/admin.py:212 +#: ishtar_common/admin.py:211 msgid "Export selected as GeoJSON file" msgstr "" -#: ishtar_common/admin.py:295 +#: ishtar_common/admin.py:294 msgid "Export selected as Ishtar (zipped JSON)" msgstr "" -#: ishtar_common/admin.py:301 +#: ishtar_common/admin.py:300 msgid "Merge inside" msgstr "" -#: ishtar_common/admin.py:317 +#: ishtar_common/admin.py:316 msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 +#: ishtar_common/admin.py:333 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "" -#: ishtar_common/admin.py:359 +#: ishtar_common/admin.py:358 msgid "{} merged into {}." msgstr "" -#: ishtar_common/admin.py:382 +#: ishtar_common/admin.py:381 #: ishtar_common/templates/admin/change_parent.html:14 msgid "Change parent" msgstr "" -#: ishtar_common/admin.py:396 +#: ishtar_common/admin.py:395 msgid "Change parent of selected item(s)" msgstr "" -#: ishtar_common/admin.py:428 +#: ishtar_common/admin.py:427 msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:489 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "" -#: ishtar_common/admin.py:541 ishtar_common/models.py:979 +#: ishtar_common/admin.py:540 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/admin.py:541 ishtar_common/forms_common.py:1229 #: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 #: ishtar_common/models.py:2898 msgid "Profiles" msgstr "" -#: ishtar_common/admin.py:637 +#: ishtar_common/admin.py:636 msgid "The CSV file should at least have a {} column" msgstr "" -#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 +#: ishtar_common/admin.py:703 ishtar_common/admin.py:933 #, python-format msgid "%d item(s) created." msgstr "" -#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 +#: ishtar_common/admin.py:705 ishtar_common/admin.py:937 #, python-format msgid "%d item(s) updated." msgstr "" -#: ishtar_common/admin.py:710 +#: ishtar_common/admin.py:709 msgid "These parents are missing: {}" msgstr "" -#: ishtar_common/admin.py:730 +#: ishtar_common/admin.py:729 msgid "Geojson file" msgstr "" -#: ishtar_common/admin.py:732 +#: ishtar_common/admin.py:731 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." msgstr "" -#: ishtar_common/admin.py:738 +#: ishtar_common/admin.py:737 msgid "Prefix for numero INSEE" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:740 msgid "Field name for numero INSEE" msgstr "" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:743 msgid "Field name for name" msgstr "" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "m2" msgstr "" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "km2" msgstr "" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:746 msgid "Surface unit" msgstr "" -#: ishtar_common/admin.py:749 +#: ishtar_common/admin.py:748 msgid "Field name for surface" msgstr "" -#: ishtar_common/admin.py:752 +#: ishtar_common/admin.py:751 msgid "Field name for year" msgstr "" -#: ishtar_common/admin.py:756 +#: ishtar_common/admin.py:755 msgid "Not required for new town. Leave it empty when not available." msgstr "" -#: ishtar_common/admin.py:759 +#: ishtar_common/admin.py:758 msgid "Update only geometry of existing towns" msgstr "" -#: ishtar_common/admin.py:778 +#: ishtar_common/admin.py:777 msgid "\"{}\" not found in feature {}" msgstr "" -#: ishtar_common/admin.py:791 +#: ishtar_common/admin.py:790 msgid "\"{}\" not found in properties of feature {}" msgstr "" -#: ishtar_common/admin.py:804 +#: ishtar_common/admin.py:803 msgid "Bad geometry for feature {}" msgstr "" -#: ishtar_common/admin.py:815 +#: ishtar_common/admin.py:814 msgid "Geometry {} not managed for towns - feature {}" msgstr "" -#: ishtar_common/admin.py:825 +#: ishtar_common/admin.py:824 msgid "Bad value for surface: {} - feature {}" msgstr "" -#: ishtar_common/admin.py:869 +#: ishtar_common/admin.py:868 msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:892 +#: ishtar_common/admin.py:891 msgid "Bad geojson file" msgstr "" -#: ishtar_common/admin.py:904 +#: ishtar_common/admin.py:903 msgid "Too many errors..." msgstr "" -#: ishtar_common/admin.py:957 +#: ishtar_common/admin.py:956 msgid "Zipped JSON file" msgstr "" -#: ishtar_common/admin.py:958 +#: ishtar_common/admin.py:957 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "" -#: ishtar_common/admin.py:994 +#: ishtar_common/admin.py:993 msgid "{} {}(s) created/updated." msgstr "" -#: ishtar_common/admin.py:1017 +#: ishtar_common/admin.py:1016 msgid "Center" msgstr "" -#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 +#: ishtar_common/admin.py:1017 ishtar_common/models_common.py:2798 msgid "Limit" msgstr "" -#: ishtar_common/admin.py:1026 +#: ishtar_common/admin.py:1025 msgid "Parents" msgstr "" -#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 +#: ishtar_common/admin.py:1066 ishtar_common/admin.py:1507 msgid "Make available" msgstr "" -#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make unavailable" msgstr "" -#: ishtar_common/admin.py:1192 +#: ishtar_common/admin.py:1191 msgid "Department number" msgstr "" -#: ishtar_common/admin.py:1193 +#: ishtar_common/admin.py:1192 msgid "Area name" msgstr "" -#: ishtar_common/admin.py:1207 +#: ishtar_common/admin.py:1206 msgid "Choose an area or set an area reference." msgstr "" -#: ishtar_common/admin.py:1214 +#: ishtar_common/admin.py:1213 msgid "Invalid department number." msgstr "" -#: ishtar_common/admin.py:1223 +#: ishtar_common/admin.py:1222 msgid "This name is already used by another area." msgstr "" -#: ishtar_common/admin.py:1251 +#: ishtar_common/admin.py:1250 msgid "Area \"{}\" created." msgstr "" -#: ishtar_common/admin.py:1268 +#: ishtar_common/admin.py:1267 msgid "{} town(s) added to \"{}\"." msgstr "" -#: ishtar_common/admin.py:1440 +#: ishtar_common/admin.py:1439 msgid "{} importer type(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1461 +#: ishtar_common/admin.py:1460 msgid "Select only one importer." msgstr "" -#: ishtar_common/admin.py:1491 +#: ishtar_common/admin.py:1490 msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1560 +#: ishtar_common/admin.py:1559 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1591 +#: ishtar_common/admin.py:1590 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1604 +#: ishtar_common/admin.py:1603 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1631 +#: ishtar_common/admin.py:1630 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1638 +#: ishtar_common/admin.py:1637 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1652 +#: ishtar_common/admin.py:1651 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1687 +#: ishtar_common/admin.py:1686 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1832 +#: ishtar_common/admin.py:1831 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1833 +#: ishtar_common/admin.py:1832 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1862 ishtar_common/models.py:1553 msgid "Form" msgstr "" -#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1883 ishtar_common/models.py:1694 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 +#: ishtar_common/admin.py:2013 ishtar_common/admin.py:2065 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2021 +#: ishtar_common/admin.py:2020 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2033 +#: ishtar_common/admin.py:2032 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2073 +#: ishtar_common/admin.py:2072 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2084 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2152 ishtar_common/models.py:976 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 -#: ishtar_common/admin.py:2333 +#: ishtar_common/admin.py:2185 ishtar_common/admin.py:2295 +#: ishtar_common/admin.py:2331 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2208 +#: ishtar_common/admin.py:2206 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2216 +#: ishtar_common/admin.py:2214 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" -#: ishtar_common/admin.py:2226 +#: ishtar_common/admin.py:2224 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2244 +#: ishtar_common/admin.py:2242 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2250 +#: ishtar_common/admin.py:2248 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2256 +#: ishtar_common/admin.py:2254 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2265 +#: ishtar_common/admin.py:2263 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2283 +#: ishtar_common/admin.py:2281 msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2318 +#: ishtar_common/admin.py:2316 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2340 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2347 +#: ishtar_common/admin.py:2345 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2360 +#: ishtar_common/admin.py:2358 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2393 +#: ishtar_common/admin.py:2391 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2394 +#: ishtar_common/admin.py:2392 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2402 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/admin.py:2405 ishtar_common/models.py:449 #: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 @@ -8367,21 +8314,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2409 +#: ishtar_common/admin.py:2407 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2439 +#: ishtar_common/admin.py:2437 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2472 +#: ishtar_common/admin.py:2470 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2480 +#: ishtar_common/admin.py:2478 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8417,173 +8364,173 @@ msgstr "" msgid "Ishtar - Common" msgstr "" -#: ishtar_common/data_importer.py:278 +#: ishtar_common/data_importer.py:279 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:297 +#: ishtar_common/data_importer.py:298 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:309 +#: ishtar_common/data_importer.py:310 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:319 +#: ishtar_common/data_importer.py:320 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:388 -#: ishtar_common/data_importer.py:678 +#: ishtar_common/data_importer.py:376 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:679 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:401 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:470 ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:471 ishtar_common/data_importer.py:764 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:478 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:479 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:707 +#: ishtar_common/data_importer.py:708 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:846 +#: ishtar_common/data_importer.py:847 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:852 +#: ishtar_common/data_importer.py:853 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 +#: ishtar_common/data_importer.py:855 ishtar_common/views.py:1619 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:855 +#: ishtar_common/data_importer.py:856 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:856 +#: ishtar_common/data_importer.py:857 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:857 +#: ishtar_common/data_importer.py:858 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:859 +#: ishtar_common/data_importer.py:860 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:863 +#: ishtar_common/data_importer.py:864 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:867 +#: ishtar_common/data_importer.py:868 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/data_importer.py:1554 ishtar_common/views.py:1697 #: ishtar_common/views.py:1707 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1842 +#: ishtar_common/data_importer.py:1845 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1847 +#: ishtar_common/data_importer.py:1850 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1929 +#: ishtar_common/data_importer.py:1932 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:2056 +#: ishtar_common/data_importer.py:2059 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2131 +#: ishtar_common/data_importer.py:2134 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2139 +#: ishtar_common/data_importer.py:2142 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2144 +#: ishtar_common/data_importer.py:2147 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2229 +#: ishtar_common/data_importer.py:2232 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2232 +#: ishtar_common/data_importer.py:2235 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2312 +#: ishtar_common/data_importer.py:2315 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2363 +#: ishtar_common/data_importer.py:2366 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8659,6 +8606,26 @@ msgstr "" msgid "Set to null" msgstr "" +#: ishtar_common/forms.py:1298 +msgid "Geo - Name" +msgstr "" + +#: ishtar_common/forms.py:1299 +msgid "Geo - Data type" +msgstr "" + +#: ishtar_common/forms.py:1300 +msgid "Geo - Origin" +msgstr "" + +#: ishtar_common/forms.py:1301 +msgid "Geo - Provider" +msgstr "" + +#: ishtar_common/forms.py:1302 +msgid "Geo - Comment" +msgstr "" + #: ishtar_common/forms_common.py:86 msgid "" "<p>Type name, department code of the town you would like to select. The " @@ -8691,7 +8658,7 @@ msgstr "" msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2542 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -8769,8 +8736,8 @@ msgstr "" #: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 #: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 -#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 -#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3075 +#: ishtar_common/models_common.py:3210 ishtar_common/wizards.py:1933 msgid "Email" msgstr "E-Mail-Adresse" @@ -8842,12 +8809,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3059 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 -#: ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3062 +#: ishtar_common/models_common.py:3065 msgid "Phone description 2" msgstr "" @@ -8855,11 +8822,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3069 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3067 msgid "Phone 3" msgstr "" @@ -8867,23 +8834,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3044 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3046 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3049 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3052 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3055 msgid "Other address: country" msgstr "" @@ -8892,7 +8859,7 @@ msgid "Already has an account" msgstr "" #: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 -#: ishtar_common/wizards.py:1930 +#: ishtar_common/wizards.py:1932 msgid "Username" msgstr "Benutzername" @@ -8912,7 +8879,7 @@ msgid "Account" msgstr "" #: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 -#: ishtar_common/wizards.py:1966 +#: ishtar_common/wizards.py:1968 msgid "New password" msgstr "" @@ -9076,6 +9043,7 @@ msgstr "" #: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 #: ishtar_common/models.py:5185 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "" @@ -9321,16 +9289,19 @@ msgstr "" #: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" #: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" #: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" @@ -9343,6 +9314,21 @@ msgstr "" msgid "Buffer type" msgstr "" +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:3706 +msgid "Estimated error for X" +msgstr "" + +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:3709 +msgid "Estimated error for Y" +msgstr "" + +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2185 +#: ishtar_common/models_common.py:3712 +msgid "Estimated error for Z" +msgstr "" + #: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "" @@ -9351,44 +9337,48 @@ msgstr "" msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2859 +#: ishtar_common/forms_common.py:2855 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2864 +#: ishtar_common/forms_common.py:2860 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2869 +#: ishtar_common/forms_common.py:2865 msgid "A value is expected for Z." msgstr "" -#: ishtar_common/forms_common.py:2888 +#: ishtar_common/forms_common.py:2884 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:2924 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 -#: ishtar_common/models_common.py:3539 +#: ishtar_common/forms_common.py:2926 +msgid "Coordinates" +msgstr "" + +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3721 msgid "Point" msgstr "" -#: ishtar_common/forms_common.py:2931 +#: ishtar_common/forms_common.py:2928 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:2929 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:2933 +#: ishtar_common/forms_common.py:2930 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:2934 +#: ishtar_common/forms_common.py:2931 msgid "Multi-polygons" msgstr "" @@ -10344,6 +10334,11 @@ msgstr "" msgid "Error: general_contractor type is missing" msgstr "" +#: ishtar_common/models.py:2465 +msgctxt "key for text search" +msgid "precise-town" +msgstr "" + #: ishtar_common/models.py:2503 msgid "Organizations" msgstr "" @@ -10759,7 +10754,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3430 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -11157,11 +11152,23 @@ msgstr "" msgid "Data provider" msgstr "" +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:3702 +msgid "X" +msgstr "" + #: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 #: ishtar_common/models_common.py:2172 msgid "User input" msgstr "" +#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3703 +msgid "Y" +msgstr "" + +#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3704 +msgid "Z" +msgstr "" + #: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "" @@ -11174,7 +11181,11 @@ msgstr "" msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:3716 +msgid "Spatial Reference System" +msgstr "" + +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3722 msgid "Point (2D)" msgstr "" @@ -11198,103 +11209,138 @@ msgstr "" msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2274 +#: ishtar_common/models_common.py:2284 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2647 +#: ishtar_common/models_common.py:2702 +#, fuzzy +#| msgid "username" +msgctxt "key for text search" +msgid "geo-name" +msgstr "Benutzername" + +#: ishtar_common/models_common.py:2705 +msgctxt "key for text search" +msgid "geo-type" +msgstr "" + +#: ishtar_common/models_common.py:2708 +msgctxt "key for text search" +msgid "geo-origin" +msgstr "" + +#: ishtar_common/models_common.py:2711 +msgctxt "key for text search" +msgid "geo-provider" +msgstr "" + +#: ishtar_common/models_common.py:2714 +msgctxt "key for text search" +msgid "geo-comment" +msgstr "" + +#: ishtar_common/models_common.py:2736 +msgid "Add geographic item" +msgstr "" + +#: ishtar_common/models_common.py:2738 +msgid "geo." +msgstr "" + +#: ishtar_common/models_common.py:2808 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2651 +#: ishtar_common/models_common.py:2812 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2655 +#: ishtar_common/models_common.py:2816 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:2856 +#: ishtar_common/models_common.py:3038 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:2889 +#: ishtar_common/models_common.py:3071 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:2895 +#: ishtar_common/models_common.py:3077 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:3114 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3013 +#: ishtar_common/models_common.py:3195 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3023 +#: ishtar_common/models_common.py:3205 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3041 +#: ishtar_common/models_common.py:3223 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3252 +#: ishtar_common/models_common.py:3434 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3256 +#: ishtar_common/models_common.py:3438 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3332 +#: ishtar_common/models_common.py:3514 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3334 +#: ishtar_common/models_common.py:3516 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3542 +#: ishtar_common/models_common.py:3724 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3727 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3729 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:3549 +#: ishtar_common/models_common.py:3731 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3556 +#: ishtar_common/models_common.py:3738 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4107 +#: ishtar_common/models_common.py:4254 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4109 +#: ishtar_common/models_common.py:4256 msgid "regen." msgstr "" @@ -11786,10 +11832,12 @@ msgid "Unarchive" msgstr "" #: ishtar_common/models_imports.py:1374 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "" #: ishtar_common/models_imports.py:1375 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 @@ -11798,7 +11846,7 @@ msgid "Delete" msgstr "" #: ishtar_common/models_imports.py:1469 ishtar_common/models_imports.py:1472 -#: ishtar_common/models_imports.py:1531 +#: ishtar_common/models_imports.py:1534 msgid "Invalid GIS file." msgstr "" @@ -11811,27 +11859,27 @@ msgstr "" msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1528 +#: ishtar_common/models_imports.py:1531 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1570 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1635 +#: ishtar_common/models_imports.py:1638 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1666 +#: ishtar_common/models_imports.py:1669 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1702 +#: ishtar_common/models_imports.py:1705 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1710 +#: ishtar_common/models_imports.py:1713 msgid "Import {} finished with no errors" msgstr "" @@ -12485,11 +12533,11 @@ msgstr "" msgid "Geometry" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:39 msgid "geo item" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:35 #, fuzzy #| msgid "email address" msgid "Associated context records" @@ -12655,6 +12703,46 @@ msgstr "" msgid "Are you sure you want to delete: " msgstr "" +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:11 +msgid "Are you sure to want to delete this geographic item?" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:12 +msgid "No rollback is possible." +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:43 +msgid "Geographic item for these towns" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:52 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:97 +msgid "Geographic item for these operations" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:61 +msgid "Geographic item for these sites" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:70 +#, fuzzy +#| msgid "email address" +msgid "Geographic item for these context records" +msgstr "E-Mail-Adresse" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:79 +msgid "Geographic item for these base finds" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:88 +msgid "Geographic item for these containers" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:111 +#: ishtar_common/templates/ishtar/import_delete.html:45 +msgid "Are you sure to want to delete this import?" +msgstr "" + #: ishtar_common/templates/ishtar/forms/geo_form.html:7 msgid "" "Many items are attached to this geographic item. Only the ten first of each " @@ -12767,10 +12855,6 @@ msgid "" "every piece of information." msgstr "" -#: ishtar_common/templates/ishtar/import_delete.html:45 -msgid "Are you sure to want to delete this import?" -msgstr "" - #: ishtar_common/templates/ishtar/import_list.html:10 msgid "Autorefresh the table (useful when waiting for an import result)" msgstr "" @@ -13416,19 +13500,19 @@ msgstr "" msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:612 +#: ishtar_common/utils.py:614 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:690 +#: ishtar_common/utils.py:692 msgid "Information" msgstr "" -#: ishtar_common/utils.py:691 +#: ishtar_common/utils.py:693 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1710 +#: ishtar_common/utils.py:1520 msgid "The maximum supported file size is {} Mo." msgstr "" @@ -13577,18 +13661,23 @@ msgstr "" msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2862 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2803 +#: ishtar_common/views.py:2813 ishtar_common/views.py:2910 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 +#: ishtar_common/views.py:2851 ishtar_common/views.py:2899 +#: ishtar_common/views.py:2948 msgid "Main geo item for" msgstr "" +#: ishtar_common/views.py:2961 +msgid "Delete geographic item" +msgstr "" + #: ishtar_common/views_item.py:185 #, python-format msgid "New %s" @@ -13637,19 +13726,19 @@ msgstr "" msgid "Deleted" msgstr "" -#: ishtar_common/wizards.py:1061 +#: ishtar_common/wizards.py:1063 msgid "{} modified." msgstr "" -#: ishtar_common/wizards.py:1063 +#: ishtar_common/wizards.py:1065 msgid "{} created." msgstr "" -#: ishtar_common/wizards.py:1841 +#: ishtar_common/wizards.py:1843 msgid "{} deleted." msgstr "" -#: ishtar_common/wizards.py:2090 +#: ishtar_common/wizards.py:2092 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 1d9afe7be..83ae3e026 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-29 11:29+0200\n" +"POT-Creation-Date: 2022-11-10 11:43+0100\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" @@ -20,23 +20,23 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:527 -#: archaeological_context_records/models.py:721 +#: archaeological_context_records/models.py:531 +#: archaeological_context_records/models.py:728 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1139 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:2420 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1311 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1482 -#: archaeological_operations/models.py:2336 -#: archaeological_operations/models.py:2354 -#: archaeological_operations/models.py:2470 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2958 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:2379 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2513 +#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:3001 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 @@ -87,15 +87,15 @@ msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 #: archaeological_files/forms.py:883 archaeological_files/forms.py:919 -#: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 +#: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 #: archaeological_finds/forms_treatments.py:683 #: archaeological_finds/forms_treatments.py:926 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1312 -#: archaeological_operations/forms.py:1547 -#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 +#: archaeological_operations/forms.py:1289 +#: archaeological_operations/forms.py:1500 +#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:499 #: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 #: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" @@ -103,16 +103,16 @@ msgstr "" #: archaeological_context_records/forms.py:145 #: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:576 -#: archaeological_context_records/forms.py:630 -#: archaeological_context_records/models.py:733 -#: archaeological_context_records/models.py:1414 -#: archaeological_warehouse/forms.py:454 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/forms.py:604 +#: archaeological_context_records/models.py:740 +#: archaeological_context_records/models.py:1427 +#: archaeological_warehouse/forms.py:448 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 +#: archaeological_finds/forms.py:1354 archaeological_operations/forms.py:1815 msgid "Code PATRIARCHE" msgstr "" @@ -126,44 +126,44 @@ msgid "Operation - year" msgstr "" #: archaeological_context_records/forms.py:154 -#: archaeological_finds/forms.py:1379 +#: archaeological_finds/forms.py:1351 msgid "Operation's number (index by year)" msgstr "" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:737 -#: archaeological_context_records/models.py:727 +#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/models.py:734 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1444 +#: archaeological_finds/forms.py:1416 msgid "Search within related operations" msgstr "" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:702 msgid "Unit type" msgstr "" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:288 -#: archaeological_context_records/forms.py:578 -#: archaeological_context_records/forms.py:631 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:517 -#: archaeological_context_records/models.py:705 -#: archaeological_context_records/models.py:1416 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/forms.py:605 +#: archaeological_context_records/models.py:520 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:712 +#: archaeological_context_records/models.py:1429 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:89 archaeological_files/forms.py:932 -#: archaeological_finds/models_finds.py:1097 +#: archaeological_finds/models_finds.py:1100 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/models.py:2982 -#: archaeological_operations/models.py:3229 +#: archaeological_operations/forms.py:1514 +#: archaeological_operations/models.py:3025 +#: archaeological_operations/models.py:3272 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -180,8 +180,8 @@ msgstr "" #: archaeological_context_records/forms.py:173 #: archaeological_context_records/forms.py:308 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:815 +#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:820 msgid "Excavation technique" msgstr "" @@ -197,8 +197,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1616 +#: archaeological_operations/forms.py:1397 +#: archaeological_operations/forms.py:1569 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -212,56 +212,56 @@ msgid "Context record - 020 - General" msgstr "" #: archaeological_context_records/forms.py:289 -#: archaeological_context_records/forms.py:568 -#: archaeological_context_records/forms.py:632 -#: archaeological_context_records/forms.py:730 -#: archaeological_context_records/models.py:513 -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:713 -#: archaeological_finds/models_finds.py:1094 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:606 +#: archaeological_context_records/forms.py:704 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:720 +#: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2963 +#: archaeological_operations/models.py:3006 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 -#: ishtar_common/models_common.py:3517 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2824 +#: ishtar_common/models_common.py:3700 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" #: archaeological_context_records/forms.py:294 -#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:547 msgid "Only the items associated to the operation can be selected." msgstr "" #: archaeological_context_records/forms.py:299 -#: archaeological_context_records/forms.py:579 -#: archaeological_context_records/forms.py:634 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:526 -#: archaeological_context_records/models.py:758 -#: archaeological_context_records/models.py:1415 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:608 +#: archaeological_context_records/models.py:522 +#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:1428 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:301 -#: archaeological_context_records/models.py:734 -#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:1430 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:295 archaeological_finds/forms.py:297 -#: archaeological_finds/forms.py:648 archaeological_finds/forms.py:650 -#: archaeological_finds/forms.py:818 archaeological_finds/forms.py:864 -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:620 archaeological_finds/forms.py:622 +#: archaeological_finds/forms.py:790 archaeological_finds/forms.py:836 +#: archaeological_finds/forms.py:1430 #: archaeological_finds/forms_treatments.py:193 -#: archaeological_finds/models_finds.py:409 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:411 +#: archaeological_finds/models_finds.py:1814 #: archaeological_finds/models_treatments.py:255 -#: archaeological_finds/templates/ishtar/sheet_find.html:180 +#: archaeological_finds/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 #: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 @@ -270,59 +270,59 @@ msgid "Description" msgstr "" #: archaeological_context_records/forms.py:303 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/models.py:771 msgid "Filling" msgstr "" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:735 +#: archaeological_context_records/models.py:742 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:313 +#: archaeological_context_records/forms.py:316 #: archaeological_files/forms.py:298 archaeological_files/forms.py:595 #: archaeological_files/models.py:629 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:812 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:319 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/forms.py:322 +#: archaeological_context_records/models.py:745 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:739 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:746 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:321 -#: archaeological_context_records/models.py:740 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:747 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:748 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:323 -#: archaeological_context_records/models.py:742 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:749 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:325 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:751 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:736 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:743 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:737 +#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/models.py:744 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/models.py:592 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -333,108 +333,49 @@ msgstr "" #: archaeological_finds/forms_treatments.py:879 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1242 +#: archaeological_operations/models.py:1277 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:992 ishtar_common/forms.py:993 msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/forms.py:337 #: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:748 +#: archaeological_context_records/forms.py:343 +#: archaeological_context_records/models.py:755 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 -#: archaeological_warehouse/forms.py:737 +#: archaeological_warehouse/forms.py:731 #: archaeological_warehouse/templates/ishtar/sheet_container.html:81 msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:346 -#: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 -msgid "Coordinates" -msgstr "" - -#: archaeological_context_records/forms.py:347 -#: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 -#: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3520 -msgid "X" -msgstr "" - -#: archaeological_context_records/forms.py:349 -#: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 -#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 -msgid "Estimated error for X" -msgstr "" - -#: archaeological_context_records/forms.py:351 -#: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3521 -msgid "Y" -msgstr "" - -#: archaeological_context_records/forms.py:353 -#: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 -#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 -msgid "Estimated error for Y" -msgstr "" - -#: archaeological_context_records/forms.py:355 -#: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:3522 -msgid "Z" -msgstr "" - -#: archaeological_context_records/forms.py:357 -#: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 -msgid "Estimated error for Z" -msgstr "" - -#: archaeological_context_records/forms.py:360 -#: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 -#: ishtar_common/models_common.py:3534 -msgid "Spatial Reference System" -msgstr "" - -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:427 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:432 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:463 -#: archaeological_context_records/forms.py:485 +#: archaeological_context_records/forms.py:437 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1247 +#: archaeological_finds/models_finds.py:1857 #: archaeological_finds/templates/ishtar/sheet_find.html:248 msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:470 +#: archaeological_context_records/forms.py:444 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:528 -#: archaeological_finds/forms.py:910 archaeological_finds/forms.py:1261 -#: archaeological_finds/models_finds.py:1147 +#: archaeological_context_records/models.py:532 +#: archaeological_finds/forms.py:882 archaeological_finds/forms.py:1233 +#: archaeological_finds/models_finds.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:256 #: archaeological_operations/forms.py:903 #: archaeological_operations/templates/ishtar/sheet_operation.html:517 @@ -443,89 +384,89 @@ msgstr "" msgid "Period" msgstr "" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:445 #: archaeological_context_records/models.py:109 #: archaeological_files/forms.py:559 archaeological_files/models.py:75 #: archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1262 +#: archaeological_finds/forms.py:1235 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:556 #: archaeological_finds/forms_treatments.py:814 -#: archaeological_finds/models_finds.py:3346 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: 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:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_operations/forms.py:858 -#: archaeological_operations/models.py:103 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3233 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:3276 msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:472 +#: archaeological_context_records/forms.py:446 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:564 archaeological_files/models.py:76 -#: archaeological_files/models.py:699 archaeological_finds/forms.py:1263 -#: archaeological_finds/models_finds.py:3347 +#: archaeological_files/models.py:699 archaeological_finds/forms.py:1236 +#: archaeological_finds/models_finds.py:3355 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:258 -#: 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/templates/ishtar/sheet_find.html:502 -#: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3234 +#: 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/templates/ishtar/sheet_find.html:504 +#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:3277 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:473 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1237 #: archaeological_finds/templates/ishtar/sheet_find.html:260 msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:474 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1265 +#: archaeological_finds/forms.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:259 msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:475 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1266 +#: archaeological_finds/forms.py:1238 #: archaeological_finds/templates/ishtar/sheet_find.html:261 msgid "Precise dating" msgstr "" -#: archaeological_context_records/forms.py:486 +#: archaeological_context_records/forms.py:460 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:472 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1545 +#: archaeological_context_records/models.py:1558 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:177 archaeological_finds/forms.py:183 -#: archaeological_finds/forms.py:816 archaeological_finds/forms.py:834 -#: archaeological_finds/forms.py:1437 archaeological_finds/models_finds.py:1090 -#: archaeological_finds/models_finds.py:2404 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:806 +#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:2412 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 +#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 #: ishtar_common/views.py:401 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:516 +#: archaeological_context_records/forms.py:490 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 @@ -533,34 +474,34 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:491 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:522 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/forms.py:496 +#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/models.py:772 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:497 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:533 -#: archaeological_context_records/models.py:530 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/forms.py:507 +#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:815 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:801 -#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 -#: archaeological_finds/forms.py:817 -#: archaeological_finds/templates/ishtar/sheet_find.html:158 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:533 +#: archaeological_context_records/models.py:808 +#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:613 +#: archaeological_finds/forms.py:789 +#: archaeological_finds/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -568,80 +509,80 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:767 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:774 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:776 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:783 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:789 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:540 -#: archaeological_context_records/models.py:791 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:798 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:516 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:527 #: archaeological_operations/forms.py:613 #: archaeological_operations/forms.py:626 #: archaeological_operations/views.py:204 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:558 +#: archaeological_context_records/forms.py:532 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:538 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:666 -#: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: archaeological_context_records/forms.py:640 +#: archaeological_finds/forms.py:1042 archaeological_finds/forms.py:1067 +#: archaeological_operations/forms.py:1885 ishtar_common/forms_common.py:2310 #: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:696 +#: archaeological_context_records/forms.py:670 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:716 -#: archaeological_context_records/models.py:1308 -#: archaeological_context_records/models.py:1347 -#: archaeological_context_records/models.py:1413 +#: archaeological_context_records/forms.py:690 +#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1426 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:720 +#: archaeological_context_records/forms.py:694 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:745 +#: archaeological_context_records/forms.py:719 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:770 +#: archaeological_context_records/forms.py:744 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:763 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -737,8 +678,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:909 -#: archaeological_finds/tests.py:1272 +#: archaeological_context_records/tests.py:911 +#: archaeological_finds/tests.py:1274 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -785,9 +726,9 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:214 archaeological_finds/forms.py:443 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2040 -#: archaeological_finds/models_finds.py:3312 -#: archaeological_finds/models_finds.py:3334 +#: archaeological_finds/models_finds.py:2044 +#: archaeological_finds/models_finds.py:3320 +#: archaeological_finds/models_finds.py:3342 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -800,20 +741,20 @@ msgstr "" #: archaeological_context_records/models.py:344 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 -#: archaeological_finds/models_finds.py:111 -#: archaeological_finds/models_finds.py:127 -#: archaeological_finds/models_finds.py:247 -#: archaeological_finds/models_finds.py:288 -#: archaeological_finds/models_finds.py:354 -#: archaeological_finds/models_finds.py:1805 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:100 +#: archaeological_finds/models_finds.py:113 +#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:249 +#: archaeological_finds/models_finds.py:290 +#: archaeological_finds/models_finds.py:356 +#: archaeological_finds/models_finds.py:1809 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:127 -#: archaeological_operations/models.py:145 -#: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3791 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:155 +#: archaeological_operations/models.py:3834 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 @@ -869,279 +810,279 @@ msgstr "" msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:505 -#: archaeological_context_records/models.py:506 -#: archaeological_context_records/models.py:1418 -#: archaeological_finds/models_finds.py:1109 -#: archaeological_finds/models_finds.py:1110 +#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:1431 +#: archaeological_finds/models_finds.py:1112 +#: archaeological_finds/models_finds.py:1113 #: archaeological_operations/forms.py:534 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1319 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/models.py:277 -#: archaeological_operations/models.py:286 -#: archaeological_operations/models.py:456 -#: archaeological_operations/models.py:913 -#: archaeological_operations/models.py:998 -#: archaeological_operations/models.py:1304 +#: archaeological_operations/forms.py:1296 +#: archaeological_operations/forms.py:1412 +#: archaeological_operations/models.py:305 +#: archaeological_operations/models.py:314 +#: archaeological_operations/models.py:485 +#: archaeological_operations/models.py:948 +#: archaeological_operations/models.py:1032 +#: archaeological_operations/models.py:1339 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:511 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:513 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:514 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:511 -#: archaeological_finds/models_finds.py:1095 +#: archaeological_context_records/models.py:515 +#: archaeological_finds/models_finds.py:1098 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:516 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:519 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:532 -#: archaeological_finds/models_finds.py:1159 -#: archaeological_operations/models.py:288 -#: archaeological_operations/models.py:917 +#: archaeological_context_records/models.py:536 +#: archaeological_finds/models_finds.py:1162 +#: archaeological_operations/models.py:316 +#: archaeological_operations/models.py:952 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:533 -#: archaeological_finds/models_finds.py:1160 -#: archaeological_operations/models.py:289 -#: archaeological_operations/models.py:918 +#: archaeological_context_records/models.py:537 +#: archaeological_finds/models_finds.py:1163 +#: archaeological_operations/models.py:317 +#: archaeological_operations/models.py:953 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:572 +#: archaeological_context_records/models.py:576 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/tests.py:735 -#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1245 -#: archaeological_operations/models.py:349 -#: archaeological_operations/models.py:1057 -#: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/tests.py:737 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1091 +#: archaeological_operations/tests.py:2989 +#: archaeological_warehouse/models.py:316 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 +#: archaeological_context_records/models.py:582 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1618 archaeological_finds/tests.py:1303 +#: archaeological_context_records/models.py:585 +#: archaeological_finds/models_finds.py:1621 archaeological_finds/tests.py:1305 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:585 -#: archaeological_operations/models.py:1053 -#: archaeological_operations/models.py:2500 -#: archaeological_operations/tests.py:4581 +#: archaeological_context_records/models.py:589 +#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:2543 +#: archaeological_operations/tests.py:4463 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:589 -#: archaeological_finds/models_finds.py:1253 -#: archaeological_operations/models.py:1050 +#: archaeological_context_records/models.py:593 +#: archaeological_finds/models_finds.py:1256 +#: archaeological_operations/models.py:1084 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:593 -#: archaeological_context_records/models.py:647 -#: archaeological_finds/models_finds.py:1354 -#: archaeological_finds/models_finds.py:1726 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: archaeological_context_records/models.py:597 +#: archaeological_context_records/models.py:654 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_finds/models_finds.py:1730 +#: archaeological_operations/models.py:412 +#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:597 -#: archaeological_context_records/models.py:650 -#: archaeological_finds/models_finds.py:1269 -#: archaeological_operations/models.py:1141 -#: archaeological_operations/models.py:1205 +#: archaeological_context_records/models.py:601 +#: archaeological_context_records/models.py:657 +#: archaeological_finds/models_finds.py:1272 +#: archaeological_operations/models.py:1175 +#: archaeological_operations/models.py:1240 #: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:601 -#: archaeological_context_records/tests.py:802 -#: archaeological_finds/models_finds.py:1292 +#: archaeological_context_records/models.py:605 +#: archaeological_context_records/tests.py:804 +#: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:605 -#: archaeological_operations/models.py:343 -#: archaeological_operations/models.py:1099 -#: archaeological_operations/tests.py:2973 -#: archaeological_operations/tests.py:3155 +#: archaeological_context_records/models.py:609 +#: archaeological_operations/models.py:371 +#: archaeological_operations/models.py:1133 +#: archaeological_operations/tests.py:2972 +#: archaeological_operations/tests.py:3154 msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:609 -#: archaeological_context_records/tests.py:861 +#: archaeological_context_records/models.py:613 +#: archaeological_context_records/tests.py:863 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:612 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1063 -#: archaeological_operations/models.py:2518 +#: archaeological_context_records/models.py:616 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 +#: archaeological_operations/models.py:2561 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:616 -#: archaeological_operations/models.py:1160 +#: archaeological_context_records/models.py:620 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:619 -#: archaeological_context_records/tests.py:767 +#: archaeological_context_records/models.py:623 +#: archaeological_context_records/tests.py:769 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:623 +#: archaeological_context_records/models.py:627 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:665 -#: archaeological_finds/models_finds.py:1685 -#: archaeological_operations/models.py:428 -#: archaeological_operations/models.py:1188 +#: archaeological_context_records/models.py:672 +#: archaeological_finds/models_finds.py:1689 +#: archaeological_operations/models.py:457 +#: archaeological_operations/models.py:1223 #: archaeological_warehouse/models.py:335 #: archaeological_warehouse/models.py:1056 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:672 -#: archaeological_finds/models_finds.py:1678 -#: archaeological_operations/models.py:435 -#: archaeological_operations/models.py:1181 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1682 +#: archaeological_operations/models.py:464 +#: archaeological_operations/models.py:1216 #: archaeological_warehouse/models.py:327 #: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:682 -#: archaeological_context_records/models.py:1108 +#: archaeological_context_records/models.py:689 +#: archaeological_context_records/models.py:1120 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:874 -#: archaeological_finds/models_finds.py:1695 -#: archaeological_finds/models_finds.py:2310 archaeological_finds/views.py:1245 +#: archaeological_finds/models_finds.py:877 +#: archaeological_finds/models_finds.py:1699 +#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1245 #: archaeological_finds/views.py:1260 archaeological_finds/views.py:1298 -#: archaeological_finds/views.py:1314 archaeological_operations/models.py:445 -#: archaeological_operations/models.py:600 -#: archaeological_operations/models.py:1198 -#: archaeological_operations/models.py:1831 +#: archaeological_finds/views.py:1314 archaeological_operations/models.py:474 +#: archaeological_operations/models.py:632 +#: archaeological_operations/models.py:1233 +#: archaeological_operations/models.py:1873 #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 -#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1454 +#: ishtar_common/admin.py:1574 ishtar_common/models.py:4064 #: ishtar_common/models.py:4408 ishtar_common/views.py:2637 #: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:699 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:404 -#: archaeological_finds/models_finds.py:1799 +#: archaeological_context_records/models.py:706 +#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 +#: archaeological_finds/models_finds.py:1803 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2971 +#: archaeological_operations/models.py:3014 #: archaeological_warehouse/models.py:388 #: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:701 -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2974 +#: archaeological_context_records/models.py:708 +#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 +#: archaeological_finds/models_finds.py:1805 +#: archaeological_operations/models.py:3017 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 +#: archaeological_context_records/models.py:753 +#: archaeological_operations/models.py:1331 ishtar_common/models_common.py:2794 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:751 +#: archaeological_context_records/models.py:758 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:762 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:778 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:779 +#: archaeological_context_records/models.py:786 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:786 +#: archaeological_context_records/models.py:793 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:801 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:823 +#: archaeological_context_records/models.py:829 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1994 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_finds/templates/ishtar/sheet_find.html:74 +#: archaeological_finds/templates/ishtar/sheet_find.html:71 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2718 +#: archaeological_operations/models.py:524 +#: archaeological_operations/models.py:1405 +#: archaeological_operations/models.py:2761 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1155,136 +1096,136 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:830 -#: archaeological_finds/models_finds.py:2000 +#: archaeological_context_records/models.py:836 +#: archaeological_finds/models_finds.py:2004 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:530 +#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:2768 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:835 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2012 +#: archaeological_context_records/models.py:841 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:506 -#: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1416 +#: archaeological_operations/models.py:3021 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2819 ishtar_common/models_common.py:2842 msgid "Cached name" msgstr "" -#: archaeological_context_records/models.py:838 -#: archaeological_finds/models_finds.py:2019 -#: archaeological_operations/models.py:519 -#: archaeological_operations/models.py:1467 +#: archaeological_context_records/models.py:844 +#: archaeological_finds/models_finds.py:2023 +#: archaeological_operations/models.py:548 +#: archaeological_operations/models.py:1502 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:841 #: archaeological_context_records/models.py:847 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2016 -#: archaeological_finds/models_finds.py:2022 -#: archaeological_finds/models_finds.py:2028 -#: archaeological_finds/models_finds.py:2034 -#: archaeological_operations/models.py:510 -#: archaeological_operations/models.py:516 -#: archaeological_operations/models.py:522 -#: archaeological_operations/models.py:528 -#: archaeological_operations/models.py:1383 -#: archaeological_operations/models.py:1464 -#: archaeological_operations/models.py:1470 -#: archaeological_operations/models.py:1476 +#: archaeological_context_records/models.py:853 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2026 +#: archaeological_finds/models_finds.py:2032 +#: archaeological_finds/models_finds.py:2038 +#: archaeological_operations/models.py:539 +#: archaeological_operations/models.py:545 +#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:557 +#: archaeological_operations/models.py:1418 +#: archaeological_operations/models.py:1499 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:1511 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:850 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:858 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:417 +#: archaeological_finds/models_finds.py:419 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:873 +#: archaeological_context_records/models.py:879 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:905 -#: archaeological_finds/models_finds.py:2200 +#: archaeological_context_records/models.py:914 +#: archaeological_finds/models_finds.py:2204 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1096 +#: archaeological_context_records/models.py:1108 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1098 +#: archaeological_context_records/models.py:1110 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1309 +#: archaeological_context_records/models.py:1322 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1342 +#: archaeological_context_records/models.py:1355 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1343 +#: archaeological_context_records/models.py:1356 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1344 +#: archaeological_context_records/models.py:1357 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1345 +#: archaeological_context_records/models.py:1358 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1346 +#: archaeological_context_records/models.py:1359 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1348 +#: archaeological_context_records/models.py:1361 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1349 +#: archaeological_context_records/models.py:1362 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1350 +#: archaeological_context_records/models.py:1363 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1351 +#: archaeological_context_records/models.py:1364 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1365 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1359 +#: archaeological_context_records/models.py:1372 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1373 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1551 +#: archaeological_context_records/models.py:1564 msgid "Context record parent" msgstr "" @@ -1332,7 +1273,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2045 #: 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:90 @@ -1347,26 +1288,26 @@ msgid "Finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 -#: archaeological_finds/templates/ishtar/sheet_find.html:83 +#: archaeological_finds/templates/ishtar/sheet_find.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 -#: archaeological_finds/templates/ishtar/sheet_find.html:92 +#: archaeological_finds/templates/ishtar/sheet_find.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 msgid "Custom fields" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 #: archaeological_files/templates/ishtar/sheet_file.html:46 -#: archaeological_finds/templates/ishtar/sheet_find.html:163 +#: archaeological_finds/templates/ishtar/sheet_find.html:160 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3725 +#: ishtar_common/models_common.py:3872 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1382,21 +1323,21 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_files_pdl/forms.py:121 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:73 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2635 +#: ishtar_common/models_common.py:2796 msgid "Localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 -#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:714 -#: archaeological_finds/forms.py:819 +#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:686 +#: archaeological_finds/forms.py:791 #: archaeological_finds/templates/ishtar/sheet_basefind.html:52 -#: archaeological_finds/templates/ishtar/sheet_find.html:219 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 msgid "Sheet" @@ -1420,9 +1361,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:126 #: archaeological_finds/models_treatments.py:212 -#: archaeological_finds/templates/ishtar/sheet_find.html:383 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 +#: 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_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1505,7 +1446,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1820 +#: archaeological_operations/models.py:1862 msgid "Add context record" msgstr "" @@ -1539,7 +1480,7 @@ msgstr "" #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 -#: archaeological_finds/forms.py:1377 +#: archaeological_finds/forms.py:1349 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1547,18 +1488,18 @@ msgstr "" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/forms_treatments.py:930 -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:197 #: archaeological_finds/models_treatments.py:1094 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 -#: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:909 -#: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:2468 -#: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2961 +#: archaeological_operations/forms.py:1504 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:944 +#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2740 +#: archaeological_operations/models.py:3004 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1568,33 +1509,33 @@ msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 #: archaeological_files/forms.py:332 archaeological_files/models.py:524 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1316 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 #: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1432 -#: archaeological_operations/forms.py:1553 -#: archaeological_operations/forms.py:1630 -#: archaeological_operations/models.py:454 -#: archaeological_operations/models.py:2700 +#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:1583 +#: archaeological_operations/models.py:483 +#: archaeological_operations/models.py:2743 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:898 #: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1564 -#: archaeological_operations/models.py:2340 +#: archaeological_operations/forms.py:1517 +#: archaeological_operations/models.py:2383 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2802 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1633,26 +1574,26 @@ msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 #: archaeological_files/forms.py:479 archaeological_files/models.py:638 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 -#: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 -#: archaeological_finds/forms.py:2111 +#: archaeological_finds/forms.py:658 archaeological_finds/forms.py:869 +#: archaeological_finds/forms.py:1096 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:2083 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:809 -#: archaeological_finds/models_finds.py:410 -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:1936 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:817 -#: archaeological_operations/forms.py:1325 -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1629 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2714 -#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 +#: archaeological_operations/forms.py:1302 +#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/forms.py:1582 +#: archaeological_operations/models.py:495 +#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:2757 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 +#: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 #: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 #: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 #: ishtar_common/models.py:2772 ishtar_common/models.py:3412 @@ -1660,6 +1601,7 @@ msgstr "" #: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 msgid "Comment" msgstr "" @@ -1682,7 +1624,7 @@ msgstr "" #: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1522 ishtar_common/forms.py:926 msgid "Created by" msgstr "" @@ -1690,7 +1632,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1575 +#: archaeological_operations/forms.py:1528 msgid "Modified by" msgstr "" @@ -1703,7 +1645,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1276 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1715,7 +1657,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 msgid "Reception date" msgstr "" @@ -1753,7 +1695,7 @@ msgstr "" #: archaeological_files/forms.py:256 archaeological_files/models.py:540 #: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:355 msgid "Person in charge" msgstr "" @@ -1762,13 +1704,13 @@ msgstr "" #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1102 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1920 -#: archaeological_operations/models.py:455 +#: archaeological_operations/forms.py:1293 +#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1873 +#: archaeological_operations/models.py:484 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 @@ -1782,12 +1724,13 @@ msgstr "" #: ishtar_common/models.py:2482 ishtar_common/models.py:2767 #: ishtar_common/models.py:3093 ishtar_common/models.py:3229 #: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 -#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2793 ishtar_common/models_common.py:2842 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1826,7 +1769,7 @@ msgstr "" #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2983 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" @@ -1860,14 +1803,13 @@ msgstr "" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 +#: archaeological_operations/models.py:2746 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "" #: archaeological_files/forms.py:459 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:984 -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2697 msgid "Scientist in charge" msgstr "" @@ -2013,10 +1955,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:998 #: archaeological_finds/models_treatments.py:198 #: archaeological_finds/models_treatments.py:1095 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 -#: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1685 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1638 +#: archaeological_operations/models.py:2682 ishtar_common/models.py:4089 msgid "Index" msgstr "" @@ -2026,10 +1968,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1558 -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/models.py:2370 -#: archaeological_operations/models.py:2629 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1572 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2672 msgid "Act type" msgstr "" @@ -2040,17 +1982,17 @@ msgstr "" #: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1559 -#: archaeological_operations/forms.py:1755 +#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1708 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1565 -#: archaeological_operations/forms.py:1626 -#: archaeological_operations/models.py:2698 +#: archaeological_operations/forms.py:1518 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2741 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2096,10 +2038,10 @@ msgstr "" #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1840 -#: archaeological_operations/models.py:2353 -#: archaeological_operations/models.py:2469 -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:1882 +#: archaeological_operations/models.py:2396 +#: archaeological_operations/models.py:2512 +#: archaeological_operations/models.py:2720 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "" @@ -2112,9 +2054,9 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3337 +#: archaeological_finds/models_finds.py:3345 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2734 +#: archaeological_operations/models.py:2777 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2244,8 +2186,8 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 +#: ishtar_common/admin.py:1024 ishtar_common/models.py:2275 #: ishtar_common/models_common.py:714 msgid "Parent" msgstr "" @@ -2306,9 +2248,9 @@ msgstr "" msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1142 -#: archaeological_operations/models.py:284 -#: archaeological_operations/models.py:910 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 +#: archaeological_operations/models.py:312 +#: archaeological_operations/models.py:945 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:240 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:257 @@ -2316,17 +2258,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1194 +#: ishtar_common/admin.py:1193 msgid "Area" msgstr "" -#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1145 -#: archaeological_operations/models.py:285 -#: archaeological_operations/models.py:911 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 +#: archaeological_operations/models.py:313 +#: archaeological_operations/models.py:946 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1166 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1169 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2360,34 +2302,34 @@ msgstr "" #: archaeological_operations/forms.py:1110 #: archaeological_operations/forms.py:1126 #: archaeological_operations/forms.py:1131 -#: archaeological_operations/forms.py:1506 -#: archaeological_operations/models.py:276 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2709 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/models.py:304 +#: archaeological_operations/models.py:493 +#: archaeological_operations/models.py:1029 +#: archaeological_operations/models.py:1031 +#: archaeological_operations/models.py:1336 +#: archaeological_operations/models.py:2752 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 #: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2664 +#: ishtar_common/models_common.py:2825 msgid "Towns" msgstr "" -#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1249 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1048 -#: archaeological_operations/models.py:2493 -#: archaeological_operations/tests.py:2979 -#: archaeological_operations/tests.py:3055 +#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:2536 +#: archaeological_operations/tests.py:2978 +#: archaeological_operations/tests.py:3054 msgctxt "key for text search" msgid "year" msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:333 +#: archaeological_operations/models.py:361 #: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" @@ -2395,21 +2337,21 @@ msgstr "" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:339 +#: archaeological_operations/models.py:367 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1067 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 msgctxt "key for text search" msgid "department" msgstr "" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:336 -#: archaeological_operations/models.py:1071 -#: archaeological_operations/tests.py:3099 +#: archaeological_operations/models.py:364 +#: archaeological_operations/models.py:1105 +#: archaeological_operations/tests.py:3098 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" @@ -2419,9 +2361,9 @@ msgstr "" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:2504 -#: archaeological_operations/tests.py:3112 +#: archaeological_operations/models.py:1111 +#: archaeological_operations/models.py:2547 +#: archaeological_operations/tests.py:3111 #: archaeological_warehouse/models.py:312 #: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 #: ishtar_common/models.py:2719 ishtar_common/models.py:3295 @@ -2450,28 +2392,28 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1455 -#: archaeological_operations/models.py:355 -#: archaeological_operations/models.py:1119 -#: archaeological_operations/models.py:2614 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 +#: archaeological_operations/models.py:383 +#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:2657 #: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1606 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1609 #: archaeological_finds/models_treatments.py:1055 -#: archaeological_finds/tests.py:1327 +#: archaeological_finds/tests.py:1329 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2549 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2592 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2553 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" @@ -2576,11 +2518,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1228 archaeological_operations/models.py:1803 +#: archaeological_files/models.py:1228 archaeological_operations/models.py:1841 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1230 archaeological_operations/models.py:1805 +#: archaeological_files/models.py:1230 archaeological_operations/models.py:1843 msgid "parcels" msgstr "" @@ -2594,13 +2536,13 @@ msgstr "" #: archaeological_files/models.py:1247 #: archaeological_finds/models_treatments.py:401 -#: archaeological_finds/models_treatments.py:1216 +#: archaeological_finds/models_treatments.py:1220 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1249 #: archaeological_finds/models_treatments.py:403 -#: archaeological_finds/models_treatments.py:1218 +#: archaeological_finds/models_treatments.py:1222 msgid "admin. act" msgstr "" @@ -2613,8 +2555,8 @@ msgstr "" msgid "operation" msgstr "" -#: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2948 +#: archaeological_files/models.py:1327 archaeological_operations/models.py:1320 +#: archaeological_operations/models.py:2991 msgid "File" msgstr "" @@ -2812,7 +2754,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2778 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2825,11 +2767,11 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2813 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 #: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." @@ -2840,10 +2782,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:690 #: archaeological_finds/forms_treatments.py:779 #: archaeological_finds/models_treatments.py:125 -#: archaeological_finds/templates/ishtar/sheet_find.html:382 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:498 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 @@ -2852,7 +2794,7 @@ msgstr "" #: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 #: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 #: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 -#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/forms_common.py:2935 ishtar_common/models.py:744 #: ishtar_common/models.py:2484 ishtar_common/models.py:3813 #: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 @@ -2869,7 +2811,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:859 -#: archaeological_operations/models.py:1245 +#: archaeological_operations/models.py:1280 msgid "Excavation end date" msgstr "" @@ -2883,7 +2825,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:713 +#: archaeological_warehouse/forms.py:694 ishtar_common/models.py:713 #: ishtar_common/models_imports.py:935 msgid "Date" msgstr "" @@ -2907,7 +2849,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3331 msgid "Effective" msgstr "" @@ -3014,7 +2956,7 @@ msgstr "" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3033 msgid "Postal code" msgstr "" @@ -3022,7 +2964,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 #: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 +#: ishtar_common/models_common.py:3028 ishtar_common/models_common.py:3183 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -3123,213 +3065,213 @@ msgstr "" msgid "Simple find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:644 -#: archaeological_finds/forms.py:843 archaeological_finds/forms.py:1056 -#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1997 -#: archaeological_finds/models_finds.py:403 -#: archaeological_finds/models_finds.py:1806 +#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:616 +#: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1028 +#: archaeological_finds/forms.py:1337 archaeological_finds/forms.py:1969 +#: archaeological_finds/models_finds.py:405 +#: archaeological_finds/models_finds.py:1810 msgid "Free ID" msgstr "" -#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:646 -#: archaeological_finds/forms.py:847 archaeological_finds/forms.py:1058 -#: archaeological_finds/forms.py:1366 archaeological_finds/forms.py:2064 -#: archaeological_finds/models_finds.py:1807 +#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:618 +#: archaeological_finds/forms.py:819 archaeological_finds/forms.py:1030 +#: archaeological_finds/forms.py:1338 archaeological_finds/forms.py:2036 +#: archaeological_finds/models_finds.py:1811 msgid "Denomination" msgstr "" -#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:848 -#: archaeological_finds/forms.py:1367 archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1938 msgid "Previous ID" msgstr "" -#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:852 -#: archaeological_finds/forms.py:1370 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:824 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:1812 msgid "Museum ID" msgstr "" -#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:853 -#: archaeological_finds/forms.py:1371 archaeological_finds/models_finds.py:1809 +#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:825 +#: archaeological_finds/forms.py:1343 archaeological_finds/models_finds.py:1813 msgid "Laboratory ID" msgstr "" -#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:854 -#: archaeological_finds/forms.py:1369 archaeological_finds/models_finds.py:1804 +#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1808 msgid "Seal number" msgstr "" -#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:855 -#: archaeological_finds/forms.py:1372 archaeological_finds/models_finds.py:1931 +#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:827 +#: archaeological_finds/forms.py:1344 archaeological_finds/models_finds.py:1935 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1991 +#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1995 msgid "Public description" msgstr "" -#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:653 -#: archaeological_finds/forms.py:1478 archaeological_finds/models_finds.py:1874 +#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:625 +#: archaeological_finds/forms.py:1450 archaeological_finds/models_finds.py:1878 msgid "Is complete?" msgstr "" -#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:656 -#: archaeological_finds/forms.py:867 archaeological_finds/models_finds.py:89 -#: archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1112 -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:628 +#: archaeological_finds/forms.py:839 archaeological_finds/models_finds.py:91 +#: archaeological_finds/models_finds.py:1114 +#: archaeological_finds/models_finds.py:1115 +#: archaeological_finds/models_finds.py:1821 msgid "Material types" msgstr "" -#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:659 -#: archaeological_finds/forms.py:1487 archaeological_finds/models_finds.py:1821 +#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:631 +#: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:1825 #: ishtar_common/models_imports.py:914 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1489 -#: archaeological_finds/models_finds.py:1828 +#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1461 +#: archaeological_finds/models_finds.py:1832 msgid "Comment on the material" msgstr "" -#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:662 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:262 -#: archaeological_finds/models_finds.py:1113 -#: archaeological_finds/models_finds.py:1114 -#: archaeological_finds/models_finds.py:1876 +#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 +#: archaeological_finds/forms.py:842 archaeological_finds/models_finds.py:264 +#: archaeological_finds/models_finds.py:1116 +#: archaeological_finds/models_finds.py:1117 +#: archaeological_finds/models_finds.py:1880 msgid "Object types" msgstr "" -#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:666 -#: archaeological_finds/forms.py:1496 archaeological_finds/models_finds.py:1880 +#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:638 +#: archaeological_finds/forms.py:1468 archaeological_finds/models_finds.py:1884 msgid "Object type quality" msgstr "" -#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:874 -#: archaeological_finds/forms.py:1498 archaeological_finds/models_finds.py:276 +#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:846 +#: archaeological_finds/forms.py:1470 archaeological_finds/models_finds.py:278 msgid "Functional areas" msgstr "" -#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:668 -#: archaeological_finds/forms.py:1505 archaeological_finds/forms.py:2003 -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:640 +#: archaeological_finds/forms.py:1477 archaeological_finds/forms.py:1975 +#: archaeological_finds/models_finds.py:1839 msgid "Find number" msgstr "" -#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:670 -#: archaeological_finds/forms.py:1507 archaeological_finds/models_finds.py:1911 +#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1915 msgid "Minimum number of individuals (MNI)" msgstr "" -#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:674 -#: archaeological_finds/forms.py:1511 archaeological_finds/models_finds.py:1811 +#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:646 +#: archaeological_finds/forms.py:1483 archaeological_finds/models_finds.py:1815 msgid "Decoration" msgstr "" -#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:677 -#: archaeological_finds/forms.py:1512 archaeological_finds/models_finds.py:1812 +#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:649 +#: archaeological_finds/forms.py:1484 archaeological_finds/models_finds.py:1816 msgid "Inscription" msgstr "" -#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:680 -#: archaeological_finds/forms.py:878 archaeological_finds/forms.py:1510 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:652 +#: archaeological_finds/forms.py:850 archaeological_finds/forms.py:1482 +#: archaeological_finds/models_finds.py:1818 msgid "Manufacturing place" msgstr "" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:683 -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1514 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1906 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:655 +#: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1486 +#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1910 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1518 -#: archaeological_finds/models_finds.py:1856 -#: archaeological_operations/forms.py:1322 -#: archaeological_operations/models.py:461 +#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1490 +#: archaeological_finds/models_finds.py:1860 +#: archaeological_operations/forms.py:1299 +#: archaeological_operations/models.py:490 msgid "Cultural attribution" msgstr "" -#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:689 -#: archaeological_finds/forms.py:913 archaeological_finds/forms.py:1520 -#: archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:661 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1492 +#: archaeological_finds/models_finds.py:1937 msgid "Comment on dating" msgstr "" -#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 -#: archaeological_finds/forms.py:1319 -#: archaeological_finds/templates/ishtar/sheet_find.html:201 +#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:664 +#: archaeological_finds/forms.py:1291 +#: archaeological_finds/templates/ishtar/sheet_find.html:198 msgid "Dimensions" msgstr "" -#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:693 -#: archaeological_finds/models_finds.py:1913 +#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:665 +#: archaeological_finds/models_finds.py:1917 msgid "Length (cm)" msgstr "" -#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:694 -#: archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:666 +#: archaeological_finds/models_finds.py:1918 msgid "Width (cm)" msgstr "" -#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:695 -#: archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:667 +#: archaeological_finds/models_finds.py:1919 msgid "Height (cm)" msgstr "" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:698 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:670 +#: archaeological_finds/models_finds.py:1922 msgid "Thickness (cm)" msgstr "" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:696 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:668 +#: archaeological_finds/models_finds.py:1920 msgid "Diameter (cm)" msgstr "" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:697 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:669 +#: archaeological_finds/models_finds.py:1921 msgid "Circumference (cm)" msgstr "" -#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:699 -#: archaeological_finds/forms.py:2001 archaeological_finds/models_finds.py:1830 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:671 +#: archaeological_finds/forms.py:1973 archaeological_finds/models_finds.py:1834 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "" -#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 -#: archaeological_finds/forms.py:2002 -#: archaeological_finds/templates/ishtar/sheet_find.html:210 +#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:672 +#: archaeological_finds/forms.py:1974 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 msgid "Weight (g)" msgstr "" -#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:702 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:674 msgid "Clutter long side (cm)" msgstr "" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:705 +#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:677 msgid "Clutter short side (cm)" msgstr "" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:680 msgid "Clutter height (cm)" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:711 -#: archaeological_finds/forms.py:1591 archaeological_finds/models_finds.py:1929 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 +#: archaeological_finds/forms.py:1563 archaeological_finds/models_finds.py:1933 msgid "Dimensions comment" msgstr "" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:715 -#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1596 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:687 +#: archaeological_finds/forms.py:872 archaeological_finds/forms.py:1568 +#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1942 msgid "Check" msgstr "" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:717 -#: archaeological_finds/forms.py:902 archaeological_finds/models_finds.py:1943 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:689 +#: archaeological_finds/forms.py:874 archaeological_finds/models_finds.py:1947 msgid "Check date" msgstr "" @@ -3341,559 +3283,563 @@ msgstr "" msgid "Find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:850 -#: archaeological_finds/forms.py:1368 archaeological_finds/models_finds.py:408 +#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:822 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:410 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:421 +#: archaeological_finds/forms.py:514 archaeological_finds/models_finds.py:423 msgid "Discovery date (exact or TPQ)" msgstr "" -#: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 +#: archaeological_finds/forms.py:517 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:1477 -#: archaeological_finds/models_finds.py:428 +#: archaeological_finds/forms.py:520 archaeological_finds/forms.py:1449 +#: archaeological_finds/models_finds.py:430 msgid "Batch/object" msgstr "" -#: archaeological_finds/forms.py:539 archaeological_finds/forms.py:1594 -#: archaeological_finds/models_finds.py:436 +#: archaeological_finds/forms.py:523 +msgid "Topography" +msgstr "" + +#: archaeological_finds/forms.py:525 archaeological_finds/forms.py:1566 +#: archaeological_finds/models_finds.py:438 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:571 +#: archaeological_finds/forms.py:543 msgid "" "Discovery date: if a TAQ date is provided a TPQ date has to be informed. If " "you have a precise date fill only the TPQ - discovery date field." msgstr "" -#: archaeological_finds/forms.py:579 +#: archaeological_finds/forms.py:551 msgid "Discovery date: TAQ date must be older than TPQ date." msgstr "" -#: archaeological_finds/forms.py:596 +#: archaeological_finds/forms.py:568 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: archaeological_finds/forms.py:612 +#: archaeological_finds/forms.py:584 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: archaeological_finds/forms.py:628 archaeological_finds/forms.py:1994 +#: archaeological_finds/forms.py:600 archaeological_finds/forms.py:1966 msgid "Resulting find" msgstr "" -#: archaeological_finds/forms.py:629 +#: archaeological_finds/forms.py:601 msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:733 archaeological_finds/forms.py:2009 +#: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1981 msgid "Resulting finds" msgstr "" -#: archaeological_finds/forms.py:734 +#: archaeological_finds/forms.py:706 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "" -#: archaeological_finds/forms.py:739 +#: archaeological_finds/forms.py:711 msgid "Number of resulting finds" msgstr "" -#: archaeological_finds/forms.py:742 +#: archaeological_finds/forms.py:714 msgid "Prefix label for resulting finds" msgstr "" -#: archaeological_finds/forms.py:745 +#: archaeological_finds/forms.py:717 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" msgstr "" -#: archaeological_finds/forms.py:750 +#: archaeological_finds/forms.py:722 msgid "Numbering starting from" msgstr "" -#: archaeological_finds/forms.py:753 +#: archaeological_finds/forms.py:725 msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:772 archaeological_finds/forms.py:1036 -#: archaeological_finds/forms.py:1103 +#: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1008 +#: archaeological_finds/forms.py:1075 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1112 +#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:1084 msgid "Find - Quick action - Modify" msgstr "" -#: archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:792 msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 -#: archaeological_finds/forms.py:1347 -#: archaeological_finds/templates/ishtar/sheet_find.html:231 +#: archaeological_finds/forms.py:793 archaeological_finds/forms.py:1137 +#: archaeological_finds/forms.py:1319 +#: archaeological_finds/templates/ishtar/sheet_find.html:228 msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:883 archaeological_finds/forms.py:1200 -#: archaeological_finds/forms.py:1605 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1973 -#: archaeological_warehouse/forms.py:586 +#: archaeological_finds/forms.py:855 archaeological_finds/forms.py:1172 +#: archaeological_finds/forms.py:1577 archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1977 +#: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1206 -#: archaeological_finds/forms.py:1606 archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1977 -#: archaeological_warehouse/forms.py:587 +#: archaeological_finds/forms.py:857 archaeological_finds/forms.py:1178 +#: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1160 +#: archaeological_finds/models_finds.py:1981 +#: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:888 archaeological_finds/forms.py:1197 -#: archaeological_finds/forms.py:1603 archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1958 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:898 +#: archaeological_finds/forms.py:860 archaeological_finds/forms.py:1169 +#: archaeological_finds/forms.py:1575 archaeological_finds/models_finds.py:1154 +#: archaeological_finds/models_finds.py:1962 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:898 msgid "Conservatory state" msgstr "" -#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1218 -#: archaeological_finds/forms.py:1610 archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1983 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/forms.py:863 archaeological_finds/forms.py:1190 +#: archaeological_finds/forms.py:1582 archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1987 +#: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:894 archaeological_finds/forms.py:1191 -#: archaeological_finds/forms.py:1602 archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_warehouse/forms.py:584 +#: archaeological_finds/forms.py:866 archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1156 +#: archaeological_finds/models_finds.py:1904 +#: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:905 archaeological_finds/forms.py:1223 -#: archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:877 archaeological_finds/forms.py:1195 +#: archaeological_finds/models_finds.py:1993 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:907 archaeological_finds/forms.py:1221 -#: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:879 archaeological_finds/forms.py:1193 +#: archaeological_finds/models_finds.py:1172 +#: archaeological_finds/models_finds.py:1992 msgid "Insurance value" msgstr "" -#: archaeological_finds/forms.py:917 +#: archaeological_finds/forms.py:889 msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:979 +#: archaeological_finds/forms.py:951 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:999 archaeological_finds/forms.py:1451 -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2218 -#: archaeological_finds/forms.py:2235 archaeological_finds/forms.py:2240 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:1423 +#: archaeological_finds/forms.py:2185 archaeological_finds/forms.py:2190 +#: archaeological_finds/forms.py:2207 archaeological_finds/forms.py:2212 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:881 -#: archaeological_finds/models_finds.py:1702 +#: archaeological_finds/models_finds.py:884 +#: archaeological_finds/models_finds.py:1706 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1228 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:994 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:1029 +#: archaeological_finds/forms.py:1001 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:1033 archaeological_finds/forms.py:1100 +#: archaeological_finds/forms.py:1005 archaeological_finds/forms.py:1072 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:2081 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 #: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:2082 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 +#: archaeological_finds/forms.py:1100 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2129 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 +#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:2094 +#: archaeological_finds/forms.py:2136 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1138 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1185 archaeological_finds/forms.py:1601 -#: archaeological_finds/models_finds.py:1152 -#: archaeological_finds/models_finds.py:1894 -#: archaeological_warehouse/forms.py:583 +#: archaeological_finds/forms.py:1157 archaeological_finds/forms.py:1573 +#: archaeological_finds/models_finds.py:1155 +#: archaeological_finds/models_finds.py:1898 +#: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "" -#: archaeological_finds/forms.py:1212 archaeological_finds/forms.py:1608 -#: archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/forms.py:1184 archaeological_finds/forms.py:1580 +#: archaeological_finds/models_finds.py:1153 +#: archaeological_finds/models_finds.py:1972 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1220 archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1944 +#: archaeological_finds/forms.py:1192 archaeological_finds/models_finds.py:1171 +#: archaeological_finds/models_finds.py:1948 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1604 -#: archaeological_finds/models_finds.py:1964 +#: archaeological_finds/forms.py:1198 archaeological_finds/forms.py:1576 +#: archaeological_finds/models_finds.py:1968 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1276 +#: archaeological_finds/forms.py:1248 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1282 +#: archaeological_finds/forms.py:1254 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1258 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1308 +#: archaeological_finds/forms.py:1280 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "" -#: archaeological_finds/forms.py:1374 archaeological_finds/models_finds.py:1091 +#: archaeological_finds/forms.py:1346 archaeological_finds/models_finds.py:1094 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1375 archaeological_finds/models_finds.py:1092 +#: archaeological_finds/forms.py:1347 archaeological_finds/models_finds.py:1095 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1135 +#: archaeological_finds/forms.py:1357 archaeological_finds/models_finds.py:1138 #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1803 -#: archaeological_operations/forms.py:1869 -#: archaeological_operations/models.py:908 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 +#: archaeological_operations/forms.py:1756 +#: archaeological_operations/forms.py:1822 +#: archaeological_operations/models.py:943 +#: archaeological_operations/models.py:1030 +#: archaeological_operations/models.py:1328 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "" -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:1360 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1391 +#: archaeological_finds/forms.py:1363 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1402 +#: archaeological_finds/forms.py:1374 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1405 +#: archaeological_finds/forms.py:1377 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1409 +#: archaeological_finds/forms.py:1381 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: archaeological_finds/forms.py:1384 archaeological_operations/forms.py:499 +#: archaeological_operations/forms.py:1301 ishtar_common/forms_common.py:1233 #: ishtar_common/models.py:3098 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1415 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1387 archaeological_warehouse/forms.py:524 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1423 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1395 archaeological_warehouse/forms.py:532 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1426 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1398 archaeological_warehouse/forms.py:535 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1434 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1406 archaeological_warehouse/forms.py:543 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1447 +#: archaeological_finds/forms.py:1419 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1432 msgid "Discovery date after" msgstr "" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1435 msgid "Discovery date before" msgstr "" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1438 msgid "Discovery date (exact or TPQ) after" msgstr "" -#: archaeological_finds/forms.py:1469 +#: archaeological_finds/forms.py:1441 msgid "Discovery date (exact or TPQ) before" msgstr "" -#: archaeological_finds/forms.py:1472 +#: archaeological_finds/forms.py:1444 msgid "Discovery date (TAQ) after" msgstr "" -#: archaeological_finds/forms.py:1475 +#: archaeological_finds/forms.py:1447 msgid "Discovery date (TAQ) before" msgstr "" -#: archaeological_finds/forms.py:1480 archaeological_finds/forms.py:2000 -#: archaeological_finds/models_finds.py:88 -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1452 archaeological_finds/forms.py:1972 +#: archaeological_finds/models_finds.py:90 +#: archaeological_finds/models_finds.py:1151 #: archaeological_operations/templates/ishtar/sheet_operation.html:534 -#: archaeological_warehouse/forms.py:572 +#: archaeological_warehouse/forms.py:566 msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1491 archaeological_finds/models_finds.py:261 -#: archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1463 archaeological_finds/models_finds.py:263 +#: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:907 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:907 msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1495 msgid "Length - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1498 msgid "Length - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1529 +#: archaeological_finds/forms.py:1501 msgid "Width - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1532 +#: archaeological_finds/forms.py:1504 msgid "Width - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1535 +#: archaeological_finds/forms.py:1507 msgid "Height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1538 +#: archaeological_finds/forms.py:1510 msgid "Height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1541 +#: archaeological_finds/forms.py:1513 msgid "Thickness - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1544 +#: archaeological_finds/forms.py:1516 msgid "Thickness - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1547 +#: archaeological_finds/forms.py:1519 msgid "Diameter - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1550 +#: archaeological_finds/forms.py:1522 msgid "Diameter - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1553 +#: archaeological_finds/forms.py:1525 msgid "Circumference - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1556 +#: archaeological_finds/forms.py:1528 msgid "Circumference - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1559 +#: archaeological_finds/forms.py:1531 msgid "Volume - lower than (l)" msgstr "" -#: archaeological_finds/forms.py:1560 +#: archaeological_finds/forms.py:1532 msgid "Volume - higher than (l)" msgstr "" -#: archaeological_finds/forms.py:1562 +#: archaeological_finds/forms.py:1534 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1565 +#: archaeological_finds/forms.py:1537 msgid "Weight - higher than (g)" msgstr "" -#: archaeological_finds/forms.py:1568 +#: archaeological_finds/forms.py:1540 msgid "Clutter long side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1572 +#: archaeological_finds/forms.py:1544 msgid "Clutter long side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1576 +#: archaeological_finds/forms.py:1548 msgid "Clutter short side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1580 +#: archaeological_finds/forms.py:1552 msgid "Clutter short side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1584 +#: archaeological_finds/forms.py:1556 msgid "Clutter height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1588 +#: archaeological_finds/forms.py:1560 msgid "Clutter height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1597 +#: archaeological_finds/forms.py:1569 msgid "Check date after" msgstr "" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1571 msgid "Check date before" msgstr "" -#: archaeological_finds/forms.py:1612 +#: archaeological_finds/forms.py:1584 msgid "Estimated value - higher than" msgstr "" -#: archaeological_finds/forms.py:1613 +#: archaeological_finds/forms.py:1585 msgid "Estimated value - lower than" msgstr "" -#: archaeological_finds/forms.py:1614 +#: archaeological_finds/forms.py:1586 msgid "Insurance value - higher than" msgstr "" -#: archaeological_finds/forms.py:1615 +#: archaeological_finds/forms.py:1587 msgid "Insurance value - lower than" msgstr "" -#: archaeological_finds/forms.py:1617 +#: archaeological_finds/forms.py:1589 msgid "Appraisal date after" msgstr "" -#: archaeological_finds/forms.py:1620 +#: archaeological_finds/forms.py:1592 msgid "Appraisal date before" msgstr "" -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1595 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1597 msgid "Treatment file end date before" msgstr "" -#: archaeological_finds/forms.py:1628 +#: archaeological_finds/forms.py:1600 msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 -#: archaeological_finds/models_finds.py:1868 -#: archaeological_finds/templates/ishtar/sheet_find.html:306 +#: archaeological_finds/forms.py:1658 archaeological_finds/models_finds.py:1111 +#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:1693 +#: archaeological_finds/forms.py:1665 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:331 +#: archaeological_finds/forms.py:1684 archaeological_finds/models_finds.py:1110 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1691 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1739 archaeological_finds/forms.py:1760 -#: archaeological_finds/forms.py:1816 archaeological_finds/views.py:380 +#: archaeological_finds/forms.py:1711 archaeological_finds/forms.py:1732 +#: archaeological_finds/forms.py:1788 archaeological_finds/views.py:380 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:1855 archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1827 archaeological_finds/forms.py:1990 #: archaeological_finds/models_treatments.py:391 #: archaeological_finds/templates/ishtar/sheet_treatment.html:103 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:1878 +#: archaeological_finds/forms.py:1850 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:1999 +#: archaeological_finds/forms.py:1971 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2014 +#: archaeological_finds/forms.py:1986 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2057 +#: archaeological_finds/forms.py:2029 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2069 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2041 archaeological_finds/forms.py:2059 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2104 +#: archaeological_finds/forms.py:2076 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2107 +#: archaeological_finds/forms.py:2079 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:193 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:381 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:383 +#: archaeological_finds/templates/ishtar/sheet_find.html:421 +#: archaeological_finds/templates/ishtar/sheet_find.html:459 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 #: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 @@ -3902,11 +3848,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2149 archaeological_finds/forms.py:2204 +#: archaeological_finds/forms.py:2121 archaeological_finds/forms.py:2176 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2196 +#: archaeological_finds/forms.py:2168 msgid "Another basket already exists with this name." msgstr "" @@ -3932,7 +3878,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:626 -#: archaeological_finds/models_finds.py:172 +#: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 #: ishtar_common/models_imports.py:902 @@ -3954,8 +3900,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 +#: archaeological_operations/models.py:2399 +#: archaeological_operations/models.py:2736 ishtar_common/views.py:408 msgid "Treatment" msgstr "" @@ -4052,8 +3998,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2398 +#: archaeological_operations/models.py:2728 ishtar_common/views.py:407 msgid "Treatment request" msgstr "" @@ -4068,14 +4014,14 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1860 -#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:1864 +#: archaeological_finds/models_finds.py:3327 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 -#: 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_warehouse/forms.py:329 archaeological_warehouse/models.py:796 +#: 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_warehouse/forms.py:323 archaeological_warehouse/models.py:796 #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 @@ -4161,7 +4107,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:787 #: archaeological_finds/models_treatments.py:1119 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "" @@ -4169,7 +4115,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/forms_treatments.py:793 #: archaeological_finds/models_treatments.py:1127 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "" @@ -4274,222 +4220,222 @@ msgstr "" msgid "Treatment one to many - creation" msgstr "" -#: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 +#: archaeological_finds/models_finds.py:86 +#: archaeological_operations/models.py:2403 ishtar_common/models.py:3625 msgid "Code" msgstr "" -#: archaeological_finds/models_finds.py:85 +#: archaeological_finds/models_finds.py:87 msgid "Recommendation" msgstr "" -#: archaeological_finds/models_finds.py:101 +#: archaeological_finds/models_finds.py:103 msgid "Material type quality type" msgstr "" -#: archaeological_finds/models_finds.py:102 +#: archaeological_finds/models_finds.py:104 msgid "Material type quality types" msgstr "" -#: archaeological_finds/models_finds.py:114 +#: archaeological_finds/models_finds.py:116 msgid "Conservatory state type" msgstr "" -#: archaeological_finds/models_finds.py:115 +#: archaeological_finds/models_finds.py:117 msgid "Conservatory state types" msgstr "" -#: archaeological_finds/models_finds.py:128 +#: archaeological_finds/models_finds.py:130 msgid "Virtual" msgstr "" -#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:131 msgid "Destructive" msgstr "" -#: archaeological_finds/models_finds.py:131 +#: archaeological_finds/models_finds.py:133 msgid "Create a new find" msgstr "" -#: archaeological_finds/models_finds.py:134 +#: archaeological_finds/models_finds.py:136 msgid "" "If True when this treatment is applied a new version of the object will be " "created." msgstr "" -#: archaeological_finds/models_finds.py:139 +#: archaeological_finds/models_finds.py:141 msgid "Upstream is many" msgstr "" -#: archaeological_finds/models_finds.py:142 +#: archaeological_finds/models_finds.py:144 msgid "Check this if for this treatment from many finds you'll get one." msgstr "" -#: archaeological_finds/models_finds.py:146 +#: archaeological_finds/models_finds.py:148 msgid "Downstream is many" msgstr "" -#: archaeological_finds/models_finds.py:149 +#: archaeological_finds/models_finds.py:151 msgid "Check this if for this treatment from one find you'll get many." msgstr "" -#: archaeological_finds/models_finds.py:153 +#: archaeological_finds/models_finds.py:155 msgid "Change reference location" msgstr "" -#: archaeological_finds/models_finds.py:155 +#: archaeological_finds/models_finds.py:157 msgid "The treatment change the reference location." msgstr "" -#: archaeological_finds/models_finds.py:158 +#: archaeological_finds/models_finds.py:160 msgid "Change current location" msgstr "" -#: archaeological_finds/models_finds.py:160 +#: archaeological_finds/models_finds.py:162 msgid "The treatment change the current location." msgstr "" -#: archaeological_finds/models_finds.py:163 +#: archaeological_finds/models_finds.py:165 msgid "Restore the reference location" msgstr "" -#: archaeological_finds/models_finds.py:166 +#: archaeological_finds/models_finds.py:168 msgid "" "The treatment change restore reference location to the current location." msgstr "" -#: archaeological_finds/models_finds.py:173 +#: archaeological_finds/models_finds.py:175 #: archaeological_finds/models_treatments.py:371 msgid "Treatment types" msgstr "" -#: archaeological_finds/models_finds.py:226 +#: archaeological_finds/models_finds.py:228 msgid "Integrity / interest type" msgstr "" -#: archaeological_finds/models_finds.py:227 +#: archaeological_finds/models_finds.py:229 msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:909 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:909 msgid "Remarkability type" msgstr "" -#: archaeological_finds/models_finds.py:238 +#: archaeological_finds/models_finds.py:240 msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:912 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:912 msgid "Batch type" msgstr "" -#: archaeological_finds/models_finds.py:251 +#: archaeological_finds/models_finds.py:253 msgid "Batch types" msgstr "" -#: archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1888 +#: archaeological_finds/models_finds.py:277 +#: archaeological_finds/models_finds.py:1892 #: ishtar_common/models_imports.py:915 msgid "Functional area" msgstr "" -#: archaeological_finds/models_finds.py:291 +#: archaeological_finds/models_finds.py:293 msgid "Object type quality type" msgstr "" -#: archaeological_finds/models_finds.py:292 +#: archaeological_finds/models_finds.py:294 msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:910 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:910 msgid "Alteration type" msgstr "" -#: archaeological_finds/models_finds.py:303 +#: archaeological_finds/models_finds.py:305 msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:911 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:911 msgid "Alteration cause type" msgstr "" -#: archaeological_finds/models_finds.py:317 +#: archaeological_finds/models_finds.py:319 msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:905 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:905 msgid "Treatment emergency type" msgstr "" -#: archaeological_finds/models_finds.py:331 +#: archaeological_finds/models_finds.py:333 msgid "Treatment emergency types" msgstr "" -#: archaeological_finds/models_finds.py:341 +#: archaeological_finds/models_finds.py:343 msgid "Communicability type" msgstr "" -#: archaeological_finds/models_finds.py:342 +#: archaeological_finds/models_finds.py:344 msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:913 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:913 msgid "Checked type" msgstr "" -#: archaeological_finds/models_finds.py:358 +#: archaeological_finds/models_finds.py:360 msgid "Checked types" msgstr "" -#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:414 msgid "Special interest" msgstr "" -#: archaeological_finds/models_finds.py:434 +#: archaeological_finds/models_finds.py:436 msgid "Material index" msgstr "" -#: archaeological_finds/models_finds.py:439 +#: archaeological_finds/models_finds.py:441 #: ishtar_common/templates/blocks/DataTables-stats.html:25 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "" -#: archaeological_finds/models_finds.py:441 +#: archaeological_finds/models_finds.py:443 msgid "Short ID" msgstr "" -#: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 +#: archaeological_finds/models_finds.py:447 +#: archaeological_finds/models_finds.py:454 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "" -#: archaeological_finds/models_finds.py:448 +#: archaeological_finds/models_finds.py:450 msgid "Complete ID" msgstr "" -#: archaeological_finds/models_finds.py:469 +#: archaeological_finds/models_finds.py:471 msgid "Concatenation of associated material types codes" msgstr "" -#: archaeological_finds/models_finds.py:475 -#: archaeological_finds/models_finds.py:1797 +#: archaeological_finds/models_finds.py:477 +#: archaeological_finds/models_finds.py:1801 msgid "Base find" msgstr "" -#: archaeological_finds/models_finds.py:476 +#: archaeological_finds/models_finds.py:478 msgid "Base finds" msgstr "" -#: archaeological_finds/models_finds.py:852 +#: archaeological_finds/models_finds.py:855 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:853 +#: archaeological_finds/models_finds.py:856 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:865 +#: archaeological_finds/models_finds.py:868 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:12 #: ishtar_common/templates/ishtar/blocks/window_image.html:22 @@ -4501,561 +4447,561 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:920 archaeological_finds/views.py:535 +#: archaeological_finds/models_finds.py:923 archaeological_finds/views.py:535 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:932 +#: archaeological_finds/models_finds.py:935 #: archaeological_warehouse/models.py:1853 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:943 +#: archaeological_finds/models_finds.py:946 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:1096 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1098 +#: archaeological_finds/models_finds.py:1101 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1099 +#: archaeological_finds/models_finds.py:1102 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1100 +#: archaeological_finds/models_finds.py:1103 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1102 +#: archaeological_finds/models_finds.py:1105 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1104 +#: archaeological_finds/models_finds.py:1107 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1105 +#: archaeological_finds/models_finds.py:1108 msgid "Base find - Discovery date (exact or TPQ)" msgstr "" -#: archaeological_finds/models_finds.py:1106 +#: archaeological_finds/models_finds.py:1109 msgid "Base find - Discovery date (TAQ)" msgstr "" -#: archaeological_finds/models_finds.py:1167 +#: archaeological_finds/models_finds.py:1170 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:1234 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1235 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1239 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1242 +#: archaeological_finds/models_finds.py:1245 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1257 +#: archaeological_finds/models_finds.py:1260 #: archaeological_warehouse/models.py:933 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 +#: archaeological_finds/models_finds.py:1264 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1265 -#: archaeological_operations/models.py:352 -#: archaeological_operations/models.py:1060 +#: archaeological_finds/models_finds.py:1268 +#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:1094 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1274 +#: archaeological_finds/models_finds.py:1277 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1279 -#: archaeological_finds/models_finds.py:1735 +#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1739 #: archaeological_warehouse/models.py:947 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1284 +#: archaeological_finds/models_finds.py:1287 #: archaeological_warehouse/models.py:952 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1288 -#: archaeological_finds/models_finds.py:1730 +#: archaeological_finds/models_finds.py:1291 +#: archaeological_finds/models_finds.py:1734 #: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1296 +#: archaeological_finds/models_finds.py:1299 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1300 archaeological_finds/tests.py:1197 +#: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1199 #: archaeological_warehouse/models.py:968 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1304 +#: archaeological_finds/models_finds.py:1307 #: archaeological_warehouse/models.py:972 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1308 +#: archaeological_finds/models_finds.py:1311 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1312 archaeological_finds/tests.py:1375 +#: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1377 #: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1316 +#: archaeological_finds/models_finds.py:1319 #: archaeological_warehouse/models.py:984 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1320 +#: archaeological_finds/models_finds.py:1323 #: archaeological_warehouse/models.py:988 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 +#: archaeological_finds/models_finds.py:1327 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1327 +#: archaeological_finds/models_finds.py:1330 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1331 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 +#: archaeological_finds/models_finds.py:1338 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1339 -#: archaeological_finds/models_finds.py:1733 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_finds/models_finds.py:1737 #: archaeological_warehouse/models.py:902 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1343 +#: archaeological_finds/models_finds.py:1346 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1347 +#: archaeological_finds/models_finds.py:1350 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1351 +#: archaeological_finds/models_finds.py:1354 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1358 +#: archaeological_finds/models_finds.py:1361 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1362 +#: archaeological_finds/models_finds.py:1365 #: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1365 archaeological_finds/tests.py:1417 +#: archaeological_finds/models_finds.py:1368 archaeological_finds/tests.py:1419 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1370 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1374 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1378 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1382 +#: archaeological_finds/models_finds.py:1385 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1385 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1389 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1392 +#: archaeological_finds/models_finds.py:1395 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1396 +#: archaeological_finds/models_finds.py:1399 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1402 msgctxt "key for text search" msgid "discovery-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1403 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "discovery-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1410 msgctxt "key for text search" msgid "discovery-date-tpq-before" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1414 msgctxt "key for text search" msgid "discovery-date-tpq-after" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1418 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1422 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "" -#: archaeological_finds/models_finds.py:1423 +#: archaeological_finds/models_finds.py:1426 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1429 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1430 +#: archaeological_finds/models_finds.py:1433 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1434 +#: archaeological_finds/models_finds.py:1437 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1437 +#: archaeological_finds/models_finds.py:1440 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1441 +#: archaeological_finds/models_finds.py:1444 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1447 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1450 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1454 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1470 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1479 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1482 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1485 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1492 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1492 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1498 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1503 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1510 msgctxt "key for text search" msgid "length-higher" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "width-higher" msgstr "" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1516 +#: archaeological_finds/models_finds.py:1519 msgctxt "key for text search" msgid "thickness-higher" msgstr "" -#: archaeological_finds/models_finds.py:1519 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "diameter-higher" msgstr "" -#: archaeological_finds/models_finds.py:1522 +#: archaeological_finds/models_finds.py:1525 msgctxt "key for text search" msgid "circumference-higher" msgstr "" -#: archaeological_finds/models_finds.py:1526 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "volume-higher" msgstr "" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1532 msgctxt "key for text search" msgid "weight-higher" msgstr "" -#: archaeological_finds/models_finds.py:1532 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1540 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1544 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1551 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1555 msgctxt "key for text search" msgid "check-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "check-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1561 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1565 #: archaeological_warehouse/models.py:996 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1569 #: archaeological_warehouse/models.py:1000 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1573 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1574 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1578 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1585 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1586 +#: archaeological_finds/models_finds.py:1589 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1593 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1594 -#: archaeological_operations/models.py:400 +#: archaeological_finds/models_finds.py:1597 +#: archaeological_operations/models.py:428 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1602 archaeological_finds/tests.py:1315 +#: archaeological_finds/models_finds.py:1605 archaeological_finds/tests.py:1317 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1610 -#: archaeological_operations/models.py:1088 +#: archaeological_finds/models_finds.py:1613 +#: archaeological_operations/models.py:1122 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1614 archaeological_finds/tests.py:1291 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/tests.py:2856 -#: archaeological_operations/tests.py:3274 +#: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1293 +#: archaeological_operations/models.py:1126 +#: archaeological_operations/tests.py:2855 +#: archaeological_operations/tests.py:3273 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1709 -#: archaeological_finds/models_finds.py:2345 +#: archaeological_finds/models_finds.py:1713 +#: archaeological_finds/models_finds.py:2353 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 +#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 #: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -5063,112 +5009,112 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1717 +#: archaeological_finds/models_finds.py:1721 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1831 +#: archaeological_finds/models_finds.py:1835 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1833 +#: archaeological_finds/models_finds.py:1837 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1842 -#: archaeological_finds/templates/ishtar/sheet_find.html:414 +#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/templates/ishtar/sheet_find.html:416 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/templates/ishtar/sheet_find.html:452 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/templates/ishtar/sheet_find.html:454 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1924 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1923 +#: archaeological_finds/models_finds.py:1927 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1926 +#: archaeological_finds/models_finds.py:1930 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1947 +#: archaeological_finds/models_finds.py:1951 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1952 +#: archaeological_finds/models_finds.py:1956 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2006 +#: archaeological_finds/models_finds.py:2010 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 #: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "" -#: archaeological_finds/models_finds.py:2009 +#: archaeological_finds/models_finds.py:2013 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2029 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2035 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2067 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2201 +#: archaeological_finds/models_finds.py:2205 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2202 +#: archaeological_finds/models_finds.py:2206 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2207 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2208 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2209 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2318 +#: archaeological_finds/models_finds.py:2326 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2334 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2342 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2899 +#: archaeological_finds/models_finds.py:2907 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2905 +#: archaeological_finds/models_finds.py:2913 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 #: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 #: ishtar_common/models.py:2788 ishtar_common/models.py:3117 #: ishtar_common/models.py:3310 ishtar_common/models.py:3547 @@ -5176,11 +5122,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3350 +#: archaeological_finds/models_finds.py:3358 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3351 +#: archaeological_finds/models_finds.py:3359 msgid "Properties" msgstr "" @@ -5211,7 +5157,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2495 +#: archaeological_operations/models.py:2538 msgctxt "key for text search" msgid "index" msgstr "" @@ -5255,9 +5201,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:756 -#: 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:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:425 +#: archaeological_finds/templates/ishtar/sheet_find.html:463 msgid "Doer" msgstr "" @@ -5306,12 +5252,12 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1175 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:493 #: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1238 +#: archaeological_finds/models_treatments.py:1242 msgid "Add associated treatment" msgstr "" @@ -5378,56 +5324,60 @@ msgid "" "the find." msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:41 +#: archaeological_finds/templates/ishtar/sheet_find.html:40 msgid "Image / Base find" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:48 +#: archaeological_finds/templates/ishtar/sheet_find.html:47 msgid "Identification / Description / Dimensions" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:56 +#: archaeological_finds/templates/ishtar/sheet_find.html:54 msgid "Datings / Preservation" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:65 +#: archaeological_finds/templates/ishtar/sheet_find.html:62 msgid "Warehouse / Treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:175 +#: archaeological_finds/templates/ishtar/sheet_find.html:172 msgid "Administrative index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:221 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 msgid "Checked" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:302 +#: archaeological_finds/templates/ishtar/sheet_find.html:244 +msgid "No datation or preservation info." +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:304 msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:332 +#: archaeological_finds/templates/ishtar/sheet_find.html:334 msgid "Reference container / current container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:376 +#: archaeological_finds/templates/ishtar/sheet_find.html:378 msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:380 -#: archaeological_finds/templates/ishtar/sheet_find.html:418 -#: archaeological_finds/templates/ishtar/sheet_find.html:456 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 +#: archaeological_finds/templates/ishtar/sheet_find.html:382 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_finds/templates/ishtar/sheet_find.html:458 +#: archaeological_finds/templates/ishtar/sheet_find.html:497 msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:384 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +#: archaeological_finds/templates/ishtar/sheet_find.html:424 +#: archaeological_finds/templates/ishtar/sheet_find.html:462 msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats-detail.html:41 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5436,8 +5386,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 +#: archaeological_finds/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5445,7 +5395,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:529 +#: archaeological_finds/templates/ishtar/sheet_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -5532,23 +5482,23 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:881 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:883 archaeological_warehouse/models.py:1623 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1420 archaeological_finds/tests.py:1446 -#: archaeological_finds/tests.py:1456 archaeological_operations/tests.py:3042 +#: archaeological_finds/tests.py:1422 archaeological_finds/tests.py:1448 +#: archaeological_finds/tests.py:1458 archaeological_operations/tests.py:3041 #: ishtar_common/forms.py:1159 ishtar_common/forms.py:1238 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:18 +#: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:581 ishtar_common/views_item.py:847 #: ishtar_common/views_item.py:884 ishtar_common/wizards.py:483 msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1421 archaeological_finds/tests.py:1447 -#: archaeological_finds/tests.py:1457 ishtar_common/forms.py:1160 -#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:23 +#: archaeological_finds/tests.py:1423 archaeological_finds/tests.py:1449 +#: archaeological_finds/tests.py:1459 ishtar_common/forms.py:1160 +#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:485 msgid "No" msgstr "" @@ -5645,20 +5595,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2965 +#: archaeological_operations/models.py:3008 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2967 +#: archaeological_operations/models.py:3010 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2969 -#: archaeological_operations/models.py:2997 -#: archaeological_operations/models.py:3062 +#: archaeological_operations/models.py:3012 +#: archaeological_operations/models.py:3040 +#: archaeological_operations/models.py:3105 msgid "Public domain" msgstr "" @@ -5716,13 +5666,13 @@ msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:789 -#: archaeological_operations/models.py:1429 +#: archaeological_operations/models.py:1464 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:794 -#: archaeological_operations/models.py:1364 +#: archaeological_operations/models.py:1399 msgid "Address / Locality" msgstr "" @@ -5732,28 +5682,29 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:845 -#: archaeological_operations/models.py:2636 +#: archaeological_operations/models.py:2679 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/models.py:1263 +#: archaeological_operations/forms.py:1760 +#: archaeological_operations/models.py:1298 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:533 #: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1320 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:278 -#: archaeological_operations/models.py:287 -#: archaeological_operations/models.py:458 -#: archaeological_operations/models.py:912 -#: archaeological_operations/models.py:999 -#: archaeological_operations/models.py:1298 +#: archaeological_operations/forms.py:1297 +#: archaeological_operations/forms.py:1415 +#: archaeological_operations/forms.py:1924 +#: archaeological_operations/models.py:306 +#: archaeological_operations/models.py:315 +#: archaeological_operations/models.py:487 +#: archaeological_operations/models.py:947 +#: archaeological_operations/models.py:1033 +#: archaeological_operations/models.py:1333 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -5780,34 +5731,34 @@ msgstr "" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:895 -#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:1402 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:897 -#: archaeological_operations/models.py:914 -#: archaeological_operations/models.py:1410 +#: archaeological_operations/models.py:949 +#: archaeological_operations/models.py:1445 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:863 -#: archaeological_operations/models.py:1319 +#: archaeological_operations/models.py:1354 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:816 -#: archaeological_operations/models.py:1401 +#: archaeological_operations/models.py:1436 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1815 -#: archaeological_operations/models.py:915 -#: archaeological_operations/models.py:1420 +#: archaeological_operations/forms.py:1768 +#: archaeological_operations/models.py:950 +#: archaeological_operations/models.py:1455 msgid "Documentation received" msgstr "" @@ -5821,9 +5772,9 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:916 -#: archaeological_operations/models.py:1425 +#: archaeological_operations/forms.py:1772 +#: archaeological_operations/models.py:951 +#: archaeological_operations/models.py:1460 msgid "Finds received" msgstr "" @@ -5868,13 +5819,13 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1867 -#: archaeological_operations/models.py:1363 +#: archaeological_operations/forms.py:1820 +#: archaeological_operations/models.py:1398 msgid "Generic name" msgstr "" #: archaeological_operations/forms.py:808 -#: archaeological_operations/models.py:1324 +#: archaeological_operations/models.py:1359 msgid "Old code" msgstr "" @@ -5887,16 +5838,16 @@ msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:842 -#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:1396 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:856 -#: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/forms.py:1960 -#: archaeological_operations/models.py:476 -#: archaeological_operations/models.py:1277 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/forms.py:1776 +#: archaeological_operations/forms.py:1913 +#: archaeological_operations/models.py:505 +#: archaeological_operations/models.py:1312 msgid "Collaborators" msgstr "" @@ -5905,17 +5856,17 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:861 -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1283 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:883 -#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:1452 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:888 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1458 msgid "Deadline for submission of the finds" msgstr "" @@ -5924,12 +5875,12 @@ msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:900 -#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:888 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:888 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:906 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1450 msgid "Abstract" msgstr "" @@ -5954,7 +5905,7 @@ msgid "Bad operation code" msgstr "" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1856 +#: archaeological_operations/models.py:1898 msgid "Operation code" msgstr "" @@ -5968,12 +5919,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1467 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:1053 -#: archaeological_operations/models.py:1434 +#: archaeological_operations/models.py:1469 msgid "Official report number" msgstr "" @@ -5982,12 +5933,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:1481 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:1071 -#: archaeological_operations/models.py:1454 +#: archaeological_operations/models.py:1489 msgid "Writer of the minutes" msgstr "" @@ -6000,23 +5951,23 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:1080 -#: archaeological_operations/models.py:1303 +#: archaeological_operations/models.py:1338 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:1307 +#: archaeological_operations/models.py:1342 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:1311 +#: archaeological_operations/models.py:1346 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:1085 -#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:1350 msgid "Effective man-days" msgstr "" @@ -6029,17 +5980,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1101 -#: archaeological_operations/models.py:1335 +#: archaeological_operations/models.py:1370 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1374 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1106 -#: archaeological_operations/models.py:1342 +#: archaeological_operations/models.py:1377 msgid "Prescription on geoarchaeological context" msgstr "" @@ -6060,10 +6011,10 @@ msgid "Operation - 050 - Parcels (2)" msgstr "" #: archaeological_operations/forms.py:1195 -#: archaeological_operations/forms.py:1314 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1919 -#: archaeological_operations/models.py:453 +#: archaeological_operations/forms.py:1291 +#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1872 +#: archaeological_operations/models.py:482 #: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 #: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 @@ -6072,178 +6023,178 @@ msgid "Reference" msgstr "" #: archaeological_operations/forms.py:1206 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1966 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/forms.py:1919 msgid "Cultural attributions" msgstr "" -#: archaeological_operations/forms.py:1251 -#: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1228 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1892 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1271 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1299 +#: archaeological_operations/forms.py:1276 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1308 +#: archaeological_operations/forms.py:1285 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1305 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/models.py:468 +#: archaeological_operations/forms.py:1317 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:497 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1343 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/models.py:471 +#: archaeological_operations/forms.py:1320 +#: archaeological_operations/forms.py:1430 +#: archaeological_operations/models.py:500 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:488 +#: archaeological_operations/forms.py:1324 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/models.py:517 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1349 -#: archaeological_operations/forms.py:1523 -#: archaeological_operations/models.py:491 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1476 +#: archaeological_operations/models.py:520 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1525 -#: archaeological_operations/models.py:480 +#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1478 +#: archaeological_operations/models.py:509 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1533 -#: archaeological_operations/models.py:482 +#: archaeological_operations/forms.py:1331 +#: archaeological_operations/forms.py:1486 +#: archaeological_operations/models.py:511 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1357 -#: archaeological_operations/forms.py:1527 -#: archaeological_operations/models.py:484 +#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1480 +#: archaeological_operations/models.py:513 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1359 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:485 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1482 +#: archaeological_operations/models.py:514 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1531 -#: archaeological_operations/models.py:486 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1484 +#: archaeological_operations/models.py:515 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1398 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1507 +#: archaeological_operations/forms.py:1460 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1469 #: archaeological_operations/templates/ishtar/sheet_site.html:54 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1470 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1596 +#: archaeological_operations/forms.py:1549 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1611 -#: archaeological_operations/forms.py:1713 -#: archaeological_operations/forms.py:1780 +#: archaeological_operations/forms.py:1564 +#: archaeological_operations/forms.py:1666 +#: archaeological_operations/forms.py:1733 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1621 -#: archaeological_operations/models.py:2661 +#: archaeological_operations/forms.py:1574 +#: archaeological_operations/models.py:2704 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1628 -#: archaeological_operations/models.py:2696 +#: archaeological_operations/forms.py:1581 +#: archaeological_operations/models.py:2739 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1592 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1673 +#: archaeological_operations/forms.py:1626 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1630 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1690 +#: archaeological_operations/forms.py:1643 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1648 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1719 -#: archaeological_operations/forms.py:1723 +#: archaeological_operations/forms.py:1672 +#: archaeological_operations/forms.py:1676 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:1694 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1696 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1738 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1894 +#: archaeological_operations/forms.py:1847 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1950 +#: archaeological_operations/forms.py:1903 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6251,315 +6202,315 @@ msgstr "" msgid "Administrative Act" msgstr "" -#: archaeological_operations/models.py:93 +#: archaeological_operations/models.py:94 msgid "Remain types" msgstr "" -#: archaeological_operations/models.py:107 +#: archaeological_operations/models.py:108 msgid "Parent period" msgstr "" -#: archaeological_operations/models.py:114 +#: archaeological_operations/models.py:115 msgid "Type Period" msgstr "" -#: archaeological_operations/models.py:115 +#: archaeological_operations/models.py:116 msgid "Types Period" msgstr "" -#: archaeological_operations/models.py:130 +#: archaeological_operations/models.py:131 msgid "Type of report state" msgstr "" -#: archaeological_operations/models.py:131 +#: archaeological_operations/models.py:132 msgid "Types of report state" msgstr "" -#: archaeological_operations/models.py:148 +#: archaeological_operations/models.py:149 msgid "Type of record quality" msgstr "" -#: archaeological_operations/models.py:149 +#: archaeological_operations/models.py:150 msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:157 +#: archaeological_operations/models.py:158 msgid "Cultural attribution type" msgstr "" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:159 msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:346 -#: archaeological_operations/models.py:1096 -#: archaeological_operations/tests.py:3033 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1130 +#: archaeological_operations/tests.py:3032 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:358 +#: archaeological_operations/models.py:386 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:361 +#: archaeological_operations/models.py:389 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:393 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:369 +#: archaeological_operations/models.py:397 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:401 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:405 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:408 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:388 +#: archaeological_operations/models.py:416 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:392 +#: archaeological_operations/models.py:420 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:396 +#: archaeological_operations/models.py:424 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:542 +#: archaeological_operations/models.py:1496 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:525 -#: archaeological_operations/models.py:1473 +#: archaeological_operations/models.py:554 +#: archaeological_operations/models.py:1508 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1390 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1425 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:580 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 +#: archaeological_operations/models.py:771 ishtar_common/forms.py:1158 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 #: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:741 +#: archaeological_operations/models.py:773 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:977 +#: archaeological_operations/models.py:1012 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:978 +#: archaeological_operations/models.py:1013 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:979 -msgid "Scientist (full name)" -msgstr "" - -#: archaeological_operations/models.py:980 +#: archaeological_operations/models.py:1014 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:981 +#: archaeological_operations/models.py:1015 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:982 +#: archaeological_operations/models.py:1016 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:983 +#: archaeological_operations/models.py:1017 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:985 +#: archaeological_operations/models.py:1018 +msgid "Scientist (full name)" +msgstr "" + +#: archaeological_operations/models.py:1019 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:986 +#: archaeological_operations/models.py:1020 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:987 +#: archaeological_operations/models.py:1021 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:988 +#: archaeological_operations/models.py:1022 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1023 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1028 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1108 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1081 -#: archaeological_operations/tests.py:3040 +#: archaeological_operations/models.py:1115 +#: archaeological_operations/tests.py:3039 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1118 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1102 +#: archaeological_operations/models.py:1136 msgctxt "key for text search" msgid "start-before" msgstr "" -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:1139 msgctxt "key for text search" msgid "start-after" msgstr "" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1142 msgctxt "key for text search" msgid "end-before" msgstr "" -#: archaeological_operations/models.py:1112 +#: archaeological_operations/models.py:1146 msgctxt "key for text search" msgid "end-after" msgstr "" -#: archaeological_operations/models.py:1116 -#: archaeological_operations/tests.py:3083 +#: archaeological_operations/models.py:1150 +#: archaeological_operations/tests.py:3082 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:1159 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1129 +#: archaeological_operations/models.py:1163 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1137 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1145 +#: archaeological_operations/models.py:1179 msgctxt "key for text search" msgid "documentation-received" msgstr "" -#: archaeological_operations/models.py:1149 +#: archaeological_operations/models.py:1183 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "" -#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "" -#: archaeological_operations/models.py:1157 +#: archaeological_operations/models.py:1191 msgctxt "key for text search" msgid "finds-received" msgstr "" -#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "" -#: archaeological_operations/models.py:1168 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1254 +#: archaeological_operations/models.py:1289 msgid "Scientific manager" msgstr "" -#: archaeological_operations/models.py:1270 +#: archaeological_operations/models.py:1305 msgid "Operation monitor" msgstr "" -#: archaeological_operations/models.py:1396 +#: archaeological_operations/models.py:1431 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1404 +#: archaeological_operations/models.py:1439 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1438 +#: archaeological_operations/models.py:1473 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1483 +#: archaeological_operations/models.py:1518 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1001 ishtar_common/views.py:1002 @@ -6567,295 +6518,295 @@ msgstr "" msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1520 +#: archaeological_operations/models.py:1558 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1521 +#: archaeological_operations/models.py:1559 msgid "List of associated containers" msgstr "" -#: archaeological_operations/models.py:1594 +#: archaeological_operations/models.py:1632 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1703 +#: archaeological_operations/models.py:1741 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1822 +#: archaeological_operations/models.py:1864 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1841 +#: archaeological_operations/models.py:1883 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1889 +#: archaeological_operations/models.py:1931 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:1950 +#: archaeological_operations/models.py:1992 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:1960 +#: archaeological_operations/models.py:2002 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:1968 +#: archaeological_operations/models.py:2010 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:1976 +#: archaeological_operations/models.py:2018 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2030 +#: archaeological_operations/models.py:2072 #: archaeological_warehouse/templates/ishtar/sheet_container.html:103 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2092 -#: archaeological_operations/models.py:2171 +#: archaeological_operations/models.py:2134 +#: archaeological_operations/models.py:2213 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2136 +#: archaeological_operations/models.py:2178 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2223 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:309 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:575 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2266 ishtar_common/models_imports.py:889 +#: archaeological_operations/models.py:2309 ishtar_common/models_imports.py:889 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2310 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2292 +#: archaeological_operations/models.py:2335 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2293 +#: archaeological_operations/models.py:2336 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2359 +#: archaeological_operations/models.py:2402 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2364 +#: archaeological_operations/models.py:2407 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2367 +#: archaeological_operations/models.py:2410 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2371 +#: archaeological_operations/models.py:2414 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2497 +#: archaeological_operations/models.py:2540 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2507 +#: archaeological_operations/models.py:2550 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2553 #: archaeological_warehouse/models.py:923 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2557 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2526 +#: archaeological_operations/models.py:2569 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2573 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2577 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2537 +#: archaeological_operations/models.py:2580 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2584 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2588 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2600 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2561 +#: archaeological_operations/models.py:2604 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2607 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2611 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2572 +#: archaeological_operations/models.py:2615 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2619 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2623 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2627 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2630 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2594 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2598 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2602 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2606 +#: archaeological_operations/models.py:2649 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2610 +#: archaeological_operations/models.py:2653 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2687 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2749 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:2755 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2886 +#: archaeological_operations/models.py:2929 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2976 +#: archaeological_operations/models.py:3019 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3266 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3238 +#: archaeological_operations/models.py:3281 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3282 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3287 +#: archaeological_operations/models.py:3330 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3332 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3333 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3334 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3335 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3336 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3835 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3795 +#: archaeological_operations/models.py:3838 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3839 msgid "Operation types old" msgstr "" @@ -7124,73 +7075,73 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:824 +#: archaeological_operations/tests.py:821 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:854 +#: archaeological_operations/tests.py:851 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:892 +#: archaeological_operations/tests.py:889 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" -#: archaeological_operations/tests.py:1803 -msgid "" -"This parcel is associated with a context record. It can't be deleted." +#: archaeological_operations/tests.py:1802 +#: archaeological_operations/views.py:474 +msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" -#: archaeological_operations/tests.py:2530 ishtar_common/forms.py:442 +#: archaeological_operations/tests.py:2529 ishtar_common/forms.py:442 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2543 +#: archaeological_operations/tests.py:2542 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4696 +#: archaeological_operations/tests.py:4578 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4704 +#: archaeological_operations/tests.py:4586 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4717 +#: archaeological_operations/tests.py:4599 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 +#: archaeological_operations/tests.py:4606 ishtar_common/admin.py:2274 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4730 +#: archaeological_operations/tests.py:4612 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 +#: archaeological_operations/tests.py:4685 ishtar_common/admin.py:2352 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4809 ishtar_common/models_rest.py:307 +#: archaeological_operations/tests.py:4691 ishtar_common/models_rest.py:307 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4816 ishtar_common/models_rest.py:286 +#: archaeological_operations/tests.py:4698 ishtar_common/models_rest.py:286 #: ishtar_common/models_rest.py:292 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -7216,10 +7167,6 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:474 -msgid "This parcel is associated with a context record. It can't be deleted." -msgstr "" - #: archaeological_operations/views.py:575 ishtar_common/models.py:1009 msgid "Site deletion" msgstr "" @@ -7249,7 +7196,7 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:84 archaeological_warehouse/forms.py:192 -#: archaeological_warehouse/forms.py:508 archaeological_warehouse/forms.py:729 +#: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 @@ -7290,7 +7237,7 @@ msgid "Warehouse - 001 - Search" msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:260 +#: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 #: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:901 msgid "Warehouse type" msgstr "" @@ -7317,59 +7264,59 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 -#: ishtar_common/models_common.py:3006 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:3188 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3035 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3043 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 -#: ishtar_common/models_common.py:3018 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3057 +#: ishtar_common/models_common.py:3200 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3073 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:266 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:301 archaeological_warehouse/forms.py:302 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:306 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:324 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:341 archaeological_warehouse/forms.py:512 +#: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 #: archaeological_warehouse/models.py:1132 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:343 archaeological_warehouse/forms.py:510 -#: archaeological_warehouse/forms.py:734 archaeological_warehouse/models.py:698 +#: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 +#: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 #: archaeological_warehouse/models.py:859 #: archaeological_warehouse/models.py:1098 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 @@ -7377,124 +7324,124 @@ msgstr "" msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:345 +#: archaeological_warehouse/forms.py:339 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:354 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 #: archaeological_warehouse/models.py:1115 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:364 archaeological_warehouse/forms.py:745 +#: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 #: archaeological_warehouse/models.py:1089 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:372 +#: archaeological_warehouse/forms.py:366 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:377 +#: archaeological_warehouse/forms.py:371 #: archaeological_warehouse/models.py:1122 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:403 +#: archaeological_warehouse/forms.py:397 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:422 +#: archaeological_warehouse/forms.py:416 msgid "This reference already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:430 archaeological_warehouse/forms.py:807 +#: archaeological_warehouse/forms.py:424 archaeological_warehouse/forms.py:801 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:494 +#: archaeological_warehouse/forms.py:488 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:501 +#: archaeological_warehouse/forms.py:495 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:509 +#: archaeological_warehouse/forms.py:503 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:508 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:517 +#: archaeological_warehouse/forms.py:511 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:552 +#: archaeological_warehouse/forms.py:546 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:554 +#: archaeological_warehouse/forms.py:548 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:553 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:568 +#: archaeological_warehouse/forms.py:562 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:569 +#: archaeological_warehouse/forms.py:563 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:570 +#: archaeological_warehouse/forms.py:564 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:589 +#: archaeological_warehouse/forms.py:583 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:613 archaeological_warehouse/forms.py:626 -#: archaeological_warehouse/forms.py:640 archaeological_warehouse/views.py:373 +#: archaeological_warehouse/forms.py:607 archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:634 archaeological_warehouse/views.py:373 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:618 archaeological_warehouse/forms.py:631 -#: archaeological_warehouse/forms.py:645 +#: archaeological_warehouse/forms.py:612 archaeological_warehouse/forms.py:625 +#: archaeological_warehouse/forms.py:639 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:614 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:665 +#: archaeological_warehouse/forms.py:659 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:693 +#: archaeological_warehouse/forms.py:687 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:705 +#: archaeological_warehouse/forms.py:699 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:709 archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:703 archaeological_warehouse/forms.py:704 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:709 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:828 +#: archaeological_warehouse/forms.py:822 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -7861,7 +7808,7 @@ msgid "" msgstr "" #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:36 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:44 msgid "Associated finds" msgstr "" @@ -7957,383 +7904,383 @@ msgstr "" msgid "Related item" msgstr "" -#: ishtar_common/admin.py:107 +#: ishtar_common/admin.py:106 msgid "CSV file" msgstr "" -#: ishtar_common/admin.py:108 +#: ishtar_common/admin.py:107 msgid "Only unicode encoding is managed - convert your file first" msgstr "" -#: ishtar_common/admin.py:148 +#: ishtar_common/admin.py:147 msgid "Export selected as CSV file" msgstr "" -#: ishtar_common/admin.py:212 +#: ishtar_common/admin.py:211 msgid "Export selected as GeoJSON file" msgstr "" -#: ishtar_common/admin.py:295 +#: ishtar_common/admin.py:294 msgid "Export selected as Ishtar (zipped JSON)" msgstr "" -#: ishtar_common/admin.py:301 +#: ishtar_common/admin.py:300 msgid "Merge inside" msgstr "" -#: ishtar_common/admin.py:317 +#: ishtar_common/admin.py:316 msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 +#: ishtar_common/admin.py:333 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "" -#: ishtar_common/admin.py:359 +#: ishtar_common/admin.py:358 msgid "{} merged into {}." msgstr "" -#: ishtar_common/admin.py:382 +#: ishtar_common/admin.py:381 #: ishtar_common/templates/admin/change_parent.html:14 msgid "Change parent" msgstr "" -#: ishtar_common/admin.py:396 +#: ishtar_common/admin.py:395 msgid "Change parent of selected item(s)" msgstr "" -#: ishtar_common/admin.py:428 +#: ishtar_common/admin.py:427 msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:489 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "" -#: ishtar_common/admin.py:541 ishtar_common/models.py:979 +#: ishtar_common/admin.py:540 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/admin.py:541 ishtar_common/forms_common.py:1229 #: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 #: ishtar_common/models.py:2898 msgid "Profiles" msgstr "" -#: ishtar_common/admin.py:637 +#: ishtar_common/admin.py:636 msgid "The CSV file should at least have a {} column" msgstr "" -#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 +#: ishtar_common/admin.py:703 ishtar_common/admin.py:933 #, python-format msgid "%d item(s) created." msgstr "" -#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 +#: ishtar_common/admin.py:705 ishtar_common/admin.py:937 #, python-format msgid "%d item(s) updated." msgstr "" -#: ishtar_common/admin.py:710 +#: ishtar_common/admin.py:709 msgid "These parents are missing: {}" msgstr "" -#: ishtar_common/admin.py:730 +#: ishtar_common/admin.py:729 msgid "Geojson file" msgstr "" -#: ishtar_common/admin.py:732 +#: ishtar_common/admin.py:731 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." msgstr "" -#: ishtar_common/admin.py:738 +#: ishtar_common/admin.py:737 msgid "Prefix for numero INSEE" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:740 msgid "Field name for numero INSEE" msgstr "" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:743 msgid "Field name for name" msgstr "" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "m2" msgstr "" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "km2" msgstr "" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:746 msgid "Surface unit" msgstr "" -#: ishtar_common/admin.py:749 +#: ishtar_common/admin.py:748 msgid "Field name for surface" msgstr "" -#: ishtar_common/admin.py:752 +#: ishtar_common/admin.py:751 msgid "Field name for year" msgstr "" -#: ishtar_common/admin.py:756 +#: ishtar_common/admin.py:755 msgid "Not required for new town. Leave it empty when not available." msgstr "" -#: ishtar_common/admin.py:759 +#: ishtar_common/admin.py:758 msgid "Update only geometry of existing towns" msgstr "" -#: ishtar_common/admin.py:778 +#: ishtar_common/admin.py:777 msgid "\"{}\" not found in feature {}" msgstr "" -#: ishtar_common/admin.py:791 +#: ishtar_common/admin.py:790 msgid "\"{}\" not found in properties of feature {}" msgstr "" -#: ishtar_common/admin.py:804 +#: ishtar_common/admin.py:803 msgid "Bad geometry for feature {}" msgstr "" -#: ishtar_common/admin.py:815 +#: ishtar_common/admin.py:814 msgid "Geometry {} not managed for towns - feature {}" msgstr "" -#: ishtar_common/admin.py:825 +#: ishtar_common/admin.py:824 msgid "Bad value for surface: {} - feature {}" msgstr "" -#: ishtar_common/admin.py:869 +#: ishtar_common/admin.py:868 msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:892 +#: ishtar_common/admin.py:891 msgid "Bad geojson file" msgstr "" -#: ishtar_common/admin.py:904 +#: ishtar_common/admin.py:903 msgid "Too many errors..." msgstr "" -#: ishtar_common/admin.py:957 +#: ishtar_common/admin.py:956 msgid "Zipped JSON file" msgstr "" -#: ishtar_common/admin.py:958 +#: ishtar_common/admin.py:957 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "" -#: ishtar_common/admin.py:994 +#: ishtar_common/admin.py:993 msgid "{} {}(s) created/updated." msgstr "" -#: ishtar_common/admin.py:1017 +#: ishtar_common/admin.py:1016 msgid "Center" msgstr "" -#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 +#: ishtar_common/admin.py:1017 ishtar_common/models_common.py:2798 msgid "Limit" msgstr "" -#: ishtar_common/admin.py:1026 +#: ishtar_common/admin.py:1025 msgid "Parents" msgstr "" -#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 +#: ishtar_common/admin.py:1066 ishtar_common/admin.py:1507 msgid "Make available" msgstr "" -#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make unavailable" msgstr "" -#: ishtar_common/admin.py:1192 +#: ishtar_common/admin.py:1191 msgid "Department number" msgstr "" -#: ishtar_common/admin.py:1193 +#: ishtar_common/admin.py:1192 msgid "Area name" msgstr "" -#: ishtar_common/admin.py:1207 +#: ishtar_common/admin.py:1206 msgid "Choose an area or set an area reference." msgstr "" -#: ishtar_common/admin.py:1214 +#: ishtar_common/admin.py:1213 msgid "Invalid department number." msgstr "" -#: ishtar_common/admin.py:1223 +#: ishtar_common/admin.py:1222 msgid "This name is already used by another area." msgstr "" -#: ishtar_common/admin.py:1251 +#: ishtar_common/admin.py:1250 msgid "Area \"{}\" created." msgstr "" -#: ishtar_common/admin.py:1268 +#: ishtar_common/admin.py:1267 msgid "{} town(s) added to \"{}\"." msgstr "" -#: ishtar_common/admin.py:1440 +#: ishtar_common/admin.py:1439 msgid "{} importer type(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1461 +#: ishtar_common/admin.py:1460 msgid "Select only one importer." msgstr "" -#: ishtar_common/admin.py:1491 +#: ishtar_common/admin.py:1490 msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1560 +#: ishtar_common/admin.py:1559 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1591 +#: ishtar_common/admin.py:1590 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1604 +#: ishtar_common/admin.py:1603 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1631 +#: ishtar_common/admin.py:1630 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1638 +#: ishtar_common/admin.py:1637 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1652 +#: ishtar_common/admin.py:1651 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1687 +#: ishtar_common/admin.py:1686 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1832 +#: ishtar_common/admin.py:1831 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1833 +#: ishtar_common/admin.py:1832 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1862 ishtar_common/models.py:1553 msgid "Form" msgstr "" -#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1883 ishtar_common/models.py:1694 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 +#: ishtar_common/admin.py:2013 ishtar_common/admin.py:2065 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2021 +#: ishtar_common/admin.py:2020 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2033 +#: ishtar_common/admin.py:2032 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2073 +#: ishtar_common/admin.py:2072 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2084 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2152 ishtar_common/models.py:976 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 -#: ishtar_common/admin.py:2333 +#: ishtar_common/admin.py:2185 ishtar_common/admin.py:2295 +#: ishtar_common/admin.py:2331 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2208 +#: ishtar_common/admin.py:2206 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2216 +#: ishtar_common/admin.py:2214 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" -#: ishtar_common/admin.py:2226 +#: ishtar_common/admin.py:2224 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2244 +#: ishtar_common/admin.py:2242 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2250 +#: ishtar_common/admin.py:2248 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2256 +#: ishtar_common/admin.py:2254 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2265 +#: ishtar_common/admin.py:2263 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2283 +#: ishtar_common/admin.py:2281 msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2318 +#: ishtar_common/admin.py:2316 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2340 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2347 +#: ishtar_common/admin.py:2345 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2360 +#: ishtar_common/admin.py:2358 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2393 +#: ishtar_common/admin.py:2391 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2394 +#: ishtar_common/admin.py:2392 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2402 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/admin.py:2405 ishtar_common/models.py:449 #: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 @@ -8344,21 +8291,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2409 +#: ishtar_common/admin.py:2407 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2439 +#: ishtar_common/admin.py:2437 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2472 +#: ishtar_common/admin.py:2470 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2480 +#: ishtar_common/admin.py:2478 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8394,173 +8341,173 @@ msgstr "" msgid "Ishtar - Common" msgstr "" -#: ishtar_common/data_importer.py:278 +#: ishtar_common/data_importer.py:279 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:297 +#: ishtar_common/data_importer.py:298 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:309 +#: ishtar_common/data_importer.py:310 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:319 +#: ishtar_common/data_importer.py:320 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:388 -#: ishtar_common/data_importer.py:678 +#: ishtar_common/data_importer.py:376 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:679 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:401 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:470 ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:471 ishtar_common/data_importer.py:764 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:478 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:479 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:707 +#: ishtar_common/data_importer.py:708 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:846 +#: ishtar_common/data_importer.py:847 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:852 +#: ishtar_common/data_importer.py:853 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 +#: ishtar_common/data_importer.py:855 ishtar_common/views.py:1619 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:855 +#: ishtar_common/data_importer.py:856 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:856 +#: ishtar_common/data_importer.py:857 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:857 +#: ishtar_common/data_importer.py:858 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:859 +#: ishtar_common/data_importer.py:860 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:863 +#: ishtar_common/data_importer.py:864 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:867 +#: ishtar_common/data_importer.py:868 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/data_importer.py:1554 ishtar_common/views.py:1697 #: ishtar_common/views.py:1707 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1842 +#: ishtar_common/data_importer.py:1845 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1847 +#: ishtar_common/data_importer.py:1850 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1929 +#: ishtar_common/data_importer.py:1932 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:2056 +#: ishtar_common/data_importer.py:2059 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2131 +#: ishtar_common/data_importer.py:2134 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2139 +#: ishtar_common/data_importer.py:2142 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2144 +#: ishtar_common/data_importer.py:2147 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2229 +#: ishtar_common/data_importer.py:2232 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2232 +#: ishtar_common/data_importer.py:2235 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2312 +#: ishtar_common/data_importer.py:2315 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2363 +#: ishtar_common/data_importer.py:2366 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8634,6 +8581,26 @@ msgstr "" msgid "Set to null" msgstr "" +#: ishtar_common/forms.py:1298 +msgid "Geo - Name" +msgstr "" + +#: ishtar_common/forms.py:1299 +msgid "Geo - Data type" +msgstr "" + +#: ishtar_common/forms.py:1300 +msgid "Geo - Origin" +msgstr "" + +#: ishtar_common/forms.py:1301 +msgid "Geo - Provider" +msgstr "" + +#: ishtar_common/forms.py:1302 +msgid "Geo - Comment" +msgstr "" + #: ishtar_common/forms_common.py:86 msgid "" "<p>Type name, department code of the town you would like to select. The " @@ -8666,7 +8633,7 @@ msgstr "" msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2542 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -8742,8 +8709,8 @@ msgstr "" #: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 #: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 -#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 -#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3075 +#: ishtar_common/models_common.py:3210 ishtar_common/wizards.py:1933 msgid "Email" msgstr "" @@ -8815,12 +8782,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3059 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 -#: ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3062 +#: ishtar_common/models_common.py:3065 msgid "Phone description 2" msgstr "" @@ -8828,11 +8795,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3069 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3067 msgid "Phone 3" msgstr "" @@ -8840,23 +8807,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3044 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3046 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3049 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3052 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3055 msgid "Other address: country" msgstr "" @@ -8865,7 +8832,7 @@ msgid "Already has an account" msgstr "" #: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 -#: ishtar_common/wizards.py:1930 +#: ishtar_common/wizards.py:1932 msgid "Username" msgstr "" @@ -8885,7 +8852,7 @@ msgid "Account" msgstr "" #: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 -#: ishtar_common/wizards.py:1966 +#: ishtar_common/wizards.py:1968 msgid "New password" msgstr "" @@ -9049,6 +9016,7 @@ msgstr "" #: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 #: ishtar_common/models.py:5185 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "" @@ -9292,16 +9260,19 @@ msgstr "" #: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" #: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" #: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" @@ -9314,6 +9285,21 @@ msgstr "" msgid "Buffer type" msgstr "" +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:3706 +msgid "Estimated error for X" +msgstr "" + +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:3709 +msgid "Estimated error for Y" +msgstr "" + +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2185 +#: ishtar_common/models_common.py:3712 +msgid "Estimated error for Z" +msgstr "" + #: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "" @@ -9322,44 +9308,48 @@ msgstr "" msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2859 +#: ishtar_common/forms_common.py:2855 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2864 +#: ishtar_common/forms_common.py:2860 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2869 +#: ishtar_common/forms_common.py:2865 msgid "A value is expected for Z." msgstr "" -#: ishtar_common/forms_common.py:2888 +#: ishtar_common/forms_common.py:2884 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:2924 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 -#: ishtar_common/models_common.py:3539 +#: ishtar_common/forms_common.py:2926 +msgid "Coordinates" +msgstr "" + +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3721 msgid "Point" msgstr "" -#: ishtar_common/forms_common.py:2931 +#: ishtar_common/forms_common.py:2928 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:2929 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:2933 +#: ishtar_common/forms_common.py:2930 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:2934 +#: ishtar_common/forms_common.py:2931 msgid "Multi-polygons" msgstr "" @@ -10315,6 +10305,11 @@ msgstr "" msgid "Error: general_contractor type is missing" msgstr "" +#: ishtar_common/models.py:2465 +msgctxt "key for text search" +msgid "precise-town" +msgstr "" + #: ishtar_common/models.py:2503 msgid "Organizations" msgstr "" @@ -10730,7 +10725,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3430 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -11128,11 +11123,23 @@ msgstr "" msgid "Data provider" msgstr "" +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:3702 +msgid "X" +msgstr "" + #: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 #: ishtar_common/models_common.py:2172 msgid "User input" msgstr "" +#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3703 +msgid "Y" +msgstr "" + +#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3704 +msgid "Z" +msgstr "" + #: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "" @@ -11145,7 +11152,11 @@ msgstr "" msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:3716 +msgid "Spatial Reference System" +msgstr "" + +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3722 msgid "Point (2D)" msgstr "" @@ -11169,101 +11180,134 @@ msgstr "" msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2274 +#: ishtar_common/models_common.py:2284 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2647 +#: ishtar_common/models_common.py:2702 +msgctxt "key for text search" +msgid "geo-name" +msgstr "" + +#: ishtar_common/models_common.py:2705 +msgctxt "key for text search" +msgid "geo-type" +msgstr "" + +#: ishtar_common/models_common.py:2708 +msgctxt "key for text search" +msgid "geo-origin" +msgstr "" + +#: ishtar_common/models_common.py:2711 +msgctxt "key for text search" +msgid "geo-provider" +msgstr "" + +#: ishtar_common/models_common.py:2714 +msgctxt "key for text search" +msgid "geo-comment" +msgstr "" + +#: ishtar_common/models_common.py:2736 +msgid "Add geographic item" +msgstr "" + +#: ishtar_common/models_common.py:2738 +msgid "geo." +msgstr "" + +#: ishtar_common/models_common.py:2808 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2651 +#: ishtar_common/models_common.py:2812 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2655 +#: ishtar_common/models_common.py:2816 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:2856 +#: ishtar_common/models_common.py:3038 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:2889 +#: ishtar_common/models_common.py:3071 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:2895 +#: ishtar_common/models_common.py:3077 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:3114 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3013 +#: ishtar_common/models_common.py:3195 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3023 +#: ishtar_common/models_common.py:3205 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3041 +#: ishtar_common/models_common.py:3223 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3252 +#: ishtar_common/models_common.py:3434 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3256 +#: ishtar_common/models_common.py:3438 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3332 +#: ishtar_common/models_common.py:3514 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3334 +#: ishtar_common/models_common.py:3516 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3542 +#: ishtar_common/models_common.py:3724 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3727 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3729 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:3549 +#: ishtar_common/models_common.py:3731 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3556 +#: ishtar_common/models_common.py:3738 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4107 +#: ishtar_common/models_common.py:4254 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4109 +#: ishtar_common/models_common.py:4256 msgid "regen." msgstr "" @@ -11753,10 +11797,12 @@ msgid "Unarchive" msgstr "" #: ishtar_common/models_imports.py:1374 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "" #: ishtar_common/models_imports.py:1375 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 @@ -11765,7 +11811,7 @@ msgid "Delete" msgstr "" #: ishtar_common/models_imports.py:1469 ishtar_common/models_imports.py:1472 -#: ishtar_common/models_imports.py:1531 +#: ishtar_common/models_imports.py:1534 msgid "Invalid GIS file." msgstr "" @@ -11778,27 +11824,27 @@ msgstr "" msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1528 +#: ishtar_common/models_imports.py:1531 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1570 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1635 +#: ishtar_common/models_imports.py:1638 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1666 +#: ishtar_common/models_imports.py:1669 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1702 +#: ishtar_common/models_imports.py:1705 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1710 +#: ishtar_common/models_imports.py:1713 msgid "Import {} finished with no errors" msgstr "" @@ -12448,11 +12494,11 @@ msgstr "" msgid "Geometry" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:39 msgid "geo item" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:35 msgid "Associated context records" msgstr "" @@ -12616,6 +12662,44 @@ msgstr "" msgid "Are you sure you want to delete: " msgstr "" +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:11 +msgid "Are you sure to want to delete this geographic item?" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:12 +msgid "No rollback is possible." +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:43 +msgid "Geographic item for these towns" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:52 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:97 +msgid "Geographic item for these operations" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:61 +msgid "Geographic item for these sites" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:70 +msgid "Geographic item for these context records" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:79 +msgid "Geographic item for these base finds" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:88 +msgid "Geographic item for these containers" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:111 +#: ishtar_common/templates/ishtar/import_delete.html:45 +msgid "Are you sure to want to delete this import?" +msgstr "" + #: ishtar_common/templates/ishtar/forms/geo_form.html:7 msgid "" "Many items are attached to this geographic item. Only the ten first of each " @@ -12728,10 +12812,6 @@ msgid "" "every piece of information." msgstr "" -#: ishtar_common/templates/ishtar/import_delete.html:45 -msgid "Are you sure to want to delete this import?" -msgstr "" - #: ishtar_common/templates/ishtar/import_list.html:10 msgid "Autorefresh the table (useful when waiting for an import result)" msgstr "" @@ -13377,19 +13457,19 @@ msgstr "" msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:612 +#: ishtar_common/utils.py:614 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:690 +#: ishtar_common/utils.py:692 msgid "Information" msgstr "" -#: ishtar_common/utils.py:691 +#: ishtar_common/utils.py:693 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1710 +#: ishtar_common/utils.py:1520 msgid "The maximum supported file size is {} Mo." msgstr "" @@ -13538,18 +13618,23 @@ msgstr "" msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2862 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2803 +#: ishtar_common/views.py:2813 ishtar_common/views.py:2910 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 +#: ishtar_common/views.py:2851 ishtar_common/views.py:2899 +#: ishtar_common/views.py:2948 msgid "Main geo item for" msgstr "" +#: ishtar_common/views.py:2961 +msgid "Delete geographic item" +msgstr "" + #: ishtar_common/views_item.py:185 #, python-format msgid "New %s" @@ -13598,19 +13683,19 @@ msgstr "" msgid "Deleted" msgstr "" -#: ishtar_common/wizards.py:1061 +#: ishtar_common/wizards.py:1063 msgid "{} modified." msgstr "" -#: ishtar_common/wizards.py:1063 +#: ishtar_common/wizards.py:1065 msgid "{} created." msgstr "" -#: ishtar_common/wizards.py:1841 +#: ishtar_common/wizards.py:1843 msgid "{} deleted." msgstr "" -#: ishtar_common/wizards.py:2090 +#: ishtar_common/wizards.py:2092 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 6cc6254c5..b1b033948 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: 2022-09-29 11:29+0200\n" +"POT-Creation-Date: 2022-11-10 11:43+0100\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-" @@ -21,23 +21,23 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:527 -#: archaeological_context_records/models.py:721 +#: archaeological_context_records/models.py:531 +#: archaeological_context_records/models.py:728 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1139 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:2420 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1311 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1482 -#: archaeological_operations/models.py:2336 -#: archaeological_operations/models.py:2354 -#: archaeological_operations/models.py:2470 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2958 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:2379 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2513 +#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:3001 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 @@ -88,15 +88,15 @@ msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 #: archaeological_files/forms.py:883 archaeological_files/forms.py:919 -#: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 +#: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 #: archaeological_finds/forms_treatments.py:683 #: archaeological_finds/forms_treatments.py:926 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1312 -#: archaeological_operations/forms.py:1547 -#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 +#: archaeological_operations/forms.py:1289 +#: archaeological_operations/forms.py:1500 +#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:499 #: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 #: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" @@ -104,16 +104,16 @@ msgstr "Recherche en texte intégral" #: archaeological_context_records/forms.py:145 #: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:576 -#: archaeological_context_records/forms.py:630 -#: archaeological_context_records/models.py:733 -#: archaeological_context_records/models.py:1414 -#: archaeological_warehouse/forms.py:454 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/forms.py:604 +#: archaeological_context_records/models.py:740 +#: archaeological_context_records/models.py:1427 +#: archaeological_warehouse/forms.py:448 msgid "ID" msgstr "Identifiant" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 +#: archaeological_finds/forms.py:1354 archaeological_operations/forms.py:1815 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" @@ -127,44 +127,44 @@ msgid "Operation - year" msgstr "Opération - année" #: archaeological_context_records/forms.py:154 -#: archaeological_finds/forms.py:1379 +#: archaeological_finds/forms.py:1351 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:737 -#: archaeological_context_records/models.py:727 +#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/models.py:734 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "Entité archéologique" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1444 +#: archaeological_finds/forms.py:1416 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:702 msgid "Unit type" msgstr "Type d'unité" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:288 -#: archaeological_context_records/forms.py:578 -#: archaeological_context_records/forms.py:631 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:517 -#: archaeological_context_records/models.py:705 -#: archaeological_context_records/models.py:1416 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/forms.py:605 +#: archaeological_context_records/models.py:520 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:712 +#: archaeological_context_records/models.py:1429 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:89 archaeological_files/forms.py:932 -#: archaeological_finds/models_finds.py:1097 +#: archaeological_finds/models_finds.py:1100 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/models.py:2982 -#: archaeological_operations/models.py:3229 +#: archaeological_operations/forms.py:1514 +#: archaeological_operations/models.py:3025 +#: archaeological_operations/models.py:3272 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" @@ -181,8 +181,8 @@ msgstr "Rechercher parmi les relations" #: archaeological_context_records/forms.py:173 #: archaeological_context_records/forms.py:308 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:815 +#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:820 msgid "Excavation technique" msgstr "Méthode de fouille" @@ -198,8 +198,8 @@ msgstr "Rechercher une Unité d'Enregistrement" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1616 +#: archaeological_operations/forms.py:1397 +#: archaeological_operations/forms.py:1569 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -213,56 +213,56 @@ msgid "Context record - 020 - General" msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_context_records/forms.py:289 -#: archaeological_context_records/forms.py:568 -#: archaeological_context_records/forms.py:632 -#: archaeological_context_records/forms.py:730 -#: archaeological_context_records/models.py:513 -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:713 -#: archaeological_finds/models_finds.py:1094 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:606 +#: archaeological_context_records/forms.py:704 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:720 +#: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2963 +#: archaeological_operations/models.py:3006 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 -#: ishtar_common/models_common.py:3517 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2824 +#: ishtar_common/models_common.py:3700 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "Commune" #: archaeological_context_records/forms.py:294 -#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:547 msgid "Only the items associated to the operation can be selected." msgstr "Seuls les éléments associés à l'opération peuvent être sélectionnés." #: archaeological_context_records/forms.py:299 -#: archaeological_context_records/forms.py:579 -#: archaeological_context_records/forms.py:634 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:526 -#: archaeological_context_records/models.py:758 -#: archaeological_context_records/models.py:1415 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:608 +#: archaeological_context_records/models.py:522 +#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:1428 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" #: archaeological_context_records/forms.py:301 -#: archaeological_context_records/models.py:734 -#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:1430 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:295 archaeological_finds/forms.py:297 -#: archaeological_finds/forms.py:648 archaeological_finds/forms.py:650 -#: archaeological_finds/forms.py:818 archaeological_finds/forms.py:864 -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:620 archaeological_finds/forms.py:622 +#: archaeological_finds/forms.py:790 archaeological_finds/forms.py:836 +#: archaeological_finds/forms.py:1430 #: archaeological_finds/forms_treatments.py:193 -#: archaeological_finds/models_finds.py:409 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:411 +#: archaeological_finds/models_finds.py:1814 #: archaeological_finds/models_treatments.py:255 -#: archaeological_finds/templates/ishtar/sheet_find.html:180 +#: archaeological_finds/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 #: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 @@ -271,59 +271,59 @@ msgid "Description" msgstr "Description" #: archaeological_context_records/forms.py:303 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/models.py:771 msgid "Filling" msgstr "Remplissage" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:735 +#: archaeological_context_records/models.py:742 msgid "General comment" msgstr "Commentaire général" -#: archaeological_context_records/forms.py:313 +#: archaeological_context_records/forms.py:316 #: archaeological_files/forms.py:298 archaeological_files/forms.py:595 #: archaeological_files/models.py:629 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:812 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: archaeological_context_records/forms.py:319 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/forms.py:322 +#: archaeological_context_records/models.py:745 msgid "Length (m)" msgstr "Taille (m)" -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:739 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:746 msgid "Width (m)" msgstr "Largeur (m)" -#: archaeological_context_records/forms.py:321 -#: archaeological_context_records/models.py:740 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:747 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:748 msgid "Diameter (m)" msgstr "Diamètre (m)" -#: archaeological_context_records/forms.py:323 -#: archaeological_context_records/models.py:742 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:749 msgid "Depth (m)" msgstr "Profondeur (m)" -#: archaeological_context_records/forms.py:325 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:751 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition (m)" -#: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:736 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:743 msgid "Opening date" msgstr "Date d'ouverture" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:737 +#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/models.py:744 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/models.py:592 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -334,108 +334,49 @@ msgstr "Date d'ouverture" #: archaeological_finds/forms_treatments.py:879 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1242 +#: archaeological_operations/models.py:1277 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:992 ishtar_common/forms.py:993 msgid "Closing date" msgstr "Date de clôture" -#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/forms.py:337 #: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "Documentation" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:748 +#: archaeological_context_records/forms.py:343 +#: archaeological_context_records/models.py:755 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 -#: archaeological_warehouse/forms.py:737 +#: archaeological_warehouse/forms.py:731 #: archaeological_warehouse/templates/ishtar/sheet_container.html:81 msgid "Location" msgstr "Localisation" -#: archaeological_context_records/forms.py:346 -#: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 -msgid "Coordinates" -msgstr "Coordonnées" - -#: archaeological_context_records/forms.py:347 -#: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 -#: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3520 -msgid "X" -msgstr "X/Long" - -#: archaeological_context_records/forms.py:349 -#: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 -#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 -msgid "Estimated error for X" -msgstr "Erreur estimée pour X" - -#: archaeological_context_records/forms.py:351 -#: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3521 -msgid "Y" -msgstr "Y/Lat" - -#: archaeological_context_records/forms.py:353 -#: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 -#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 -msgid "Estimated error for Y" -msgstr "Erreur estimée pour Y" - -#: archaeological_context_records/forms.py:355 -#: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:3522 -msgid "Z" -msgstr "Z" - -#: archaeological_context_records/forms.py:357 -#: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 -msgid "Estimated error for Z" -msgstr "Erreur estimée pour Z" - -#: archaeological_context_records/forms.py:360 -#: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 -#: ishtar_common/models_common.py:3534 -msgid "Spatial Reference System" -msgstr "Système de référence spatiale" - -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:427 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:432 msgid "You have to choose a town or a parcel." msgstr "Vous devez choisir une commune ou une parcelle." -#: archaeological_context_records/forms.py:463 -#: archaeological_context_records/forms.py:485 +#: archaeological_context_records/forms.py:437 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1247 +#: archaeological_finds/models_finds.py:1857 #: archaeological_finds/templates/ishtar/sheet_find.html:248 msgid "Dating" msgstr "Datation" -#: archaeological_context_records/forms.py:470 +#: archaeological_context_records/forms.py:444 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:528 -#: archaeological_finds/forms.py:910 archaeological_finds/forms.py:1261 -#: archaeological_finds/models_finds.py:1147 +#: archaeological_context_records/models.py:532 +#: archaeological_finds/forms.py:882 archaeological_finds/forms.py:1233 +#: archaeological_finds/models_finds.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:256 #: archaeological_operations/forms.py:903 #: archaeological_operations/templates/ishtar/sheet_operation.html:517 @@ -444,89 +385,89 @@ msgstr "Datation" msgid "Period" msgstr "Période" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:445 #: archaeological_context_records/models.py:109 #: archaeological_files/forms.py:559 archaeological_files/models.py:75 #: archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1262 +#: archaeological_finds/forms.py:1235 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:556 #: archaeological_finds/forms_treatments.py:814 -#: archaeological_finds/models_finds.py:3346 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: 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:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_operations/forms.py:858 -#: archaeological_operations/models.py:103 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3233 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:3276 msgid "Start date" msgstr "Date de début" -#: archaeological_context_records/forms.py:472 +#: archaeological_context_records/forms.py:446 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:564 archaeological_files/models.py:76 -#: archaeological_files/models.py:699 archaeological_finds/forms.py:1263 -#: archaeological_finds/models_finds.py:3347 +#: archaeological_files/models.py:699 archaeological_finds/forms.py:1236 +#: archaeological_finds/models_finds.py:3355 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:258 -#: 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/templates/ishtar/sheet_find.html:502 -#: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3234 +#: 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/templates/ishtar/sheet_find.html:504 +#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:3277 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "Date de fin" -#: archaeological_context_records/forms.py:473 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1237 #: archaeological_finds/templates/ishtar/sheet_find.html:260 msgid "Quality" msgstr "Qualité" -#: archaeological_context_records/forms.py:474 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1265 +#: archaeological_finds/forms.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:259 msgid "Dating type" msgstr "Type de datation" -#: archaeological_context_records/forms.py:475 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1266 +#: archaeological_finds/forms.py:1238 #: archaeological_finds/templates/ishtar/sheet_find.html:261 msgid "Precise dating" msgstr "Datation précise" -#: archaeological_context_records/forms.py:486 +#: archaeological_context_records/forms.py:460 msgid "Context record - 030 - Dating" msgstr "Unité d'enregistrement - 030 - Datation" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:472 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1545 +#: archaeological_context_records/models.py:1558 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:177 archaeological_finds/forms.py:183 -#: archaeological_finds/forms.py:816 archaeological_finds/forms.py:834 -#: archaeological_finds/forms.py:1437 archaeological_finds/models_finds.py:1090 -#: archaeological_finds/models_finds.py:2404 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:806 +#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:2412 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 +#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 #: ishtar_common/views.py:401 msgid "Context record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/forms.py:516 +#: archaeological_context_records/forms.py:490 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 @@ -534,34 +475,34 @@ msgstr "Unité d'Enregistrement" msgid "Relations" msgstr "Relations" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:491 msgid "Context record - 050 - Relations" msgstr "Unité d'enregistrement - 050 - Relations" -#: archaeological_context_records/forms.py:522 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/forms.py:496 +#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/models.py:772 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "Interprétation" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:497 msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" -#: archaeological_context_records/forms.py:533 -#: archaeological_context_records/models.py:530 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/forms.py:507 +#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:815 msgid "Activity" msgstr "Activité" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:801 -#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 -#: archaeological_finds/forms.py:817 -#: archaeological_finds/templates/ishtar/sheet_find.html:158 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:533 +#: archaeological_context_records/models.py:808 +#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:613 +#: archaeological_finds/forms.py:789 +#: archaeological_finds/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -569,82 +510,82 @@ msgstr "Activité" msgid "Identification" msgstr "Identification" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:767 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:774 msgid "TAQ" msgstr "TAQ" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:776 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:783 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:789 msgid "TPQ" msgstr "TPQ" -#: archaeological_context_records/forms.py:540 -#: archaeological_context_records/models.py:791 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:798 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:516 msgid "Comments on dating" msgstr "Commentaire relatif à la datation" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:527 #: archaeological_operations/forms.py:613 #: archaeological_operations/forms.py:626 #: archaeological_operations/views.py:204 msgid "Operation search" msgstr "Rechercher une opération" -#: archaeological_context_records/forms.py:558 +#: archaeological_context_records/forms.py:532 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:538 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: archaeological_context_records/forms.py:666 -#: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: archaeological_context_records/forms.py:640 +#: archaeological_finds/forms.py:1042 archaeological_finds/forms.py:1067 +#: archaeological_operations/forms.py:1885 ishtar_common/forms_common.py:2310 #: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr " - copie" -#: archaeological_context_records/forms.py:696 +#: archaeological_context_records/forms.py:670 msgid "Context record - Quick action - Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" -#: archaeological_context_records/forms.py:716 -#: archaeological_context_records/models.py:1308 -#: archaeological_context_records/models.py:1347 -#: archaeological_context_records/models.py:1413 +#: archaeological_context_records/forms.py:690 +#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1426 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "Type de relation" -#: archaeological_context_records/forms.py:720 +#: archaeological_context_records/forms.py:694 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "Associé à" -#: archaeological_context_records/forms.py:745 +#: archaeological_context_records/forms.py:719 msgid "Associated parcel" msgstr "Parcelle associée" -#: archaeological_context_records/forms.py:770 +#: archaeological_context_records/forms.py:744 msgid "Parcel can be modified only if operations are the same" msgstr "" "Les parcelles ne peuvent être modifiées seulement si les opérations sont " "identiques" -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:763 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -742,8 +683,8 @@ msgid "Dating quality types" msgstr "Types de qualité de datation" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:909 -#: archaeological_finds/tests.py:1272 +#: archaeological_context_records/tests.py:911 +#: archaeological_finds/tests.py:1274 msgctxt "key for text search" msgid "datings-period" msgstr "datation-periode" @@ -790,9 +731,9 @@ msgstr "Datations" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:214 archaeological_finds/forms.py:443 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2040 -#: archaeological_finds/models_finds.py:3312 -#: archaeological_finds/models_finds.py:3334 +#: archaeological_finds/models_finds.py:2044 +#: archaeological_finds/models_finds.py:3320 +#: archaeological_finds/models_finds.py:3342 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -805,20 +746,20 @@ msgstr "Mobilier" #: archaeological_context_records/models.py:344 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 -#: archaeological_finds/models_finds.py:111 -#: archaeological_finds/models_finds.py:127 -#: archaeological_finds/models_finds.py:247 -#: archaeological_finds/models_finds.py:288 -#: archaeological_finds/models_finds.py:354 -#: archaeological_finds/models_finds.py:1805 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:100 +#: archaeological_finds/models_finds.py:113 +#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:249 +#: archaeological_finds/models_finds.py:290 +#: archaeological_finds/models_finds.py:356 +#: archaeological_finds/models_finds.py:1809 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:127 -#: archaeological_operations/models.py:145 -#: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3791 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:155 +#: archaeological_operations/models.py:3834 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 @@ -874,250 +815,250 @@ msgstr "Type de documentation" msgid "Documentation types" msgstr "Types de documentation" -#: archaeological_context_records/models.py:505 -#: archaeological_context_records/models.py:506 -#: archaeological_context_records/models.py:1418 -#: archaeological_finds/models_finds.py:1109 -#: archaeological_finds/models_finds.py:1110 +#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:1431 +#: archaeological_finds/models_finds.py:1112 +#: archaeological_finds/models_finds.py:1113 #: archaeological_operations/forms.py:534 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1319 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/models.py:277 -#: archaeological_operations/models.py:286 -#: archaeological_operations/models.py:456 -#: archaeological_operations/models.py:913 -#: archaeological_operations/models.py:998 -#: archaeological_operations/models.py:1304 +#: archaeological_operations/forms.py:1296 +#: archaeological_operations/forms.py:1412 +#: archaeological_operations/models.py:305 +#: archaeological_operations/models.py:314 +#: archaeological_operations/models.py:485 +#: archaeological_operations/models.py:948 +#: archaeological_operations/models.py:1032 +#: archaeological_operations/models.py:1339 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "Périodes" -#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:511 msgid "Datings (period)" msgstr "Datations (période)" -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:513 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:514 msgid "Operation (Patriarche code)" msgstr "Opération (code Patriarche)" -#: archaeological_context_records/models.py:511 -#: archaeological_finds/models_finds.py:1095 +#: archaeological_context_records/models.py:515 +#: archaeological_finds/models_finds.py:1098 msgid "Operation (name)" msgstr "Opération (nom)" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:516 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant)" -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:519 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: archaeological_context_records/models.py:532 -#: archaeological_finds/models_finds.py:1159 -#: archaeological_operations/models.py:288 -#: archaeological_operations/models.py:917 +#: archaeological_context_records/models.py:536 +#: archaeological_finds/models_finds.py:1162 +#: archaeological_operations/models.py:316 +#: archaeological_operations/models.py:952 msgid "Associated document type" msgstr "Type de document associé" -#: archaeological_context_records/models.py:533 -#: archaeological_finds/models_finds.py:1160 -#: archaeological_operations/models.py:289 -#: archaeological_operations/models.py:918 +#: archaeological_context_records/models.py:537 +#: archaeological_finds/models_finds.py:1163 +#: archaeological_operations/models.py:317 +#: archaeological_operations/models.py:953 msgid "Modification (year)" msgstr "Modification (année)" -#: archaeological_context_records/models.py:572 +#: archaeological_context_records/models.py:576 msgctxt "key for text search" msgid "id" msgstr "id" -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/tests.py:735 -#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1245 -#: archaeological_operations/models.py:349 -#: archaeological_operations/models.py:1057 -#: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/tests.py:737 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1091 +#: archaeological_operations/tests.py:2989 +#: archaeological_warehouse/models.py:316 msgctxt "key for text search" msgid "town" msgstr "commune" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 +#: archaeological_context_records/models.py:582 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "operation-annee" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1618 archaeological_finds/tests.py:1303 +#: archaeological_context_records/models.py:585 +#: archaeological_finds/models_finds.py:1621 archaeological_finds/tests.py:1305 msgctxt "key for text search" msgid "operation-name" msgstr "operation-nom" -#: archaeological_context_records/models.py:585 -#: archaeological_operations/models.py:1053 -#: archaeological_operations/models.py:2500 -#: archaeological_operations/tests.py:4581 +#: archaeological_context_records/models.py:589 +#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:2543 +#: archaeological_operations/tests.py:4463 msgctxt "key for text search" msgid "patriarche" msgstr "patriarche" -#: archaeological_context_records/models.py:589 -#: archaeological_finds/models_finds.py:1253 -#: archaeological_operations/models.py:1050 +#: archaeological_context_records/models.py:593 +#: archaeological_finds/models_finds.py:1256 +#: archaeological_operations/models.py:1084 msgctxt "key for text search" msgid "operation-code" msgstr "operation-code" -#: archaeological_context_records/models.py:593 -#: archaeological_context_records/models.py:647 -#: archaeological_finds/models_finds.py:1354 -#: archaeological_finds/models_finds.py:1726 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: archaeological_context_records/models.py:597 +#: archaeological_context_records/models.py:654 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_finds/models_finds.py:1730 +#: archaeological_operations/models.py:412 +#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "operation" -#: archaeological_context_records/models.py:597 -#: archaeological_context_records/models.py:650 -#: archaeological_finds/models_finds.py:1269 -#: archaeological_operations/models.py:1141 -#: archaeological_operations/models.py:1205 +#: archaeological_context_records/models.py:601 +#: archaeological_context_records/models.py:657 +#: archaeological_finds/models_finds.py:1272 +#: archaeological_operations/models.py:1175 +#: archaeological_operations/models.py:1240 #: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "site" -#: archaeological_context_records/models.py:601 -#: archaeological_context_records/tests.py:802 -#: archaeological_finds/models_finds.py:1292 +#: archaeological_context_records/models.py:605 +#: archaeological_context_records/tests.py:804 +#: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "operation-type-relation" -#: archaeological_context_records/models.py:605 -#: archaeological_operations/models.py:343 -#: archaeological_operations/models.py:1099 -#: archaeological_operations/tests.py:2973 -#: archaeological_operations/tests.py:3155 +#: archaeological_context_records/models.py:609 +#: archaeological_operations/models.py:371 +#: archaeological_operations/models.py:1133 +#: archaeological_operations/tests.py:2972 +#: archaeological_operations/tests.py:3154 msgctxt "key for text search" msgid "period" msgstr "periode" -#: archaeological_context_records/models.py:609 -#: archaeological_context_records/tests.py:861 +#: archaeological_context_records/models.py:613 +#: archaeological_context_records/tests.py:863 msgctxt "key for text search" msgid "unit-type" msgstr "type-unite" -#: archaeological_context_records/models.py:612 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1063 -#: archaeological_operations/models.py:2518 +#: archaeological_context_records/models.py:616 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 +#: archaeological_operations/models.py:2561 msgctxt "key for text search" msgid "parcel" msgstr "parcelle" -#: archaeological_context_records/models.py:616 -#: archaeological_operations/models.py:1160 +#: archaeological_context_records/models.py:620 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "has-finds" msgstr "mobilier-rattache" -#: archaeological_context_records/models.py:619 -#: archaeological_context_records/tests.py:767 +#: archaeological_context_records/models.py:623 +#: archaeological_context_records/tests.py:769 msgctxt "key for text search" msgid "record-relation-type" msgstr "ue-type-relation" -#: archaeological_context_records/models.py:623 +#: archaeological_context_records/models.py:627 msgctxt "key for text search" msgid "excavation-technique" msgstr "methode-de-fouille" -#: archaeological_context_records/models.py:665 -#: archaeological_finds/models_finds.py:1685 -#: archaeological_operations/models.py:428 -#: archaeological_operations/models.py:1188 +#: archaeological_context_records/models.py:672 +#: archaeological_finds/models_finds.py:1689 +#: archaeological_operations/models.py:457 +#: archaeological_operations/models.py:1223 #: archaeological_warehouse/models.py:335 #: archaeological_warehouse/models.py:1056 msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" -#: archaeological_context_records/models.py:672 -#: archaeological_finds/models_finds.py:1678 -#: archaeological_operations/models.py:435 -#: archaeological_operations/models.py:1181 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1682 +#: archaeological_operations/models.py:464 +#: archaeological_operations/models.py:1216 #: archaeological_warehouse/models.py:327 #: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "Modification par lot" -#: archaeological_context_records/models.py:682 -#: archaeological_context_records/models.py:1108 +#: archaeological_context_records/models.py:689 +#: archaeological_context_records/models.py:1120 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:874 -#: archaeological_finds/models_finds.py:1695 -#: archaeological_finds/models_finds.py:2310 archaeological_finds/views.py:1245 +#: archaeological_finds/models_finds.py:877 +#: archaeological_finds/models_finds.py:1699 +#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1245 #: archaeological_finds/views.py:1260 archaeological_finds/views.py:1298 -#: archaeological_finds/views.py:1314 archaeological_operations/models.py:445 -#: archaeological_operations/models.py:600 -#: archaeological_operations/models.py:1198 -#: archaeological_operations/models.py:1831 +#: archaeological_finds/views.py:1314 archaeological_operations/models.py:474 +#: archaeological_operations/models.py:632 +#: archaeological_operations/models.py:1233 +#: archaeological_operations/models.py:1873 #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 -#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1454 +#: ishtar_common/admin.py:1574 ishtar_common/models.py:4064 #: ishtar_common/models.py:4408 ishtar_common/views.py:2637 #: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "Dupliquer" -#: archaeological_context_records/models.py:699 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:404 -#: archaeological_finds/models_finds.py:1799 +#: archaeological_context_records/models.py:706 +#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 +#: archaeological_finds/models_finds.py:1803 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2971 +#: archaeological_operations/models.py:3014 #: archaeological_warehouse/models.py:388 #: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "Identifiant" -#: archaeological_context_records/models.py:701 -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2974 +#: archaeological_context_records/models.py:708 +#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 +#: archaeological_finds/models_finds.py:1805 +#: archaeological_operations/models.py:3017 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" -#: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 +#: archaeological_context_records/models.py:753 +#: archaeological_operations/models.py:1331 ishtar_common/models_common.py:2794 msgid "Surface (m2)" msgstr "Surface (m2)" -#: archaeological_context_records/models.py:751 +#: archaeological_context_records/models.py:758 msgid "A short description of the location of the context record" msgstr "Une courte description de la localisation de l'Unité d'Enregistrement" -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:762 msgid "Comment on datings" msgstr "Commentaire relatif aux datations" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:778 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1125,11 +1066,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date" -#: archaeological_context_records/models.py:779 +#: archaeological_context_records/models.py:786 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: archaeological_context_records/models.py:786 +#: archaeological_context_records/models.py:793 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1137,20 +1078,20 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:801 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: archaeological_context_records/models.py:823 +#: archaeological_context_records/models.py:829 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1994 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_finds/templates/ishtar/sheet_find.html:74 +#: archaeological_finds/templates/ishtar/sheet_find.html:71 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2718 +#: archaeological_operations/models.py:524 +#: archaeological_operations/models.py:1405 +#: archaeological_operations/models.py:2761 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1164,136 +1105,136 @@ msgstr "Estimation d'un « Terminus Post Quem »" msgid "Documents" msgstr "Documents" -#: archaeological_context_records/models.py:830 -#: archaeological_finds/models_finds.py:2000 +#: archaeological_context_records/models.py:836 +#: archaeological_finds/models_finds.py:2004 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:530 +#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:2768 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" msgstr "Image principale" -#: archaeological_context_records/models.py:835 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2012 +#: archaeological_context_records/models.py:841 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:506 -#: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1416 +#: archaeological_operations/models.py:3021 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2819 ishtar_common/models_common.py:2842 msgid "Cached name" msgstr "Nom en cache" -#: archaeological_context_records/models.py:838 -#: archaeological_finds/models_finds.py:2019 -#: archaeological_operations/models.py:519 -#: archaeological_operations/models.py:1467 +#: archaeological_context_records/models.py:844 +#: archaeological_finds/models_finds.py:2023 +#: archaeological_operations/models.py:548 +#: archaeological_operations/models.py:1502 msgid "Cached periods label" msgstr "Nom en cache des périodes" -#: archaeological_context_records/models.py:841 #: archaeological_context_records/models.py:847 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2016 -#: archaeological_finds/models_finds.py:2022 -#: archaeological_finds/models_finds.py:2028 -#: archaeological_finds/models_finds.py:2034 -#: archaeological_operations/models.py:510 -#: archaeological_operations/models.py:516 -#: archaeological_operations/models.py:522 -#: archaeological_operations/models.py:528 -#: archaeological_operations/models.py:1383 -#: archaeological_operations/models.py:1464 -#: archaeological_operations/models.py:1470 -#: archaeological_operations/models.py:1476 +#: archaeological_context_records/models.py:853 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2026 +#: archaeological_finds/models_finds.py:2032 +#: archaeological_finds/models_finds.py:2038 +#: archaeological_operations/models.py:539 +#: archaeological_operations/models.py:545 +#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:557 +#: archaeological_operations/models.py:1418 +#: archaeological_operations/models.py:1499 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:1511 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" -#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:850 msgid "Cached related context records" msgstr "Nom en cache des unités d'enregistrements liées" -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:858 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:417 +#: archaeological_finds/models_finds.py:419 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/models.py:873 +#: archaeological_context_records/models.py:879 msgctxt "short" msgid "Context record" msgstr "UE" -#: archaeological_context_records/models.py:905 -#: archaeological_finds/models_finds.py:2200 +#: archaeological_context_records/models.py:914 +#: archaeological_finds/models_finds.py:2204 msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" -#: archaeological_context_records/models.py:1096 +#: archaeological_context_records/models.py:1108 msgid "Add find" msgstr "Ajout mobilier" -#: archaeological_context_records/models.py:1098 +#: archaeological_context_records/models.py:1110 msgid "find" msgstr "mobilier" -#: archaeological_context_records/models.py:1309 +#: archaeological_context_records/models.py:1322 msgid "Relation types" msgstr "Types de relation" -#: archaeological_context_records/models.py:1342 +#: archaeological_context_records/models.py:1355 msgid "ID (left)" msgstr "Identifiant (gauche)" -#: archaeological_context_records/models.py:1343 +#: archaeological_context_records/models.py:1356 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: archaeological_context_records/models.py:1344 +#: archaeological_context_records/models.py:1357 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: archaeological_context_records/models.py:1345 +#: archaeological_context_records/models.py:1358 msgid "Description (left)" msgstr "Description (gauche)" -#: archaeological_context_records/models.py:1346 +#: archaeological_context_records/models.py:1359 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: archaeological_context_records/models.py:1348 +#: archaeological_context_records/models.py:1361 msgid "ID (right)" msgstr "Identifiant (droit)" -#: archaeological_context_records/models.py:1349 +#: archaeological_context_records/models.py:1362 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: archaeological_context_records/models.py:1350 +#: archaeological_context_records/models.py:1363 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: archaeological_context_records/models.py:1351 +#: archaeological_context_records/models.py:1364 msgid "Description (right)" msgstr "Description (droite)" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1365 msgid "Periods (right)" msgstr "Périodes (droite)" -#: archaeological_context_records/models.py:1359 +#: archaeological_context_records/models.py:1372 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1373 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1551 +#: archaeological_context_records/models.py:1564 msgid "Context record parent" msgstr "Unité d'Enregistrement parente" @@ -1343,7 +1284,7 @@ msgstr "Opération / Site" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2045 #: 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:90 @@ -1358,26 +1299,26 @@ msgid "Finds" msgstr "Mobilier" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 -#: archaeological_finds/templates/ishtar/sheet_find.html:83 +#: archaeological_finds/templates/ishtar/sheet_find.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "Donnée géographique" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 -#: archaeological_finds/templates/ishtar/sheet_find.html:92 +#: archaeological_finds/templates/ishtar/sheet_find.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 msgid "Custom fields" msgstr "Champs personnalisés" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 #: archaeological_files/templates/ishtar/sheet_file.html:46 -#: archaeological_finds/templates/ishtar/sheet_find.html:163 +#: archaeological_finds/templates/ishtar/sheet_find.html:160 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3725 +#: ishtar_common/models_common.py:3872 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "Identifiant complet" @@ -1393,21 +1334,21 @@ msgstr "Surface" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_files_pdl/forms.py:121 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:73 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2635 +#: ishtar_common/models_common.py:2796 msgid "Localisation" msgstr "Localisation" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 -#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:714 -#: archaeological_finds/forms.py:819 +#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:686 +#: archaeological_finds/forms.py:791 #: archaeological_finds/templates/ishtar/sheet_basefind.html:52 -#: archaeological_finds/templates/ishtar/sheet_find.html:219 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 msgid "Sheet" @@ -1431,9 +1372,9 @@ msgstr "Référence numérique" #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:126 #: archaeological_finds/models_treatments.py:212 -#: archaeological_finds/templates/ishtar/sheet_find.html:383 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 +#: 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_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1516,7 +1457,7 @@ msgid "Context record deletion" msgstr "Supprimer une Unité d'Enregistrement" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1820 +#: archaeological_operations/models.py:1862 msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" @@ -1550,7 +1491,7 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 -#: archaeological_finds/forms.py:1377 +#: archaeological_finds/forms.py:1349 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1558,18 +1499,18 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/forms_treatments.py:930 -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:197 #: archaeological_finds/models_treatments.py:1094 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 -#: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:909 -#: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:2468 -#: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2961 +#: archaeological_operations/forms.py:1504 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:944 +#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2740 +#: archaeological_operations/models.py:3004 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1579,33 +1520,33 @@ msgstr "Année" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 #: archaeological_files/forms.py:332 archaeological_files/models.py:524 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1316 msgid "Numeric reference" msgstr "Identifiant numérique" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 #: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1432 -#: archaeological_operations/forms.py:1553 -#: archaeological_operations/forms.py:1630 -#: archaeological_operations/models.py:454 -#: archaeological_operations/models.py:2700 +#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:1583 +#: archaeological_operations/models.py:483 +#: archaeological_operations/models.py:2743 msgid "Other reference" msgstr "Autre référence" #: archaeological_files/forms.py:92 archaeological_files/forms.py:898 #: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1564 -#: archaeological_operations/models.py:2340 +#: archaeological_operations/forms.py:1517 +#: archaeological_operations/models.py:2383 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2802 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" @@ -1644,26 +1585,26 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 #: archaeological_files/forms.py:479 archaeological_files/models.py:638 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 -#: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 -#: archaeological_finds/forms.py:2111 +#: archaeological_finds/forms.py:658 archaeological_finds/forms.py:869 +#: archaeological_finds/forms.py:1096 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:2083 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:809 -#: archaeological_finds/models_finds.py:410 -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:1936 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:817 -#: archaeological_operations/forms.py:1325 -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1629 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2714 -#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 +#: archaeological_operations/forms.py:1302 +#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/forms.py:1582 +#: archaeological_operations/models.py:495 +#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:2757 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 +#: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 #: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 #: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 #: ishtar_common/models.py:2772 ishtar_common/models.py:3412 @@ -1671,6 +1612,7 @@ msgstr "Référence du permis / de l'arrêté" #: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 msgid "Comment" msgstr "Commentaire" @@ -1693,7 +1635,7 @@ msgstr "Organisation de l'aménageur" #: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1522 ishtar_common/forms.py:926 msgid "Created by" msgstr "Créé par" @@ -1701,7 +1643,7 @@ msgstr "Créé par" #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1575 +#: archaeological_operations/forms.py:1528 msgid "Modified by" msgstr "Modifié par" @@ -1714,7 +1656,7 @@ msgstr "Rechercher un dossier archéologique" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1276 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1726,7 +1668,7 @@ msgstr "Date de création" #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 msgid "Reception date" msgstr "Date de réception" @@ -1764,7 +1706,7 @@ msgstr "Date avant" #: archaeological_files/forms.py:256 archaeological_files/models.py:540 #: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:355 msgid "Person in charge" msgstr "Personne responsable" @@ -1773,13 +1715,13 @@ msgstr "Personne responsable" #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1102 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1920 -#: archaeological_operations/models.py:455 +#: archaeological_operations/forms.py:1293 +#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1873 +#: archaeological_operations/models.py:484 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 @@ -1793,12 +1735,13 @@ msgstr "Personne responsable" #: ishtar_common/models.py:2482 ishtar_common/models.py:2767 #: ishtar_common/models.py:3093 ishtar_common/models.py:3229 #: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 -#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2793 ishtar_common/models_common.py:2842 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1837,7 +1780,7 @@ msgstr "Un autre dossier avec cet identifiant numérique existe." #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2983 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "Parcelles" @@ -1871,14 +1814,13 @@ msgstr "Dossier archéologique - 045 - Recherche - Général" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 +#: archaeological_operations/models.py:2746 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "Départements" #: archaeological_files/forms.py:459 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:984 -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2697 msgid "Scientist in charge" msgstr "Responsable d'opération" @@ -2024,10 +1966,10 @@ msgstr "Équipement / service" #: archaeological_finds/forms_treatments.py:998 #: archaeological_finds/models_treatments.py:198 #: archaeological_finds/models_treatments.py:1095 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 -#: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1685 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1638 +#: archaeological_operations/models.py:2682 ishtar_common/models.py:4089 msgid "Index" msgstr "Index" @@ -2037,10 +1979,10 @@ msgstr "Index" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1558 -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/models.py:2370 -#: archaeological_operations/models.py:2629 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1572 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2672 msgid "Act type" msgstr "Type d'acte" @@ -2051,17 +1993,17 @@ msgstr "Objet (recherche en texte intégral)" #: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1559 -#: archaeological_operations/forms.py:1755 +#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1708 msgid "Indexed?" msgstr "Indexé ?" #: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1565 -#: archaeological_operations/forms.py:1626 -#: archaeological_operations/models.py:2698 +#: archaeological_operations/forms.py:1518 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2741 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" @@ -2107,10 +2049,10 @@ msgstr "Dossier archéologique - Acte administratif - Général" #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1840 -#: archaeological_operations/models.py:2353 -#: archaeological_operations/models.py:2469 -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:1882 +#: archaeological_operations/models.py:2396 +#: archaeological_operations/models.py:2512 +#: archaeological_operations/models.py:2720 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2123,9 +2065,9 @@ 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:3337 +#: archaeological_finds/models_finds.py:3345 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2734 +#: archaeological_operations/models.py:2777 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -2258,8 +2200,8 @@ msgstr "Quantité par défaut par jour" msgid "Available" msgstr "Disponible" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 +#: ishtar_common/admin.py:1024 ishtar_common/models.py:2275 #: ishtar_common/models_common.py:714 msgid "Parent" msgstr "Parent" @@ -2320,9 +2262,9 @@ msgstr "Type d'opération pour les redevances - France" msgid "Operation types for royalties - France" msgstr "Types d'opération pour les redevances - France" -#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1142 -#: archaeological_operations/models.py:284 -#: archaeological_operations/models.py:910 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 +#: archaeological_operations/models.py:312 +#: archaeological_operations/models.py:945 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:240 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:257 @@ -2330,17 +2272,17 @@ msgstr "Types d'opération pour les redevances - France" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1194 +#: ishtar_common/admin.py:1193 msgid "Area" msgstr "Zone" -#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1145 -#: archaeological_operations/models.py:285 -#: archaeological_operations/models.py:911 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 +#: archaeological_operations/models.py:313 +#: archaeological_operations/models.py:946 msgid "Extended area" msgstr "Zone étendue" -#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1166 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1169 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2374,34 +2316,34 @@ msgstr "Surface totale aménagée (km²)" #: archaeological_operations/forms.py:1110 #: archaeological_operations/forms.py:1126 #: archaeological_operations/forms.py:1131 -#: archaeological_operations/forms.py:1506 -#: archaeological_operations/models.py:276 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2709 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/models.py:304 +#: archaeological_operations/models.py:493 +#: archaeological_operations/models.py:1029 +#: archaeological_operations/models.py:1031 +#: archaeological_operations/models.py:1336 +#: archaeological_operations/models.py:2752 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 #: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2664 +#: ishtar_common/models_common.py:2825 msgid "Towns" msgstr "Communes" -#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1249 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1048 -#: archaeological_operations/models.py:2493 -#: archaeological_operations/tests.py:2979 -#: archaeological_operations/tests.py:3055 +#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:2536 +#: archaeological_operations/tests.py:2978 +#: archaeological_operations/tests.py:3054 msgctxt "key for text search" msgid "year" msgstr "annee" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:333 +#: archaeological_operations/models.py:361 #: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" @@ -2409,21 +2351,21 @@ msgstr "reference" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:339 +#: archaeological_operations/models.py:367 msgctxt "key for text search" msgid "other-reference" msgstr "autre-reference" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1067 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 msgctxt "key for text search" msgid "department" msgstr "departement" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:336 -#: archaeological_operations/models.py:1071 -#: archaeological_operations/tests.py:3099 +#: archaeological_operations/models.py:364 +#: archaeological_operations/models.py:1105 +#: archaeological_operations/tests.py:3098 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" @@ -2433,9 +2375,9 @@ msgstr "nom" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:2504 -#: archaeological_operations/tests.py:3112 +#: archaeological_operations/models.py:1111 +#: archaeological_operations/models.py:2547 +#: archaeological_operations/tests.py:3111 #: archaeological_warehouse/models.py:312 #: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 #: ishtar_common/models.py:2719 ishtar_common/models.py:3295 @@ -2464,28 +2406,28 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1455 -#: archaeological_operations/models.py:355 -#: archaeological_operations/models.py:1119 -#: archaeological_operations/models.py:2614 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 +#: archaeological_operations/models.py:383 +#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:2657 #: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "commentaire" -#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1606 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1609 #: archaeological_finds/models_treatments.py:1055 -#: archaeological_finds/tests.py:1327 +#: archaeological_finds/tests.py:1329 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2549 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2592 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2553 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" @@ -2590,11 +2532,11 @@ msgstr "Intercommunal" msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1228 archaeological_operations/models.py:1803 +#: archaeological_files/models.py:1228 archaeological_operations/models.py:1841 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1230 archaeological_operations/models.py:1805 +#: archaeological_files/models.py:1230 archaeological_operations/models.py:1843 msgid "parcels" msgstr "parcelles" @@ -2608,13 +2550,13 @@ msgstr "plan d'intervention" #: archaeological_files/models.py:1247 #: archaeological_finds/models_treatments.py:401 -#: archaeological_finds/models_treatments.py:1216 +#: archaeological_finds/models_treatments.py:1220 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" #: archaeological_files/models.py:1249 #: archaeological_finds/models_treatments.py:403 -#: archaeological_finds/models_treatments.py:1218 +#: archaeological_finds/models_treatments.py:1222 msgid "admin. act" msgstr "acte admin." @@ -2627,8 +2569,8 @@ msgstr "Ajouter une opération" msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2948 +#: archaeological_files/models.py:1327 archaeological_operations/models.py:1320 +#: archaeological_operations/models.py:2991 msgid "File" msgstr "Dossier" @@ -2826,7 +2768,7 @@ msgstr "Parcelles associées" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2778 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2839,11 +2781,11 @@ msgstr "Opérations associées" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2813 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 #: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." @@ -2854,10 +2796,10 @@ msgstr "Réf." #: archaeological_finds/forms_treatments.py:690 #: archaeological_finds/forms_treatments.py:779 #: archaeological_finds/models_treatments.py:125 -#: archaeological_finds/templates/ishtar/sheet_find.html:382 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:498 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 @@ -2866,7 +2808,7 @@ msgstr "Réf." #: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 #: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 #: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 -#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/forms_common.py:2935 ishtar_common/models.py:744 #: ishtar_common/models.py:2484 ishtar_common/models.py:3813 #: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 @@ -2883,7 +2825,7 @@ msgstr "Type" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:859 -#: archaeological_operations/models.py:1245 +#: archaeological_operations/models.py:1280 msgid "Excavation end date" msgstr "Date de fin de chantier" @@ -2897,7 +2839,7 @@ msgstr "Actes administratifs associés à ces opérations" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:713 +#: archaeological_warehouse/forms.py:694 ishtar_common/models.py:713 #: ishtar_common/models_imports.py:935 msgid "Date" msgstr "Date" @@ -2921,7 +2863,7 @@ msgstr "Besoins humains et techniques" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3331 msgid "Effective" msgstr "Effectif" @@ -3028,7 +2970,7 @@ msgstr "N° / voie" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3033 msgid "Postal code" msgstr "Code postal" @@ -3036,7 +2978,7 @@ msgstr "Code postal" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 #: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 +#: ishtar_common/models_common.py:3028 ishtar_common/models_common.py:3183 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -3140,213 +3082,213 @@ msgstr "Mobilier - 010 - Choix de l'unité d'enregistrement" msgid "Simple find - 020 - General" msgstr "Mobilier simple - 020 - Général" -#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:644 -#: archaeological_finds/forms.py:843 archaeological_finds/forms.py:1056 -#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1997 -#: archaeological_finds/models_finds.py:403 -#: archaeological_finds/models_finds.py:1806 +#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:616 +#: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1028 +#: archaeological_finds/forms.py:1337 archaeological_finds/forms.py:1969 +#: archaeological_finds/models_finds.py:405 +#: archaeological_finds/models_finds.py:1810 msgid "Free ID" msgstr "Identifiant libre" -#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:646 -#: archaeological_finds/forms.py:847 archaeological_finds/forms.py:1058 -#: archaeological_finds/forms.py:1366 archaeological_finds/forms.py:2064 -#: archaeological_finds/models_finds.py:1807 +#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:618 +#: archaeological_finds/forms.py:819 archaeological_finds/forms.py:1030 +#: archaeological_finds/forms.py:1338 archaeological_finds/forms.py:2036 +#: archaeological_finds/models_finds.py:1811 msgid "Denomination" msgstr "Dénomination" -#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:848 -#: archaeological_finds/forms.py:1367 archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1938 msgid "Previous ID" msgstr "Identifiant précédent" -#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:852 -#: archaeological_finds/forms.py:1370 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:824 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:1812 msgid "Museum ID" msgstr "Identifiant musée" -#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:853 -#: archaeological_finds/forms.py:1371 archaeological_finds/models_finds.py:1809 +#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:825 +#: archaeological_finds/forms.py:1343 archaeological_finds/models_finds.py:1813 msgid "Laboratory ID" msgstr "Numéro de laboratoire" -#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:854 -#: archaeological_finds/forms.py:1369 archaeological_finds/models_finds.py:1804 +#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1808 msgid "Seal number" msgstr "Numéro de scellé" -#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:855 -#: archaeological_finds/forms.py:1372 archaeological_finds/models_finds.py:1931 +#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:827 +#: archaeological_finds/forms.py:1344 archaeological_finds/models_finds.py:1935 msgid "Mark" msgstr "Marquage" -#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1991 +#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1995 msgid "Public description" msgstr "Description publique" -#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:653 -#: archaeological_finds/forms.py:1478 archaeological_finds/models_finds.py:1874 +#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:625 +#: archaeological_finds/forms.py:1450 archaeological_finds/models_finds.py:1878 msgid "Is complete?" msgstr "Est complet ?" -#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:656 -#: archaeological_finds/forms.py:867 archaeological_finds/models_finds.py:89 -#: archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1112 -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:628 +#: archaeological_finds/forms.py:839 archaeological_finds/models_finds.py:91 +#: archaeological_finds/models_finds.py:1114 +#: archaeological_finds/models_finds.py:1115 +#: archaeological_finds/models_finds.py:1821 msgid "Material types" msgstr "Types de matériau" -#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:659 -#: archaeological_finds/forms.py:1487 archaeological_finds/models_finds.py:1821 +#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:631 +#: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:1825 #: ishtar_common/models_imports.py:914 msgid "Material type quality" msgstr "Qualité du type de matériaux" -#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1489 -#: archaeological_finds/models_finds.py:1828 +#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1461 +#: archaeological_finds/models_finds.py:1832 msgid "Comment on the material" msgstr "Commentaire relatif au matériau" -#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:662 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:262 -#: archaeological_finds/models_finds.py:1113 -#: archaeological_finds/models_finds.py:1114 -#: archaeological_finds/models_finds.py:1876 +#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 +#: archaeological_finds/forms.py:842 archaeological_finds/models_finds.py:264 +#: archaeological_finds/models_finds.py:1116 +#: archaeological_finds/models_finds.py:1117 +#: archaeological_finds/models_finds.py:1880 msgid "Object types" msgstr "Types d'objet" -#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:666 -#: archaeological_finds/forms.py:1496 archaeological_finds/models_finds.py:1880 +#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:638 +#: archaeological_finds/forms.py:1468 archaeological_finds/models_finds.py:1884 msgid "Object type quality" msgstr "Qualité du type d'objet" -#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:874 -#: archaeological_finds/forms.py:1498 archaeological_finds/models_finds.py:276 +#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:846 +#: archaeological_finds/forms.py:1470 archaeological_finds/models_finds.py:278 msgid "Functional areas" msgstr "Domaines fonctionnels" -#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:668 -#: archaeological_finds/forms.py:1505 archaeological_finds/forms.py:2003 -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:640 +#: archaeological_finds/forms.py:1477 archaeological_finds/forms.py:1975 +#: archaeological_finds/models_finds.py:1839 msgid "Find number" msgstr "Mobilier (en nombre)" -#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:670 -#: archaeological_finds/forms.py:1507 archaeological_finds/models_finds.py:1911 +#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1915 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:674 -#: archaeological_finds/forms.py:1511 archaeological_finds/models_finds.py:1811 +#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:646 +#: archaeological_finds/forms.py:1483 archaeological_finds/models_finds.py:1815 msgid "Decoration" msgstr "Décor" -#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:677 -#: archaeological_finds/forms.py:1512 archaeological_finds/models_finds.py:1812 +#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:649 +#: archaeological_finds/forms.py:1484 archaeological_finds/models_finds.py:1816 msgid "Inscription" msgstr "Inscription" -#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:680 -#: archaeological_finds/forms.py:878 archaeological_finds/forms.py:1510 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:652 +#: archaeological_finds/forms.py:850 archaeological_finds/forms.py:1482 +#: archaeological_finds/models_finds.py:1818 msgid "Manufacturing place" msgstr "Lieu de fabrication" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:683 -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1514 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1906 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:655 +#: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1486 +#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1910 msgid "Communicability" msgstr "Communicabilité" -#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1518 -#: archaeological_finds/models_finds.py:1856 -#: archaeological_operations/forms.py:1322 -#: archaeological_operations/models.py:461 +#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1490 +#: archaeological_finds/models_finds.py:1860 +#: archaeological_operations/forms.py:1299 +#: archaeological_operations/models.py:490 msgid "Cultural attribution" msgstr "Attribution culturelle" -#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:689 -#: archaeological_finds/forms.py:913 archaeological_finds/forms.py:1520 -#: archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:661 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1492 +#: archaeological_finds/models_finds.py:1937 msgid "Comment on dating" msgstr "Commentaire relatif aux datations" -#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 -#: archaeological_finds/forms.py:1319 -#: archaeological_finds/templates/ishtar/sheet_find.html:201 +#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:664 +#: archaeological_finds/forms.py:1291 +#: archaeological_finds/templates/ishtar/sheet_find.html:198 msgid "Dimensions" msgstr "Dimensions" -#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:693 -#: archaeological_finds/models_finds.py:1913 +#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:665 +#: archaeological_finds/models_finds.py:1917 msgid "Length (cm)" msgstr "Longueur (cm)" -#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:694 -#: archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:666 +#: archaeological_finds/models_finds.py:1918 msgid "Width (cm)" msgstr "Largeur (cm)" -#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:695 -#: archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:667 +#: archaeological_finds/models_finds.py:1919 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:698 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:670 +#: archaeological_finds/models_finds.py:1922 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:696 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:668 +#: archaeological_finds/models_finds.py:1920 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:697 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:669 +#: archaeological_finds/models_finds.py:1921 msgid "Circumference (cm)" msgstr "Circonférence (cm)" -#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:699 -#: archaeological_finds/forms.py:2001 archaeological_finds/models_finds.py:1830 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:671 +#: archaeological_finds/forms.py:1973 archaeological_finds/models_finds.py:1834 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "Volume (l)" -#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 -#: archaeological_finds/forms.py:2002 -#: archaeological_finds/templates/ishtar/sheet_find.html:210 +#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:672 +#: archaeological_finds/forms.py:1974 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 msgid "Weight (g)" msgstr "Poids (g)" -#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:702 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:674 msgid "Clutter long side (cm)" msgstr "Encombrement grand côté (cm)" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:705 +#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:677 msgid "Clutter short side (cm)" msgstr "Encombrement petit côté (cm)" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:680 msgid "Clutter height (cm)" msgstr "Encombrement hauteur (cm)" -#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:711 -#: archaeological_finds/forms.py:1591 archaeological_finds/models_finds.py:1929 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 +#: archaeological_finds/forms.py:1563 archaeological_finds/models_finds.py:1933 msgid "Dimensions comment" msgstr "Commentaire relatif aux dimensions" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:715 -#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1596 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:687 +#: archaeological_finds/forms.py:872 archaeological_finds/forms.py:1568 +#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1942 msgid "Check" msgstr "Vérification" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:717 -#: archaeological_finds/forms.py:902 archaeological_finds/models_finds.py:1943 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:689 +#: archaeological_finds/forms.py:874 archaeological_finds/models_finds.py:1947 msgid "Check date" msgstr "Date de vérification" @@ -3360,31 +3302,35 @@ msgstr "" msgid "Find - 020 - General" msgstr "Mobilier - 020 - Général" -#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:850 -#: archaeological_finds/forms.py:1368 archaeological_finds/models_finds.py:408 +#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:822 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:410 msgid "Excavation ID" msgstr "Identifiant fouille" -#: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:421 +#: archaeological_finds/forms.py:514 archaeological_finds/models_finds.py:423 msgid "Discovery date (exact or TPQ)" msgstr "Date de découverte (exacte ou TPQ)" -#: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 +#: archaeological_finds/forms.py:517 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "Date de découverte (TAQ)" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:1477 -#: archaeological_finds/models_finds.py:428 +#: archaeological_finds/forms.py:520 archaeological_finds/forms.py:1449 +#: archaeological_finds/models_finds.py:430 msgid "Batch/object" msgstr "Lot/objet" -#: archaeological_finds/forms.py:539 archaeological_finds/forms.py:1594 -#: archaeological_finds/models_finds.py:436 +#: archaeological_finds/forms.py:523 +msgid "Topography" +msgstr "Topographie" + +#: archaeological_finds/forms.py:525 archaeological_finds/forms.py:1566 +#: archaeological_finds/models_finds.py:438 msgid "Point of topographic reference" msgstr "Point topographique" -#: archaeological_finds/forms.py:571 +#: archaeological_finds/forms.py:543 msgid "" "Discovery date: if a TAQ date is provided a TPQ date has to be informed. If " "you have a precise date fill only the TPQ - discovery date field." @@ -3393,47 +3339,47 @@ msgstr "" "renseignée. Si vous avez une date précise, remplissez seulement le champ « " "date de découverte (exacte ou TPQ) »." -#: archaeological_finds/forms.py:579 +#: archaeological_finds/forms.py:551 msgid "Discovery date: TAQ date must be older than TPQ date." msgstr "Date de découverte : la date TAQ doit être postérieure à la date TPQ." -#: archaeological_finds/forms.py:596 +#: archaeological_finds/forms.py:568 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" "Vous devez au minimum fournir X, Y et le système de référence spatiale " "utilisé." -#: archaeological_finds/forms.py:612 +#: archaeological_finds/forms.py:584 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." -#: archaeological_finds/forms.py:628 archaeological_finds/forms.py:1994 +#: archaeological_finds/forms.py:600 archaeological_finds/forms.py:1966 msgid "Resulting find" msgstr "Mobilier résultant" -#: archaeological_finds/forms.py:629 +#: archaeological_finds/forms.py:601 msgid "Treatment n-1 - 030 - Resulting find" msgstr "Traitement n-1 - 030 - Mobilier résultant" -#: archaeological_finds/forms.py:733 archaeological_finds/forms.py:2009 +#: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1981 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: archaeological_finds/forms.py:734 +#: archaeological_finds/forms.py:706 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "Traitement 1-n - 030 - Mobiliers résultants" -#: archaeological_finds/forms.py:739 +#: archaeological_finds/forms.py:711 msgid "Number of resulting finds" msgstr "Nombre de mobiliers résultants" -#: archaeological_finds/forms.py:742 +#: archaeological_finds/forms.py:714 msgid "Prefix label for resulting finds" msgstr "Préfixe du libellé des mobiliers résultants" -#: archaeological_finds/forms.py:745 +#: archaeological_finds/forms.py:717 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" @@ -3441,487 +3387,487 @@ msgstr "" "Par exemple : avec un préfixe « élément- », chaque élément résultant sera " "nommé « élément-1 », « élément-2 », « élément-3 »..." -#: archaeological_finds/forms.py:750 +#: archaeological_finds/forms.py:722 msgid "Numbering starting from" msgstr "Numérotation commençant depuis" -#: archaeological_finds/forms.py:753 +#: archaeological_finds/forms.py:725 msgid "Name of the new basket containing the resulting items" msgstr "Nom du nouveau panier contenant les éléments résultants" -#: archaeological_finds/forms.py:772 archaeological_finds/forms.py:1036 -#: archaeological_finds/forms.py:1103 +#: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1008 +#: archaeological_finds/forms.py:1075 msgid "A basket with this label already exists." msgstr "Un panier avec ce libellé existe déjà." -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1112 +#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:1084 msgid "Find - Quick action - Modify" msgstr "Mobilier - Action rapide - Modification" -#: archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:792 msgid "Datation" msgstr "Datation" -#: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 -#: archaeological_finds/forms.py:1347 -#: archaeological_finds/templates/ishtar/sheet_find.html:231 +#: archaeological_finds/forms.py:793 archaeological_finds/forms.py:1137 +#: archaeological_finds/forms.py:1319 +#: archaeological_finds/templates/ishtar/sheet_find.html:228 msgid "Preservation" msgstr "Conservation" -#: archaeological_finds/forms.py:883 archaeological_finds/forms.py:1200 -#: archaeological_finds/forms.py:1605 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1973 -#: archaeological_warehouse/forms.py:586 +#: archaeological_finds/forms.py:855 archaeological_finds/forms.py:1172 +#: archaeological_finds/forms.py:1577 archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1977 +#: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "Altération" -#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1206 -#: archaeological_finds/forms.py:1606 archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1977 -#: archaeological_warehouse/forms.py:587 +#: archaeological_finds/forms.py:857 archaeological_finds/forms.py:1178 +#: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1160 +#: archaeological_finds/models_finds.py:1981 +#: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "Cause d'altération" -#: archaeological_finds/forms.py:888 archaeological_finds/forms.py:1197 -#: archaeological_finds/forms.py:1603 archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1958 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:898 +#: archaeological_finds/forms.py:860 archaeological_finds/forms.py:1169 +#: archaeological_finds/forms.py:1575 archaeological_finds/models_finds.py:1154 +#: archaeological_finds/models_finds.py:1962 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:898 msgid "Conservatory state" msgstr "État de conservation" -#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1218 -#: archaeological_finds/forms.py:1610 archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1983 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/forms.py:863 archaeological_finds/forms.py:1190 +#: archaeological_finds/forms.py:1582 archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1987 +#: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "Urgence du traitement" -#: archaeological_finds/forms.py:894 archaeological_finds/forms.py:1191 -#: archaeological_finds/forms.py:1602 archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_warehouse/forms.py:584 +#: archaeological_finds/forms.py:866 archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1156 +#: archaeological_finds/models_finds.py:1904 +#: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "Remarquabilité" -#: archaeological_finds/forms.py:905 archaeological_finds/forms.py:1223 -#: archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:877 archaeological_finds/forms.py:1195 +#: archaeological_finds/models_finds.py:1993 msgid "Appraisal date" msgstr "Date d'évaluation" -#: archaeological_finds/forms.py:907 archaeological_finds/forms.py:1221 -#: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:879 archaeological_finds/forms.py:1193 +#: archaeological_finds/models_finds.py:1172 +#: archaeological_finds/models_finds.py:1992 msgid "Insurance value" msgstr "Valeur d'assurance" -#: archaeological_finds/forms.py:917 +#: archaeological_finds/forms.py:889 msgid "Comment on conservatory" msgstr "Commentaire de conservation" -#: archaeological_finds/forms.py:979 +#: archaeological_finds/forms.py:951 msgid "Find - Quick action - Modify single" msgstr "Mobilier - Action rapide - Modification simple" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "Créer" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "Mettre à jour" -#: archaeological_finds/forms.py:999 archaeological_finds/forms.py:1451 -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2218 -#: archaeological_finds/forms.py:2235 archaeological_finds/forms.py:2240 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:1423 +#: archaeological_finds/forms.py:2185 archaeological_finds/forms.py:2190 +#: archaeological_finds/forms.py:2207 archaeological_finds/forms.py:2212 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:881 -#: archaeological_finds/models_finds.py:1702 +#: archaeological_finds/models_finds.py:884 +#: archaeological_finds/models_finds.py:1706 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1228 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "Panier" -#: archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:994 msgid "On update, you have to select a basket." msgstr "Pour la mise à jour, sélectionnez un panier." -#: archaeological_finds/forms.py:1029 +#: archaeological_finds/forms.py:1001 msgid "You cannot update the selected basket." msgstr "Vous ne pouvez pas mettre à jour le panier sélectionné." -#: archaeological_finds/forms.py:1033 archaeological_finds/forms.py:1100 +#: archaeological_finds/forms.py:1005 archaeological_finds/forms.py:1072 msgid "A label is required." msgstr "Un libellé est obligatoire." -#: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:2081 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 #: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "Identifiant textuel" -#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:2082 msgid "Is public" msgstr "Est public" -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 +#: archaeological_finds/forms.py:1100 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2129 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "Partagé (lecture) avec" -#: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 +#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:2094 +#: archaeological_finds/forms.py:2136 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "Partagé (lecture/édition) avec" -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1138 msgid "Find - 030 - Preservation" msgstr "Mobilier - 030 - Conservation" -#: archaeological_finds/forms.py:1185 archaeological_finds/forms.py:1601 -#: archaeological_finds/models_finds.py:1152 -#: archaeological_finds/models_finds.py:1894 -#: archaeological_warehouse/forms.py:583 +#: archaeological_finds/forms.py:1157 archaeological_finds/forms.py:1573 +#: archaeological_finds/models_finds.py:1155 +#: archaeological_finds/models_finds.py:1898 +#: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: archaeological_finds/forms.py:1212 archaeological_finds/forms.py:1608 -#: archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/forms.py:1184 archaeological_finds/forms.py:1580 +#: archaeological_finds/models_finds.py:1153 +#: archaeological_finds/models_finds.py:1972 msgid "Recommended treatments" msgstr "Traitements recommandés" -#: archaeological_finds/forms.py:1220 archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1944 +#: archaeological_finds/forms.py:1192 archaeological_finds/models_finds.py:1171 +#: archaeological_finds/models_finds.py:1948 msgid "Estimated value" msgstr "Valeur estimée" -#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1604 -#: archaeological_finds/models_finds.py:1964 +#: archaeological_finds/forms.py:1198 archaeological_finds/forms.py:1576 +#: archaeological_finds/models_finds.py:1968 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: archaeological_finds/forms.py:1276 +#: archaeological_finds/forms.py:1248 msgid "Find - 040 - Dating" msgstr "Mobilier - 040 - Datation" -#: archaeological_finds/forms.py:1282 +#: archaeological_finds/forms.py:1254 msgid "Find - 001 - Search" msgstr "Mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1258 msgid "Find origin" msgstr "Origine du mobilier" -#: archaeological_finds/forms.py:1308 +#: archaeological_finds/forms.py:1280 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "Date de découverte" -#: archaeological_finds/forms.py:1374 archaeological_finds/models_finds.py:1091 +#: archaeological_finds/forms.py:1346 archaeological_finds/models_finds.py:1094 msgid "Base find - Short ID" msgstr "Mobilier d'origine - ID court" -#: archaeological_finds/forms.py:1375 archaeological_finds/models_finds.py:1092 +#: archaeological_finds/forms.py:1347 archaeological_finds/models_finds.py:1095 msgid "Base find - Complete ID" msgstr "Mobilier d'origine - ID complet" -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1135 +#: archaeological_finds/forms.py:1357 archaeological_finds/models_finds.py:1138 #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1803 -#: archaeological_operations/forms.py:1869 -#: archaeological_operations/models.py:908 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 +#: archaeological_operations/forms.py:1756 +#: archaeological_operations/forms.py:1822 +#: archaeological_operations/models.py:943 +#: archaeological_operations/models.py:1030 +#: archaeological_operations/models.py:1328 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "Type d'opération" -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:1360 msgid "Operation - Address / Locality" msgstr "Opération - Adresse / Lieu-dit" -#: archaeological_finds/forms.py:1391 +#: archaeological_finds/forms.py:1363 msgid "Operation - In charge" msgstr "Opération - Responsable" -#: archaeological_finds/forms.py:1402 +#: archaeological_finds/forms.py:1374 msgid "Operation - Scientist in charge" msgstr "Opération - Responsable d'opération" -#: archaeological_finds/forms.py:1405 +#: archaeological_finds/forms.py:1377 msgid "Operation - Operator" msgstr "Opération - Opérateur" -#: archaeological_finds/forms.py:1409 +#: archaeological_finds/forms.py:1381 msgid "Operation - Name" msgstr "Opération - Nom" -#: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: archaeological_finds/forms.py:1384 archaeological_operations/forms.py:499 +#: archaeological_operations/forms.py:1301 ishtar_common/forms_common.py:1233 #: ishtar_common/models.py:3098 msgid "Areas" msgstr "Zones" -#: archaeological_finds/forms.py:1415 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1387 archaeological_warehouse/forms.py:524 msgid "Archaeological site (attached to the operation)" msgstr "Site archéologique (rattaché à l'opération)" -#: archaeological_finds/forms.py:1423 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1395 archaeological_warehouse/forms.py:532 msgid "Archaeological site name (attached to the operation)" msgstr "Site archéologique nom (rattaché à l'opération)" -#: archaeological_finds/forms.py:1426 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1398 archaeological_warehouse/forms.py:535 msgid "Archaeological site (attached to the context record)" msgstr "Site archéologique (rattaché à l'UE)" -#: archaeological_finds/forms.py:1434 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1406 archaeological_warehouse/forms.py:543 msgid "Archaeological site name (attached to the context record)" msgstr "Site archéologique nom (rattaché à l'UE)" -#: archaeological_finds/forms.py:1447 +#: archaeological_finds/forms.py:1419 msgid "Search within related context records" msgstr "Recherche parmi les Unités d'Enregistrement associées" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1432 msgid "Discovery date after" msgstr "Date de découverte après" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1435 msgid "Discovery date before" msgstr "Date de découverte avant" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1438 msgid "Discovery date (exact or TPQ) after" msgstr "Date de découverte (exacte ou TPQ) après" -#: archaeological_finds/forms.py:1469 +#: archaeological_finds/forms.py:1441 msgid "Discovery date (exact or TPQ) before" msgstr "Date de découverte (exacte ou TPQ) avant" -#: archaeological_finds/forms.py:1472 +#: archaeological_finds/forms.py:1444 msgid "Discovery date (TAQ) after" msgstr "Date de découverte (TAQ) après" -#: archaeological_finds/forms.py:1475 +#: archaeological_finds/forms.py:1447 msgid "Discovery date (TAQ) before" msgstr "Date de découverte (TAQ) avant" -#: archaeological_finds/forms.py:1480 archaeological_finds/forms.py:2000 -#: archaeological_finds/models_finds.py:88 -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1452 archaeological_finds/forms.py:1972 +#: archaeological_finds/models_finds.py:90 +#: archaeological_finds/models_finds.py:1151 #: archaeological_operations/templates/ishtar/sheet_operation.html:534 -#: archaeological_warehouse/forms.py:572 +#: archaeological_warehouse/forms.py:566 msgid "Material type" msgstr "Type de matériau" -#: archaeological_finds/forms.py:1491 archaeological_finds/models_finds.py:261 -#: archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1463 archaeological_finds/models_finds.py:263 +#: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:907 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:907 msgid "Object type" msgstr "Type d'objet" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1495 msgid "Length - higher than (cm)" msgstr "Longueur - plus grand que (cm)" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1498 msgid "Length - lower than (cm)" msgstr "Longueur - plus petit que (cm)" -#: archaeological_finds/forms.py:1529 +#: archaeological_finds/forms.py:1501 msgid "Width - lower than (cm)" msgstr "Largeur - plus petit que (cm)" -#: archaeological_finds/forms.py:1532 +#: archaeological_finds/forms.py:1504 msgid "Width - higher than (cm)" msgstr "Largeur - plus grand que (cm)" -#: archaeological_finds/forms.py:1535 +#: archaeological_finds/forms.py:1507 msgid "Height - lower than (cm)" msgstr "Hauteur - plus petit que (cm)" -#: archaeological_finds/forms.py:1538 +#: archaeological_finds/forms.py:1510 msgid "Height - higher than (cm)" msgstr "Hauteur - plus grand que (cm)" -#: archaeological_finds/forms.py:1541 +#: archaeological_finds/forms.py:1513 msgid "Thickness - lower than (cm)" msgstr "Épaisseur - plus petit que (cm)" -#: archaeological_finds/forms.py:1544 +#: archaeological_finds/forms.py:1516 msgid "Thickness - higher than (cm)" msgstr "Épaisseur - plus grand que (cm)" -#: archaeological_finds/forms.py:1547 +#: archaeological_finds/forms.py:1519 msgid "Diameter - lower than (cm)" msgstr "Diamètre - plus petit que (cm)" -#: archaeological_finds/forms.py:1550 +#: archaeological_finds/forms.py:1522 msgid "Diameter - higher than (cm)" msgstr "Diamètre - plus grand que (cm)" -#: archaeological_finds/forms.py:1553 +#: archaeological_finds/forms.py:1525 msgid "Circumference - lower than (cm)" msgstr "Circonférence - plus petit que (cm)" -#: archaeological_finds/forms.py:1556 +#: archaeological_finds/forms.py:1528 msgid "Circumference - higher than (cm)" msgstr "Circonférence - plus grand que (cm)" -#: archaeological_finds/forms.py:1559 +#: archaeological_finds/forms.py:1531 msgid "Volume - lower than (l)" msgstr "Volume - plus petit que (l)" -#: archaeological_finds/forms.py:1560 +#: archaeological_finds/forms.py:1532 msgid "Volume - higher than (l)" msgstr "Volume - plus grand que (l)" -#: archaeological_finds/forms.py:1562 +#: archaeological_finds/forms.py:1534 msgid "Weight - lower than (g)" msgstr "Poids - plus petit que (g)" -#: archaeological_finds/forms.py:1565 +#: archaeological_finds/forms.py:1537 msgid "Weight - higher than (g)" msgstr "Poids - plus grand que (g)" -#: archaeological_finds/forms.py:1568 +#: archaeological_finds/forms.py:1540 msgid "Clutter long side - lower than (cm)" msgstr "Encombrement grand côté - plus petit que (cm)" -#: archaeological_finds/forms.py:1572 +#: archaeological_finds/forms.py:1544 msgid "Clutter long side - higher than (cm)" msgstr "Encombrement grand côté - plus grand que (cm)" -#: archaeological_finds/forms.py:1576 +#: archaeological_finds/forms.py:1548 msgid "Clutter short side - lower than (cm)" msgstr "Encombrement petit côté - plus petit que (cm)" -#: archaeological_finds/forms.py:1580 +#: archaeological_finds/forms.py:1552 msgid "Clutter short side - higher than (cm)" msgstr "Encombrement petit côté - plus grand que (cm)" -#: archaeological_finds/forms.py:1584 +#: archaeological_finds/forms.py:1556 msgid "Clutter height - lower than (cm)" msgstr "Encombrement hauteur - plus petit que (cm)" -#: archaeological_finds/forms.py:1588 +#: archaeological_finds/forms.py:1560 msgid "Clutter height - higher than (cm)" msgstr "Encombrement hauteur - plus grand que (cm)" -#: archaeological_finds/forms.py:1597 +#: archaeological_finds/forms.py:1569 msgid "Check date after" msgstr "Date de vérification après" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1571 msgid "Check date before" msgstr "Date de vérification avant" -#: archaeological_finds/forms.py:1612 +#: archaeological_finds/forms.py:1584 msgid "Estimated value - higher than" msgstr "Valeur estimée - plus grand que" -#: archaeological_finds/forms.py:1613 +#: archaeological_finds/forms.py:1585 msgid "Estimated value - lower than" msgstr "Valeur estimée - plus petit que" -#: archaeological_finds/forms.py:1614 +#: archaeological_finds/forms.py:1586 msgid "Insurance value - higher than" msgstr "Valeur d'assurance - plus grand que" -#: archaeological_finds/forms.py:1615 +#: archaeological_finds/forms.py:1587 msgid "Insurance value - lower than" msgstr "Valeur d'assurance - plus petit que" -#: archaeological_finds/forms.py:1617 +#: archaeological_finds/forms.py:1589 msgid "Appraisal date after" msgstr "Date d'évaluation après" -#: archaeological_finds/forms.py:1620 +#: archaeological_finds/forms.py:1592 msgid "Appraisal date before" msgstr "Date d'évaluation avant" -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1595 msgid "Loan?" msgstr "Prêt ?" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1597 msgid "Treatment file end date before" msgstr "Dossier de traitement - date de clotûre avant" -#: archaeological_finds/forms.py:1628 +#: archaeological_finds/forms.py:1600 msgid "Treatment end date before" msgstr "Traitement - date de clôture avant" -#: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 -#: archaeological_finds/models_finds.py:1868 -#: archaeological_finds/templates/ishtar/sheet_find.html:306 +#: archaeological_finds/forms.py:1658 archaeological_finds/models_finds.py:1111 +#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "Contenant de référence" -#: archaeological_finds/forms.py:1693 +#: archaeological_finds/forms.py:1665 msgid "Reference container - Warehouse (location)" msgstr "Lieu de conservation du contenant de référence" -#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:331 +#: archaeological_finds/forms.py:1684 archaeological_finds/models_finds.py:1110 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "Contenant actuel" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1691 msgid "Current container - Warehouse (location)" msgstr "Lieu de conservation du contenant actuel" -#: archaeological_finds/forms.py:1739 archaeological_finds/forms.py:1760 -#: archaeological_finds/forms.py:1816 archaeological_finds/views.py:380 +#: archaeological_finds/forms.py:1711 archaeological_finds/forms.py:1732 +#: archaeological_finds/forms.py:1788 archaeological_finds/views.py:380 msgid "Find search" msgstr "Rechercher un mobilier" -#: archaeological_finds/forms.py:1855 archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1827 archaeological_finds/forms.py:1990 #: archaeological_finds/models_treatments.py:391 #: archaeological_finds/templates/ishtar/sheet_treatment.html:103 msgid "Upstream finds" msgstr "Mobilier amont" -#: archaeological_finds/forms.py:1878 +#: archaeological_finds/forms.py:1850 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: archaeological_finds/forms.py:1999 +#: archaeological_finds/forms.py:1971 msgid "Precise description" msgstr "Description précise" -#: archaeological_finds/forms.py:2014 +#: archaeological_finds/forms.py:1986 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: archaeological_finds/forms.py:2057 +#: archaeological_finds/forms.py:2029 msgid "Find basket - 001 - Search" msgstr "Panier mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:2069 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2041 archaeological_finds/forms.py:2059 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "Recherche de panier" -#: archaeological_finds/forms.py:2104 +#: archaeological_finds/forms.py:2076 msgid "Find basket" msgstr "Panier de mobilier" -#: archaeological_finds/forms.py:2107 +#: archaeological_finds/forms.py:2079 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:193 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:381 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:383 +#: archaeological_finds/templates/ishtar/sheet_find.html:421 +#: archaeological_finds/templates/ishtar/sheet_find.html:459 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 #: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 @@ -3930,11 +3876,11 @@ msgstr "Panier de mobilier" msgid "Label" msgstr "Dénomination" -#: archaeological_finds/forms.py:2149 archaeological_finds/forms.py:2204 +#: archaeological_finds/forms.py:2121 archaeological_finds/forms.py:2176 msgid "A basket with this slug already exists." msgstr "Un panier avec cet identifiant textuel existe déjà." -#: archaeological_finds/forms.py:2196 +#: archaeological_finds/forms.py:2168 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." @@ -3960,7 +3906,7 @@ msgstr "Responsable de suivi scientifique" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:626 -#: archaeological_finds/models_finds.py:172 +#: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 #: ishtar_common/models_imports.py:902 @@ -3982,8 +3928,8 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 +#: archaeological_operations/models.py:2399 +#: archaeological_operations/models.py:2736 ishtar_common/views.py:408 msgid "Treatment" msgstr "Traitement" @@ -4086,8 +4032,8 @@ msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2398 +#: archaeological_operations/models.py:2728 ishtar_common/views.py:407 msgid "Treatment request" msgstr "Demande de traitement" @@ -4105,14 +4051,14 @@ msgid "Would you like to delete this treatment?" msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1860 -#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:1864 +#: archaeological_finds/models_finds.py:3327 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 -#: 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_warehouse/forms.py:329 archaeological_warehouse/models.py:796 +#: 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_warehouse/forms.py:323 archaeological_warehouse/models.py:796 #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 @@ -4198,7 +4144,7 @@ msgstr "Réf. interne" #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:787 #: archaeological_finds/models_treatments.py:1119 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "Demandeur" @@ -4206,7 +4152,7 @@ msgstr "Demandeur" #: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/forms_treatments.py:793 #: archaeological_finds/models_treatments.py:1127 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "Organisation demandeuse" @@ -4311,44 +4257,44 @@ msgstr "Traitement de plusieurs à un - création" msgid "Treatment one to many - creation" msgstr "Traitement de un à plusieurs - création" -#: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 +#: archaeological_finds/models_finds.py:86 +#: archaeological_operations/models.py:2403 ishtar_common/models.py:3625 msgid "Code" msgstr "Code" -#: archaeological_finds/models_finds.py:85 +#: archaeological_finds/models_finds.py:87 msgid "Recommendation" msgstr "Recommandation" -#: archaeological_finds/models_finds.py:101 +#: archaeological_finds/models_finds.py:103 msgid "Material type quality type" msgstr "Type de qualité du type de matériaux" -#: archaeological_finds/models_finds.py:102 +#: archaeological_finds/models_finds.py:104 msgid "Material type quality types" msgstr "Types de qualité du type de matériaux" -#: archaeological_finds/models_finds.py:114 +#: archaeological_finds/models_finds.py:116 msgid "Conservatory state type" msgstr "Type d'état de conservation" -#: archaeological_finds/models_finds.py:115 +#: archaeological_finds/models_finds.py:117 msgid "Conservatory state types" msgstr "Types d'état de conservation" -#: archaeological_finds/models_finds.py:128 +#: archaeological_finds/models_finds.py:130 msgid "Virtual" msgstr "Virtuel" -#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:131 msgid "Destructive" msgstr "Destructif" -#: archaeological_finds/models_finds.py:131 +#: archaeological_finds/models_finds.py:133 msgid "Create a new find" msgstr "Créer un nouvel élément" -#: archaeological_finds/models_finds.py:134 +#: archaeological_finds/models_finds.py:136 msgid "" "If True when this treatment is applied a new version of the object will be " "created." @@ -4356,185 +4302,185 @@ msgstr "" "Si mis à Vrai quand le traitement est appliqué une nouvelle version de " "l'objet sera créée." -#: archaeological_finds/models_finds.py:139 +#: archaeological_finds/models_finds.py:141 msgid "Upstream is many" msgstr "Les éléments amont sont multiples" -#: archaeological_finds/models_finds.py:142 +#: archaeological_finds/models_finds.py:144 msgid "Check this if for this treatment from many finds you'll get one." msgstr "" "Cochez cela si, pour ce traitement, à partir de plusieurs éléments vous en " "obtenez un seul." -#: archaeological_finds/models_finds.py:146 +#: archaeological_finds/models_finds.py:148 msgid "Downstream is many" msgstr "Les éléments aval sont multiples" -#: archaeological_finds/models_finds.py:149 +#: archaeological_finds/models_finds.py:151 msgid "Check this if for this treatment from one find you'll get many." msgstr "" "Cochez cela si, pour ce traitement, à partir d'un seul élément vous en " "obtenez plusieurs." -#: archaeological_finds/models_finds.py:153 +#: archaeological_finds/models_finds.py:155 msgid "Change reference location" msgstr "Change la localisation de référence" -#: archaeological_finds/models_finds.py:155 +#: archaeological_finds/models_finds.py:157 msgid "The treatment change the reference location." msgstr "Le traitement change la localisation de référence." -#: archaeological_finds/models_finds.py:158 +#: archaeological_finds/models_finds.py:160 msgid "Change current location" msgstr "Change la localisation actuelle" -#: archaeological_finds/models_finds.py:160 +#: archaeological_finds/models_finds.py:162 msgid "The treatment change the current location." msgstr "Le traitement change la localisation actuelle." -#: archaeological_finds/models_finds.py:163 +#: archaeological_finds/models_finds.py:165 msgid "Restore the reference location" msgstr "Restaure la localisation de référence" -#: archaeological_finds/models_finds.py:166 +#: archaeological_finds/models_finds.py:168 msgid "" "The treatment change restore reference location to the current location." msgstr "" "Le traitement restaure la localisation de référence sur la localisation " "actuelle." -#: archaeological_finds/models_finds.py:173 +#: archaeological_finds/models_finds.py:175 #: archaeological_finds/models_treatments.py:371 msgid "Treatment types" msgstr "Types de traitement" -#: archaeological_finds/models_finds.py:226 +#: archaeological_finds/models_finds.py:228 msgid "Integrity / interest type" msgstr "Type d'intégrité / intérêt" -#: archaeological_finds/models_finds.py:227 +#: archaeological_finds/models_finds.py:229 msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:909 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:909 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: archaeological_finds/models_finds.py:238 +#: archaeological_finds/models_finds.py:240 msgid "Remarkability types" msgstr "Types de remarquabilité" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:912 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:912 msgid "Batch type" msgstr "Type de lot" -#: archaeological_finds/models_finds.py:251 +#: archaeological_finds/models_finds.py:253 msgid "Batch types" msgstr "Types de lot" -#: archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1888 +#: archaeological_finds/models_finds.py:277 +#: archaeological_finds/models_finds.py:1892 #: ishtar_common/models_imports.py:915 msgid "Functional area" msgstr "Domaine fonctionnel" -#: archaeological_finds/models_finds.py:291 +#: archaeological_finds/models_finds.py:293 msgid "Object type quality type" msgstr "Type de qualité du type d'objet" -#: archaeological_finds/models_finds.py:292 +#: archaeological_finds/models_finds.py:294 msgid "Object type quality types" msgstr "Types de qualité du type d'objet" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:910 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:910 msgid "Alteration type" msgstr "Type d'altération" -#: archaeological_finds/models_finds.py:303 +#: archaeological_finds/models_finds.py:305 msgid "Alteration types" msgstr "Types d'altération" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:911 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:911 msgid "Alteration cause type" msgstr "Type de cause d'altération" -#: archaeological_finds/models_finds.py:317 +#: archaeological_finds/models_finds.py:319 msgid "Alteration cause types" msgstr "Types de cause d'altération" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:905 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:905 msgid "Treatment emergency type" msgstr "Type d'urgence de traitement" -#: archaeological_finds/models_finds.py:331 +#: archaeological_finds/models_finds.py:333 msgid "Treatment emergency types" msgstr "Types d'urgence du traitement" -#: archaeological_finds/models_finds.py:341 +#: archaeological_finds/models_finds.py:343 msgid "Communicability type" msgstr "Type de communicabilité" -#: archaeological_finds/models_finds.py:342 +#: archaeological_finds/models_finds.py:344 msgid "Communicability types" msgstr "Types de communicabilité" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:913 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:913 msgid "Checked type" msgstr "Type de vérification" -#: archaeological_finds/models_finds.py:358 +#: archaeological_finds/models_finds.py:360 msgid "Checked types" msgstr "Types de vérification" -#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:414 msgid "Special interest" msgstr "Intérêt spécifique" -#: archaeological_finds/models_finds.py:434 +#: archaeological_finds/models_finds.py:436 msgid "Material index" msgstr "Index matériel" -#: archaeological_finds/models_finds.py:439 +#: archaeological_finds/models_finds.py:441 #: ishtar_common/templates/blocks/DataTables-stats.html:25 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "Ligne" -#: archaeological_finds/models_finds.py:441 +#: archaeological_finds/models_finds.py:443 msgid "Short ID" msgstr "Identifiant court" -#: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 +#: archaeological_finds/models_finds.py:447 +#: archaeological_finds/models_finds.py:454 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: archaeological_finds/models_finds.py:448 +#: archaeological_finds/models_finds.py:450 msgid "Complete ID" msgstr "Identifiant complet" -#: archaeological_finds/models_finds.py:469 +#: archaeological_finds/models_finds.py:471 msgid "Concatenation of associated material types codes" msgstr "Concaténation des types de matériaux associés" -#: archaeological_finds/models_finds.py:475 -#: archaeological_finds/models_finds.py:1797 +#: archaeological_finds/models_finds.py:477 +#: archaeological_finds/models_finds.py:1801 msgid "Base find" msgstr "Mobilier d'origine" -#: archaeological_finds/models_finds.py:476 +#: archaeological_finds/models_finds.py:478 msgid "Base finds" msgstr "Mobilier d'origine" -#: archaeological_finds/models_finds.py:852 +#: archaeological_finds/models_finds.py:855 msgid "g" msgstr "g" -#: archaeological_finds/models_finds.py:853 +#: archaeological_finds/models_finds.py:856 msgid "kg" msgstr "kg" -#: archaeological_finds/models_finds.py:865 +#: archaeological_finds/models_finds.py:868 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:12 #: ishtar_common/templates/ishtar/blocks/window_image.html:22 @@ -4546,561 +4492,561 @@ msgstr "kg" msgid "Modify" msgstr "Modifier" -#: archaeological_finds/models_finds.py:920 archaeological_finds/views.py:535 +#: archaeological_finds/models_finds.py:923 archaeological_finds/views.py:535 msgid "Manage basket" msgstr "Gérer un panier" -#: archaeological_finds/models_finds.py:932 +#: archaeological_finds/models_finds.py:935 #: archaeological_warehouse/models.py:1853 msgid "Add treatment" msgstr "Ajouter un traitement" -#: archaeological_finds/models_finds.py:943 +#: archaeological_finds/models_finds.py:946 msgid "Add treatment file" msgstr "Ajouter une demande de traitement" -#: archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:1096 msgid "Operation (code)" msgstr "Opération (code)" -#: archaeological_finds/models_finds.py:1098 +#: archaeological_finds/models_finds.py:1101 msgid "Batch" msgstr "Lot" -#: archaeological_finds/models_finds.py:1099 +#: archaeological_finds/models_finds.py:1102 msgid "Base find - Comment" msgstr "Mobilier d'origine - Commentaires" -#: archaeological_finds/models_finds.py:1100 +#: archaeological_finds/models_finds.py:1103 msgid "Base find - Description" msgstr "Mobilier d'origine - Description" -#: archaeological_finds/models_finds.py:1102 +#: archaeological_finds/models_finds.py:1105 msgid "Base find - Topographic localisation" msgstr "Mobilier d'origine - Localisation topographique" -#: archaeological_finds/models_finds.py:1104 +#: archaeological_finds/models_finds.py:1107 msgid "Base find - Special interest" msgstr "Mobilier d'origine - Intérêt spécifique" -#: archaeological_finds/models_finds.py:1105 +#: archaeological_finds/models_finds.py:1108 msgid "Base find - Discovery date (exact or TPQ)" msgstr "Mobilier d'origine - Date de découverte (exacte ou TPQ)" -#: archaeological_finds/models_finds.py:1106 +#: archaeological_finds/models_finds.py:1109 msgid "Base find - Discovery date (TAQ)" msgstr "Mobilier d'origine - Date de découverte (TAQ)" -#: archaeological_finds/models_finds.py:1167 +#: archaeological_finds/models_finds.py:1170 msgid "Weight (kg)" msgstr "Poids (kg)" -#: archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:1234 msgctxt "key for text search" msgid "short-id" msgstr "id-court" -#: archaeological_finds/models_finds.py:1235 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "complete-id" msgstr "id-complet" -#: archaeological_finds/models_finds.py:1239 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "free-id" msgstr "id-libre" -#: archaeological_finds/models_finds.py:1242 +#: archaeological_finds/models_finds.py:1245 msgctxt "key for text search" msgid "denomination" msgstr "denomination" -#: archaeological_finds/models_finds.py:1257 +#: archaeological_finds/models_finds.py:1260 #: archaeological_warehouse/models.py:933 msgctxt "key for text search" msgid "code-patriarche" msgstr "code-patriarche" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 +#: archaeological_finds/models_finds.py:1264 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "type-operation" -#: archaeological_finds/models_finds.py:1265 -#: archaeological_operations/models.py:352 -#: archaeological_operations/models.py:1060 +#: archaeological_finds/models_finds.py:1268 +#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:1094 msgctxt "key for text search" msgid "area" msgstr "zone" -#: archaeological_finds/models_finds.py:1274 +#: archaeological_finds/models_finds.py:1277 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "site-name" msgstr "site-nom" -#: archaeological_finds/models_finds.py:1279 -#: archaeological_finds/models_finds.py:1735 +#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1739 #: archaeological_warehouse/models.py:947 msgctxt "key for text search" msgid "context-record-site" msgstr "ue-site" -#: archaeological_finds/models_finds.py:1284 +#: archaeological_finds/models_finds.py:1287 #: archaeological_warehouse/models.py:952 msgctxt "key for text search" msgid "context-record-site-name" msgstr "ue-site-nom" -#: archaeological_finds/models_finds.py:1288 -#: archaeological_finds/models_finds.py:1730 +#: archaeological_finds/models_finds.py:1291 +#: archaeological_finds/models_finds.py:1734 #: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "ue" -#: archaeological_finds/models_finds.py:1296 +#: archaeological_finds/models_finds.py:1299 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "ue-type-relation" -#: archaeological_finds/models_finds.py:1300 archaeological_finds/tests.py:1197 +#: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1199 #: archaeological_warehouse/models.py:968 msgctxt "key for text search" msgid "material" msgstr "materiau" -#: archaeological_finds/models_finds.py:1304 +#: archaeological_finds/models_finds.py:1307 #: archaeological_warehouse/models.py:972 msgctxt "key for text search" msgid "object-type" msgstr "type-objet" -#: archaeological_finds/models_finds.py:1308 +#: archaeological_finds/models_finds.py:1311 msgctxt "key for text search" msgid "recommended-treatments" msgstr "traitements-recommandes" -#: archaeological_finds/models_finds.py:1312 archaeological_finds/tests.py:1375 +#: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1377 #: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "conservatory" msgstr "conservation" -#: archaeological_finds/models_finds.py:1316 +#: archaeological_finds/models_finds.py:1319 #: archaeological_warehouse/models.py:984 msgctxt "key for text search" msgid "integrity" msgstr "integrite" -#: archaeological_finds/models_finds.py:1320 +#: archaeological_finds/models_finds.py:1323 #: archaeological_warehouse/models.py:988 msgctxt "key for text search" msgid "remarkability" msgstr "remarquabilite" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 +#: archaeological_finds/models_finds.py:1327 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "description" -#: archaeological_finds/models_finds.py:1327 +#: archaeological_finds/models_finds.py:1330 msgctxt "key for text search" msgid "batch" msgstr "lot" -#: archaeological_finds/models_finds.py:1331 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "checked" msgstr "verifie" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 +#: archaeological_finds/models_finds.py:1338 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "contenant" -#: archaeological_finds/models_finds.py:1339 -#: archaeological_finds/models_finds.py:1733 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_finds/models_finds.py:1737 #: archaeological_warehouse/models.py:902 msgctxt "key for text search" msgid "location" msgstr "localisation" -#: archaeological_finds/models_finds.py:1343 +#: archaeological_finds/models_finds.py:1346 msgctxt "key for text search" msgid "current-location" msgstr "localisation-actuelle" -#: archaeological_finds/models_finds.py:1347 +#: archaeological_finds/models_finds.py:1350 msgctxt "key for text search" msgid "current-container" msgstr "contenant-actuel" -#: archaeological_finds/models_finds.py:1351 +#: archaeological_finds/models_finds.py:1354 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "panier" -#: archaeological_finds/models_finds.py:1358 +#: archaeological_finds/models_finds.py:1361 msgctxt "key for text search" msgid "last-modified-by" msgstr "modifie-en-dernier-par" -#: archaeological_finds/models_finds.py:1362 +#: archaeological_finds/models_finds.py:1365 #: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" -#: archaeological_finds/models_finds.py:1365 archaeological_finds/tests.py:1417 +#: archaeological_finds/models_finds.py:1368 archaeological_finds/tests.py:1419 msgctxt "key for text search" msgid "loan" msgstr "pret" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1370 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "demande-fin-de-traitement-avant" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1374 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "fin-de-traitement-avant" -#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1378 msgctxt "key for text search" msgid "previous-id" msgstr "id-precedent" -#: archaeological_finds/models_finds.py:1382 +#: archaeological_finds/models_finds.py:1385 msgctxt "key for text search" msgid "seal-number" msgstr "numero-scelle" -#: archaeological_finds/models_finds.py:1385 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "excavation-id" msgstr "id-fouille" -#: archaeological_finds/models_finds.py:1389 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "museum-id" msgstr "id-musee" -#: archaeological_finds/models_finds.py:1392 +#: archaeological_finds/models_finds.py:1395 msgctxt "key for text search" msgid "laboratory-id" msgstr "numero-laboratoire" -#: archaeological_finds/models_finds.py:1396 +#: archaeological_finds/models_finds.py:1399 msgctxt "key for text search" msgid "mark" msgstr "marquage" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1402 msgctxt "key for text search" msgid "discovery-date-before" msgstr "date-decouverte-avant" -#: archaeological_finds/models_finds.py:1403 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "discovery-date-after" msgstr "date-decouverte-apres" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1410 msgctxt "key for text search" msgid "discovery-date-tpq-before" msgstr "date-decouverte-tpq-avant" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1414 msgctxt "key for text search" msgid "discovery-date-tpq-after" msgstr "date-decouverte-tpq-apres" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1418 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "date-decouverte-taq-avant" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1422 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "date-decouverte-taq-apres" -#: archaeological_finds/models_finds.py:1423 +#: archaeological_finds/models_finds.py:1426 msgctxt "key for text search" msgid "is-complete" msgstr "est-complet" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1429 msgctxt "key for text search" msgid "material-type-quality" msgstr "type-materiaux-qualite" -#: archaeological_finds/models_finds.py:1430 +#: archaeological_finds/models_finds.py:1433 msgctxt "key for text search" msgid "object-type-quality" msgstr "type-objet-qualite" -#: archaeological_finds/models_finds.py:1434 +#: archaeological_finds/models_finds.py:1437 msgctxt "key for text search" msgid "find-number" msgstr "nombre-mobilier" -#: archaeological_finds/models_finds.py:1437 +#: archaeological_finds/models_finds.py:1440 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "nmi" -#: archaeological_finds/models_finds.py:1441 +#: archaeological_finds/models_finds.py:1444 msgctxt "key for text search" msgid "decoration" msgstr "decor" -#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1447 msgctxt "key for text search" msgid "inscription" msgstr "inscription" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1450 msgctxt "key for text search" msgid "manufacturing-place" msgstr "lieu-fabrication" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1454 msgctxt "key for text search" msgid "communicabilities" msgstr "communicabilite" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "material-comment" msgstr "materiau-commentaire" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "dating-comment" msgstr "commentaire-datation" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "conservatory-comment" msgstr "commentaire-conservation" -#: archaeological_finds/models_finds.py:1470 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "length-lower" msgstr "longueur-plus-petit" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "width-lower" msgstr "largeur-plus-petit" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1479 msgctxt "key for text search" msgid "height-lower" msgstr "hauteur-plus-petit" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1482 msgctxt "key for text search" msgid "thickness-lower" msgstr "epaisseur-plus-petit" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "diameter-lower" msgstr "diametre-plus-petit" -#: archaeological_finds/models_finds.py:1485 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "circumference-lower" msgstr "circonference-plus-petit" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1492 msgctxt "key for text search" msgid "volume-lower" msgstr "volume-plus-petit" -#: archaeological_finds/models_finds.py:1492 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "weight-lower" msgstr "poids-plus-petit" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1498 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "encombrement-cote-long-plus-petit" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "encombrement-cote-court-plus-petit" -#: archaeological_finds/models_finds.py:1503 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "encombrement-hauteur-plus-petit" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1510 msgctxt "key for text search" msgid "length-higher" msgstr "longueur-plus-grand" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "width-higher" msgstr "largeur-plus-grand" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "height-higher" msgstr "hauteur-plus-grand" -#: archaeological_finds/models_finds.py:1516 +#: archaeological_finds/models_finds.py:1519 msgctxt "key for text search" msgid "thickness-higher" msgstr "epaisseur-plus-grand" -#: archaeological_finds/models_finds.py:1519 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "diameter-higher" msgstr "diametre-plus-grand" -#: archaeological_finds/models_finds.py:1522 +#: archaeological_finds/models_finds.py:1525 msgctxt "key for text search" msgid "circumference-higher" msgstr "circonference-plus-grand" -#: archaeological_finds/models_finds.py:1526 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "volume-higher" msgstr "volume-plus-grand" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1532 msgctxt "key for text search" msgid "weight-higher" msgstr "poids-plus-grand" -#: archaeological_finds/models_finds.py:1532 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "encombrement-cote-long-plus-grand" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "encombrement-cote-court-plus-grand" -#: archaeological_finds/models_finds.py:1540 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "encombrement-hauteur-plus-grand" -#: archaeological_finds/models_finds.py:1544 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "dimensions-comment" msgstr "commentaire-dimensions" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1551 msgctxt "key for text search" msgid "topographic-localisation" msgstr "localisation-topographique" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1555 msgctxt "key for text search" msgid "check-date-before" msgstr "date-verification-avant" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "check-date-after" msgstr "date-verification-apres" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1561 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "alterations" msgstr "alterations" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1565 #: archaeological_warehouse/models.py:996 msgctxt "key for text search" msgid "alteration-causes" msgstr "causes-alterations" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1569 #: archaeological_warehouse/models.py:1000 msgctxt "key for text search" msgid "treatment-emergency" msgstr "urgence-traitement" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1573 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "valeur-estimee-plus-grand" -#: archaeological_finds/models_finds.py:1574 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "valeur-estimee-plus-petit" -#: archaeological_finds/models_finds.py:1578 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "valeur-assurance-plus-grand" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1585 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "valeur-assurance-plus-petit" -#: archaeological_finds/models_finds.py:1586 +#: archaeological_finds/models_finds.py:1589 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "date-evaluation-avant" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1593 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "date-evaluation-apres" -#: archaeological_finds/models_finds.py:1594 -#: archaeological_operations/models.py:400 +#: archaeological_finds/models_finds.py:1597 +#: archaeological_operations/models.py:428 msgctxt "key for text search" msgid "cultural-attribution" msgstr "attribution-culturelle" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" msgid "functional-area" msgstr "domaine-fonctionnel" -#: archaeological_finds/models_finds.py:1602 archaeological_finds/tests.py:1315 +#: archaeological_finds/models_finds.py:1605 archaeological_finds/tests.py:1317 msgctxt "key for text search" msgid "operation-address" msgstr "operation-adresse" -#: archaeological_finds/models_finds.py:1610 -#: archaeological_operations/models.py:1088 +#: archaeological_finds/models_finds.py:1613 +#: archaeological_operations/models.py:1122 msgctxt "key for text search" msgid "scientist" msgstr "scientifique" -#: archaeological_finds/models_finds.py:1614 archaeological_finds/tests.py:1291 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/tests.py:2856 -#: archaeological_operations/tests.py:3274 +#: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1293 +#: archaeological_operations/models.py:1126 +#: archaeological_operations/tests.py:2855 +#: archaeological_operations/tests.py:3273 msgctxt "key for text search" msgid "operator" msgstr "operateur" -#: archaeological_finds/models_finds.py:1709 -#: archaeological_finds/models_finds.py:2345 +#: archaeological_finds/models_finds.py:1713 +#: archaeological_finds/models_finds.py:2353 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 +#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 #: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -5108,115 +5054,115 @@ msgstr "operateur" msgid "Packaging" msgstr "Conditionnement" -#: archaeological_finds/models_finds.py:1717 +#: archaeological_finds/models_finds.py:1721 msgid "Treatment many to one" msgstr "Traitement de plusieurs à un" -#: archaeological_finds/models_finds.py:1831 +#: archaeological_finds/models_finds.py:1835 msgid "Weight" msgstr "Poids" -#: archaeological_finds/models_finds.py:1833 +#: archaeological_finds/models_finds.py:1837 msgid "Weight unit" msgstr "Unité de poids" -#: archaeological_finds/models_finds.py:1842 -#: archaeological_finds/templates/ishtar/sheet_find.html:414 +#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/templates/ishtar/sheet_find.html:416 msgid "Upstream treatment" msgstr "Traitement amont" -#: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/templates/ishtar/sheet_find.html:452 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/templates/ishtar/sheet_find.html:454 msgid "Downstream treatment" msgstr "Traitement aval" -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1924 msgid "Clutter - long side (cm)" msgstr "Encombrement - grand côté (cm)" -#: archaeological_finds/models_finds.py:1923 +#: archaeological_finds/models_finds.py:1927 msgid "Clutter - short side (cm)" msgstr "Encombrement - petit côté (cm)" -#: archaeological_finds/models_finds.py:1926 +#: archaeological_finds/models_finds.py:1930 msgid "Clutter - height (cm)" msgstr "Encombrement - hauteur (cm)" -#: archaeological_finds/models_finds.py:1947 +#: archaeological_finds/models_finds.py:1951 msgid "Collection" msgstr "Collection" -#: archaeological_finds/models_finds.py:1952 +#: archaeological_finds/models_finds.py:1956 msgid "Do not use - need evolutions" msgstr "Ne pas utiliser - Nécessite des évolutions" -#: archaeological_finds/models_finds.py:2006 +#: archaeological_finds/models_finds.py:2010 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 #: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "Traitements" -#: archaeological_finds/models_finds.py:2009 +#: archaeological_finds/models_finds.py:2013 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:2025 +#: archaeological_finds/models_finds.py:2029 msgid "Cached object types label" msgstr "Nom en cache des types d'objet" -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2035 msgid "Cached material types label" msgstr "Nom en cache des types de matériaux" -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2067 msgid "FIND" msgstr "MOBILIER" -#: archaeological_finds/models_finds.py:2201 +#: archaeological_finds/models_finds.py:2205 msgid "Material types string" msgstr "Chaîne de caractère des types de matériau" -#: archaeological_finds/models_finds.py:2202 +#: archaeological_finds/models_finds.py:2206 msgid "Material types code string" msgstr "Code des types de matériau" -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2207 msgid "Recommendations string from material" msgstr "Chaîne de caractères - recommandations pour le matériau" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2208 msgid "Complete ID of associated base finds" msgstr "Identifiant complet du mobilier d'origine associé" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2209 msgid "Label of associated context records" msgstr "Dénomination des unités d'enregistrement associées" -#: archaeological_finds/models_finds.py:2318 +#: archaeological_finds/models_finds.py:2326 msgid "Add to basket" msgstr "Ajouter au panier" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2334 msgid "Simple treatment" msgstr "Traitement simple" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2342 msgid "Divide treatment" msgstr "Traitement de division" -#: archaeological_finds/models_finds.py:2899 +#: archaeological_finds/models_finds.py:2907 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:2905 +#: archaeological_finds/models_finds.py:2913 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:3342 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 #: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 #: ishtar_common/models.py:2788 ishtar_common/models.py:3117 #: ishtar_common/models.py:3310 ishtar_common/models.py:3547 @@ -5224,11 +5170,11 @@ msgstr "Aucun contenant n'a été défini - la localisation ne peut être défin msgid "Person" msgstr "Personne" -#: archaeological_finds/models_finds.py:3350 +#: archaeological_finds/models_finds.py:3358 msgid "Property" msgstr "Propriété" -#: archaeological_finds/models_finds.py:3351 +#: archaeological_finds/models_finds.py:3359 msgid "Properties" msgstr "Propriétés" @@ -5259,7 +5205,7 @@ msgstr "libelle" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2495 +#: archaeological_operations/models.py:2538 msgctxt "key for text search" msgid "index" msgstr "index" @@ -5305,9 +5251,9 @@ msgid "Downstream finds" msgstr "Mobilier aval" #: archaeological_finds/models_treatments.py:756 -#: 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:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:425 +#: archaeological_finds/templates/ishtar/sheet_find.html:463 msgid "Doer" msgstr "Opérateur" @@ -5356,12 +5302,12 @@ msgid "exhibition-end-after" msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1175 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:493 #: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "Demandes de traitement" -#: archaeological_finds/models_treatments.py:1238 +#: archaeological_finds/models_treatments.py:1242 msgid "Add associated treatment" msgstr "Ajouter un traitement associé" @@ -5436,56 +5382,60 @@ msgstr "" "Cette fiche a un traitement aval associé, elle concerne une vieille version " "de ce mobilier." -#: archaeological_finds/templates/ishtar/sheet_find.html:41 +#: archaeological_finds/templates/ishtar/sheet_find.html:40 msgid "Image / Base find" msgstr "Image / Mobilier d'origine" -#: archaeological_finds/templates/ishtar/sheet_find.html:48 +#: archaeological_finds/templates/ishtar/sheet_find.html:47 msgid "Identification / Description / Dimensions" msgstr "Identification / Description / Dimensions" -#: archaeological_finds/templates/ishtar/sheet_find.html:56 +#: archaeological_finds/templates/ishtar/sheet_find.html:54 msgid "Datings / Preservation" msgstr "Datations / Conservation" -#: archaeological_finds/templates/ishtar/sheet_find.html:65 +#: archaeological_finds/templates/ishtar/sheet_find.html:62 msgid "Warehouse / Treatments" msgstr "Lieu de conservation / Traitements" -#: archaeological_finds/templates/ishtar/sheet_find.html:175 +#: archaeological_finds/templates/ishtar/sheet_find.html:172 msgid "Administrative index" msgstr "Index administratif" -#: archaeological_finds/templates/ishtar/sheet_find.html:221 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 msgid "Checked" msgstr "Vérifié" -#: archaeological_finds/templates/ishtar/sheet_find.html:302 +#: archaeological_finds/templates/ishtar/sheet_find.html:244 +msgid "No datation or preservation info." +msgstr "Pas d'information de datation ou de conservation" + +#: archaeological_finds/templates/ishtar/sheet_find.html:304 msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" -#: archaeological_finds/templates/ishtar/sheet_find.html:332 +#: archaeological_finds/templates/ishtar/sheet_find.html:334 msgid "Reference container / current container" msgstr "Contenant de référence / contenant actuel" -#: archaeological_finds/templates/ishtar/sheet_find.html:376 +#: archaeological_finds/templates/ishtar/sheet_find.html:378 msgid "Simple treatments" msgstr "Traitements simples" -#: archaeological_finds/templates/ishtar/sheet_find.html:380 -#: archaeological_finds/templates/ishtar/sheet_find.html:418 -#: archaeological_finds/templates/ishtar/sheet_find.html:456 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 +#: archaeological_finds/templates/ishtar/sheet_find.html:382 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_finds/templates/ishtar/sheet_find.html:458 +#: archaeological_finds/templates/ishtar/sheet_find.html:497 msgid "Year - index" msgstr "Année - index" -#: archaeological_finds/templates/ishtar/sheet_find.html:384 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +#: archaeological_finds/templates/ishtar/sheet_find.html:424 +#: archaeological_finds/templates/ishtar/sheet_find.html:462 msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats-detail.html:41 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5494,8 +5444,8 @@ msgstr "Mobilier associé (max. 15 affichés)" msgid "Export as CSV" msgstr "Export en CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 +#: archaeological_finds/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5503,7 +5453,7 @@ msgstr "Export en CSV" msgid "CSV" msgstr "CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:529 +#: archaeological_finds/templates/ishtar/sheet_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -5599,23 +5549,23 @@ msgstr "" msgid "Treatment informations:" msgstr "Informations sur le traitement :" -#: archaeological_finds/tests.py:881 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:883 archaeological_warehouse/models.py:1623 msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." -#: archaeological_finds/tests.py:1420 archaeological_finds/tests.py:1446 -#: archaeological_finds/tests.py:1456 archaeological_operations/tests.py:3042 +#: archaeological_finds/tests.py:1422 archaeological_finds/tests.py:1448 +#: archaeological_finds/tests.py:1458 archaeological_operations/tests.py:3041 #: ishtar_common/forms.py:1159 ishtar_common/forms.py:1238 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:18 +#: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:581 ishtar_common/views_item.py:847 #: ishtar_common/views_item.py:884 ishtar_common/wizards.py:483 msgid "Yes" msgstr "Oui" -#: archaeological_finds/tests.py:1421 archaeological_finds/tests.py:1447 -#: archaeological_finds/tests.py:1457 ishtar_common/forms.py:1160 -#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:23 +#: archaeological_finds/tests.py:1423 archaeological_finds/tests.py:1449 +#: archaeological_finds/tests.py:1459 ishtar_common/forms.py:1160 +#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:485 msgid "No" msgstr "Non" @@ -5714,20 +5664,20 @@ msgstr "" "recherche a été épinglée." #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2965 +#: archaeological_operations/models.py:3008 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2967 +#: archaeological_operations/models.py:3010 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2969 -#: archaeological_operations/models.py:2997 -#: archaeological_operations/models.py:3062 +#: archaeological_operations/models.py:3012 +#: archaeological_operations/models.py:3040 +#: archaeological_operations/models.py:3105 msgid "Public domain" msgstr "Domaine public" @@ -5785,13 +5735,13 @@ msgstr "Opération - 001 - Recherche" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:789 -#: archaeological_operations/models.py:1429 +#: archaeological_operations/models.py:1464 msgid "DRASSM code" msgstr "Code DRASSM" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:794 -#: archaeological_operations/models.py:1364 +#: archaeological_operations/models.py:1399 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" @@ -5801,28 +5751,29 @@ msgstr "Est ouvert ?" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:845 -#: archaeological_operations/models.py:2636 +#: archaeological_operations/models.py:2679 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/models.py:1263 +#: archaeological_operations/forms.py:1760 +#: archaeological_operations/models.py:1298 msgid "Operator" msgstr "Opérateur" #: archaeological_operations/forms.py:533 #: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1320 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:278 -#: archaeological_operations/models.py:287 -#: archaeological_operations/models.py:458 -#: archaeological_operations/models.py:912 -#: archaeological_operations/models.py:999 -#: archaeological_operations/models.py:1298 +#: archaeological_operations/forms.py:1297 +#: archaeological_operations/forms.py:1415 +#: archaeological_operations/forms.py:1924 +#: archaeological_operations/models.py:306 +#: archaeological_operations/models.py:315 +#: archaeological_operations/models.py:487 +#: archaeological_operations/models.py:947 +#: archaeological_operations/models.py:1033 +#: archaeological_operations/models.py:1333 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "Vestiges" @@ -5849,34 +5800,34 @@ msgstr "Résumé (recherche en texte intégral)" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:895 -#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:1402 msgid "Comment about scientific documentation" msgstr "Commentaire relatif à la documentation scientifique" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:897 -#: archaeological_operations/models.py:914 -#: archaeological_operations/models.py:1410 +#: archaeological_operations/models.py:949 +#: archaeological_operations/models.py:1445 msgid "Record quality" msgstr "Qualité d'enregistrement" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:863 -#: archaeological_operations/models.py:1319 +#: archaeological_operations/models.py:1354 msgid "Report processing" msgstr "Traitement du rapport" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:816 -#: archaeological_operations/models.py:1401 +#: archaeological_operations/models.py:1436 msgid "Virtual operation" msgstr "Opération virtuelle" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1815 -#: archaeological_operations/models.py:915 -#: archaeological_operations/models.py:1420 +#: archaeological_operations/forms.py:1768 +#: archaeological_operations/models.py:950 +#: archaeological_operations/models.py:1455 msgid "Documentation received" msgstr "Documentation reçue" @@ -5890,9 +5841,9 @@ msgstr "Date limite de versement de la documentation après" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:916 -#: archaeological_operations/models.py:1425 +#: archaeological_operations/forms.py:1772 +#: archaeological_operations/models.py:951 +#: archaeological_operations/models.py:1460 msgid "Finds received" msgstr "Mobilier reçu" @@ -5937,13 +5888,13 @@ msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1867 -#: archaeological_operations/models.py:1363 +#: archaeological_operations/forms.py:1820 +#: archaeological_operations/models.py:1398 msgid "Generic name" msgstr "Nom générique" #: archaeological_operations/forms.py:808 -#: archaeological_operations/models.py:1324 +#: archaeological_operations/models.py:1359 msgid "Old code" msgstr "Ancien code" @@ -5956,16 +5907,16 @@ msgid "Head scientist" msgstr "Responsable d'opération" #: archaeological_operations/forms.py:842 -#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:1396 msgid "Operator reference" msgstr "Référence de l'opérateur" #: archaeological_operations/forms.py:856 -#: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/forms.py:1960 -#: archaeological_operations/models.py:476 -#: archaeological_operations/models.py:1277 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/forms.py:1776 +#: archaeological_operations/forms.py:1913 +#: archaeological_operations/models.py:505 +#: archaeological_operations/models.py:1312 msgid "Collaborators" msgstr "Collaborateurs" @@ -5974,17 +5925,17 @@ msgid "Dates / Administrative" msgstr "Dates / Administratif" #: archaeological_operations/forms.py:861 -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1283 msgid "Report delivery date" msgstr "Date de livraison du rapport" #: archaeological_operations/forms.py:883 -#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:1452 msgid "Deadline for submission of the documentation" msgstr "Date limite de versement de la documentation" #: archaeological_operations/forms.py:888 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1458 msgid "Deadline for submission of the finds" msgstr "Date limite de versement du mobilier" @@ -5993,12 +5944,12 @@ msgid "Scientific" msgstr "Scientifique" #: archaeological_operations/forms.py:900 -#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:888 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:888 msgid "Remain type" msgstr "Type de vestige" #: archaeological_operations/forms.py:906 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1450 msgid "Abstract" msgstr "Résumé" @@ -6027,7 +5978,7 @@ msgid "Bad operation code" msgstr "Mauvais code d'opération" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1856 +#: archaeological_operations/models.py:1898 msgid "Operation code" msgstr "Code de l'opération" @@ -6041,12 +5992,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "Opération - 015 - Saisie judiciaire" #: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1467 msgid "Seizure name" msgstr "Nom de la saisie" #: archaeological_operations/forms.py:1053 -#: archaeological_operations/models.py:1434 +#: archaeological_operations/models.py:1469 msgid "Official report number" msgstr "Numéro de procès-verbal ou de saisine" @@ -6055,12 +6006,12 @@ msgid "Protagonist" msgstr "Protagoniste" #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:1481 msgid "Applicant authority" msgstr "Autorité requérante" #: archaeological_operations/forms.py:1071 -#: archaeological_operations/models.py:1454 +#: archaeological_operations/models.py:1489 msgid "Writer of the minutes" msgstr "Rédacteur du procès verbal" @@ -6073,23 +6024,23 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "Opération - 033 - Préventif - Fouille" #: archaeological_operations/forms.py:1080 -#: archaeological_operations/models.py:1303 +#: archaeological_operations/models.py:1338 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "Coût (euros)" #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:1307 +#: archaeological_operations/models.py:1342 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" #: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:1311 +#: archaeological_operations/models.py:1346 msgid "Optional man-days" msgstr "Jours-hommes optionnels" #: archaeological_operations/forms.py:1085 -#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:1350 msgid "Effective man-days" msgstr "Jours-hommes effectifs" @@ -6102,17 +6053,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "Opération - 037 - Préventif - Diagnostic" #: archaeological_operations/forms.py:1101 -#: archaeological_operations/models.py:1335 +#: archaeological_operations/models.py:1370 msgid "Prescription on zoning" msgstr "Prescription sur zonage" #: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1374 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" #: archaeological_operations/forms.py:1106 -#: archaeological_operations/models.py:1342 +#: archaeological_operations/models.py:1377 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" @@ -6133,10 +6084,10 @@ msgid "Operation - 050 - Parcels (2)" msgstr "Opération - 050 - Parcelles (2)" #: archaeological_operations/forms.py:1195 -#: archaeological_operations/forms.py:1314 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1919 -#: archaeological_operations/models.py:453 +#: archaeological_operations/forms.py:1291 +#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1872 +#: archaeological_operations/models.py:482 #: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 #: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 @@ -6145,130 +6096,130 @@ msgid "Reference" msgstr "Référence" #: archaeological_operations/forms.py:1206 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1966 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/forms.py:1919 msgid "Cultural attributions" msgstr "Attributions culturelles" -#: archaeological_operations/forms.py:1251 -#: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1228 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1892 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1271 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: archaeological_operations/forms.py:1299 +#: archaeological_operations/forms.py:1276 msgid "Would you like to delete this operation?" msgstr "Voulez-vous supprimer cette opération ?" -#: archaeological_operations/forms.py:1308 +#: archaeological_operations/forms.py:1285 msgid "Archaeological site - 001 - Search" msgstr "Site archéologique - 001 - Recherche" -#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1305 msgid "Top operation" msgstr "Opération chapeau" -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/models.py:468 +#: archaeological_operations/forms.py:1317 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:497 msgid "National Geographic Institute locality" msgstr "Lieu-dit IGN" -#: archaeological_operations/forms.py:1343 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/models.py:471 +#: archaeological_operations/forms.py:1320 +#: archaeological_operations/forms.py:1430 +#: archaeological_operations/models.py:500 msgid "Cadastral locality" msgstr "Lieu-dit cadastre" -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:488 +#: archaeological_operations/forms.py:1324 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/models.py:517 msgid "AffMar number" msgstr "Numéro AffMar" -#: archaeological_operations/forms.py:1349 -#: archaeological_operations/forms.py:1523 -#: archaeological_operations/models.py:491 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1476 +#: archaeological_operations/models.py:520 msgid "DRASSM number" msgstr "Numéro DRASSM" -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1525 -#: archaeological_operations/models.py:480 +#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1478 +#: archaeological_operations/models.py:509 msgid "Shipwreck name" msgstr "Nom de l'épave" -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1533 -#: archaeological_operations/models.py:482 +#: archaeological_operations/forms.py:1331 +#: archaeological_operations/forms.py:1486 +#: archaeological_operations/models.py:511 msgid "Oceanographic service localisation" msgstr "Localisation SHOM" -#: archaeological_operations/forms.py:1357 -#: archaeological_operations/forms.py:1527 -#: archaeological_operations/models.py:484 +#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1480 +#: archaeological_operations/models.py:513 msgid "Shipwreck code" msgstr "Code épave" -#: archaeological_operations/forms.py:1359 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:485 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1482 +#: archaeological_operations/models.py:514 msgid "Sinking date" msgstr "Date de naufrage" -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1531 -#: archaeological_operations/models.py:486 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1484 +#: archaeological_operations/models.py:515 msgid "Discovery area" msgstr "Zone de découverte" -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1398 msgid "Archaeological site - 010 - General" msgstr "Site archéologique - 010 - Général" -#: archaeological_operations/forms.py:1507 +#: archaeological_operations/forms.py:1460 msgid "Archaeological site - 020 - Towns" msgstr "Site archéologique - 020 - Villes" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1469 #: archaeological_operations/templates/ishtar/sheet_site.html:54 msgid "Underwater" msgstr "Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1470 msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1596 +#: archaeological_operations/forms.py:1549 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1611 -#: archaeological_operations/forms.py:1713 -#: archaeological_operations/forms.py:1780 +#: archaeological_operations/forms.py:1564 +#: archaeological_operations/forms.py:1666 +#: archaeological_operations/forms.py:1733 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1621 -#: archaeological_operations/models.py:2661 +#: archaeological_operations/forms.py:1574 +#: archaeological_operations/models.py:2704 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1628 -#: archaeological_operations/models.py:2696 +#: archaeological_operations/forms.py:1581 +#: archaeological_operations/models.py:2739 msgid "Signature date" msgstr "Date de signature" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1592 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1673 +#: archaeological_operations/forms.py:1626 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -6277,48 +6228,48 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1630 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1690 +#: archaeological_operations/forms.py:1643 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1648 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "Patron" -#: archaeological_operations/forms.py:1719 -#: archaeological_operations/forms.py:1723 +#: archaeological_operations/forms.py:1672 +#: archaeological_operations/forms.py:1676 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:1694 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1696 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1738 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1894 +#: archaeological_operations/forms.py:1847 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:1950 +#: archaeological_operations/forms.py:1903 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -6326,317 +6277,317 @@ msgstr "Dossiers - Action rapide - Modification" msgid "Administrative Act" msgstr "Acte administratif" -#: archaeological_operations/models.py:93 +#: archaeological_operations/models.py:94 msgid "Remain types" msgstr "Types de vestige" -#: archaeological_operations/models.py:107 +#: archaeological_operations/models.py:108 msgid "Parent period" msgstr "Période parente" -#: archaeological_operations/models.py:114 +#: archaeological_operations/models.py:115 msgid "Type Period" msgstr "Type de période" -#: archaeological_operations/models.py:115 +#: archaeological_operations/models.py:116 msgid "Types Period" msgstr "Types de période" -#: archaeological_operations/models.py:130 +#: archaeological_operations/models.py:131 msgid "Type of report state" msgstr "Type d'état de rapport" -#: archaeological_operations/models.py:131 +#: archaeological_operations/models.py:132 msgid "Types of report state" msgstr "Types d'état de rapport" -#: archaeological_operations/models.py:148 +#: archaeological_operations/models.py:149 msgid "Type of record quality" msgstr "Type de qualité d'enregistrement" -#: archaeological_operations/models.py:149 +#: archaeological_operations/models.py:150 msgid "Types of record quality" msgstr "Types de qualité d'enregistrement" -#: archaeological_operations/models.py:157 +#: archaeological_operations/models.py:158 msgid "Cultural attribution type" msgstr "Type d'attribution culturelle" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:159 msgid "Cultural attribution types" msgstr "Types d'attribution culturelle" -#: archaeological_operations/models.py:346 -#: archaeological_operations/models.py:1096 -#: archaeological_operations/tests.py:3033 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1130 +#: archaeological_operations/tests.py:3032 msgctxt "key for text search" msgid "remain" msgstr "vestige" -#: archaeological_operations/models.py:358 +#: archaeological_operations/models.py:386 msgctxt "key for text search" msgid "locality-ngi" msgstr "lieu-dit-ign" -#: archaeological_operations/models.py:361 +#: archaeological_operations/models.py:389 msgctxt "key for text search" msgid "locality-cadastral" msgstr "lieu-dit-cadastre" -#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:393 msgctxt "key for text search" msgid "shipwreck-name" msgstr "nom-epave" -#: archaeological_operations/models.py:369 +#: archaeological_operations/models.py:397 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "localisation-shom" -#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:401 msgctxt "key for text search" msgid "shipwreck-code" msgstr "code-epave" -#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:405 msgctxt "key for text search" msgid "sinking-date" msgstr "date-naufrage" -#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:408 msgctxt "key for text search" msgid "discovery-area" msgstr "zone-decouverte" -#: archaeological_operations/models.py:388 +#: archaeological_operations/models.py:416 msgctxt "key for text search" msgid "top-operation" msgstr "operation-chapeau" -#: archaeological_operations/models.py:392 +#: archaeological_operations/models.py:420 msgctxt "key for text search" msgid "numero-drassm" msgstr "numero-drassm" -#: archaeological_operations/models.py:396 +#: archaeological_operations/models.py:424 msgctxt "key for text search" msgid "numero-affmar" msgstr "numero-affmar" -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:542 +#: archaeological_operations/models.py:1496 msgid "Cached town label" msgstr "Nom en cache des communes" -#: archaeological_operations/models.py:525 -#: archaeological_operations/models.py:1473 +#: archaeological_operations/models.py:554 +#: archaeological_operations/models.py:1508 msgid "Cached remains label" msgstr "Nom en cache des vestiges" -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1390 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1425 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "Entités archéologiques" -#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:580 msgid "SITE" msgstr "SITE" -#: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 +#: archaeological_operations/models.py:771 ishtar_common/forms.py:1158 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 #: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "Inconnu" -#: archaeological_operations/models.py:741 +#: archaeological_operations/models.py:773 msgid "Virtual operation of site: {}" msgstr "Opération virtuelle du site : {}" -#: archaeological_operations/models.py:977 +#: archaeological_operations/models.py:1012 msgid "Associated file (label)" msgstr "Dossier associé (nom)" -#: archaeological_operations/models.py:978 +#: archaeological_operations/models.py:1013 msgid "Operator name" msgstr "Nom de l'opérateur" -#: archaeological_operations/models.py:979 -msgid "Scientist (full name)" -msgstr "Responsable d'opération (nom complet)" - -#: archaeological_operations/models.py:980 +#: archaeological_operations/models.py:1014 msgid "Associated file (external ID)" msgstr "Dossier associé (identifiant)" -#: archaeological_operations/models.py:981 +#: archaeological_operations/models.py:1015 msgid "Scientist (title)" msgstr "Responsable d'opération (titre)" -#: archaeological_operations/models.py:982 +#: archaeological_operations/models.py:1016 msgid "Scientist (surname)" msgstr "Responsable d'opération (nom)" -#: archaeological_operations/models.py:983 +#: archaeological_operations/models.py:1017 msgid "Scientist (name)" msgstr "Scientifique (nom)" -#: archaeological_operations/models.py:985 +#: archaeological_operations/models.py:1018 +msgid "Scientist (full name)" +msgstr "Responsable d'opération (nom complet)" + +#: archaeological_operations/models.py:1019 msgid "Scientist - Organization (name)" msgstr "Scientifique - Organisation (nom)" -#: archaeological_operations/models.py:986 +#: archaeological_operations/models.py:1020 msgid "Scientific monitor (title)" msgstr "Responsable de suivi scientifique (titre)" -#: archaeological_operations/models.py:987 +#: archaeological_operations/models.py:1021 msgid "Scientific monitor (surname)" msgstr "Responsable de suivi scientifique (prénom)" -#: archaeological_operations/models.py:988 +#: archaeological_operations/models.py:1022 msgid "Scientific monitor (name)" msgstr "Responsable de suivi scientifique (nom)" -#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1023 msgid "Scientific monitor - Organization (name)" msgstr "Responsable de suivi scientifique - Organisation (nom)" -#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1028 msgid "Archaeological sites (reference)" msgstr "Entités archéologiques (référence)" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1108 msgctxt "key for text search" msgid "address" msgstr "adresse" -#: archaeological_operations/models.py:1081 -#: archaeological_operations/tests.py:3040 +#: archaeological_operations/models.py:1115 +#: archaeological_operations/tests.py:3039 msgctxt "key for text search" msgid "is-open" msgstr "est-ouvert" -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1118 msgctxt "key for text search" msgid "scientific-monitor" msgstr "reponsable-suivi-scientifique" -#: archaeological_operations/models.py:1102 +#: archaeological_operations/models.py:1136 msgctxt "key for text search" msgid "start-before" msgstr "commence-avant" -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:1139 msgctxt "key for text search" msgid "start-after" msgstr "commence-apres" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1142 msgctxt "key for text search" msgid "end-before" msgstr "fini-avant" -#: archaeological_operations/models.py:1112 +#: archaeological_operations/models.py:1146 msgctxt "key for text search" msgid "end-after" msgstr "fini-apres" -#: archaeological_operations/models.py:1116 -#: archaeological_operations/tests.py:3083 +#: archaeological_operations/models.py:1150 +#: archaeological_operations/tests.py:3082 msgctxt "key for text search" msgid "relation-types" msgstr "type-relation" -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "abstract" msgstr "resume" -#: archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:1159 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "commentaire-documentation-scientifique" -#: archaeological_operations/models.py:1129 +#: archaeological_operations/models.py:1163 msgctxt "key for text search" msgid "record-quality" msgstr "qualite-enregistrement" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "report-processing" msgstr "traitement-rapport" -#: archaeological_operations/models.py:1137 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "virtual-operation" msgstr "operation-virtuelle" -#: archaeological_operations/models.py:1145 +#: archaeological_operations/models.py:1179 msgctxt "key for text search" msgid "documentation-received" msgstr "documentation-recue" -#: archaeological_operations/models.py:1149 +#: archaeological_operations/models.py:1183 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "documentation-date-limite-avant" -#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "documentation-date-limite-après" -#: archaeological_operations/models.py:1157 +#: archaeological_operations/models.py:1191 msgctxt "key for text search" msgid "finds-received" msgstr "mobilier-recu" -#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "mobilier-date-limite-avant" -#: archaeological_operations/models.py:1168 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "mobilier-date-limite-apres" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "code-drassm" msgstr "code-drassm" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "dossier" -#: archaeological_operations/models.py:1254 +#: archaeological_operations/models.py:1289 msgid "Scientific manager" msgstr "Responsable de suivi scientifique" -#: archaeological_operations/models.py:1270 +#: archaeological_operations/models.py:1305 msgid "Operation monitor" msgstr "Responsable de suivi scientifique" -#: archaeological_operations/models.py:1396 +#: archaeological_operations/models.py:1431 msgid "Sites for which this operation is top operation" msgstr "Sites pour lesquels cette opération est une opération chapeau" -#: archaeological_operations/models.py:1404 +#: archaeological_operations/models.py:1439 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" "Si coché, cela signifie que cette opération n'a pas été officiellement " "enregistrée." -#: archaeological_operations/models.py:1438 +#: archaeological_operations/models.py:1473 msgid "Name of the protagonist" msgstr "Nom du protagoniste" -#: archaeological_operations/models.py:1483 +#: archaeological_operations/models.py:1518 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1001 ishtar_common/views.py:1002 @@ -6644,295 +6595,295 @@ msgstr "Nom du protagoniste" msgid "Operations" msgstr "Opérations" -#: archaeological_operations/models.py:1520 +#: archaeological_operations/models.py:1558 msgid "List of associated context records" msgstr "Liste des unités d'enregistrement associées" -#: archaeological_operations/models.py:1521 +#: archaeological_operations/models.py:1559 msgid "List of associated containers" msgstr "Liste des contenants associés" -#: archaeological_operations/models.py:1594 +#: archaeological_operations/models.py:1632 msgid "OPE" msgstr "OPE" -#: archaeological_operations/models.py:1703 +#: archaeological_operations/models.py:1741 msgid "Intercommunal" msgstr "Intercommunal" -#: archaeological_operations/models.py:1822 +#: archaeological_operations/models.py:1864 msgid "context record" msgstr "UE" -#: archaeological_operations/models.py:1841 +#: archaeological_operations/models.py:1883 msgid "Code patriarche" msgstr "Code patriarche" -#: archaeological_operations/models.py:1889 +#: archaeological_operations/models.py:1931 msgid "This operation code already exists for this year" msgstr "Ce code d'opération existe déjà pour cette année" -#: archaeological_operations/models.py:1950 +#: archaeological_operations/models.py:1992 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: archaeological_operations/models.py:1960 +#: archaeological_operations/models.py:2002 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: archaeological_operations/models.py:1968 +#: archaeological_operations/models.py:2010 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: archaeological_operations/models.py:1976 +#: archaeological_operations/models.py:2018 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: archaeological_operations/models.py:2030 +#: archaeological_operations/models.py:2072 #: archaeological_warehouse/templates/ishtar/sheet_container.html:103 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 msgid "Number of finds" msgstr "Nombre de mobiliers possédés" -#: archaeological_operations/models.py:2092 -#: archaeological_operations/models.py:2171 +#: archaeological_operations/models.py:2134 +#: archaeological_operations/models.py:2213 msgid "No type" msgstr "Pas de type" -#: archaeological_operations/models.py:2136 +#: archaeological_operations/models.py:2178 msgid "Number of sources" msgstr "Nombre de documents" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2223 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:309 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:575 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "Moyenne" -#: archaeological_operations/models.py:2266 ishtar_common/models_imports.py:889 +#: archaeological_operations/models.py:2309 ishtar_common/models_imports.py:889 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2310 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: archaeological_operations/models.py:2292 +#: archaeological_operations/models.py:2335 msgid "Operation record relation" msgstr "Relation entre opérations" -#: archaeological_operations/models.py:2293 +#: archaeological_operations/models.py:2336 msgid "Operation record relations" msgstr "Relations entre opérations" -#: archaeological_operations/models.py:2359 +#: archaeological_operations/models.py:2402 msgid "Intended to" msgstr "Destiné à" -#: archaeological_operations/models.py:2364 +#: archaeological_operations/models.py:2407 msgid "Associated template" msgstr "Patron associé" -#: archaeological_operations/models.py:2367 +#: archaeological_operations/models.py:2410 msgid "Indexed" msgstr "Indexé" -#: archaeological_operations/models.py:2371 +#: archaeological_operations/models.py:2414 msgid "Act types" msgstr "Types d'acte" -#: archaeological_operations/models.py:2497 +#: archaeological_operations/models.py:2540 msgctxt "key for text search" msgid "other-ref" msgstr "autre-ref" -#: archaeological_operations/models.py:2507 +#: archaeological_operations/models.py:2550 msgctxt "key for text search" msgid "indexed" msgstr "indexe" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2553 #: archaeological_warehouse/models.py:923 msgctxt "key for text search" msgid "operation-town" msgstr "operation-commune" -#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2557 msgctxt "key for text search" msgid "file-town" msgstr "dossier-commune" -#: archaeological_operations/models.py:2526 +#: archaeological_operations/models.py:2569 msgctxt "key for text search" msgid "operation-department" msgstr "operation-departement" -#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2573 msgctxt "key for text search" msgid "file-department" msgstr "dossier-departement" -#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2577 msgctxt "key for text search" msgid "object" msgstr "objet" -#: archaeological_operations/models.py:2537 +#: archaeological_operations/models.py:2580 msgctxt "key for text search" msgid "signature-before" msgstr "signature-avant" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2584 msgctxt "key for text search" msgid "signature-after" msgstr "signature-apres" -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2588 msgctxt "key for text search" msgid "file-name" msgstr "dossier-nom" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2600 msgctxt "key for text search" msgid "file-reference" msgstr "dossier-reference" -#: archaeological_operations/models.py:2561 +#: archaeological_operations/models.py:2604 msgctxt "key for text search" msgid "file-year" msgstr "dossier-annee" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2607 msgctxt "key for text search" msgid "file-other-reference" msgstr "dossier-autre-reference" -#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2611 msgctxt "key for text search" msgid "file-in-charge" msgstr "dossier-responsable" -#: archaeological_operations/models.py:2572 +#: archaeological_operations/models.py:2615 msgctxt "key for text search" msgid "file-permit-reference" msgstr "dossier-ref-permis" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2619 msgctxt "key for text search" msgid "treatment-name" msgstr "traitement-nom" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2623 msgctxt "key for text search" msgid "treatment-reference" msgstr "traitement-reference" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2627 msgctxt "key for text search" msgid "treatment-year" msgstr "traitement-annee" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2630 msgctxt "key for text search" msgid "treatment-index" msgstr "traitement-index" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "treatment-type" msgstr "traitement-type" -#: archaeological_operations/models.py:2594 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-file-name" msgstr "dossier-traitement-nom" -#: archaeological_operations/models.py:2598 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "dossier-traitement-reference" -#: archaeological_operations/models.py:2602 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-file-year" msgstr "dossier-traitement-annee" -#: archaeological_operations/models.py:2606 +#: archaeological_operations/models.py:2649 msgctxt "key for text search" msgid "treatment-file-index" msgstr "dossier-traitement-index" -#: archaeological_operations/models.py:2610 +#: archaeological_operations/models.py:2653 msgctxt "key for text search" msgid "treatment-file-type" msgstr "dossier-traitement-type" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2687 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2749 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:2755 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:2886 +#: archaeological_operations/models.py:2929 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:2976 +#: archaeological_operations/models.py:3019 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3266 ishtar_common/models.py:3421 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3238 +#: archaeological_operations/models.py:3281 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3282 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3287 +#: archaeological_operations/models.py:3330 msgid "Recorded" msgstr "Enregistré" -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3332 msgid "Active" msgstr "Actif" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3333 msgid "Field completed" msgstr "Terrain achevé" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3334 msgid "Associated report" msgstr "Rapport associé" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3335 msgid "Closed" msgstr "Clos" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3336 msgid "Documented and closed" msgstr "Documenté et clos" -#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3835 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3795 +#: archaeological_operations/models.py:3838 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3839 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -7203,17 +7154,17 @@ msgstr "Mobilier par Unités d'Enregistrement" msgid "This act is indexed!" msgstr "Cet acte est indexé !" -#: archaeological_operations/tests.py:824 +#: archaeological_operations/tests.py:821 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "De nouveaux objets vont être créés." -#: archaeological_operations/tests.py:854 +#: archaeological_operations/tests.py:851 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "Cette ligne a déjà été importée." -#: archaeological_operations/tests.py:892 +#: archaeological_operations/tests.py:889 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" @@ -7221,31 +7172,31 @@ msgstr "" "Le(s) erreur(s) suivante(s) ont été rencontrées lors de l'analyse du fichier " "source :" -#: archaeological_operations/tests.py:1803 -msgid "" -"This parcel is associated with a context record. It can't be deleted." +#: archaeological_operations/tests.py:1802 +#: archaeological_operations/views.py:474 +msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" "Cette parcelle est associée à une unité d'enregistrement. Elle ne peut être " "supprimée." -#: archaeological_operations/tests.py:2530 ishtar_common/forms.py:442 +#: archaeological_operations/tests.py:2529 ishtar_common/forms.py:442 msgid "This item is locked for edition." msgstr "Cet élément est verrouillé pour l'édition." -#: archaeological_operations/tests.py:2543 +#: archaeological_operations/tests.py:2542 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "Cet élément a été verrouillé. L'édition est désactivée." -#: archaeological_operations/tests.py:4696 +#: archaeological_operations/tests.py:4578 msgid "is not a valid JSON message" msgstr "n'est pas un message JSON valide" -#: archaeological_operations/tests.py:4704 +#: archaeological_operations/tests.py:4586 msgid "{result['created']} matches created" msgstr "{result['created']} correspondances créées" -#: archaeological_operations/tests.py:4717 +#: archaeological_operations/tests.py:4599 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " @@ -7254,7 +7205,7 @@ msgstr "" "Ces modèles de recherche n'ont pas été touvées : {missing_search_models}. " "Pas la même version d'Ishtar ?" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 +#: archaeological_operations/tests.py:4606 ishtar_common/admin.py:2274 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " @@ -7263,15 +7214,15 @@ msgstr "" "Ces types n'ont pas été touvés : {missing_types}. Pas la même version " "d'Ishtar ?" -#: archaeological_operations/tests.py:4730 +#: archaeological_operations/tests.py:4612 msgid "{result['deleted']} matches deleted" msgstr "{result['deleted']} correspondances supprimées" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 +#: archaeological_operations/tests.py:4685 ishtar_common/admin.py:2352 msgid "{result['updated']} match key(s) updated." msgstr "{result['updated']} clé(s) de correspondance mises à jour." -#: archaeological_operations/tests.py:4809 ishtar_common/models_rest.py:307 +#: archaeological_operations/tests.py:4691 ishtar_common/models_rest.py:307 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." @@ -7279,7 +7230,7 @@ msgstr "" "{ctype} - {distant_key}, {distant_label} non référécé dans la base de " "données." -#: archaeological_operations/tests.py:4816 ishtar_common/models_rest.py:286 +#: archaeological_operations/tests.py:4698 ishtar_common/models_rest.py:286 #: ishtar_common/models_rest.py:292 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -7305,12 +7256,6 @@ msgstr "Clôturer une opération" msgid "Operation deletion" msgstr "Supprimer une opération" -#: archaeological_operations/views.py:474 -msgid "This parcel is associated with a context record. It can't be deleted." -msgstr "" -"Cette parcelle est associée à une unité d'enregistrement. Elle ne peut être " -"supprimée." - #: archaeological_operations/views.py:575 ishtar_common/models.py:1009 msgid "Site deletion" msgstr "Supprimer un site" @@ -7344,7 +7289,7 @@ msgstr "" "oubli, définissez-le à la première étape." #: archaeological_warehouse/forms.py:84 archaeological_warehouse/forms.py:192 -#: archaeological_warehouse/forms.py:508 archaeological_warehouse/forms.py:729 +#: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 @@ -7385,7 +7330,7 @@ msgid "Warehouse - 001 - Search" msgstr "Lieu de conservation - 001 - Recherche" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:260 +#: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 #: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:901 msgid "Warehouse type" msgstr "Type de lieu de conservation" @@ -7416,61 +7361,61 @@ msgstr "" "conservation, les champs suivants sont utilisés pour cette organisation." #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 -#: ishtar_common/models_common.py:3006 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:3188 msgid "Address complement" msgstr "Complément d'adresse" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3035 msgid "Town (freeform)" msgstr "Commune (saisie libre)" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3043 msgid "Country" msgstr "Pays" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 -#: ishtar_common/models_common.py:3018 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3057 +#: ishtar_common/models_common.py:3200 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "Téléphone" #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3073 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "Téléphone mobile" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:266 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:301 archaeological_warehouse/forms.py:302 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:306 msgid "Context record - Quick action -Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:324 msgid "Container - 010 - General" msgstr "Contenant - 010 - Général" -#: archaeological_warehouse/forms.py:341 archaeological_warehouse/forms.py:512 +#: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 #: archaeological_warehouse/models.py:1132 msgid "Old reference" msgstr "Ancienne référence" -#: archaeological_warehouse/forms.py:343 archaeological_warehouse/forms.py:510 -#: archaeological_warehouse/forms.py:734 archaeological_warehouse/models.py:698 +#: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 +#: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 #: archaeological_warehouse/models.py:859 #: archaeological_warehouse/models.py:1098 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 @@ -7478,124 +7423,124 @@ msgstr "Ancienne référence" msgid "Container type" msgstr "Type de contenant" -#: archaeological_warehouse/forms.py:345 +#: archaeological_warehouse/forms.py:339 msgid "Current location (warehouse)" msgstr "Lieu de conservation actuel" -#: archaeological_warehouse/forms.py:354 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 #: archaeological_warehouse/models.py:1115 msgid "Parent container" msgstr "Contenant parent" -#: archaeological_warehouse/forms.py:364 archaeological_warehouse/forms.py:745 +#: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 #: archaeological_warehouse/models.py:1089 msgid "Responsibility" msgstr "Responsabilité" -#: archaeological_warehouse/forms.py:372 +#: archaeological_warehouse/forms.py:366 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:377 +#: archaeological_warehouse/forms.py:371 #: archaeological_warehouse/models.py:1122 msgid "Measured weight (g)" msgstr "Poids mesuré (g)" -#: archaeological_warehouse/forms.py:403 +#: archaeological_warehouse/forms.py:397 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:422 +#: archaeological_warehouse/forms.py:416 msgid "This reference already exists for this warehouse." msgstr "Cette référence existe déjà pour ce lieu de conservation." -#: archaeological_warehouse/forms.py:430 archaeological_warehouse/forms.py:807 +#: archaeological_warehouse/forms.py:424 archaeological_warehouse/forms.py:801 msgid "A container cannot be a parent of himself." msgstr "Un contenant ne peut être associé à lui-même." -#: archaeological_warehouse/forms.py:494 +#: archaeological_warehouse/forms.py:488 msgid "This ID already exists for this warehouse." msgstr "Cet identifiant existe déjà pour ce lieu de conservation." -#: archaeological_warehouse/forms.py:501 +#: archaeological_warehouse/forms.py:495 msgid "Container - 001 - Search" msgstr "Contenant - 001 - Recherche" -#: archaeological_warehouse/forms.py:509 +#: archaeological_warehouse/forms.py:503 msgid "Warehouse (responsibility)" msgstr "Lieu de conservation (responsabilité)" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:508 msgid "Contain containers" msgstr "Contient des contenants" -#: archaeological_warehouse/forms.py:517 +#: archaeological_warehouse/forms.py:511 msgid "Is stationary" msgstr "Est immobile" -#: archaeological_warehouse/forms.py:552 +#: archaeological_warehouse/forms.py:546 msgid "Operation - Code PATRIARCHE" msgstr "Opération - Code PATRIARCHE" -#: archaeological_warehouse/forms.py:554 +#: archaeological_warehouse/forms.py:548 msgid "Operation - town" msgstr "Opération - Commune" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:553 msgid "Operation - Scientist" msgstr "Opération - Responsable d'opération" -#: archaeological_warehouse/forms.py:568 +#: archaeological_warehouse/forms.py:562 msgid "Find - Label" msgstr "Mobilier - ID libre" -#: archaeological_warehouse/forms.py:569 +#: archaeological_warehouse/forms.py:563 msgid "Find - Denomination" msgstr "Mobilier - Dénomination" -#: archaeological_warehouse/forms.py:570 +#: archaeological_warehouse/forms.py:564 msgid "Find - Description" msgstr "Mobilier - Description" -#: archaeological_warehouse/forms.py:589 +#: archaeological_warehouse/forms.py:583 msgid "Preservation type" msgstr "Type de conservation" -#: archaeological_warehouse/forms.py:613 archaeological_warehouse/forms.py:626 -#: archaeological_warehouse/forms.py:640 archaeological_warehouse/views.py:373 +#: archaeological_warehouse/forms.py:607 archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:634 archaeological_warehouse/views.py:373 msgid "Container search" msgstr "Rechercher un contenant" -#: archaeological_warehouse/forms.py:618 archaeological_warehouse/forms.py:631 -#: archaeological_warehouse/forms.py:645 +#: archaeological_warehouse/forms.py:612 archaeological_warehouse/forms.py:625 +#: archaeological_warehouse/forms.py:639 msgid "You should select a container." msgstr "Vous devez sélectionner un contenant." -#: archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:614 msgid "Add a new container" msgstr "Ajouter un nouveau contenant" -#: archaeological_warehouse/forms.py:665 +#: archaeological_warehouse/forms.py:659 msgid "Container to merge" msgstr "Contenant à fusionner" -#: archaeological_warehouse/forms.py:693 +#: archaeological_warehouse/forms.py:687 msgid "Packager" msgstr "Personne assurant le conditionnement" -#: archaeological_warehouse/forms.py:705 +#: archaeological_warehouse/forms.py:699 msgid "Packaged finds" msgstr "Mobilier conditionné" -#: archaeological_warehouse/forms.py:709 archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:703 archaeological_warehouse/forms.py:704 msgid "Would you like to delete this container?" msgstr "Voulez-vous supprimer ce contenant ?" -#: archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:709 msgid "Container - Quick action - Modify" msgstr "Contenant - Action rapide - Modification" -#: archaeological_warehouse/forms.py:828 +#: archaeological_warehouse/forms.py:822 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -7979,7 +7924,7 @@ msgstr "" "corriger cela." #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:36 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:44 msgid "Associated finds" msgstr "Mobilier associé" @@ -8082,93 +8027,93 @@ msgstr "Nouvel auteur" msgid "Related item" msgstr "Élément associé" -#: ishtar_common/admin.py:107 +#: ishtar_common/admin.py:106 msgid "CSV file" msgstr "Fichier CSV" -#: ishtar_common/admin.py:108 +#: ishtar_common/admin.py:107 msgid "Only unicode encoding is managed - convert your file first" msgstr "Seul l'unicode est géré - convertissez votre fichier d'abord" -#: ishtar_common/admin.py:148 +#: ishtar_common/admin.py:147 msgid "Export selected as CSV file" msgstr "Exporter la sélection en fichier CSV" -#: ishtar_common/admin.py:212 +#: ishtar_common/admin.py:211 msgid "Export selected as GeoJSON file" msgstr "Exporter la sélection en fichier GeoJSON" -#: ishtar_common/admin.py:295 +#: ishtar_common/admin.py:294 msgid "Export selected as Ishtar (zipped JSON)" msgstr "Exporter la sélection au format Ishtar (JSON zippé)" -#: ishtar_common/admin.py:301 +#: ishtar_common/admin.py:300 msgid "Merge inside" msgstr "Fusionner dans" -#: ishtar_common/admin.py:317 +#: ishtar_common/admin.py:316 msgid "Merge selected items" msgstr "Fusionner les éléments sélectionnés" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 +#: ishtar_common/admin.py:333 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "Au moins deux éléments doivent être sélectionnés." -#: ishtar_common/admin.py:359 +#: ishtar_common/admin.py:358 msgid "{} merged into {}." msgstr "{} fusionnés en {}." -#: ishtar_common/admin.py:382 +#: ishtar_common/admin.py:381 #: ishtar_common/templates/admin/change_parent.html:14 msgid "Change parent" msgstr "Modifier le parent" -#: ishtar_common/admin.py:396 +#: ishtar_common/admin.py:395 msgid "Change parent of selected item(s)" msgstr "Modifier le parent des éléments sélectionnés" -#: ishtar_common/admin.py:428 +#: ishtar_common/admin.py:427 msgid "{} parent(s) were changed to {}." msgstr "{} parent(s) a/ont été changé(s) en {}." -#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:489 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "Cartes - centre par défaut" -#: ishtar_common/admin.py:541 ishtar_common/models.py:979 +#: ishtar_common/admin.py:540 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "Profil" -#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/admin.py:541 ishtar_common/forms_common.py:1229 #: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 #: ishtar_common/models.py:2898 msgid "Profiles" msgstr "Profils" -#: ishtar_common/admin.py:637 +#: ishtar_common/admin.py:636 msgid "The CSV file should at least have a {} column" msgstr "Le fichier CSV doit avoir au minimum une colonne {}" -#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 +#: ishtar_common/admin.py:703 ishtar_common/admin.py:933 #, python-format msgid "%d item(s) created." msgstr "%d élément(s) créés." -#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 +#: ishtar_common/admin.py:705 ishtar_common/admin.py:937 #, python-format msgid "%d item(s) updated." msgstr "%d élément(s) mis à jour." -#: ishtar_common/admin.py:710 +#: ishtar_common/admin.py:709 msgid "These parents are missing: {}" msgstr "Ces parents sont manquants : {}" -#: ishtar_common/admin.py:730 +#: ishtar_common/admin.py:729 msgid "Geojson file" msgstr "Fichier GeoJSON" -#: ishtar_common/admin.py:732 +#: ishtar_common/admin.py:731 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." @@ -8176,257 +8121,257 @@ msgstr "" "Seul l'unicode est géré - convertissez votre fichier d'abord. Le fichier " "doit être un fichier GeoJSON ou une archive ZIP contenant un fichier GeoJSON." -#: ishtar_common/admin.py:738 +#: ishtar_common/admin.py:737 msgid "Prefix for numero INSEE" msgstr "Préfixe pour le numéro INSEE" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:740 msgid "Field name for numero INSEE" msgstr "Nom du champ pour le numéro INSEE" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:743 msgid "Field name for name" msgstr "Nom du champ pour le nom" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "m2" msgstr "m2" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "km2" msgstr "km2" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:746 msgid "Surface unit" msgstr "Unité de surface" -#: ishtar_common/admin.py:749 +#: ishtar_common/admin.py:748 msgid "Field name for surface" msgstr "Nom du champ pour la surface" -#: ishtar_common/admin.py:752 +#: ishtar_common/admin.py:751 msgid "Field name for year" msgstr "Nom du champ pour l'année" -#: ishtar_common/admin.py:756 +#: ishtar_common/admin.py:755 msgid "Not required for new town. Leave it empty when not available." msgstr "" "Non requis pour les nouvelles communes. À laisser vide quand cela n'est pas " "disponible." -#: ishtar_common/admin.py:759 +#: ishtar_common/admin.py:758 msgid "Update only geometry of existing towns" msgstr "Mettre à jour seulement la géométrie pour les communes existantes" -#: ishtar_common/admin.py:778 +#: ishtar_common/admin.py:777 msgid "\"{}\" not found in feature {}" msgstr "\"{}\" non trouvé sur l'entité {}" -#: ishtar_common/admin.py:791 +#: ishtar_common/admin.py:790 msgid "\"{}\" not found in properties of feature {}" msgstr "\"{}\" non trouvé dans les propriétés de l'entité {}" -#: ishtar_common/admin.py:804 +#: ishtar_common/admin.py:803 msgid "Bad geometry for feature {}" msgstr "Mauvaise géométrie pour l'entité {}" -#: ishtar_common/admin.py:815 +#: ishtar_common/admin.py:814 msgid "Geometry {} not managed for towns - feature {}" msgstr "Géométrie {} non gérée pour les communes - entité {}" -#: ishtar_common/admin.py:825 +#: ishtar_common/admin.py:824 msgid "Bad value for surface: {} - feature {}" msgstr "Mauvaise valeur pour la surface : {} - entité {}" -#: ishtar_common/admin.py:869 +#: ishtar_common/admin.py:868 msgid "No json file found in zipfile" msgstr "Pas de fichier JSON trouvé dans le fichier ZIP" -#: ishtar_common/admin.py:892 +#: ishtar_common/admin.py:891 msgid "Bad geojson file" msgstr "Mauvais fichier GeoJSON" -#: ishtar_common/admin.py:904 +#: ishtar_common/admin.py:903 msgid "Too many errors..." msgstr "Trop d'erreurs..." -#: ishtar_common/admin.py:957 +#: ishtar_common/admin.py:956 msgid "Zipped JSON file" msgstr "Fichier JSON zippé" -#: ishtar_common/admin.py:958 +#: ishtar_common/admin.py:957 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "Import depuis un fichier JSON zippé généré par Ishtar" -#: ishtar_common/admin.py:994 +#: ishtar_common/admin.py:993 msgid "{} {}(s) created/updated." msgstr "{} {}(s) crées/mis à jour." -#: ishtar_common/admin.py:1017 +#: ishtar_common/admin.py:1016 msgid "Center" msgstr "Centre" -#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 +#: ishtar_common/admin.py:1017 ishtar_common/models_common.py:2798 msgid "Limit" msgstr "Limite" -#: ishtar_common/admin.py:1026 +#: ishtar_common/admin.py:1025 msgid "Parents" msgstr "Parents" -#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 +#: ishtar_common/admin.py:1066 ishtar_common/admin.py:1507 msgid "Make available" msgstr "Rendre disponible" -#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make unavailable" msgstr "Rendre indisponible" -#: ishtar_common/admin.py:1192 +#: ishtar_common/admin.py:1191 msgid "Department number" msgstr "Numéro de département" -#: ishtar_common/admin.py:1193 +#: ishtar_common/admin.py:1192 msgid "Area name" msgstr "Nom de zone" -#: ishtar_common/admin.py:1207 +#: ishtar_common/admin.py:1206 msgid "Choose an area or set an area reference." msgstr "Choisissez une zone ou définissez une zone de référence." -#: ishtar_common/admin.py:1214 +#: ishtar_common/admin.py:1213 msgid "Invalid department number." msgstr "Numéro de département non valide." -#: ishtar_common/admin.py:1223 +#: ishtar_common/admin.py:1222 msgid "This name is already used by another area." msgstr "Ce nom est déjà utilisé par une autre zone." -#: ishtar_common/admin.py:1251 +#: ishtar_common/admin.py:1250 msgid "Area \"{}\" created." msgstr "Zone \"{}\" créée." -#: ishtar_common/admin.py:1268 +#: ishtar_common/admin.py:1267 msgid "{} town(s) added to \"{}\"." msgstr "{} commune(s) ajoutée(s) à \"{}\"." -#: ishtar_common/admin.py:1440 +#: ishtar_common/admin.py:1439 msgid "{} importer type(s) duplicated: {}." msgstr "{} type(s) d''importeur dupliqué(s) : {}." -#: ishtar_common/admin.py:1461 +#: ishtar_common/admin.py:1460 msgid "Select only one importer." msgstr "Sélectionner seulement un importeur." -#: ishtar_common/admin.py:1491 +#: ishtar_common/admin.py:1490 msgid "Export as libreoffice template" msgstr "Exporter comme un patron libreoffice" -#: ishtar_common/admin.py:1560 +#: ishtar_common/admin.py:1559 msgid "{} importer column(s) duplicated: {}." msgstr "{} colonne(s) dupliquée(s) : {}." -#: ishtar_common/admin.py:1591 +#: ishtar_common/admin.py:1590 msgid "{} importer column(s) right-shifted." msgstr "{} colonne(s) décalée(s) à droite." -#: ishtar_common/admin.py:1604 +#: ishtar_common/admin.py:1603 msgid "Shift right" msgstr "Décaler à droite" -#: ishtar_common/admin.py:1631 +#: ishtar_common/admin.py:1630 msgid "{} importer column(s) left-shifted." msgstr "{} colonne(s) décalée(s) à gauche." -#: ishtar_common/admin.py:1638 +#: ishtar_common/admin.py:1637 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" "{} colonne(s) n''ont pas été décalée(s) à gauche : pas de place disponible." -#: ishtar_common/admin.py:1652 +#: ishtar_common/admin.py:1651 msgid "Shift left" msgstr "Décaler à gauche" -#: ishtar_common/admin.py:1687 +#: ishtar_common/admin.py:1686 msgid "Importer available" msgstr "Importeur disponible" -#: ishtar_common/admin.py:1832 +#: ishtar_common/admin.py:1831 msgid "Display selected" msgstr "Afficher les éléments sélectionnés" -#: ishtar_common/admin.py:1833 +#: ishtar_common/admin.py:1832 msgid "Hide selected" msgstr "Cacher les éléments sélectionnés" -#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1862 ishtar_common/models.py:1553 msgid "Form" msgstr "Formulaire" -#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1883 ishtar_common/models.py:1694 msgid "Field" msgstr "Champ" -#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 +#: ishtar_common/admin.py:2013 ishtar_common/admin.py:2065 msgid "Select only one task." msgstr "Sélectionner seulement une seule tâche." -#: ishtar_common/admin.py:2021 +#: ishtar_common/admin.py:2020 msgid "Export already exported/scheduled." msgstr "Export déjà réalisé/planifié." -#: ishtar_common/admin.py:2033 +#: ishtar_common/admin.py:2032 msgid "Launch export" msgstr "Lancer l'export" -#: ishtar_common/admin.py:2073 +#: ishtar_common/admin.py:2072 msgid "Import already imported/scheduled." msgstr "Import déjà réalisé/planifié." -#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2084 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "Lancer l'import" -#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2152 ishtar_common/models.py:976 msgid "Content type" msgstr "Type de contenu" -#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 -#: ishtar_common/admin.py:2333 +#: ishtar_common/admin.py:2185 ishtar_common/admin.py:2295 +#: ishtar_common/admin.py:2331 msgid "Select only one source." msgstr "Sélectionner une seule source." -#: ishtar_common/admin.py:2208 +#: ishtar_common/admin.py:2206 msgid "Timeout: failed to join {}." msgstr "Temps expiré : échec pour joindre {}" -#: ishtar_common/admin.py:2216 +#: ishtar_common/admin.py:2214 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" "Mauvaise réponse pour {} - {}. Code de réponse {} != 200. Vérifiez votre " "clé ?" -#: ishtar_common/admin.py:2226 +#: ishtar_common/admin.py:2224 msgid "Response of {} is not a valid JSON message." msgstr "La réponse de {} n'est pas un message JSON valide." -#: ishtar_common/admin.py:2244 +#: ishtar_common/admin.py:2242 #, python-brace-format msgid "{created} matches created" msgstr "{created} correspondances créées" -#: ishtar_common/admin.py:2250 +#: ishtar_common/admin.py:2248 #, python-brace-format msgid "{updated} matches updated" msgstr "{updated} correspondances mises à jour" -#: ishtar_common/admin.py:2256 +#: ishtar_common/admin.py:2254 #, python-brace-format msgid "{deleted} matches deleted" msgstr "{deleted} correspondances supprimés" -#: ishtar_common/admin.py:2265 +#: ishtar_common/admin.py:2263 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " @@ -8435,42 +8380,42 @@ msgstr "" "Ces modèles de recherche n'ont pas été trouvés : {missing_models}. Pas la " "même version d'Ishtar ?" -#: ishtar_common/admin.py:2283 +#: ishtar_common/admin.py:2281 msgid "Update types from source" msgstr "Mettre à jour les types depuis la source" -#: ishtar_common/admin.py:2318 +#: ishtar_common/admin.py:2316 msgid "Generate match document" msgstr "Générer le document de correspondance" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2340 msgid "Error on update. Cannot open match document." msgstr "" "Erreur lors de la mise à jour. Le document de correspondance ne peut être " "ouvert." -#: ishtar_common/admin.py:2347 +#: ishtar_common/admin.py:2345 msgid "Error on type update from match document:" msgstr "" "Erreur lors de la mise à jour des types depuis le document de correspondance." -#: ishtar_common/admin.py:2360 +#: ishtar_common/admin.py:2358 msgid "Update association from match document" msgstr "Mettre à jour les associations depuis un document de correspondance" -#: ishtar_common/admin.py:2393 +#: ishtar_common/admin.py:2391 msgid "Enable match" msgstr "Activer la correspondance" -#: ishtar_common/admin.py:2394 +#: ishtar_common/admin.py:2392 msgid "Disable match" msgstr "Désactiver la correspondance" -#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2402 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "API - Accès distant - Modèle de recherche" -#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/admin.py:2405 ishtar_common/models.py:449 #: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 @@ -8481,15 +8426,15 @@ msgstr "API - Accès distant - Modèle de recherche" msgid "Key" msgstr "Clé" -#: ishtar_common/admin.py:2409 +#: ishtar_common/admin.py:2407 msgid "Save first to choose a key" msgstr "Enregistrer d'abord pour choisir une clé" -#: ishtar_common/admin.py:2439 +#: ishtar_common/admin.py:2437 msgid "Available keys: " msgstr "Clés disponibles : " -#: ishtar_common/admin.py:2472 +#: ishtar_common/admin.py:2470 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." @@ -8497,7 +8442,7 @@ msgstr "" "Seul un type de données géographique est accepté. Créez différents objets si " "vous en avez plusieurs." -#: ishtar_common/admin.py:2480 +#: ishtar_common/admin.py:2478 msgid "You cannot set only x or only y coordinate." msgstr "Vous ne pouvez pas seulement renseigner une coordonnée x ou y." @@ -8533,60 +8478,60 @@ msgstr "Ishtar - Lieu de conservation" msgid "Ishtar - Common" msgstr "Ishtar - Commun" -#: ishtar_common/data_importer.py:278 +#: ishtar_common/data_importer.py:279 #, 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:297 +#: ishtar_common/data_importer.py:298 #, 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:309 +#: ishtar_common/data_importer.py:310 #, python-format msgid "\"%(value)s\" is not a float" msgstr "\"%(value)s\" n'est pas un nombre à virgule" -#: ishtar_common/data_importer.py:319 +#: ishtar_common/data_importer.py:320 #, 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:375 ishtar_common/data_importer.py:388 -#: ishtar_common/data_importer.py:678 +#: ishtar_common/data_importer.py:376 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:679 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "\"%(value)s\" n'est pas une date valide" -#: ishtar_common/data_importer.py:401 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "\"%(value)s\" n'est pas un entier" -#: ishtar_common/data_importer.py:470 ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:471 ishtar_common/data_importer.py:764 #, 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:477 +#: ishtar_common/data_importer.py:478 #, 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:479 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "%d. Aucun de ceux-là - passer" -#: ishtar_common/data_importer.py:707 +#: ishtar_common/data_importer.py:708 #, 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:846 +#: ishtar_common/data_importer.py:847 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 " @@ -8596,29 +8541,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:852 +#: ishtar_common/data_importer.py:853 #, 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:854 ishtar_common/views.py:1619 +#: ishtar_common/data_importer.py:855 ishtar_common/views.py:1619 msgid "No data provided" msgstr "Aucune donnée fournie" -#: ishtar_common/data_importer.py:855 +#: ishtar_common/data_importer.py:856 msgid "Value is required" msgstr "Valeur requise" -#: ishtar_common/data_importer.py:856 +#: ishtar_common/data_importer.py:857 #, python-format msgid "At least %d columns must be filled" msgstr "Au moins %d colonnes doivent être remplies" -#: ishtar_common/data_importer.py:857 +#: ishtar_common/data_importer.py:858 msgid "The regexp doesn't match." msgstr "L'expression régulière ne fonctionne pas." -#: ishtar_common/data_importer.py:859 +#: ishtar_common/data_importer.py:860 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." @@ -8626,7 +8571,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:863 +#: ishtar_common/data_importer.py:864 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." @@ -8634,85 +8579,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:867 +#: ishtar_common/data_importer.py:868 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:1551 ishtar_common/views.py:1697 +#: ishtar_common/data_importer.py:1554 ishtar_common/views.py:1697 #: ishtar_common/views.py:1707 msgid "Not imported" msgstr "Non importé" -#: ishtar_common/data_importer.py:1842 +#: ishtar_common/data_importer.py:1845 msgid "Importer configuration error: \"{}\"." msgstr "Erreur de configuration de l'importeur : \"{}\"." -#: ishtar_common/data_importer.py:1847 +#: ishtar_common/data_importer.py:1850 msgid "Import error: {} - \"{}\"." msgstr "Erreur d'import : {} - \"{}\"." -#: ishtar_common/data_importer.py:1929 +#: ishtar_common/data_importer.py:1932 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:2056 +#: ishtar_common/data_importer.py:2059 msgid "* created *" msgstr "* créé *" -#: ishtar_common/data_importer.py:2131 +#: ishtar_common/data_importer.py:2134 msgid "* match not find *" msgstr "* correspondance non trouvée *" -#: ishtar_common/data_importer.py:2139 +#: ishtar_common/data_importer.py:2142 msgid "* the query match more than 10 results*" msgstr "* la requête correspond à plus de 10 résultats *" -#: ishtar_common/data_importer.py:2144 +#: ishtar_common/data_importer.py:2147 msgid " or " msgstr " ou " -#: ishtar_common/data_importer.py:2229 +#: ishtar_common/data_importer.py:2232 msgid "unicity key(s) \"{}\" is/are missing" msgstr "clé(s) d'unicité \"{}\" manquante(s)" -#: ishtar_common/data_importer.py:2232 +#: ishtar_common/data_importer.py:2235 msgid "Import error {}, {}" msgstr "Erreur d'import {}, {}" -#: ishtar_common/data_importer.py:2312 +#: ishtar_common/data_importer.py:2315 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "Erreur d'import {}, chemin \"{}\", contexte : {}, erreur : {}" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "line" msgstr "ligne" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "col" msgstr "colonne" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "error" msgstr "erreur" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "field" msgstr "champ" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "source" msgstr "source" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "result" msgstr "résultat" -#: ishtar_common/data_importer.py:2363 +#: ishtar_common/data_importer.py:2366 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -8786,6 +8731,26 @@ msgstr " - remplacer" msgid "Set to null" msgstr "Mettre à la valeur null" +#: ishtar_common/forms.py:1298 +msgid "Geo - Name" +msgstr "Géo - Nom" + +#: ishtar_common/forms.py:1299 +msgid "Geo - Data type" +msgstr "Géo - Type de données" + +#: ishtar_common/forms.py:1300 +msgid "Geo - Origin" +msgstr "Géo - Type d'origine" + +#: ishtar_common/forms.py:1301 +msgid "Geo - Provider" +msgstr "Géo - Fournisseur" + +#: ishtar_common/forms.py:1302 +msgid "Geo - Comment" +msgstr "Géo - Commentaire" + #: ishtar_common/forms_common.py:86 msgid "" "<p>Type name, department code of the town you would like to select. The " @@ -8830,7 +8795,7 @@ msgstr "" "Vous devez soit déposer un fichier soit renseigner un lien pour les images " "mais pas les deux." -#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2542 msgid "\"Associated images\" field must be a valid zip file." msgstr "Le champ « images associées » doit être un fichier zip valide." @@ -8908,8 +8873,8 @@ msgstr "Peut être utilisé par les patrons" #: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 #: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 -#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 -#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3075 +#: ishtar_common/models_common.py:3210 ishtar_common/wizards.py:1933 msgid "Email" msgstr "Courriel" @@ -8981,12 +8946,12 @@ msgstr "Formule d'appel" msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3059 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 -#: ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3062 +#: ishtar_common/models_common.py:3065 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -8994,11 +8959,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3069 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3067 msgid "Phone 3" msgstr "Téléphone 3" @@ -9006,23 +8971,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3044 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3046 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3049 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3052 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3055 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -9031,7 +8996,7 @@ msgid "Already has an account" msgstr "A déjà un compte" #: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 -#: ishtar_common/wizards.py:1930 +#: ishtar_common/wizards.py:1932 msgid "Username" msgstr "Nom d'utilisateur" @@ -9051,7 +9016,7 @@ msgid "Account" msgstr "Compte" #: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 -#: ishtar_common/wizards.py:1966 +#: ishtar_common/wizards.py:1968 msgid "New password" msgstr "Nouveau mot de passe" @@ -9221,6 +9186,7 @@ msgstr "ISBN" #: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 #: ishtar_common/models.py:5185 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "Source" @@ -9472,16 +9438,19 @@ msgstr "" #: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "Type de donnée" #: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "Origine" #: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "Fournisseur" @@ -9494,6 +9463,21 @@ msgstr "Tampon" msgid "Buffer type" msgstr "Type de tampon" +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:3706 +msgid "Estimated error for X" +msgstr "Erreur estimée pour X" + +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:3709 +msgid "Estimated error for Y" +msgstr "Erreur estimée pour Y" + +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2185 +#: ishtar_common/models_common.py:3712 +msgid "Estimated error for Z" +msgstr "Erreur estimée pour Z" + #: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "Méta-donnée" @@ -9502,44 +9486,48 @@ msgstr "Méta-donnée" msgid "Geography" msgstr "Géographie" -#: ishtar_common/forms_common.py:2859 +#: ishtar_common/forms_common.py:2855 msgid "If you set a buffer set a buffer type." msgstr "Si vous definissez un tampon, designez son type." -#: ishtar_common/forms_common.py:2864 +#: ishtar_common/forms_common.py:2860 msgid "If you set a buffer type set a buffer." msgstr "Si vous definissez un type de tampon, definissez un tampon." -#: ishtar_common/forms_common.py:2869 +#: ishtar_common/forms_common.py:2865 msgid "A value is expected for Z." msgstr "Une valeur est attendue pour Z." -#: ishtar_common/forms_common.py:2888 +#: ishtar_common/forms_common.py:2884 msgid "A geo item has to be attached at least to one item" msgstr "Un élément géographique doit être rattaché à au moins un élément" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:2924 msgid "Geometry type" msgstr "Type de géométrie" -#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 -#: ishtar_common/models_common.py:3539 +#: ishtar_common/forms_common.py:2926 +msgid "Coordinates" +msgstr "Coordonnées" + +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3721 msgid "Point" msgstr "Point" -#: ishtar_common/forms_common.py:2931 +#: ishtar_common/forms_common.py:2928 msgid "Point 3D" msgstr "Point 3D" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:2929 msgid "Multi-points" msgstr "Points multiples" -#: ishtar_common/forms_common.py:2933 +#: ishtar_common/forms_common.py:2930 msgid "Multi-lines" msgstr "Lignes multiples" -#: ishtar_common/forms_common.py:2934 +#: ishtar_common/forms_common.py:2931 msgid "Multi-polygons" msgstr "Polygones multi-parties" @@ -10578,6 +10566,11 @@ msgstr "Erreur : le type planning_service est manquant" msgid "Error: general_contractor type is missing" msgstr "Erreur : le type general_contractor est manquant" +#: ishtar_common/models.py:2465 +msgctxt "key for text search" +msgid "precise-town" +msgstr "commune-precis" + #: ishtar_common/models.py:2503 msgid "Organizations" msgstr "Organisations" @@ -11000,7 +10993,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "depot" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3430 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" @@ -11417,11 +11410,23 @@ msgstr "Par exemple : contour, Z-supérieur, ..." msgid "Data provider" msgstr "Fournisseur de données" +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:3702 +msgid "X" +msgstr "X/Long" + #: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 #: ishtar_common/models_common.py:2172 msgid "User input" msgstr "Saisie utilisateur" +#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3703 +msgid "Y" +msgstr "Y/Lat" + +#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3704 +msgid "Z" +msgstr "Z" + #: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "X (cache)" @@ -11434,7 +11439,11 @@ msgstr "Y (cache)" msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:3716 +msgid "Spatial Reference System" +msgstr "Système de référence spatiale" + +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3722 msgid "Point (2D)" msgstr "Point (2D)" @@ -11458,103 +11467,136 @@ msgstr "Polygones multi-parties" msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2274 +#: ishtar_common/models_common.py:2284 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:2647 +#: ishtar_common/models_common.py:2702 +msgctxt "key for text search" +msgid "geo-name" +msgstr "geo-nom" + +#: ishtar_common/models_common.py:2705 +msgctxt "key for text search" +msgid "geo-type" +msgstr "geo-type" + +#: ishtar_common/models_common.py:2708 +msgctxt "key for text search" +msgid "geo-origin" +msgstr "geo-origine" + +#: ishtar_common/models_common.py:2711 +msgctxt "key for text search" +msgid "geo-provider" +msgstr "geo-fournisseur" + +#: ishtar_common/models_common.py:2714 +msgctxt "key for text search" +msgid "geo-comment" +msgstr "geo-commentaire" + +#: ishtar_common/models_common.py:2736 +msgid "Add geographic item" +msgstr "Ajouter élément géographique" + +#: ishtar_common/models_common.py:2738 +msgid "geo." +msgstr "géo." + +#: ishtar_common/models_common.py:2808 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:2651 +#: ishtar_common/models_common.py:2812 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" "Remplir ce champ est nécessaire pour distinguer les anciennes communes des " "nouvelles communes." -#: ishtar_common/models_common.py:2655 +#: ishtar_common/models_common.py:2816 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:2856 +#: ishtar_common/models_common.py:3038 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:2889 +#: ishtar_common/models_common.py:3071 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:2895 +#: ishtar_common/models_common.py:3077 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:3114 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:3013 +#: ishtar_common/models_common.py:3195 msgid "Postal code - Town" msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:3023 +#: ishtar_common/models_common.py:3205 msgid "Mobile" msgstr "Mobile" -#: ishtar_common/models_common.py:3041 +#: ishtar_common/models_common.py:3223 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:3252 +#: ishtar_common/models_common.py:3434 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:3256 +#: ishtar_common/models_common.py:3438 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:3332 +#: ishtar_common/models_common.py:3514 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:3334 +#: ishtar_common/models_common.py:3516 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:3542 +#: ishtar_common/models_common.py:3724 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3727 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3729 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:3549 +#: ishtar_common/models_common.py:3731 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:3556 +#: ishtar_common/models_common.py:3738 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" -#: ishtar_common/models_common.py:4107 +#: ishtar_common/models_common.py:4254 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:4109 +#: ishtar_common/models_common.py:4256 msgid "regen." msgstr "regén." @@ -11962,8 +12004,8 @@ msgid "" "Number of header lines in your file (can be 0 and should be 0 for geopackage " "or Shapefile)." 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)." +"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:1174 msgid "Error file" @@ -12058,10 +12100,12 @@ msgid "Unarchive" msgstr "Désarchiver" #: ishtar_common/models_imports.py:1374 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "Modifier" #: ishtar_common/models_imports.py:1375 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 @@ -12070,7 +12114,7 @@ msgid "Delete" msgstr "Supprimer" #: ishtar_common/models_imports.py:1469 ishtar_common/models_imports.py:1472 -#: ishtar_common/models_imports.py:1531 +#: ishtar_common/models_imports.py:1534 msgid "Invalid GIS file." msgstr "Fichier SIG invalide." @@ -12083,27 +12127,27 @@ msgstr "Géométrie \"{geometry}\" non gérée." msgid "CRS not managed." msgstr "CRS non géré." -#: ishtar_common/models_imports.py:1528 +#: ishtar_common/models_imports.py:1531 msgid "Error reading feature {idx + 1} - {e}" msgstr "Erreur en lisant l'entité geographique {idx + 1} - {e}" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1570 msgid "Modification check {} added to the queue" msgstr "Vérification des changements {} ajoutée à la file d'attente" -#: ishtar_common/models_imports.py:1635 +#: ishtar_common/models_imports.py:1638 msgid "Import {} added to the queue" msgstr "Import {} ajouté à la file d'attente" -#: ishtar_common/models_imports.py:1666 +#: ishtar_common/models_imports.py:1669 msgid "Error on imported file: {}" msgstr "Erreur sur le fichier d'import : {}" -#: ishtar_common/models_imports.py:1702 +#: ishtar_common/models_imports.py:1705 msgid "Import {} finished with errors" msgstr "Import {} fini avec des erreurs" -#: ishtar_common/models_imports.py:1710 +#: ishtar_common/models_imports.py:1713 msgid "Import {} finished with no errors" msgstr "Import {} fini avec aucune erreur" @@ -12780,11 +12824,11 @@ msgstr "Principal" msgid "Geometry" msgstr "Géométrie" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:39 msgid "geo item" msgstr "élément géographique" -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:35 msgid "Associated context records" msgstr "Unités d'enregistrement associées" @@ -12951,6 +12995,44 @@ msgstr "" msgid "Are you sure you want to delete: " msgstr "Êtes-vous sûr de vouloir supprimer : " +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:11 +msgid "Are you sure to want to delete this geographic item?" +msgstr "Êtes vous sûr de vouloir supprimer cet élément géographique ?" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:12 +msgid "No rollback is possible." +msgstr "Aucun annulation n'est possible." + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:43 +msgid "Geographic item for these towns" +msgstr "Élément géographique pour ces communes" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:52 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:97 +msgid "Geographic item for these operations" +msgstr "Élément géographique pour ces opérations" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:61 +msgid "Geographic item for these sites" +msgstr "Élément géographique pour ces sites" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:70 +msgid "Geographic item for these context records" +msgstr "Élément géographique pour ces unités d'enregistrement" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:79 +msgid "Geographic item for these base finds" +msgstr "Élément géographique pour ces mobiliers d'origine" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:88 +msgid "Geographic item for these containers" +msgstr "Élément géographique pour ces contenants" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:111 +#: ishtar_common/templates/ishtar/import_delete.html:45 +msgid "Are you sure to want to delete this import?" +msgstr "Êtes vous sûr de vouloir supprimer cet import ?" + #: ishtar_common/templates/ishtar/forms/geo_form.html:7 msgid "" "Many items are attached to this geographic item. Only the ten first of each " @@ -13071,13 +13153,9 @@ msgid "" "No rollback is possible. Be careful to scroll to the end of page to check " "every piece of information." msgstr "" -"Aucun retour arrière n'est possible. Faite bien attention à descendre " +"Aucune annulation n'est possible. Faite bien attention à descendre " "jusqu'en bas de la page pour vérifier toutes les informations." -#: ishtar_common/templates/ishtar/import_delete.html:45 -msgid "Are you sure to want to delete this import?" -msgstr "Êtes vous sûr de vouloir supprimer cet import ?" - #: ishtar_common/templates/ishtar/import_list.html:10 msgid "Autorefresh the table (useful when waiting for an import result)" msgstr "" @@ -13746,19 +13824,19 @@ msgid "You don't have sufficient permissions to do this action." msgstr "" "Vous n'avez pas les permissions suffisantes pour effectuer cette action." -#: ishtar_common/utils.py:612 +#: ishtar_common/utils.py:614 msgid " (...)" msgstr " (...)" -#: ishtar_common/utils.py:690 +#: ishtar_common/utils.py:692 msgid "Information" msgstr "Information" -#: ishtar_common/utils.py:691 +#: ishtar_common/utils.py:693 msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: ishtar_common/utils.py:1710 +#: ishtar_common/utils.py:1520 msgid "The maximum supported file size is {} Mo." msgstr "La taille maximale supportée pour le fichier est de {} Mo." @@ -13912,18 +13990,23 @@ msgstr "Action non disponible pour ces éléments." msgid "lock/unlock" msgstr "verrouiller/déverrouiller" -#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2862 msgid "Geo item creation" msgstr "Élément géographique création" -#: ishtar_common/views.py:2803 +#: ishtar_common/views.py:2813 ishtar_common/views.py:2910 msgid "Geo item modification" msgstr "Élément géographique modification" -#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 +#: ishtar_common/views.py:2851 ishtar_common/views.py:2899 +#: ishtar_common/views.py:2948 msgid "Main geo item for" msgstr "Élément géo. principal pour" +#: ishtar_common/views.py:2961 +msgid "Delete geographic item" +msgstr "Supprimer des données géographiques" + #: ishtar_common/views_item.py:185 #, python-format msgid "New %s" @@ -13972,19 +14055,19 @@ msgstr "Erreur de permission : vous ne pouvez pas faire cette action." msgid "Deleted" msgstr "Supprimé" -#: ishtar_common/wizards.py:1061 +#: ishtar_common/wizards.py:1063 msgid "{} modified." msgstr "{} modifié(s)." -#: ishtar_common/wizards.py:1063 +#: ishtar_common/wizards.py:1065 msgid "{} created." msgstr "{} créé(s)." -#: ishtar_common/wizards.py:1841 +#: ishtar_common/wizards.py:1843 msgid "{} deleted." msgstr "{} supprimé(e)(s)." -#: ishtar_common/wizards.py:2090 +#: ishtar_common/wizards.py:2092 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création/modification du compte" @@ -14005,6 +14088,12 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "" +#~ "This parcel is associated with a context record. It can't be deleted." +#~ msgstr "" +#~ "Cette parcelle est associée à une unité d'enregistrement. Elle ne peut " +#~ "être supprimée." + #~ msgid "Tel: " #~ msgstr "Tél : " diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 1d9afe7be..83ae3e026 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-29 11:29+0200\n" +"POT-Creation-Date: 2022-11-10 11:43+0100\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" @@ -20,23 +20,23 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:527 -#: archaeological_context_records/models.py:721 +#: archaeological_context_records/models.py:531 +#: archaeological_context_records/models.py:728 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1139 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:2420 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1311 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1482 -#: archaeological_operations/models.py:2336 -#: archaeological_operations/models.py:2354 -#: archaeological_operations/models.py:2470 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2958 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:2379 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2513 +#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:3001 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 @@ -87,15 +87,15 @@ msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 #: archaeological_files/forms.py:883 archaeological_files/forms.py:919 -#: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 +#: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 #: archaeological_finds/forms_treatments.py:683 #: archaeological_finds/forms_treatments.py:926 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1312 -#: archaeological_operations/forms.py:1547 -#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 +#: archaeological_operations/forms.py:1289 +#: archaeological_operations/forms.py:1500 +#: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:499 #: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 #: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" @@ -103,16 +103,16 @@ msgstr "" #: archaeological_context_records/forms.py:145 #: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:576 -#: archaeological_context_records/forms.py:630 -#: archaeological_context_records/models.py:733 -#: archaeological_context_records/models.py:1414 -#: archaeological_warehouse/forms.py:454 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/forms.py:604 +#: archaeological_context_records/models.py:740 +#: archaeological_context_records/models.py:1427 +#: archaeological_warehouse/forms.py:448 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 +#: archaeological_finds/forms.py:1354 archaeological_operations/forms.py:1815 msgid "Code PATRIARCHE" msgstr "" @@ -126,44 +126,44 @@ msgid "Operation - year" msgstr "" #: archaeological_context_records/forms.py:154 -#: archaeological_finds/forms.py:1379 +#: archaeological_finds/forms.py:1351 msgid "Operation's number (index by year)" msgstr "" #: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:737 -#: archaeological_context_records/models.py:727 +#: archaeological_context_records/forms.py:711 +#: archaeological_context_records/models.py:734 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1444 +#: archaeological_finds/forms.py:1416 msgid "Search within related operations" msgstr "" #: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:728 +#: archaeological_context_records/forms.py:702 msgid "Unit type" msgstr "" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:288 -#: archaeological_context_records/forms.py:578 -#: archaeological_context_records/forms.py:631 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:517 -#: archaeological_context_records/models.py:705 -#: archaeological_context_records/models.py:1416 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/forms.py:605 +#: archaeological_context_records/models.py:520 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:712 +#: archaeological_context_records/models.py:1429 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:89 archaeological_files/forms.py:932 -#: archaeological_finds/models_finds.py:1097 +#: archaeological_finds/models_finds.py:1100 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/models.py:2982 -#: archaeological_operations/models.py:3229 +#: archaeological_operations/forms.py:1514 +#: archaeological_operations/models.py:3025 +#: archaeological_operations/models.py:3272 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -180,8 +180,8 @@ msgstr "" #: archaeological_context_records/forms.py:173 #: archaeological_context_records/forms.py:308 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:815 +#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:820 msgid "Excavation technique" msgstr "" @@ -197,8 +197,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:58 #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1616 +#: archaeological_operations/forms.py:1397 +#: archaeological_operations/forms.py:1569 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -212,56 +212,56 @@ msgid "Context record - 020 - General" msgstr "" #: archaeological_context_records/forms.py:289 -#: archaeological_context_records/forms.py:568 -#: archaeological_context_records/forms.py:632 -#: archaeological_context_records/forms.py:730 -#: archaeological_context_records/models.py:513 -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:713 -#: archaeological_finds/models_finds.py:1094 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:606 +#: archaeological_context_records/forms.py:704 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:720 +#: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2963 +#: archaeological_operations/models.py:3006 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 -#: ishtar_common/models_common.py:3517 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2824 +#: ishtar_common/models_common.py:3700 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" #: archaeological_context_records/forms.py:294 -#: archaeological_context_records/forms.py:573 +#: archaeological_context_records/forms.py:547 msgid "Only the items associated to the operation can be selected." msgstr "" #: archaeological_context_records/forms.py:299 -#: archaeological_context_records/forms.py:579 -#: archaeological_context_records/forms.py:634 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:526 -#: archaeological_context_records/models.py:758 -#: archaeological_context_records/models.py:1415 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:608 +#: archaeological_context_records/models.py:522 +#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:1428 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:301 -#: archaeological_context_records/models.py:734 -#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:1430 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:295 archaeological_finds/forms.py:297 -#: archaeological_finds/forms.py:648 archaeological_finds/forms.py:650 -#: archaeological_finds/forms.py:818 archaeological_finds/forms.py:864 -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:620 archaeological_finds/forms.py:622 +#: archaeological_finds/forms.py:790 archaeological_finds/forms.py:836 +#: archaeological_finds/forms.py:1430 #: archaeological_finds/forms_treatments.py:193 -#: archaeological_finds/models_finds.py:409 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:411 +#: archaeological_finds/models_finds.py:1814 #: archaeological_finds/models_treatments.py:255 -#: archaeological_finds/templates/ishtar/sheet_find.html:180 +#: archaeological_finds/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 #: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 @@ -270,59 +270,59 @@ msgid "Description" msgstr "" #: archaeological_context_records/forms.py:303 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/models.py:771 msgid "Filling" msgstr "" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:735 +#: archaeological_context_records/models.py:742 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:313 +#: archaeological_context_records/forms.py:316 #: archaeological_files/forms.py:298 archaeological_files/forms.py:595 #: archaeological_files/models.py:629 archaeological_files_pdl/forms.py:143 #: archaeological_operations/forms.py:812 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:319 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/forms.py:322 +#: archaeological_context_records/models.py:745 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:739 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:746 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:321 -#: archaeological_context_records/models.py:740 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:747 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:748 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:323 -#: archaeological_context_records/models.py:742 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:749 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:325 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:751 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:736 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:743 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:737 +#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/models.py:744 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/models.py:592 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -333,108 +333,49 @@ msgstr "" #: archaeological_finds/forms_treatments.py:879 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1242 +#: archaeological_operations/models.py:1277 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:992 ishtar_common/forms.py:993 msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:334 +#: archaeological_context_records/forms.py:337 #: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:748 +#: archaeological_context_records/forms.py:343 +#: archaeological_context_records/models.py:755 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 -#: archaeological_warehouse/forms.py:737 +#: archaeological_warehouse/forms.py:731 #: archaeological_warehouse/templates/ishtar/sheet_container.html:81 msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:346 -#: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 -msgid "Coordinates" -msgstr "" - -#: archaeological_context_records/forms.py:347 -#: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 -#: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3520 -msgid "X" -msgstr "" - -#: archaeological_context_records/forms.py:349 -#: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 -#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 -msgid "Estimated error for X" -msgstr "" - -#: archaeological_context_records/forms.py:351 -#: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3521 -msgid "Y" -msgstr "" - -#: archaeological_context_records/forms.py:353 -#: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 -#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 -msgid "Estimated error for Y" -msgstr "" - -#: archaeological_context_records/forms.py:355 -#: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:3522 -msgid "Z" -msgstr "" - -#: archaeological_context_records/forms.py:357 -#: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 -msgid "Estimated error for Z" -msgstr "" - -#: archaeological_context_records/forms.py:360 -#: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 -#: ishtar_common/models_common.py:3534 -msgid "Spatial Reference System" -msgstr "" - -#: archaeological_context_records/forms.py:453 +#: archaeological_context_records/forms.py:427 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:432 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:463 -#: archaeological_context_records/forms.py:485 +#: archaeological_context_records/forms.py:437 +#: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1254 archaeological_finds/forms.py:1275 -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1247 +#: archaeological_finds/models_finds.py:1857 #: archaeological_finds/templates/ishtar/sheet_find.html:248 msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:470 +#: archaeological_context_records/forms.py:444 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:528 -#: archaeological_finds/forms.py:910 archaeological_finds/forms.py:1261 -#: archaeological_finds/models_finds.py:1147 +#: archaeological_context_records/models.py:532 +#: archaeological_finds/forms.py:882 archaeological_finds/forms.py:1233 +#: archaeological_finds/models_finds.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:256 #: archaeological_operations/forms.py:903 #: archaeological_operations/templates/ishtar/sheet_operation.html:517 @@ -443,89 +384,89 @@ msgstr "" msgid "Period" msgstr "" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:445 #: archaeological_context_records/models.py:109 #: archaeological_files/forms.py:559 archaeological_files/models.py:75 #: archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1262 +#: archaeological_finds/forms.py:1235 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:556 #: archaeological_finds/forms_treatments.py:814 -#: archaeological_finds/models_finds.py:3346 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: 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:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_operations/forms.py:858 -#: archaeological_operations/models.py:103 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3233 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:3276 msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:472 +#: archaeological_context_records/forms.py:446 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:564 archaeological_files/models.py:76 -#: archaeological_files/models.py:699 archaeological_finds/forms.py:1263 -#: archaeological_finds/models_finds.py:3347 +#: archaeological_files/models.py:699 archaeological_finds/forms.py:1236 +#: archaeological_finds/models_finds.py:3355 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:258 -#: 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/templates/ishtar/sheet_find.html:502 -#: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3234 +#: 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/templates/ishtar/sheet_find.html:504 +#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:3277 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:473 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1237 #: archaeological_finds/templates/ishtar/sheet_find.html:260 msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:474 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1265 +#: archaeological_finds/forms.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:259 msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:475 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1266 +#: archaeological_finds/forms.py:1238 #: archaeological_finds/templates/ishtar/sheet_find.html:261 msgid "Precise dating" msgstr "" -#: archaeological_context_records/forms.py:486 +#: archaeological_context_records/forms.py:460 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:498 +#: archaeological_context_records/forms.py:472 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1545 +#: archaeological_context_records/models.py:1558 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:177 archaeological_finds/forms.py:183 -#: archaeological_finds/forms.py:816 archaeological_finds/forms.py:834 -#: archaeological_finds/forms.py:1437 archaeological_finds/models_finds.py:1090 -#: archaeological_finds/models_finds.py:2404 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:806 +#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:2412 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 +#: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 #: ishtar_common/views.py:401 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:516 +#: archaeological_context_records/forms.py:490 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 @@ -533,34 +474,34 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:491 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:522 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/forms.py:496 +#: archaeological_context_records/forms.py:505 +#: archaeological_context_records/models.py:772 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:523 +#: archaeological_context_records/forms.py:497 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:533 -#: archaeological_context_records/models.py:530 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/forms.py:507 +#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:815 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:801 -#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 -#: archaeological_finds/forms.py:817 -#: archaeological_finds/templates/ishtar/sheet_find.html:158 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:533 +#: archaeological_context_records/models.py:808 +#: archaeological_finds/forms.py:277 archaeological_finds/forms.py:613 +#: archaeological_finds/forms.py:789 +#: archaeological_finds/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -568,80 +509,80 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:767 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:774 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:776 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:783 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:789 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:540 -#: archaeological_context_records/models.py:791 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:798 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/forms.py:516 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:527 #: archaeological_operations/forms.py:613 #: archaeological_operations/forms.py:626 #: archaeological_operations/views.py:204 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:558 +#: archaeological_context_records/forms.py:532 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:538 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:666 -#: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: archaeological_context_records/forms.py:640 +#: archaeological_finds/forms.py:1042 archaeological_finds/forms.py:1067 +#: archaeological_operations/forms.py:1885 ishtar_common/forms_common.py:2310 #: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:696 +#: archaeological_context_records/forms.py:670 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:716 -#: archaeological_context_records/models.py:1308 -#: archaeological_context_records/models.py:1347 -#: archaeological_context_records/models.py:1413 +#: archaeological_context_records/forms.py:690 +#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1426 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:720 +#: archaeological_context_records/forms.py:694 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:745 +#: archaeological_context_records/forms.py:719 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:770 +#: archaeological_context_records/forms.py:744 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:763 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -737,8 +678,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:909 -#: archaeological_finds/tests.py:1272 +#: archaeological_context_records/tests.py:911 +#: archaeological_finds/tests.py:1274 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -785,9 +726,9 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:214 archaeological_finds/forms.py:443 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2040 -#: archaeological_finds/models_finds.py:3312 -#: archaeological_finds/models_finds.py:3334 +#: archaeological_finds/models_finds.py:2044 +#: archaeological_finds/models_finds.py:3320 +#: archaeological_finds/models_finds.py:3342 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -800,20 +741,20 @@ msgstr "" #: archaeological_context_records/models.py:344 #: archaeological_files/models.py:74 archaeological_files/models.py:103 #: archaeological_files/models.py:156 archaeological_files/models.py:171 -#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:98 -#: archaeological_finds/models_finds.py:111 -#: archaeological_finds/models_finds.py:127 -#: archaeological_finds/models_finds.py:247 -#: archaeological_finds/models_finds.py:288 -#: archaeological_finds/models_finds.py:354 -#: archaeological_finds/models_finds.py:1805 +#: archaeological_files/models.py:230 archaeological_finds/models_finds.py:100 +#: archaeological_finds/models_finds.py:113 +#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:249 +#: archaeological_finds/models_finds.py:290 +#: archaeological_finds/models_finds.py:356 +#: archaeological_finds/models_finds.py:1809 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:127 -#: archaeological_operations/models.py:145 -#: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3791 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:155 +#: archaeological_operations/models.py:3834 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 @@ -869,279 +810,279 @@ msgstr "" msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:505 -#: archaeological_context_records/models.py:506 -#: archaeological_context_records/models.py:1418 -#: archaeological_finds/models_finds.py:1109 -#: archaeological_finds/models_finds.py:1110 +#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:1431 +#: archaeological_finds/models_finds.py:1112 +#: archaeological_finds/models_finds.py:1113 #: archaeological_operations/forms.py:534 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1319 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/models.py:277 -#: archaeological_operations/models.py:286 -#: archaeological_operations/models.py:456 -#: archaeological_operations/models.py:913 -#: archaeological_operations/models.py:998 -#: archaeological_operations/models.py:1304 +#: archaeological_operations/forms.py:1296 +#: archaeological_operations/forms.py:1412 +#: archaeological_operations/models.py:305 +#: archaeological_operations/models.py:314 +#: archaeological_operations/models.py:485 +#: archaeological_operations/models.py:948 +#: archaeological_operations/models.py:1032 +#: archaeological_operations/models.py:1339 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:511 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:513 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:514 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:511 -#: archaeological_finds/models_finds.py:1095 +#: archaeological_context_records/models.py:515 +#: archaeological_finds/models_finds.py:1098 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:516 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:519 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:532 -#: archaeological_finds/models_finds.py:1159 -#: archaeological_operations/models.py:288 -#: archaeological_operations/models.py:917 +#: archaeological_context_records/models.py:536 +#: archaeological_finds/models_finds.py:1162 +#: archaeological_operations/models.py:316 +#: archaeological_operations/models.py:952 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:533 -#: archaeological_finds/models_finds.py:1160 -#: archaeological_operations/models.py:289 -#: archaeological_operations/models.py:918 +#: archaeological_context_records/models.py:537 +#: archaeological_finds/models_finds.py:1163 +#: archaeological_operations/models.py:317 +#: archaeological_operations/models.py:953 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:572 +#: archaeological_context_records/models.py:576 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/tests.py:735 -#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1245 -#: archaeological_operations/models.py:349 -#: archaeological_operations/models.py:1057 -#: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/tests.py:737 +#: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1091 +#: archaeological_operations/tests.py:2989 +#: archaeological_warehouse/models.py:316 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 +#: archaeological_context_records/models.py:582 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1618 archaeological_finds/tests.py:1303 +#: archaeological_context_records/models.py:585 +#: archaeological_finds/models_finds.py:1621 archaeological_finds/tests.py:1305 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:585 -#: archaeological_operations/models.py:1053 -#: archaeological_operations/models.py:2500 -#: archaeological_operations/tests.py:4581 +#: archaeological_context_records/models.py:589 +#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:2543 +#: archaeological_operations/tests.py:4463 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:589 -#: archaeological_finds/models_finds.py:1253 -#: archaeological_operations/models.py:1050 +#: archaeological_context_records/models.py:593 +#: archaeological_finds/models_finds.py:1256 +#: archaeological_operations/models.py:1084 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:593 -#: archaeological_context_records/models.py:647 -#: archaeological_finds/models_finds.py:1354 -#: archaeological_finds/models_finds.py:1726 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: archaeological_context_records/models.py:597 +#: archaeological_context_records/models.py:654 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_finds/models_finds.py:1730 +#: archaeological_operations/models.py:412 +#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:597 -#: archaeological_context_records/models.py:650 -#: archaeological_finds/models_finds.py:1269 -#: archaeological_operations/models.py:1141 -#: archaeological_operations/models.py:1205 +#: archaeological_context_records/models.py:601 +#: archaeological_context_records/models.py:657 +#: archaeological_finds/models_finds.py:1272 +#: archaeological_operations/models.py:1175 +#: archaeological_operations/models.py:1240 #: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:601 -#: archaeological_context_records/tests.py:802 -#: archaeological_finds/models_finds.py:1292 +#: archaeological_context_records/models.py:605 +#: archaeological_context_records/tests.py:804 +#: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:605 -#: archaeological_operations/models.py:343 -#: archaeological_operations/models.py:1099 -#: archaeological_operations/tests.py:2973 -#: archaeological_operations/tests.py:3155 +#: archaeological_context_records/models.py:609 +#: archaeological_operations/models.py:371 +#: archaeological_operations/models.py:1133 +#: archaeological_operations/tests.py:2972 +#: archaeological_operations/tests.py:3154 msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:609 -#: archaeological_context_records/tests.py:861 +#: archaeological_context_records/models.py:613 +#: archaeological_context_records/tests.py:863 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:612 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1063 -#: archaeological_operations/models.py:2518 +#: archaeological_context_records/models.py:616 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 +#: archaeological_operations/models.py:2561 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:616 -#: archaeological_operations/models.py:1160 +#: archaeological_context_records/models.py:620 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:619 -#: archaeological_context_records/tests.py:767 +#: archaeological_context_records/models.py:623 +#: archaeological_context_records/tests.py:769 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:623 +#: archaeological_context_records/models.py:627 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:665 -#: archaeological_finds/models_finds.py:1685 -#: archaeological_operations/models.py:428 -#: archaeological_operations/models.py:1188 +#: archaeological_context_records/models.py:672 +#: archaeological_finds/models_finds.py:1689 +#: archaeological_operations/models.py:457 +#: archaeological_operations/models.py:1223 #: archaeological_warehouse/models.py:335 #: archaeological_warehouse/models.py:1056 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:672 -#: archaeological_finds/models_finds.py:1678 -#: archaeological_operations/models.py:435 -#: archaeological_operations/models.py:1181 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1682 +#: archaeological_operations/models.py:464 +#: archaeological_operations/models.py:1216 #: archaeological_warehouse/models.py:327 #: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:682 -#: archaeological_context_records/models.py:1108 +#: archaeological_context_records/models.py:689 +#: archaeological_context_records/models.py:1120 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:874 -#: archaeological_finds/models_finds.py:1695 -#: archaeological_finds/models_finds.py:2310 archaeological_finds/views.py:1245 +#: archaeological_finds/models_finds.py:877 +#: archaeological_finds/models_finds.py:1699 +#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1245 #: archaeological_finds/views.py:1260 archaeological_finds/views.py:1298 -#: archaeological_finds/views.py:1314 archaeological_operations/models.py:445 -#: archaeological_operations/models.py:600 -#: archaeological_operations/models.py:1198 -#: archaeological_operations/models.py:1831 +#: archaeological_finds/views.py:1314 archaeological_operations/models.py:474 +#: archaeological_operations/models.py:632 +#: archaeological_operations/models.py:1233 +#: archaeological_operations/models.py:1873 #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 -#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1454 +#: ishtar_common/admin.py:1574 ishtar_common/models.py:4064 #: ishtar_common/models.py:4408 ishtar_common/views.py:2637 #: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:699 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:404 -#: archaeological_finds/models_finds.py:1799 +#: archaeological_context_records/models.py:706 +#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 +#: archaeological_finds/models_finds.py:1803 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2971 +#: archaeological_operations/models.py:3014 #: archaeological_warehouse/models.py:388 #: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:701 -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2974 +#: archaeological_context_records/models.py:708 +#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 +#: archaeological_finds/models_finds.py:1805 +#: archaeological_operations/models.py:3017 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 +#: archaeological_context_records/models.py:753 +#: archaeological_operations/models.py:1331 ishtar_common/models_common.py:2794 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:751 +#: archaeological_context_records/models.py:758 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:762 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:778 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:779 +#: archaeological_context_records/models.py:786 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:786 +#: archaeological_context_records/models.py:793 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:801 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:823 +#: archaeological_context_records/models.py:829 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1994 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_finds/templates/ishtar/sheet_find.html:74 +#: archaeological_finds/templates/ishtar/sheet_find.html:71 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2718 +#: archaeological_operations/models.py:524 +#: archaeological_operations/models.py:1405 +#: archaeological_operations/models.py:2761 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1155,136 +1096,136 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:830 -#: archaeological_finds/models_finds.py:2000 +#: archaeological_context_records/models.py:836 +#: archaeological_finds/models_finds.py:2004 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:530 +#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:2768 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:835 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2012 +#: archaeological_context_records/models.py:841 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:506 -#: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1416 +#: archaeological_operations/models.py:3021 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2819 ishtar_common/models_common.py:2842 msgid "Cached name" msgstr "" -#: archaeological_context_records/models.py:838 -#: archaeological_finds/models_finds.py:2019 -#: archaeological_operations/models.py:519 -#: archaeological_operations/models.py:1467 +#: archaeological_context_records/models.py:844 +#: archaeological_finds/models_finds.py:2023 +#: archaeological_operations/models.py:548 +#: archaeological_operations/models.py:1502 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:841 #: archaeological_context_records/models.py:847 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2016 -#: archaeological_finds/models_finds.py:2022 -#: archaeological_finds/models_finds.py:2028 -#: archaeological_finds/models_finds.py:2034 -#: archaeological_operations/models.py:510 -#: archaeological_operations/models.py:516 -#: archaeological_operations/models.py:522 -#: archaeological_operations/models.py:528 -#: archaeological_operations/models.py:1383 -#: archaeological_operations/models.py:1464 -#: archaeological_operations/models.py:1470 -#: archaeological_operations/models.py:1476 +#: archaeological_context_records/models.py:853 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2026 +#: archaeological_finds/models_finds.py:2032 +#: archaeological_finds/models_finds.py:2038 +#: archaeological_operations/models.py:539 +#: archaeological_operations/models.py:545 +#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:557 +#: archaeological_operations/models.py:1418 +#: archaeological_operations/models.py:1499 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:1511 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:850 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:858 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:417 +#: archaeological_finds/models_finds.py:419 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:873 +#: archaeological_context_records/models.py:879 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:905 -#: archaeological_finds/models_finds.py:2200 +#: archaeological_context_records/models.py:914 +#: archaeological_finds/models_finds.py:2204 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1096 +#: archaeological_context_records/models.py:1108 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1098 +#: archaeological_context_records/models.py:1110 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1309 +#: archaeological_context_records/models.py:1322 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1342 +#: archaeological_context_records/models.py:1355 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1343 +#: archaeological_context_records/models.py:1356 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1344 +#: archaeological_context_records/models.py:1357 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1345 +#: archaeological_context_records/models.py:1358 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1346 +#: archaeological_context_records/models.py:1359 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1348 +#: archaeological_context_records/models.py:1361 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1349 +#: archaeological_context_records/models.py:1362 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1350 +#: archaeological_context_records/models.py:1363 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1351 +#: archaeological_context_records/models.py:1364 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1365 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1359 +#: archaeological_context_records/models.py:1372 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1360 +#: archaeological_context_records/models.py:1373 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1551 +#: archaeological_context_records/models.py:1564 msgid "Context record parent" msgstr "" @@ -1332,7 +1273,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2045 #: 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:90 @@ -1347,26 +1288,26 @@ msgid "Finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 -#: archaeological_finds/templates/ishtar/sheet_find.html:83 +#: archaeological_finds/templates/ishtar/sheet_find.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 -#: archaeological_finds/templates/ishtar/sheet_find.html:92 +#: archaeological_finds/templates/ishtar/sheet_find.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 msgid "Custom fields" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 #: archaeological_files/templates/ishtar/sheet_file.html:46 -#: archaeological_finds/templates/ishtar/sheet_find.html:163 +#: archaeological_finds/templates/ishtar/sheet_find.html:160 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3725 +#: ishtar_common/models_common.py:3872 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1382,21 +1323,21 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_files_pdl/forms.py:121 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:73 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2635 +#: ishtar_common/models_common.py:2796 msgid "Localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 -#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:714 -#: archaeological_finds/forms.py:819 +#: archaeological_finds/forms.py:393 archaeological_finds/forms.py:686 +#: archaeological_finds/forms.py:791 #: archaeological_finds/templates/ishtar/sheet_basefind.html:52 -#: archaeological_finds/templates/ishtar/sheet_find.html:219 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 msgid "Sheet" @@ -1420,9 +1361,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:126 #: archaeological_finds/models_treatments.py:212 -#: archaeological_finds/templates/ishtar/sheet_find.html:383 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 +#: 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_operations/templates/ishtar/dashboards/dashboard_operation.html:48 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:70 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:92 @@ -1505,7 +1446,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1820 +#: archaeological_operations/models.py:1862 msgid "Add context record" msgstr "" @@ -1539,7 +1480,7 @@ msgstr "" #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 -#: archaeological_finds/forms.py:1377 +#: archaeological_finds/forms.py:1349 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1547,18 +1488,18 @@ msgstr "" #: archaeological_finds/forms_treatments.py:688 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/forms_treatments.py:930 -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:197 #: archaeological_finds/models_treatments.py:1094 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 -#: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:909 -#: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:2468 -#: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2961 +#: archaeological_operations/forms.py:1504 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:944 +#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2740 +#: archaeological_operations/models.py:3004 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1568,33 +1509,33 @@ msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:276 #: archaeological_files/forms.py:332 archaeological_files/models.py:524 #: archaeological_files_pdl/forms.py:463 archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1316 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 #: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1432 -#: archaeological_operations/forms.py:1553 -#: archaeological_operations/forms.py:1630 -#: archaeological_operations/models.py:454 -#: archaeological_operations/models.py:2700 +#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:1583 +#: archaeological_operations/models.py:483 +#: archaeological_operations/models.py:2743 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:898 #: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1564 -#: archaeological_operations/models.py:2340 +#: archaeological_operations/forms.py:1517 +#: archaeological_operations/models.py:2383 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2802 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1633,26 +1574,26 @@ msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:294 #: archaeological_files/forms.py:479 archaeological_files/models.py:638 #: archaeological_files_pdl/forms.py:454 archaeological_finds/forms.py:340 -#: archaeological_finds/forms.py:686 archaeological_finds/forms.py:897 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1515 -#: archaeological_finds/forms.py:2111 +#: archaeological_finds/forms.py:658 archaeological_finds/forms.py:869 +#: archaeological_finds/forms.py:1096 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:2083 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:809 -#: archaeological_finds/models_finds.py:410 -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:1936 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:817 -#: archaeological_operations/forms.py:1325 -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1629 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2714 -#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 -#: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 +#: archaeological_operations/forms.py:1302 +#: archaeological_operations/forms.py:1423 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/forms.py:1582 +#: archaeological_operations/models.py:495 +#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:2757 +#: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 +#: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 #: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 #: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 #: ishtar_common/models.py:2772 ishtar_common/models.py:3412 @@ -1660,6 +1601,7 @@ msgstr "" #: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 msgid "Comment" msgstr "" @@ -1682,7 +1624,7 @@ msgstr "" #: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1522 ishtar_common/forms.py:926 msgid "Created by" msgstr "" @@ -1690,7 +1632,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1575 +#: archaeological_operations/forms.py:1528 msgid "Modified by" msgstr "" @@ -1703,7 +1645,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1276 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1715,7 +1657,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:812 #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1136 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 msgid "Reception date" msgstr "" @@ -1753,7 +1695,7 @@ msgstr "" #: archaeological_files/forms.py:256 archaeological_files/models.py:540 #: archaeological_finds/models_treatments.py:1111 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:355 msgid "Person in charge" msgstr "" @@ -1762,13 +1704,13 @@ msgstr "" #: archaeological_finds/forms_treatments.py:686 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1102 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1920 -#: archaeological_operations/models.py:455 +#: archaeological_operations/forms.py:1293 +#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1873 +#: archaeological_operations/models.py:484 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 @@ -1782,12 +1724,13 @@ msgstr "" #: ishtar_common/models.py:2482 ishtar_common/models.py:2767 #: ishtar_common/models.py:3093 ishtar_common/models.py:3229 #: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 -#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 +#: ishtar_common/models_common.py:2793 ishtar_common/models_common.py:2842 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1826,7 +1769,7 @@ msgstr "" #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2983 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" @@ -1860,14 +1803,13 @@ msgstr "" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 +#: archaeological_operations/models.py:2746 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "" #: archaeological_files/forms.py:459 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:984 -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2697 msgid "Scientist in charge" msgstr "" @@ -2013,10 +1955,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:998 #: archaeological_finds/models_treatments.py:198 #: archaeological_finds/models_treatments.py:1095 -#: archaeological_finds/templates/ishtar/sheet_find.html:364 -#: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1685 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 +#: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1638 +#: archaeological_operations/models.py:2682 ishtar_common/models.py:4089 msgid "Index" msgstr "" @@ -2026,10 +1968,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1558 -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/models.py:2370 -#: archaeological_operations/models.py:2629 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/forms.py:1572 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2672 msgid "Act type" msgstr "" @@ -2040,17 +1982,17 @@ msgstr "" #: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1559 -#: archaeological_operations/forms.py:1755 +#: archaeological_operations/forms.py:1512 +#: archaeological_operations/forms.py:1708 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1565 -#: archaeological_operations/forms.py:1626 -#: archaeological_operations/models.py:2698 +#: archaeological_operations/forms.py:1518 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2741 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2096,10 +2038,10 @@ msgstr "" #: archaeological_files/wizards.py:169 archaeological_files/wizards.py:181 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1840 -#: archaeological_operations/models.py:2353 -#: archaeological_operations/models.py:2469 -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:1882 +#: archaeological_operations/models.py:2396 +#: archaeological_operations/models.py:2512 +#: archaeological_operations/models.py:2720 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "" @@ -2112,9 +2054,9 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3337 +#: archaeological_finds/models_finds.py:3345 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2734 +#: archaeological_operations/models.py:2777 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2244,8 +2186,8 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 +#: ishtar_common/admin.py:1024 ishtar_common/models.py:2275 #: ishtar_common/models_common.py:714 msgid "Parent" msgstr "" @@ -2306,9 +2248,9 @@ msgstr "" msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1142 -#: archaeological_operations/models.py:284 -#: archaeological_operations/models.py:910 +#: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 +#: archaeological_operations/models.py:312 +#: archaeological_operations/models.py:945 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:225 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:240 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:257 @@ -2316,17 +2258,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1194 +#: ishtar_common/admin.py:1193 msgid "Area" msgstr "" -#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1145 -#: archaeological_operations/models.py:285 -#: archaeological_operations/models.py:911 +#: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 +#: archaeological_operations/models.py:313 +#: archaeological_operations/models.py:946 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1166 +#: archaeological_files/models.py:392 archaeological_finds/models_finds.py:1169 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:18 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:164 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 @@ -2360,34 +2302,34 @@ msgstr "" #: archaeological_operations/forms.py:1110 #: archaeological_operations/forms.py:1126 #: archaeological_operations/forms.py:1131 -#: archaeological_operations/forms.py:1506 -#: archaeological_operations/models.py:276 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2709 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/models.py:304 +#: archaeological_operations/models.py:493 +#: archaeological_operations/models.py:1029 +#: archaeological_operations/models.py:1031 +#: archaeological_operations/models.py:1336 +#: archaeological_operations/models.py:2752 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 #: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2664 +#: ishtar_common/models_common.py:2825 msgid "Towns" msgstr "" -#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1249 +#: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1048 -#: archaeological_operations/models.py:2493 -#: archaeological_operations/tests.py:2979 -#: archaeological_operations/tests.py:3055 +#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:2536 +#: archaeological_operations/tests.py:2978 +#: archaeological_operations/tests.py:3054 msgctxt "key for text search" msgid "year" msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:333 +#: archaeological_operations/models.py:361 #: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" @@ -2395,21 +2337,21 @@ msgstr "" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:339 +#: archaeological_operations/models.py:367 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1067 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 msgctxt "key for text search" msgid "department" msgstr "" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:336 -#: archaeological_operations/models.py:1071 -#: archaeological_operations/tests.py:3099 +#: archaeological_operations/models.py:364 +#: archaeological_operations/models.py:1105 +#: archaeological_operations/tests.py:3098 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" @@ -2419,9 +2361,9 @@ msgstr "" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:2504 -#: archaeological_operations/tests.py:3112 +#: archaeological_operations/models.py:1111 +#: archaeological_operations/models.py:2547 +#: archaeological_operations/tests.py:3111 #: archaeological_warehouse/models.py:312 #: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 #: ishtar_common/models.py:2719 ishtar_common/models.py:3295 @@ -2450,28 +2392,28 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1455 -#: archaeological_operations/models.py:355 -#: archaeological_operations/models.py:1119 -#: archaeological_operations/models.py:2614 +#: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 +#: archaeological_operations/models.py:383 +#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:2657 #: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1606 +#: archaeological_files/models.py:499 archaeological_finds/models_finds.py:1609 #: archaeological_finds/models_treatments.py:1055 -#: archaeological_finds/tests.py:1327 +#: archaeological_finds/tests.py:1329 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2549 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2592 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2553 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" @@ -2576,11 +2518,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1228 archaeological_operations/models.py:1803 +#: archaeological_files/models.py:1228 archaeological_operations/models.py:1841 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1230 archaeological_operations/models.py:1805 +#: archaeological_files/models.py:1230 archaeological_operations/models.py:1843 msgid "parcels" msgstr "" @@ -2594,13 +2536,13 @@ msgstr "" #: archaeological_files/models.py:1247 #: archaeological_finds/models_treatments.py:401 -#: archaeological_finds/models_treatments.py:1216 +#: archaeological_finds/models_treatments.py:1220 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1249 #: archaeological_finds/models_treatments.py:403 -#: archaeological_finds/models_treatments.py:1218 +#: archaeological_finds/models_treatments.py:1222 msgid "admin. act" msgstr "" @@ -2613,8 +2555,8 @@ msgstr "" msgid "operation" msgstr "" -#: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2948 +#: archaeological_files/models.py:1327 archaeological_operations/models.py:1320 +#: archaeological_operations/models.py:2991 msgid "File" msgstr "" @@ -2812,7 +2754,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2778 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2825,11 +2767,11 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2813 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 #: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." @@ -2840,10 +2782,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:690 #: archaeological_finds/forms_treatments.py:779 #: archaeological_finds/models_treatments.py:125 -#: archaeological_finds/templates/ishtar/sheet_find.html:382 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:498 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 @@ -2852,7 +2794,7 @@ msgstr "" #: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 #: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 #: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 -#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/forms_common.py:2935 ishtar_common/models.py:744 #: ishtar_common/models.py:2484 ishtar_common/models.py:3813 #: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 @@ -2869,7 +2811,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:859 -#: archaeological_operations/models.py:1245 +#: archaeological_operations/models.py:1280 msgid "Excavation end date" msgstr "" @@ -2883,7 +2825,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:713 +#: archaeological_warehouse/forms.py:694 ishtar_common/models.py:713 #: ishtar_common/models_imports.py:935 msgid "Date" msgstr "" @@ -2907,7 +2849,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3331 msgid "Effective" msgstr "" @@ -3014,7 +2956,7 @@ msgstr "" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3033 msgid "Postal code" msgstr "" @@ -3022,7 +2964,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 #: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 +#: ishtar_common/models_common.py:3028 ishtar_common/models_common.py:3183 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -3123,213 +3065,213 @@ msgstr "" msgid "Simple find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:644 -#: archaeological_finds/forms.py:843 archaeological_finds/forms.py:1056 -#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1997 -#: archaeological_finds/models_finds.py:403 -#: archaeological_finds/models_finds.py:1806 +#: archaeological_finds/forms.py:280 archaeological_finds/forms.py:616 +#: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1028 +#: archaeological_finds/forms.py:1337 archaeological_finds/forms.py:1969 +#: archaeological_finds/models_finds.py:405 +#: archaeological_finds/models_finds.py:1810 msgid "Free ID" msgstr "" -#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:646 -#: archaeological_finds/forms.py:847 archaeological_finds/forms.py:1058 -#: archaeological_finds/forms.py:1366 archaeological_finds/forms.py:2064 -#: archaeological_finds/models_finds.py:1807 +#: archaeological_finds/forms.py:282 archaeological_finds/forms.py:618 +#: archaeological_finds/forms.py:819 archaeological_finds/forms.py:1030 +#: archaeological_finds/forms.py:1338 archaeological_finds/forms.py:2036 +#: archaeological_finds/models_finds.py:1811 msgid "Denomination" msgstr "" -#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:848 -#: archaeological_finds/forms.py:1367 archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:283 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1938 msgid "Previous ID" msgstr "" -#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:852 -#: archaeological_finds/forms.py:1370 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:284 archaeological_finds/forms.py:824 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:1812 msgid "Museum ID" msgstr "" -#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:853 -#: archaeological_finds/forms.py:1371 archaeological_finds/models_finds.py:1809 +#: archaeological_finds/forms.py:285 archaeological_finds/forms.py:825 +#: archaeological_finds/forms.py:1343 archaeological_finds/models_finds.py:1813 msgid "Laboratory ID" msgstr "" -#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:854 -#: archaeological_finds/forms.py:1369 archaeological_finds/models_finds.py:1804 +#: archaeological_finds/forms.py:286 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1808 msgid "Seal number" msgstr "" -#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:855 -#: archaeological_finds/forms.py:1372 archaeological_finds/models_finds.py:1931 +#: archaeological_finds/forms.py:287 archaeological_finds/forms.py:827 +#: archaeological_finds/forms.py:1344 archaeological_finds/models_finds.py:1935 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1991 +#: archaeological_finds/forms.py:300 archaeological_finds/models_finds.py:1995 msgid "Public description" msgstr "" -#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:653 -#: archaeological_finds/forms.py:1478 archaeological_finds/models_finds.py:1874 +#: archaeological_finds/forms.py:302 archaeological_finds/forms.py:625 +#: archaeological_finds/forms.py:1450 archaeological_finds/models_finds.py:1878 msgid "Is complete?" msgstr "" -#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:656 -#: archaeological_finds/forms.py:867 archaeological_finds/models_finds.py:89 -#: archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1112 -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/forms.py:304 archaeological_finds/forms.py:628 +#: archaeological_finds/forms.py:839 archaeological_finds/models_finds.py:91 +#: archaeological_finds/models_finds.py:1114 +#: archaeological_finds/models_finds.py:1115 +#: archaeological_finds/models_finds.py:1821 msgid "Material types" msgstr "" -#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:659 -#: archaeological_finds/forms.py:1487 archaeological_finds/models_finds.py:1821 +#: archaeological_finds/forms.py:307 archaeological_finds/forms.py:631 +#: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:1825 #: ishtar_common/models_imports.py:914 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1489 -#: archaeological_finds/models_finds.py:1828 +#: archaeological_finds/forms.py:310 archaeological_finds/forms.py:1461 +#: archaeological_finds/models_finds.py:1832 msgid "Comment on the material" msgstr "" -#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:662 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:262 -#: archaeological_finds/models_finds.py:1113 -#: archaeological_finds/models_finds.py:1114 -#: archaeological_finds/models_finds.py:1876 +#: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 +#: archaeological_finds/forms.py:842 archaeological_finds/models_finds.py:264 +#: archaeological_finds/models_finds.py:1116 +#: archaeological_finds/models_finds.py:1117 +#: archaeological_finds/models_finds.py:1880 msgid "Object types" msgstr "" -#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:666 -#: archaeological_finds/forms.py:1496 archaeological_finds/models_finds.py:1880 +#: archaeological_finds/forms.py:317 archaeological_finds/forms.py:638 +#: archaeological_finds/forms.py:1468 archaeological_finds/models_finds.py:1884 msgid "Object type quality" msgstr "" -#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:874 -#: archaeological_finds/forms.py:1498 archaeological_finds/models_finds.py:276 +#: archaeological_finds/forms.py:320 archaeological_finds/forms.py:846 +#: archaeological_finds/forms.py:1470 archaeological_finds/models_finds.py:278 msgid "Functional areas" msgstr "" -#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:668 -#: archaeological_finds/forms.py:1505 archaeological_finds/forms.py:2003 -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/forms.py:323 archaeological_finds/forms.py:640 +#: archaeological_finds/forms.py:1477 archaeological_finds/forms.py:1975 +#: archaeological_finds/models_finds.py:1839 msgid "Find number" msgstr "" -#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:670 -#: archaeological_finds/forms.py:1507 archaeological_finds/models_finds.py:1911 +#: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1915 msgid "Minimum number of individuals (MNI)" msgstr "" -#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:674 -#: archaeological_finds/forms.py:1511 archaeological_finds/models_finds.py:1811 +#: archaeological_finds/forms.py:329 archaeological_finds/forms.py:646 +#: archaeological_finds/forms.py:1483 archaeological_finds/models_finds.py:1815 msgid "Decoration" msgstr "" -#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:677 -#: archaeological_finds/forms.py:1512 archaeological_finds/models_finds.py:1812 +#: archaeological_finds/forms.py:332 archaeological_finds/forms.py:649 +#: archaeological_finds/forms.py:1484 archaeological_finds/models_finds.py:1816 msgid "Inscription" msgstr "" -#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:680 -#: archaeological_finds/forms.py:878 archaeological_finds/forms.py:1510 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/forms.py:335 archaeological_finds/forms.py:652 +#: archaeological_finds/forms.py:850 archaeological_finds/forms.py:1482 +#: archaeological_finds/models_finds.py:1818 msgid "Manufacturing place" msgstr "" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:683 -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1514 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1906 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:655 +#: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1486 +#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1910 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1518 -#: archaeological_finds/models_finds.py:1856 -#: archaeological_operations/forms.py:1322 -#: archaeological_operations/models.py:461 +#: archaeological_finds/forms.py:342 archaeological_finds/forms.py:1490 +#: archaeological_finds/models_finds.py:1860 +#: archaeological_operations/forms.py:1299 +#: archaeological_operations/models.py:490 msgid "Cultural attribution" msgstr "" -#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:689 -#: archaeological_finds/forms.py:913 archaeological_finds/forms.py:1520 -#: archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:346 archaeological_finds/forms.py:661 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1492 +#: archaeological_finds/models_finds.py:1937 msgid "Comment on dating" msgstr "" -#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:692 -#: archaeological_finds/forms.py:1319 -#: archaeological_finds/templates/ishtar/sheet_find.html:201 +#: archaeological_finds/forms.py:349 archaeological_finds/forms.py:664 +#: archaeological_finds/forms.py:1291 +#: archaeological_finds/templates/ishtar/sheet_find.html:198 msgid "Dimensions" msgstr "" -#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:693 -#: archaeological_finds/models_finds.py:1913 +#: archaeological_finds/forms.py:351 archaeological_finds/forms.py:665 +#: archaeological_finds/models_finds.py:1917 msgid "Length (cm)" msgstr "" -#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:694 -#: archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:354 archaeological_finds/forms.py:666 +#: archaeological_finds/models_finds.py:1918 msgid "Width (cm)" msgstr "" -#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:695 -#: archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:357 archaeological_finds/forms.py:667 +#: archaeological_finds/models_finds.py:1919 msgid "Height (cm)" msgstr "" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:698 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:670 +#: archaeological_finds/models_finds.py:1922 msgid "Thickness (cm)" msgstr "" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:696 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:668 +#: archaeological_finds/models_finds.py:1920 msgid "Diameter (cm)" msgstr "" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:697 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:669 +#: archaeological_finds/models_finds.py:1921 msgid "Circumference (cm)" msgstr "" -#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:699 -#: archaeological_finds/forms.py:2001 archaeological_finds/models_finds.py:1830 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:671 +#: archaeological_finds/forms.py:1973 archaeological_finds/models_finds.py:1834 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "" -#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:700 -#: archaeological_finds/forms.py:2002 -#: archaeological_finds/templates/ishtar/sheet_find.html:210 +#: archaeological_finds/forms.py:372 archaeological_finds/forms.py:672 +#: archaeological_finds/forms.py:1974 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 msgid "Weight (g)" msgstr "" -#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:702 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:674 msgid "Clutter long side (cm)" msgstr "" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:705 +#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:677 msgid "Clutter short side (cm)" msgstr "" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:680 msgid "Clutter height (cm)" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:711 -#: archaeological_finds/forms.py:1591 archaeological_finds/models_finds.py:1929 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 +#: archaeological_finds/forms.py:1563 archaeological_finds/models_finds.py:1933 msgid "Dimensions comment" msgstr "" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:715 -#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1596 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:687 +#: archaeological_finds/forms.py:872 archaeological_finds/forms.py:1568 +#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1942 msgid "Check" msgstr "" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:717 -#: archaeological_finds/forms.py:902 archaeological_finds/models_finds.py:1943 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:689 +#: archaeological_finds/forms.py:874 archaeological_finds/models_finds.py:1947 msgid "Check date" msgstr "" @@ -3341,559 +3283,563 @@ msgstr "" msgid "Find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:850 -#: archaeological_finds/forms.py:1368 archaeological_finds/models_finds.py:408 +#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:822 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:410 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:421 +#: archaeological_finds/forms.py:514 archaeological_finds/models_finds.py:423 msgid "Discovery date (exact or TPQ)" msgstr "" -#: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 +#: archaeological_finds/forms.py:517 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:1477 -#: archaeological_finds/models_finds.py:428 +#: archaeological_finds/forms.py:520 archaeological_finds/forms.py:1449 +#: archaeological_finds/models_finds.py:430 msgid "Batch/object" msgstr "" -#: archaeological_finds/forms.py:539 archaeological_finds/forms.py:1594 -#: archaeological_finds/models_finds.py:436 +#: archaeological_finds/forms.py:523 +msgid "Topography" +msgstr "" + +#: archaeological_finds/forms.py:525 archaeological_finds/forms.py:1566 +#: archaeological_finds/models_finds.py:438 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:571 +#: archaeological_finds/forms.py:543 msgid "" "Discovery date: if a TAQ date is provided a TPQ date has to be informed. If " "you have a precise date fill only the TPQ - discovery date field." msgstr "" -#: archaeological_finds/forms.py:579 +#: archaeological_finds/forms.py:551 msgid "Discovery date: TAQ date must be older than TPQ date." msgstr "" -#: archaeological_finds/forms.py:596 +#: archaeological_finds/forms.py:568 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: archaeological_finds/forms.py:612 +#: archaeological_finds/forms.py:584 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: archaeological_finds/forms.py:628 archaeological_finds/forms.py:1994 +#: archaeological_finds/forms.py:600 archaeological_finds/forms.py:1966 msgid "Resulting find" msgstr "" -#: archaeological_finds/forms.py:629 +#: archaeological_finds/forms.py:601 msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:733 archaeological_finds/forms.py:2009 +#: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1981 msgid "Resulting finds" msgstr "" -#: archaeological_finds/forms.py:734 +#: archaeological_finds/forms.py:706 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "" -#: archaeological_finds/forms.py:739 +#: archaeological_finds/forms.py:711 msgid "Number of resulting finds" msgstr "" -#: archaeological_finds/forms.py:742 +#: archaeological_finds/forms.py:714 msgid "Prefix label for resulting finds" msgstr "" -#: archaeological_finds/forms.py:745 +#: archaeological_finds/forms.py:717 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" msgstr "" -#: archaeological_finds/forms.py:750 +#: archaeological_finds/forms.py:722 msgid "Numbering starting from" msgstr "" -#: archaeological_finds/forms.py:753 +#: archaeological_finds/forms.py:725 msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:772 archaeological_finds/forms.py:1036 -#: archaeological_finds/forms.py:1103 +#: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1008 +#: archaeological_finds/forms.py:1075 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1112 +#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:1084 msgid "Find - Quick action - Modify" msgstr "" -#: archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:792 msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:821 archaeological_finds/forms.py:1165 -#: archaeological_finds/forms.py:1347 -#: archaeological_finds/templates/ishtar/sheet_find.html:231 +#: archaeological_finds/forms.py:793 archaeological_finds/forms.py:1137 +#: archaeological_finds/forms.py:1319 +#: archaeological_finds/templates/ishtar/sheet_find.html:228 msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:883 archaeological_finds/forms.py:1200 -#: archaeological_finds/forms.py:1605 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1973 -#: archaeological_warehouse/forms.py:586 +#: archaeological_finds/forms.py:855 archaeological_finds/forms.py:1172 +#: archaeological_finds/forms.py:1577 archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1977 +#: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1206 -#: archaeological_finds/forms.py:1606 archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1977 -#: archaeological_warehouse/forms.py:587 +#: archaeological_finds/forms.py:857 archaeological_finds/forms.py:1178 +#: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1160 +#: archaeological_finds/models_finds.py:1981 +#: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:888 archaeological_finds/forms.py:1197 -#: archaeological_finds/forms.py:1603 archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1958 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:898 +#: archaeological_finds/forms.py:860 archaeological_finds/forms.py:1169 +#: archaeological_finds/forms.py:1575 archaeological_finds/models_finds.py:1154 +#: archaeological_finds/models_finds.py:1962 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:898 msgid "Conservatory state" msgstr "" -#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1218 -#: archaeological_finds/forms.py:1610 archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1983 -#: archaeological_warehouse/forms.py:591 +#: archaeological_finds/forms.py:863 archaeological_finds/forms.py:1190 +#: archaeological_finds/forms.py:1582 archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1987 +#: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:894 archaeological_finds/forms.py:1191 -#: archaeological_finds/forms.py:1602 archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_warehouse/forms.py:584 +#: archaeological_finds/forms.py:866 archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1156 +#: archaeological_finds/models_finds.py:1904 +#: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:905 archaeological_finds/forms.py:1223 -#: archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:877 archaeological_finds/forms.py:1195 +#: archaeological_finds/models_finds.py:1993 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:907 archaeological_finds/forms.py:1221 -#: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:879 archaeological_finds/forms.py:1193 +#: archaeological_finds/models_finds.py:1172 +#: archaeological_finds/models_finds.py:1992 msgid "Insurance value" msgstr "" -#: archaeological_finds/forms.py:917 +#: archaeological_finds/forms.py:889 msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:979 +#: archaeological_finds/forms.py:951 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 +#: archaeological_finds/forms.py:967 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:999 archaeological_finds/forms.py:1451 -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2218 -#: archaeological_finds/forms.py:2235 archaeological_finds/forms.py:2240 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:1423 +#: archaeological_finds/forms.py:2185 archaeological_finds/forms.py:2190 +#: archaeological_finds/forms.py:2207 archaeological_finds/forms.py:2212 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:881 -#: archaeological_finds/models_finds.py:1702 +#: archaeological_finds/models_finds.py:884 +#: archaeological_finds/models_finds.py:1706 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1228 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:994 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:1029 +#: archaeological_finds/forms.py:1001 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:1033 archaeological_finds/forms.py:1100 +#: archaeological_finds/forms.py:1005 archaeological_finds/forms.py:1072 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:2081 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 #: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:2082 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 +#: archaeological_finds/forms.py:1100 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2129 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 +#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:2094 +#: archaeological_finds/forms.py:2136 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1138 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1185 archaeological_finds/forms.py:1601 -#: archaeological_finds/models_finds.py:1152 -#: archaeological_finds/models_finds.py:1894 -#: archaeological_warehouse/forms.py:583 +#: archaeological_finds/forms.py:1157 archaeological_finds/forms.py:1573 +#: archaeological_finds/models_finds.py:1155 +#: archaeological_finds/models_finds.py:1898 +#: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "" -#: archaeological_finds/forms.py:1212 archaeological_finds/forms.py:1608 -#: archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/forms.py:1184 archaeological_finds/forms.py:1580 +#: archaeological_finds/models_finds.py:1153 +#: archaeological_finds/models_finds.py:1972 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1220 archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1944 +#: archaeological_finds/forms.py:1192 archaeological_finds/models_finds.py:1171 +#: archaeological_finds/models_finds.py:1948 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1226 archaeological_finds/forms.py:1604 -#: archaeological_finds/models_finds.py:1964 +#: archaeological_finds/forms.py:1198 archaeological_finds/forms.py:1576 +#: archaeological_finds/models_finds.py:1968 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1276 +#: archaeological_finds/forms.py:1248 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1282 +#: archaeological_finds/forms.py:1254 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1258 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1308 +#: archaeological_finds/forms.py:1280 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "" -#: archaeological_finds/forms.py:1374 archaeological_finds/models_finds.py:1091 +#: archaeological_finds/forms.py:1346 archaeological_finds/models_finds.py:1094 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1375 archaeological_finds/models_finds.py:1092 +#: archaeological_finds/forms.py:1347 archaeological_finds/models_finds.py:1095 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1135 +#: archaeological_finds/forms.py:1357 archaeological_finds/models_finds.py:1138 #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1803 -#: archaeological_operations/forms.py:1869 -#: archaeological_operations/models.py:908 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 +#: archaeological_operations/forms.py:1756 +#: archaeological_operations/forms.py:1822 +#: archaeological_operations/models.py:943 +#: archaeological_operations/models.py:1030 +#: archaeological_operations/models.py:1328 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "" -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:1360 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1391 +#: archaeological_finds/forms.py:1363 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1402 +#: archaeological_finds/forms.py:1374 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1405 +#: archaeological_finds/forms.py:1377 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1409 +#: archaeological_finds/forms.py:1381 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: archaeological_finds/forms.py:1384 archaeological_operations/forms.py:499 +#: archaeological_operations/forms.py:1301 ishtar_common/forms_common.py:1233 #: ishtar_common/models.py:3098 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1415 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1387 archaeological_warehouse/forms.py:524 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1423 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1395 archaeological_warehouse/forms.py:532 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1426 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1398 archaeological_warehouse/forms.py:535 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1434 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1406 archaeological_warehouse/forms.py:543 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1447 +#: archaeological_finds/forms.py:1419 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1432 msgid "Discovery date after" msgstr "" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1435 msgid "Discovery date before" msgstr "" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1438 msgid "Discovery date (exact or TPQ) after" msgstr "" -#: archaeological_finds/forms.py:1469 +#: archaeological_finds/forms.py:1441 msgid "Discovery date (exact or TPQ) before" msgstr "" -#: archaeological_finds/forms.py:1472 +#: archaeological_finds/forms.py:1444 msgid "Discovery date (TAQ) after" msgstr "" -#: archaeological_finds/forms.py:1475 +#: archaeological_finds/forms.py:1447 msgid "Discovery date (TAQ) before" msgstr "" -#: archaeological_finds/forms.py:1480 archaeological_finds/forms.py:2000 -#: archaeological_finds/models_finds.py:88 -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1452 archaeological_finds/forms.py:1972 +#: archaeological_finds/models_finds.py:90 +#: archaeological_finds/models_finds.py:1151 #: archaeological_operations/templates/ishtar/sheet_operation.html:534 -#: archaeological_warehouse/forms.py:572 +#: archaeological_warehouse/forms.py:566 msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1491 archaeological_finds/models_finds.py:261 -#: archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1463 archaeological_finds/models_finds.py:263 +#: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:907 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:907 msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1495 msgid "Length - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1498 msgid "Length - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1529 +#: archaeological_finds/forms.py:1501 msgid "Width - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1532 +#: archaeological_finds/forms.py:1504 msgid "Width - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1535 +#: archaeological_finds/forms.py:1507 msgid "Height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1538 +#: archaeological_finds/forms.py:1510 msgid "Height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1541 +#: archaeological_finds/forms.py:1513 msgid "Thickness - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1544 +#: archaeological_finds/forms.py:1516 msgid "Thickness - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1547 +#: archaeological_finds/forms.py:1519 msgid "Diameter - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1550 +#: archaeological_finds/forms.py:1522 msgid "Diameter - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1553 +#: archaeological_finds/forms.py:1525 msgid "Circumference - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1556 +#: archaeological_finds/forms.py:1528 msgid "Circumference - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1559 +#: archaeological_finds/forms.py:1531 msgid "Volume - lower than (l)" msgstr "" -#: archaeological_finds/forms.py:1560 +#: archaeological_finds/forms.py:1532 msgid "Volume - higher than (l)" msgstr "" -#: archaeological_finds/forms.py:1562 +#: archaeological_finds/forms.py:1534 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1565 +#: archaeological_finds/forms.py:1537 msgid "Weight - higher than (g)" msgstr "" -#: archaeological_finds/forms.py:1568 +#: archaeological_finds/forms.py:1540 msgid "Clutter long side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1572 +#: archaeological_finds/forms.py:1544 msgid "Clutter long side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1576 +#: archaeological_finds/forms.py:1548 msgid "Clutter short side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1580 +#: archaeological_finds/forms.py:1552 msgid "Clutter short side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1584 +#: archaeological_finds/forms.py:1556 msgid "Clutter height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1588 +#: archaeological_finds/forms.py:1560 msgid "Clutter height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1597 +#: archaeological_finds/forms.py:1569 msgid "Check date after" msgstr "" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1571 msgid "Check date before" msgstr "" -#: archaeological_finds/forms.py:1612 +#: archaeological_finds/forms.py:1584 msgid "Estimated value - higher than" msgstr "" -#: archaeological_finds/forms.py:1613 +#: archaeological_finds/forms.py:1585 msgid "Estimated value - lower than" msgstr "" -#: archaeological_finds/forms.py:1614 +#: archaeological_finds/forms.py:1586 msgid "Insurance value - higher than" msgstr "" -#: archaeological_finds/forms.py:1615 +#: archaeological_finds/forms.py:1587 msgid "Insurance value - lower than" msgstr "" -#: archaeological_finds/forms.py:1617 +#: archaeological_finds/forms.py:1589 msgid "Appraisal date after" msgstr "" -#: archaeological_finds/forms.py:1620 +#: archaeological_finds/forms.py:1592 msgid "Appraisal date before" msgstr "" -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1595 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1597 msgid "Treatment file end date before" msgstr "" -#: archaeological_finds/forms.py:1628 +#: archaeological_finds/forms.py:1600 msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 -#: archaeological_finds/models_finds.py:1868 -#: archaeological_finds/templates/ishtar/sheet_find.html:306 +#: archaeological_finds/forms.py:1658 archaeological_finds/models_finds.py:1111 +#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:1693 +#: archaeological_finds/forms.py:1665 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:331 +#: archaeological_finds/forms.py:1684 archaeological_finds/models_finds.py:1110 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1691 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1739 archaeological_finds/forms.py:1760 -#: archaeological_finds/forms.py:1816 archaeological_finds/views.py:380 +#: archaeological_finds/forms.py:1711 archaeological_finds/forms.py:1732 +#: archaeological_finds/forms.py:1788 archaeological_finds/views.py:380 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:1855 archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1827 archaeological_finds/forms.py:1990 #: archaeological_finds/models_treatments.py:391 #: archaeological_finds/templates/ishtar/sheet_treatment.html:103 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:1878 +#: archaeological_finds/forms.py:1850 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:1999 +#: archaeological_finds/forms.py:1971 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2014 +#: archaeological_finds/forms.py:1986 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2057 +#: archaeological_finds/forms.py:2029 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2069 archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2041 archaeological_finds/forms.py:2059 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2104 +#: archaeological_finds/forms.py:2076 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2107 +#: archaeological_finds/forms.py:2079 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:193 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:381 -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 +#: archaeological_finds/templates/ishtar/sheet_find.html:383 +#: archaeological_finds/templates/ishtar/sheet_find.html:421 +#: archaeological_finds/templates/ishtar/sheet_find.html:459 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 #: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 @@ -3902,11 +3848,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2149 archaeological_finds/forms.py:2204 +#: archaeological_finds/forms.py:2121 archaeological_finds/forms.py:2176 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2196 +#: archaeological_finds/forms.py:2168 msgid "Another basket already exists with this name." msgstr "" @@ -3932,7 +3878,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:626 -#: archaeological_finds/models_finds.py:172 +#: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 #: ishtar_common/models_imports.py:902 @@ -3954,8 +3900,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 +#: archaeological_operations/models.py:2399 +#: archaeological_operations/models.py:2736 ishtar_common/views.py:408 msgid "Treatment" msgstr "" @@ -4052,8 +3998,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2398 +#: archaeological_operations/models.py:2728 ishtar_common/views.py:407 msgid "Treatment request" msgstr "" @@ -4068,14 +4014,14 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1860 -#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:1864 +#: archaeological_finds/models_finds.py:3327 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 -#: 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_warehouse/forms.py:329 archaeological_warehouse/models.py:796 +#: 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_warehouse/forms.py:323 archaeological_warehouse/models.py:796 #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 @@ -4161,7 +4107,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:787 #: archaeological_finds/models_treatments.py:1119 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 msgid "Applicant" msgstr "" @@ -4169,7 +4115,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/forms_treatments.py:793 #: archaeological_finds/models_treatments.py:1127 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 msgid "Applicant organisation" msgstr "" @@ -4274,222 +4220,222 @@ msgstr "" msgid "Treatment one to many - creation" msgstr "" -#: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 +#: archaeological_finds/models_finds.py:86 +#: archaeological_operations/models.py:2403 ishtar_common/models.py:3625 msgid "Code" msgstr "" -#: archaeological_finds/models_finds.py:85 +#: archaeological_finds/models_finds.py:87 msgid "Recommendation" msgstr "" -#: archaeological_finds/models_finds.py:101 +#: archaeological_finds/models_finds.py:103 msgid "Material type quality type" msgstr "" -#: archaeological_finds/models_finds.py:102 +#: archaeological_finds/models_finds.py:104 msgid "Material type quality types" msgstr "" -#: archaeological_finds/models_finds.py:114 +#: archaeological_finds/models_finds.py:116 msgid "Conservatory state type" msgstr "" -#: archaeological_finds/models_finds.py:115 +#: archaeological_finds/models_finds.py:117 msgid "Conservatory state types" msgstr "" -#: archaeological_finds/models_finds.py:128 +#: archaeological_finds/models_finds.py:130 msgid "Virtual" msgstr "" -#: archaeological_finds/models_finds.py:129 +#: archaeological_finds/models_finds.py:131 msgid "Destructive" msgstr "" -#: archaeological_finds/models_finds.py:131 +#: archaeological_finds/models_finds.py:133 msgid "Create a new find" msgstr "" -#: archaeological_finds/models_finds.py:134 +#: archaeological_finds/models_finds.py:136 msgid "" "If True when this treatment is applied a new version of the object will be " "created." msgstr "" -#: archaeological_finds/models_finds.py:139 +#: archaeological_finds/models_finds.py:141 msgid "Upstream is many" msgstr "" -#: archaeological_finds/models_finds.py:142 +#: archaeological_finds/models_finds.py:144 msgid "Check this if for this treatment from many finds you'll get one." msgstr "" -#: archaeological_finds/models_finds.py:146 +#: archaeological_finds/models_finds.py:148 msgid "Downstream is many" msgstr "" -#: archaeological_finds/models_finds.py:149 +#: archaeological_finds/models_finds.py:151 msgid "Check this if for this treatment from one find you'll get many." msgstr "" -#: archaeological_finds/models_finds.py:153 +#: archaeological_finds/models_finds.py:155 msgid "Change reference location" msgstr "" -#: archaeological_finds/models_finds.py:155 +#: archaeological_finds/models_finds.py:157 msgid "The treatment change the reference location." msgstr "" -#: archaeological_finds/models_finds.py:158 +#: archaeological_finds/models_finds.py:160 msgid "Change current location" msgstr "" -#: archaeological_finds/models_finds.py:160 +#: archaeological_finds/models_finds.py:162 msgid "The treatment change the current location." msgstr "" -#: archaeological_finds/models_finds.py:163 +#: archaeological_finds/models_finds.py:165 msgid "Restore the reference location" msgstr "" -#: archaeological_finds/models_finds.py:166 +#: archaeological_finds/models_finds.py:168 msgid "" "The treatment change restore reference location to the current location." msgstr "" -#: archaeological_finds/models_finds.py:173 +#: archaeological_finds/models_finds.py:175 #: archaeological_finds/models_treatments.py:371 msgid "Treatment types" msgstr "" -#: archaeological_finds/models_finds.py:226 +#: archaeological_finds/models_finds.py:228 msgid "Integrity / interest type" msgstr "" -#: archaeological_finds/models_finds.py:227 +#: archaeological_finds/models_finds.py:229 msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:909 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:909 msgid "Remarkability type" msgstr "" -#: archaeological_finds/models_finds.py:238 +#: archaeological_finds/models_finds.py:240 msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:912 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:912 msgid "Batch type" msgstr "" -#: archaeological_finds/models_finds.py:251 +#: archaeological_finds/models_finds.py:253 msgid "Batch types" msgstr "" -#: archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1888 +#: archaeological_finds/models_finds.py:277 +#: archaeological_finds/models_finds.py:1892 #: ishtar_common/models_imports.py:915 msgid "Functional area" msgstr "" -#: archaeological_finds/models_finds.py:291 +#: archaeological_finds/models_finds.py:293 msgid "Object type quality type" msgstr "" -#: archaeological_finds/models_finds.py:292 +#: archaeological_finds/models_finds.py:294 msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:910 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:910 msgid "Alteration type" msgstr "" -#: archaeological_finds/models_finds.py:303 +#: archaeological_finds/models_finds.py:305 msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:911 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:911 msgid "Alteration cause type" msgstr "" -#: archaeological_finds/models_finds.py:317 +#: archaeological_finds/models_finds.py:319 msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:905 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:905 msgid "Treatment emergency type" msgstr "" -#: archaeological_finds/models_finds.py:331 +#: archaeological_finds/models_finds.py:333 msgid "Treatment emergency types" msgstr "" -#: archaeological_finds/models_finds.py:341 +#: archaeological_finds/models_finds.py:343 msgid "Communicability type" msgstr "" -#: archaeological_finds/models_finds.py:342 +#: archaeological_finds/models_finds.py:344 msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:913 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:913 msgid "Checked type" msgstr "" -#: archaeological_finds/models_finds.py:358 +#: archaeological_finds/models_finds.py:360 msgid "Checked types" msgstr "" -#: archaeological_finds/models_finds.py:412 +#: archaeological_finds/models_finds.py:414 msgid "Special interest" msgstr "" -#: archaeological_finds/models_finds.py:434 +#: archaeological_finds/models_finds.py:436 msgid "Material index" msgstr "" -#: archaeological_finds/models_finds.py:439 +#: archaeological_finds/models_finds.py:441 #: ishtar_common/templates/blocks/DataTables-stats.html:25 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "" -#: archaeological_finds/models_finds.py:441 +#: archaeological_finds/models_finds.py:443 msgid "Short ID" msgstr "" -#: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 +#: archaeological_finds/models_finds.py:447 +#: archaeological_finds/models_finds.py:454 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "" -#: archaeological_finds/models_finds.py:448 +#: archaeological_finds/models_finds.py:450 msgid "Complete ID" msgstr "" -#: archaeological_finds/models_finds.py:469 +#: archaeological_finds/models_finds.py:471 msgid "Concatenation of associated material types codes" msgstr "" -#: archaeological_finds/models_finds.py:475 -#: archaeological_finds/models_finds.py:1797 +#: archaeological_finds/models_finds.py:477 +#: archaeological_finds/models_finds.py:1801 msgid "Base find" msgstr "" -#: archaeological_finds/models_finds.py:476 +#: archaeological_finds/models_finds.py:478 msgid "Base finds" msgstr "" -#: archaeological_finds/models_finds.py:852 +#: archaeological_finds/models_finds.py:855 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:853 +#: archaeological_finds/models_finds.py:856 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:865 +#: archaeological_finds/models_finds.py:868 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:12 #: ishtar_common/templates/ishtar/blocks/window_image.html:22 @@ -4501,561 +4447,561 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:920 archaeological_finds/views.py:535 +#: archaeological_finds/models_finds.py:923 archaeological_finds/views.py:535 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:932 +#: archaeological_finds/models_finds.py:935 #: archaeological_warehouse/models.py:1853 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:943 +#: archaeological_finds/models_finds.py:946 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1093 +#: archaeological_finds/models_finds.py:1096 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1098 +#: archaeological_finds/models_finds.py:1101 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1099 +#: archaeological_finds/models_finds.py:1102 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1100 +#: archaeological_finds/models_finds.py:1103 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1102 +#: archaeological_finds/models_finds.py:1105 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1104 +#: archaeological_finds/models_finds.py:1107 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1105 +#: archaeological_finds/models_finds.py:1108 msgid "Base find - Discovery date (exact or TPQ)" msgstr "" -#: archaeological_finds/models_finds.py:1106 +#: archaeological_finds/models_finds.py:1109 msgid "Base find - Discovery date (TAQ)" msgstr "" -#: archaeological_finds/models_finds.py:1167 +#: archaeological_finds/models_finds.py:1170 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:1234 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1235 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1239 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1242 +#: archaeological_finds/models_finds.py:1245 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1257 +#: archaeological_finds/models_finds.py:1260 #: archaeological_warehouse/models.py:933 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 +#: archaeological_finds/models_finds.py:1264 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1265 -#: archaeological_operations/models.py:352 -#: archaeological_operations/models.py:1060 +#: archaeological_finds/models_finds.py:1268 +#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:1094 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1274 +#: archaeological_finds/models_finds.py:1277 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1279 -#: archaeological_finds/models_finds.py:1735 +#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1739 #: archaeological_warehouse/models.py:947 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1284 +#: archaeological_finds/models_finds.py:1287 #: archaeological_warehouse/models.py:952 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1288 -#: archaeological_finds/models_finds.py:1730 +#: archaeological_finds/models_finds.py:1291 +#: archaeological_finds/models_finds.py:1734 #: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1296 +#: archaeological_finds/models_finds.py:1299 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1300 archaeological_finds/tests.py:1197 +#: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1199 #: archaeological_warehouse/models.py:968 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1304 +#: archaeological_finds/models_finds.py:1307 #: archaeological_warehouse/models.py:972 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1308 +#: archaeological_finds/models_finds.py:1311 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1312 archaeological_finds/tests.py:1375 +#: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1377 #: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1316 +#: archaeological_finds/models_finds.py:1319 #: archaeological_warehouse/models.py:984 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1320 +#: archaeological_finds/models_finds.py:1323 #: archaeological_warehouse/models.py:988 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 +#: archaeological_finds/models_finds.py:1327 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1327 +#: archaeological_finds/models_finds.py:1330 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1331 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 +#: archaeological_finds/models_finds.py:1338 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1339 -#: archaeological_finds/models_finds.py:1733 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_finds/models_finds.py:1737 #: archaeological_warehouse/models.py:902 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1343 +#: archaeological_finds/models_finds.py:1346 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1347 +#: archaeological_finds/models_finds.py:1350 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1351 +#: archaeological_finds/models_finds.py:1354 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1358 +#: archaeological_finds/models_finds.py:1361 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1362 +#: archaeological_finds/models_finds.py:1365 #: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1365 archaeological_finds/tests.py:1417 +#: archaeological_finds/models_finds.py:1368 archaeological_finds/tests.py:1419 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1370 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1374 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1378 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1382 +#: archaeological_finds/models_finds.py:1385 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1385 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1389 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1392 +#: archaeological_finds/models_finds.py:1395 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1396 +#: archaeological_finds/models_finds.py:1399 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1402 msgctxt "key for text search" msgid "discovery-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1403 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "discovery-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1410 msgctxt "key for text search" msgid "discovery-date-tpq-before" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1414 msgctxt "key for text search" msgid "discovery-date-tpq-after" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1418 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1422 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "" -#: archaeological_finds/models_finds.py:1423 +#: archaeological_finds/models_finds.py:1426 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1429 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1430 +#: archaeological_finds/models_finds.py:1433 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1434 +#: archaeological_finds/models_finds.py:1437 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1437 +#: archaeological_finds/models_finds.py:1440 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1441 +#: archaeological_finds/models_finds.py:1444 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1447 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1450 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1454 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1470 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1479 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1482 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1485 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1492 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1492 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1498 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1503 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1510 msgctxt "key for text search" msgid "length-higher" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "width-higher" msgstr "" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1516 +#: archaeological_finds/models_finds.py:1519 msgctxt "key for text search" msgid "thickness-higher" msgstr "" -#: archaeological_finds/models_finds.py:1519 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "diameter-higher" msgstr "" -#: archaeological_finds/models_finds.py:1522 +#: archaeological_finds/models_finds.py:1525 msgctxt "key for text search" msgid "circumference-higher" msgstr "" -#: archaeological_finds/models_finds.py:1526 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "volume-higher" msgstr "" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1532 msgctxt "key for text search" msgid "weight-higher" msgstr "" -#: archaeological_finds/models_finds.py:1532 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1540 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1544 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1551 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1555 msgctxt "key for text search" msgid "check-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "check-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1561 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1565 #: archaeological_warehouse/models.py:996 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1569 #: archaeological_warehouse/models.py:1000 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1573 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1574 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1578 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1585 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1586 +#: archaeological_finds/models_finds.py:1589 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1593 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1594 -#: archaeological_operations/models.py:400 +#: archaeological_finds/models_finds.py:1597 +#: archaeological_operations/models.py:428 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1602 archaeological_finds/tests.py:1315 +#: archaeological_finds/models_finds.py:1605 archaeological_finds/tests.py:1317 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1610 -#: archaeological_operations/models.py:1088 +#: archaeological_finds/models_finds.py:1613 +#: archaeological_operations/models.py:1122 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1614 archaeological_finds/tests.py:1291 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/tests.py:2856 -#: archaeological_operations/tests.py:3274 +#: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1293 +#: archaeological_operations/models.py:1126 +#: archaeological_operations/tests.py:2855 +#: archaeological_operations/tests.py:3273 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1709 -#: archaeological_finds/models_finds.py:2345 +#: archaeological_finds/models_finds.py:1713 +#: archaeological_finds/models_finds.py:2353 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 +#: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 #: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -5063,112 +5009,112 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1717 +#: archaeological_finds/models_finds.py:1721 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1831 +#: archaeological_finds/models_finds.py:1835 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1833 +#: archaeological_finds/models_finds.py:1837 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1842 -#: archaeological_finds/templates/ishtar/sheet_find.html:414 +#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/templates/ishtar/sheet_find.html:416 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1849 -#: archaeological_finds/templates/ishtar/sheet_find.html:452 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/templates/ishtar/sheet_find.html:454 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1924 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1923 +#: archaeological_finds/models_finds.py:1927 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1926 +#: archaeological_finds/models_finds.py:1930 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1947 +#: archaeological_finds/models_finds.py:1951 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1952 +#: archaeological_finds/models_finds.py:1956 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2006 +#: archaeological_finds/models_finds.py:2010 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 #: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "" -#: archaeological_finds/models_finds.py:2009 +#: archaeological_finds/models_finds.py:2013 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2029 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2035 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/models_finds.py:2067 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2201 +#: archaeological_finds/models_finds.py:2205 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2202 +#: archaeological_finds/models_finds.py:2206 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2203 +#: archaeological_finds/models_finds.py:2207 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2208 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2209 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2318 +#: archaeological_finds/models_finds.py:2326 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2334 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2342 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2899 +#: archaeological_finds/models_finds.py:2907 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2905 +#: archaeological_finds/models_finds.py:2913 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 #: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 #: ishtar_common/models.py:2788 ishtar_common/models.py:3117 #: ishtar_common/models.py:3310 ishtar_common/models.py:3547 @@ -5176,11 +5122,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3350 +#: archaeological_finds/models_finds.py:3358 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3351 +#: archaeological_finds/models_finds.py:3359 msgid "Properties" msgstr "" @@ -5211,7 +5157,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2495 +#: archaeological_operations/models.py:2538 msgctxt "key for text search" msgid "index" msgstr "" @@ -5255,9 +5201,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:756 -#: 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:387 +#: archaeological_finds/templates/ishtar/sheet_find.html:425 +#: archaeological_finds/templates/ishtar/sheet_find.html:463 msgid "Doer" msgstr "" @@ -5306,12 +5252,12 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1175 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:493 #: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1238 +#: archaeological_finds/models_treatments.py:1242 msgid "Add associated treatment" msgstr "" @@ -5378,56 +5324,60 @@ msgid "" "the find." msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:41 +#: archaeological_finds/templates/ishtar/sheet_find.html:40 msgid "Image / Base find" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:48 +#: archaeological_finds/templates/ishtar/sheet_find.html:47 msgid "Identification / Description / Dimensions" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:56 +#: archaeological_finds/templates/ishtar/sheet_find.html:54 msgid "Datings / Preservation" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:65 +#: archaeological_finds/templates/ishtar/sheet_find.html:62 msgid "Warehouse / Treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:175 +#: archaeological_finds/templates/ishtar/sheet_find.html:172 msgid "Administrative index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:221 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 msgid "Checked" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:302 +#: archaeological_finds/templates/ishtar/sheet_find.html:244 +msgid "No datation or preservation info." +msgstr "" + +#: archaeological_finds/templates/ishtar/sheet_find.html:304 msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:332 +#: archaeological_finds/templates/ishtar/sheet_find.html:334 msgid "Reference container / current container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:376 +#: archaeological_finds/templates/ishtar/sheet_find.html:378 msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:380 -#: archaeological_finds/templates/ishtar/sheet_find.html:418 -#: archaeological_finds/templates/ishtar/sheet_find.html:456 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 +#: archaeological_finds/templates/ishtar/sheet_find.html:382 +#: archaeological_finds/templates/ishtar/sheet_find.html:420 +#: archaeological_finds/templates/ishtar/sheet_find.html:458 +#: archaeological_finds/templates/ishtar/sheet_find.html:497 msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:384 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 +#: archaeological_finds/templates/ishtar/sheet_find.html:386 +#: archaeological_finds/templates/ishtar/sheet_find.html:424 +#: archaeological_finds/templates/ishtar/sheet_find.html:462 msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats-detail.html:41 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5436,8 +5386,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:448 -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:450 +#: archaeological_finds/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5445,7 +5395,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:529 +#: archaeological_finds/templates/ishtar/sheet_find.html:531 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 #: ishtar_common/templates/ishtar/sheet_document.html:136 msgid "Associated documents" @@ -5532,23 +5482,23 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:881 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:883 archaeological_warehouse/models.py:1623 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1420 archaeological_finds/tests.py:1446 -#: archaeological_finds/tests.py:1456 archaeological_operations/tests.py:3042 +#: archaeological_finds/tests.py:1422 archaeological_finds/tests.py:1448 +#: archaeological_finds/tests.py:1458 archaeological_operations/tests.py:3041 #: ishtar_common/forms.py:1159 ishtar_common/forms.py:1238 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:18 +#: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:581 ishtar_common/views_item.py:847 #: ishtar_common/views_item.py:884 ishtar_common/wizards.py:483 msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1421 archaeological_finds/tests.py:1447 -#: archaeological_finds/tests.py:1457 ishtar_common/forms.py:1160 -#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:23 +#: archaeological_finds/tests.py:1423 archaeological_finds/tests.py:1449 +#: archaeological_finds/tests.py:1459 ishtar_common/forms.py:1160 +#: ishtar_common/forms.py:1240 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:485 msgid "No" msgstr "" @@ -5645,20 +5595,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2965 +#: archaeological_operations/models.py:3008 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2967 +#: archaeological_operations/models.py:3010 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2969 -#: archaeological_operations/models.py:2997 -#: archaeological_operations/models.py:3062 +#: archaeological_operations/models.py:3012 +#: archaeological_operations/models.py:3040 +#: archaeological_operations/models.py:3105 msgid "Public domain" msgstr "" @@ -5716,13 +5666,13 @@ msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:789 -#: archaeological_operations/models.py:1429 +#: archaeological_operations/models.py:1464 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:794 -#: archaeological_operations/models.py:1364 +#: archaeological_operations/models.py:1399 msgid "Address / Locality" msgstr "" @@ -5732,28 +5682,29 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:845 -#: archaeological_operations/models.py:2636 +#: archaeological_operations/models.py:2679 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/models.py:1263 +#: archaeological_operations/forms.py:1760 +#: archaeological_operations/models.py:1298 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:533 #: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1320 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:278 -#: archaeological_operations/models.py:287 -#: archaeological_operations/models.py:458 -#: archaeological_operations/models.py:912 -#: archaeological_operations/models.py:999 -#: archaeological_operations/models.py:1298 +#: archaeological_operations/forms.py:1297 +#: archaeological_operations/forms.py:1415 +#: archaeological_operations/forms.py:1924 +#: archaeological_operations/models.py:306 +#: archaeological_operations/models.py:315 +#: archaeological_operations/models.py:487 +#: archaeological_operations/models.py:947 +#: archaeological_operations/models.py:1033 +#: archaeological_operations/models.py:1333 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -5780,34 +5731,34 @@ msgstr "" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:895 -#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:1402 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:897 -#: archaeological_operations/models.py:914 -#: archaeological_operations/models.py:1410 +#: archaeological_operations/models.py:949 +#: archaeological_operations/models.py:1445 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:863 -#: archaeological_operations/models.py:1319 +#: archaeological_operations/models.py:1354 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:816 -#: archaeological_operations/models.py:1401 +#: archaeological_operations/models.py:1436 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1815 -#: archaeological_operations/models.py:915 -#: archaeological_operations/models.py:1420 +#: archaeological_operations/forms.py:1768 +#: archaeological_operations/models.py:950 +#: archaeological_operations/models.py:1455 msgid "Documentation received" msgstr "" @@ -5821,9 +5772,9 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1819 -#: archaeological_operations/models.py:916 -#: archaeological_operations/models.py:1425 +#: archaeological_operations/forms.py:1772 +#: archaeological_operations/models.py:951 +#: archaeological_operations/models.py:1460 msgid "Finds received" msgstr "" @@ -5868,13 +5819,13 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1867 -#: archaeological_operations/models.py:1363 +#: archaeological_operations/forms.py:1820 +#: archaeological_operations/models.py:1398 msgid "Generic name" msgstr "" #: archaeological_operations/forms.py:808 -#: archaeological_operations/models.py:1324 +#: archaeological_operations/models.py:1359 msgid "Old code" msgstr "" @@ -5887,16 +5838,16 @@ msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:842 -#: archaeological_operations/models.py:1361 +#: archaeological_operations/models.py:1396 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:856 -#: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/forms.py:1960 -#: archaeological_operations/models.py:476 -#: archaeological_operations/models.py:1277 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/forms.py:1776 +#: archaeological_operations/forms.py:1913 +#: archaeological_operations/models.py:505 +#: archaeological_operations/models.py:1312 msgid "Collaborators" msgstr "" @@ -5905,17 +5856,17 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:861 -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1283 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:883 -#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:1452 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:888 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1458 msgid "Deadline for submission of the finds" msgstr "" @@ -5924,12 +5875,12 @@ msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:900 -#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:888 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:888 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:906 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1450 msgid "Abstract" msgstr "" @@ -5954,7 +5905,7 @@ msgid "Bad operation code" msgstr "" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1856 +#: archaeological_operations/models.py:1898 msgid "Operation code" msgstr "" @@ -5968,12 +5919,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1467 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:1053 -#: archaeological_operations/models.py:1434 +#: archaeological_operations/models.py:1469 msgid "Official report number" msgstr "" @@ -5982,12 +5933,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:1481 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:1071 -#: archaeological_operations/models.py:1454 +#: archaeological_operations/models.py:1489 msgid "Writer of the minutes" msgstr "" @@ -6000,23 +5951,23 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:1080 -#: archaeological_operations/models.py:1303 +#: archaeological_operations/models.py:1338 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:1307 +#: archaeological_operations/models.py:1342 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:1311 +#: archaeological_operations/models.py:1346 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:1085 -#: archaeological_operations/models.py:1315 +#: archaeological_operations/models.py:1350 msgid "Effective man-days" msgstr "" @@ -6029,17 +5980,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1101 -#: archaeological_operations/models.py:1335 +#: archaeological_operations/models.py:1370 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1374 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1106 -#: archaeological_operations/models.py:1342 +#: archaeological_operations/models.py:1377 msgid "Prescription on geoarchaeological context" msgstr "" @@ -6060,10 +6011,10 @@ msgid "Operation - 050 - Parcels (2)" msgstr "" #: archaeological_operations/forms.py:1195 -#: archaeological_operations/forms.py:1314 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1919 -#: archaeological_operations/models.py:453 +#: archaeological_operations/forms.py:1291 +#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1872 +#: archaeological_operations/models.py:482 #: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 #: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 @@ -6072,178 +6023,178 @@ msgid "Reference" msgstr "" #: archaeological_operations/forms.py:1206 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1966 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/forms.py:1919 msgid "Cultural attributions" msgstr "" -#: archaeological_operations/forms.py:1251 -#: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1939 +#: archaeological_operations/forms.py:1228 +#: archaeological_operations/forms.py:1453 +#: archaeological_operations/forms.py:1892 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1294 +#: archaeological_operations/forms.py:1271 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1299 +#: archaeological_operations/forms.py:1276 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1308 +#: archaeological_operations/forms.py:1285 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1305 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1340 -#: archaeological_operations/forms.py:1449 -#: archaeological_operations/models.py:468 +#: archaeological_operations/forms.py:1317 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:497 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1343 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/models.py:471 +#: archaeological_operations/forms.py:1320 +#: archaeological_operations/forms.py:1430 +#: archaeological_operations/models.py:500 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:488 +#: archaeological_operations/forms.py:1324 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/models.py:517 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1349 -#: archaeological_operations/forms.py:1523 -#: archaeological_operations/models.py:491 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1476 +#: archaeological_operations/models.py:520 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1351 -#: archaeological_operations/forms.py:1525 -#: archaeological_operations/models.py:480 +#: archaeological_operations/forms.py:1328 +#: archaeological_operations/forms.py:1478 +#: archaeological_operations/models.py:509 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1533 -#: archaeological_operations/models.py:482 +#: archaeological_operations/forms.py:1331 +#: archaeological_operations/forms.py:1486 +#: archaeological_operations/models.py:511 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1357 -#: archaeological_operations/forms.py:1527 -#: archaeological_operations/models.py:484 +#: archaeological_operations/forms.py:1334 +#: archaeological_operations/forms.py:1480 +#: archaeological_operations/models.py:513 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1359 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:485 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1482 +#: archaeological_operations/models.py:514 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1361 -#: archaeological_operations/forms.py:1531 -#: archaeological_operations/models.py:486 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1484 +#: archaeological_operations/models.py:515 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1421 +#: archaeological_operations/forms.py:1398 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1507 +#: archaeological_operations/forms.py:1460 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1469 #: archaeological_operations/templates/ishtar/sheet_site.html:54 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1517 +#: archaeological_operations/forms.py:1470 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1596 +#: archaeological_operations/forms.py:1549 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1611 -#: archaeological_operations/forms.py:1713 -#: archaeological_operations/forms.py:1780 +#: archaeological_operations/forms.py:1564 +#: archaeological_operations/forms.py:1666 +#: archaeological_operations/forms.py:1733 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1621 -#: archaeological_operations/models.py:2661 +#: archaeological_operations/forms.py:1574 +#: archaeological_operations/models.py:2704 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1628 -#: archaeological_operations/models.py:2696 +#: archaeological_operations/forms.py:1581 +#: archaeological_operations/models.py:2739 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1639 +#: archaeological_operations/forms.py:1592 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1673 +#: archaeological_operations/forms.py:1626 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1630 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1690 +#: archaeological_operations/forms.py:1643 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1648 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1719 -#: archaeological_operations/forms.py:1723 +#: archaeological_operations/forms.py:1672 +#: archaeological_operations/forms.py:1676 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:1694 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1743 +#: archaeological_operations/forms.py:1696 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1764 +#: archaeological_operations/forms.py:1717 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1785 +#: archaeological_operations/forms.py:1738 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1894 +#: archaeological_operations/forms.py:1847 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1950 +#: archaeological_operations/forms.py:1903 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6251,315 +6202,315 @@ msgstr "" msgid "Administrative Act" msgstr "" -#: archaeological_operations/models.py:93 +#: archaeological_operations/models.py:94 msgid "Remain types" msgstr "" -#: archaeological_operations/models.py:107 +#: archaeological_operations/models.py:108 msgid "Parent period" msgstr "" -#: archaeological_operations/models.py:114 +#: archaeological_operations/models.py:115 msgid "Type Period" msgstr "" -#: archaeological_operations/models.py:115 +#: archaeological_operations/models.py:116 msgid "Types Period" msgstr "" -#: archaeological_operations/models.py:130 +#: archaeological_operations/models.py:131 msgid "Type of report state" msgstr "" -#: archaeological_operations/models.py:131 +#: archaeological_operations/models.py:132 msgid "Types of report state" msgstr "" -#: archaeological_operations/models.py:148 +#: archaeological_operations/models.py:149 msgid "Type of record quality" msgstr "" -#: archaeological_operations/models.py:149 +#: archaeological_operations/models.py:150 msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:157 +#: archaeological_operations/models.py:158 msgid "Cultural attribution type" msgstr "" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:159 msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:346 -#: archaeological_operations/models.py:1096 -#: archaeological_operations/tests.py:3033 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1130 +#: archaeological_operations/tests.py:3032 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:358 +#: archaeological_operations/models.py:386 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:361 +#: archaeological_operations/models.py:389 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:393 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:369 +#: archaeological_operations/models.py:397 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:401 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:405 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:380 +#: archaeological_operations/models.py:408 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:388 +#: archaeological_operations/models.py:416 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:392 +#: archaeological_operations/models.py:420 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:396 +#: archaeological_operations/models.py:424 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:542 +#: archaeological_operations/models.py:1496 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:525 -#: archaeological_operations/models.py:1473 +#: archaeological_operations/models.py:554 +#: archaeological_operations/models.py:1508 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1390 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1425 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:551 +#: archaeological_operations/models.py:580 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 +#: archaeological_operations/models.py:771 ishtar_common/forms.py:1158 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 #: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:741 +#: archaeological_operations/models.py:773 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:977 +#: archaeological_operations/models.py:1012 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:978 +#: archaeological_operations/models.py:1013 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:979 -msgid "Scientist (full name)" -msgstr "" - -#: archaeological_operations/models.py:980 +#: archaeological_operations/models.py:1014 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:981 +#: archaeological_operations/models.py:1015 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:982 +#: archaeological_operations/models.py:1016 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:983 +#: archaeological_operations/models.py:1017 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:985 +#: archaeological_operations/models.py:1018 +msgid "Scientist (full name)" +msgstr "" + +#: archaeological_operations/models.py:1019 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:986 +#: archaeological_operations/models.py:1020 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:987 +#: archaeological_operations/models.py:1021 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:988 +#: archaeological_operations/models.py:1022 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1023 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1028 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1108 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1081 -#: archaeological_operations/tests.py:3040 +#: archaeological_operations/models.py:1115 +#: archaeological_operations/tests.py:3039 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1118 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1102 +#: archaeological_operations/models.py:1136 msgctxt "key for text search" msgid "start-before" msgstr "" -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:1139 msgctxt "key for text search" msgid "start-after" msgstr "" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1142 msgctxt "key for text search" msgid "end-before" msgstr "" -#: archaeological_operations/models.py:1112 +#: archaeological_operations/models.py:1146 msgctxt "key for text search" msgid "end-after" msgstr "" -#: archaeological_operations/models.py:1116 -#: archaeological_operations/tests.py:3083 +#: archaeological_operations/models.py:1150 +#: archaeological_operations/tests.py:3082 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:1159 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1129 +#: archaeological_operations/models.py:1163 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1137 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1145 +#: archaeological_operations/models.py:1179 msgctxt "key for text search" msgid "documentation-received" msgstr "" -#: archaeological_operations/models.py:1149 +#: archaeological_operations/models.py:1183 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "" -#: archaeological_operations/models.py:1153 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "" -#: archaeological_operations/models.py:1157 +#: archaeological_operations/models.py:1191 msgctxt "key for text search" msgid "finds-received" msgstr "" -#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "" -#: archaeological_operations/models.py:1168 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1254 +#: archaeological_operations/models.py:1289 msgid "Scientific manager" msgstr "" -#: archaeological_operations/models.py:1270 +#: archaeological_operations/models.py:1305 msgid "Operation monitor" msgstr "" -#: archaeological_operations/models.py:1396 +#: archaeological_operations/models.py:1431 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1404 +#: archaeological_operations/models.py:1439 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1438 +#: archaeological_operations/models.py:1473 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1483 +#: archaeological_operations/models.py:1518 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1001 ishtar_common/views.py:1002 @@ -6567,295 +6518,295 @@ msgstr "" msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1520 +#: archaeological_operations/models.py:1558 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1521 +#: archaeological_operations/models.py:1559 msgid "List of associated containers" msgstr "" -#: archaeological_operations/models.py:1594 +#: archaeological_operations/models.py:1632 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1703 +#: archaeological_operations/models.py:1741 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1822 +#: archaeological_operations/models.py:1864 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1841 +#: archaeological_operations/models.py:1883 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1889 +#: archaeological_operations/models.py:1931 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:1950 +#: archaeological_operations/models.py:1992 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:1960 +#: archaeological_operations/models.py:2002 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:1968 +#: archaeological_operations/models.py:2010 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:1976 +#: archaeological_operations/models.py:2018 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2030 +#: archaeological_operations/models.py:2072 #: archaeological_warehouse/templates/ishtar/sheet_container.html:103 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2092 -#: archaeological_operations/models.py:2171 +#: archaeological_operations/models.py:2134 +#: archaeological_operations/models.py:2213 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2136 +#: archaeological_operations/models.py:2178 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2223 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:309 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:575 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2266 ishtar_common/models_imports.py:889 +#: archaeological_operations/models.py:2309 ishtar_common/models_imports.py:889 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2310 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2292 +#: archaeological_operations/models.py:2335 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2293 +#: archaeological_operations/models.py:2336 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2359 +#: archaeological_operations/models.py:2402 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2364 +#: archaeological_operations/models.py:2407 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2367 +#: archaeological_operations/models.py:2410 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2371 +#: archaeological_operations/models.py:2414 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2497 +#: archaeological_operations/models.py:2540 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2507 +#: archaeological_operations/models.py:2550 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2553 #: archaeological_warehouse/models.py:923 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2557 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2526 +#: archaeological_operations/models.py:2569 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2573 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2577 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2537 +#: archaeological_operations/models.py:2580 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2541 +#: archaeological_operations/models.py:2584 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2588 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2600 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2561 +#: archaeological_operations/models.py:2604 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2607 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2611 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2572 +#: archaeological_operations/models.py:2615 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2619 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2623 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2627 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2630 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2594 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2598 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2602 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2606 +#: archaeological_operations/models.py:2649 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2610 +#: archaeological_operations/models.py:2653 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2687 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2749 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2712 +#: archaeological_operations/models.py:2755 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2886 +#: archaeological_operations/models.py:2929 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2976 +#: archaeological_operations/models.py:3019 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3266 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3238 +#: archaeological_operations/models.py:3281 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3282 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3287 +#: archaeological_operations/models.py:3330 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3332 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3333 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3334 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3335 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3336 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3835 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3795 +#: archaeological_operations/models.py:3838 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3839 msgid "Operation types old" msgstr "" @@ -7124,73 +7075,73 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:824 +#: archaeological_operations/tests.py:821 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:854 +#: archaeological_operations/tests.py:851 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:892 +#: archaeological_operations/tests.py:889 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" -#: archaeological_operations/tests.py:1803 -msgid "" -"This parcel is associated with a context record. It can't be deleted." +#: archaeological_operations/tests.py:1802 +#: archaeological_operations/views.py:474 +msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" -#: archaeological_operations/tests.py:2530 ishtar_common/forms.py:442 +#: archaeological_operations/tests.py:2529 ishtar_common/forms.py:442 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2543 +#: archaeological_operations/tests.py:2542 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4696 +#: archaeological_operations/tests.py:4578 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4704 +#: archaeological_operations/tests.py:4586 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4717 +#: archaeological_operations/tests.py:4599 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 +#: archaeological_operations/tests.py:4606 ishtar_common/admin.py:2274 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4730 +#: archaeological_operations/tests.py:4612 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 +#: archaeological_operations/tests.py:4685 ishtar_common/admin.py:2352 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4809 ishtar_common/models_rest.py:307 +#: archaeological_operations/tests.py:4691 ishtar_common/models_rest.py:307 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4816 ishtar_common/models_rest.py:286 +#: archaeological_operations/tests.py:4698 ishtar_common/models_rest.py:286 #: ishtar_common/models_rest.py:292 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -7216,10 +7167,6 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:474 -msgid "This parcel is associated with a context record. It can't be deleted." -msgstr "" - #: archaeological_operations/views.py:575 ishtar_common/models.py:1009 msgid "Site deletion" msgstr "" @@ -7249,7 +7196,7 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:84 archaeological_warehouse/forms.py:192 -#: archaeological_warehouse/forms.py:508 archaeological_warehouse/forms.py:729 +#: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 @@ -7290,7 +7237,7 @@ msgid "Warehouse - 001 - Search" msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 -#: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:260 +#: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 #: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:901 msgid "Warehouse type" msgstr "" @@ -7317,59 +7264,59 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 -#: ishtar_common/models_common.py:3006 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:3188 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3035 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3043 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 -#: ishtar_common/models_common.py:3018 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3057 +#: ishtar_common/models_common.py:3200 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3073 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:272 +#: archaeological_warehouse/forms.py:266 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:301 archaeological_warehouse/forms.py:302 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:312 +#: archaeological_warehouse/forms.py:306 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:330 +#: archaeological_warehouse/forms.py:324 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:341 archaeological_warehouse/forms.py:512 +#: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 #: archaeological_warehouse/models.py:1132 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:343 archaeological_warehouse/forms.py:510 -#: archaeological_warehouse/forms.py:734 archaeological_warehouse/models.py:698 +#: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 +#: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 #: archaeological_warehouse/models.py:859 #: archaeological_warehouse/models.py:1098 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 @@ -7377,124 +7324,124 @@ msgstr "" msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:345 +#: archaeological_warehouse/forms.py:339 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:354 archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 #: archaeological_warehouse/models.py:1115 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:364 archaeological_warehouse/forms.py:745 +#: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 #: archaeological_warehouse/models.py:1089 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:372 +#: archaeological_warehouse/forms.py:366 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:377 +#: archaeological_warehouse/forms.py:371 #: archaeological_warehouse/models.py:1122 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:403 +#: archaeological_warehouse/forms.py:397 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:422 +#: archaeological_warehouse/forms.py:416 msgid "This reference already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:430 archaeological_warehouse/forms.py:807 +#: archaeological_warehouse/forms.py:424 archaeological_warehouse/forms.py:801 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:494 +#: archaeological_warehouse/forms.py:488 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:501 +#: archaeological_warehouse/forms.py:495 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:509 +#: archaeological_warehouse/forms.py:503 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:514 +#: archaeological_warehouse/forms.py:508 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:517 +#: archaeological_warehouse/forms.py:511 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:552 +#: archaeological_warehouse/forms.py:546 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:554 +#: archaeological_warehouse/forms.py:548 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:559 +#: archaeological_warehouse/forms.py:553 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:568 +#: archaeological_warehouse/forms.py:562 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:569 +#: archaeological_warehouse/forms.py:563 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:570 +#: archaeological_warehouse/forms.py:564 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:589 +#: archaeological_warehouse/forms.py:583 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:613 archaeological_warehouse/forms.py:626 -#: archaeological_warehouse/forms.py:640 archaeological_warehouse/views.py:373 +#: archaeological_warehouse/forms.py:607 archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:634 archaeological_warehouse/views.py:373 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:618 archaeological_warehouse/forms.py:631 -#: archaeological_warehouse/forms.py:645 +#: archaeological_warehouse/forms.py:612 archaeological_warehouse/forms.py:625 +#: archaeological_warehouse/forms.py:639 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:620 +#: archaeological_warehouse/forms.py:614 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:665 +#: archaeological_warehouse/forms.py:659 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:693 +#: archaeological_warehouse/forms.py:687 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:705 +#: archaeological_warehouse/forms.py:699 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:709 archaeological_warehouse/forms.py:710 +#: archaeological_warehouse/forms.py:703 archaeological_warehouse/forms.py:704 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:715 +#: archaeological_warehouse/forms.py:709 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:828 +#: archaeological_warehouse/forms.py:822 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -7861,7 +7808,7 @@ msgid "" msgstr "" #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:36 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:44 msgid "Associated finds" msgstr "" @@ -7957,383 +7904,383 @@ msgstr "" msgid "Related item" msgstr "" -#: ishtar_common/admin.py:107 +#: ishtar_common/admin.py:106 msgid "CSV file" msgstr "" -#: ishtar_common/admin.py:108 +#: ishtar_common/admin.py:107 msgid "Only unicode encoding is managed - convert your file first" msgstr "" -#: ishtar_common/admin.py:148 +#: ishtar_common/admin.py:147 msgid "Export selected as CSV file" msgstr "" -#: ishtar_common/admin.py:212 +#: ishtar_common/admin.py:211 msgid "Export selected as GeoJSON file" msgstr "" -#: ishtar_common/admin.py:295 +#: ishtar_common/admin.py:294 msgid "Export selected as Ishtar (zipped JSON)" msgstr "" -#: ishtar_common/admin.py:301 +#: ishtar_common/admin.py:300 msgid "Merge inside" msgstr "" -#: ishtar_common/admin.py:317 +#: ishtar_common/admin.py:316 msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 +#: ishtar_common/admin.py:333 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "" -#: ishtar_common/admin.py:359 +#: ishtar_common/admin.py:358 msgid "{} merged into {}." msgstr "" -#: ishtar_common/admin.py:382 +#: ishtar_common/admin.py:381 #: ishtar_common/templates/admin/change_parent.html:14 msgid "Change parent" msgstr "" -#: ishtar_common/admin.py:396 +#: ishtar_common/admin.py:395 msgid "Change parent of selected item(s)" msgstr "" -#: ishtar_common/admin.py:428 +#: ishtar_common/admin.py:427 msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:489 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "" -#: ishtar_common/admin.py:541 ishtar_common/models.py:979 +#: ishtar_common/admin.py:540 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/admin.py:541 ishtar_common/forms_common.py:1229 #: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 #: ishtar_common/models.py:2898 msgid "Profiles" msgstr "" -#: ishtar_common/admin.py:637 +#: ishtar_common/admin.py:636 msgid "The CSV file should at least have a {} column" msgstr "" -#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 +#: ishtar_common/admin.py:703 ishtar_common/admin.py:933 #, python-format msgid "%d item(s) created." msgstr "" -#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 +#: ishtar_common/admin.py:705 ishtar_common/admin.py:937 #, python-format msgid "%d item(s) updated." msgstr "" -#: ishtar_common/admin.py:710 +#: ishtar_common/admin.py:709 msgid "These parents are missing: {}" msgstr "" -#: ishtar_common/admin.py:730 +#: ishtar_common/admin.py:729 msgid "Geojson file" msgstr "" -#: ishtar_common/admin.py:732 +#: ishtar_common/admin.py:731 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." msgstr "" -#: ishtar_common/admin.py:738 +#: ishtar_common/admin.py:737 msgid "Prefix for numero INSEE" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:740 msgid "Field name for numero INSEE" msgstr "" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:743 msgid "Field name for name" msgstr "" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "m2" msgstr "" -#: ishtar_common/admin.py:746 +#: ishtar_common/admin.py:745 msgid "km2" msgstr "" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:746 msgid "Surface unit" msgstr "" -#: ishtar_common/admin.py:749 +#: ishtar_common/admin.py:748 msgid "Field name for surface" msgstr "" -#: ishtar_common/admin.py:752 +#: ishtar_common/admin.py:751 msgid "Field name for year" msgstr "" -#: ishtar_common/admin.py:756 +#: ishtar_common/admin.py:755 msgid "Not required for new town. Leave it empty when not available." msgstr "" -#: ishtar_common/admin.py:759 +#: ishtar_common/admin.py:758 msgid "Update only geometry of existing towns" msgstr "" -#: ishtar_common/admin.py:778 +#: ishtar_common/admin.py:777 msgid "\"{}\" not found in feature {}" msgstr "" -#: ishtar_common/admin.py:791 +#: ishtar_common/admin.py:790 msgid "\"{}\" not found in properties of feature {}" msgstr "" -#: ishtar_common/admin.py:804 +#: ishtar_common/admin.py:803 msgid "Bad geometry for feature {}" msgstr "" -#: ishtar_common/admin.py:815 +#: ishtar_common/admin.py:814 msgid "Geometry {} not managed for towns - feature {}" msgstr "" -#: ishtar_common/admin.py:825 +#: ishtar_common/admin.py:824 msgid "Bad value for surface: {} - feature {}" msgstr "" -#: ishtar_common/admin.py:869 +#: ishtar_common/admin.py:868 msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:892 +#: ishtar_common/admin.py:891 msgid "Bad geojson file" msgstr "" -#: ishtar_common/admin.py:904 +#: ishtar_common/admin.py:903 msgid "Too many errors..." msgstr "" -#: ishtar_common/admin.py:957 +#: ishtar_common/admin.py:956 msgid "Zipped JSON file" msgstr "" -#: ishtar_common/admin.py:958 +#: ishtar_common/admin.py:957 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "" -#: ishtar_common/admin.py:994 +#: ishtar_common/admin.py:993 msgid "{} {}(s) created/updated." msgstr "" -#: ishtar_common/admin.py:1017 +#: ishtar_common/admin.py:1016 msgid "Center" msgstr "" -#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 +#: ishtar_common/admin.py:1017 ishtar_common/models_common.py:2798 msgid "Limit" msgstr "" -#: ishtar_common/admin.py:1026 +#: ishtar_common/admin.py:1025 msgid "Parents" msgstr "" -#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 +#: ishtar_common/admin.py:1066 ishtar_common/admin.py:1507 msgid "Make available" msgstr "" -#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make unavailable" msgstr "" -#: ishtar_common/admin.py:1192 +#: ishtar_common/admin.py:1191 msgid "Department number" msgstr "" -#: ishtar_common/admin.py:1193 +#: ishtar_common/admin.py:1192 msgid "Area name" msgstr "" -#: ishtar_common/admin.py:1207 +#: ishtar_common/admin.py:1206 msgid "Choose an area or set an area reference." msgstr "" -#: ishtar_common/admin.py:1214 +#: ishtar_common/admin.py:1213 msgid "Invalid department number." msgstr "" -#: ishtar_common/admin.py:1223 +#: ishtar_common/admin.py:1222 msgid "This name is already used by another area." msgstr "" -#: ishtar_common/admin.py:1251 +#: ishtar_common/admin.py:1250 msgid "Area \"{}\" created." msgstr "" -#: ishtar_common/admin.py:1268 +#: ishtar_common/admin.py:1267 msgid "{} town(s) added to \"{}\"." msgstr "" -#: ishtar_common/admin.py:1440 +#: ishtar_common/admin.py:1439 msgid "{} importer type(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1461 +#: ishtar_common/admin.py:1460 msgid "Select only one importer." msgstr "" -#: ishtar_common/admin.py:1491 +#: ishtar_common/admin.py:1490 msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1560 +#: ishtar_common/admin.py:1559 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1591 +#: ishtar_common/admin.py:1590 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1604 +#: ishtar_common/admin.py:1603 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1631 +#: ishtar_common/admin.py:1630 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1638 +#: ishtar_common/admin.py:1637 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1652 +#: ishtar_common/admin.py:1651 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1687 +#: ishtar_common/admin.py:1686 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1832 +#: ishtar_common/admin.py:1831 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1833 +#: ishtar_common/admin.py:1832 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1862 ishtar_common/models.py:1553 msgid "Form" msgstr "" -#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1883 ishtar_common/models.py:1694 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 +#: ishtar_common/admin.py:2013 ishtar_common/admin.py:2065 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2021 +#: ishtar_common/admin.py:2020 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2033 +#: ishtar_common/admin.py:2032 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2073 +#: ishtar_common/admin.py:2072 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2084 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2152 ishtar_common/models.py:976 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 -#: ishtar_common/admin.py:2333 +#: ishtar_common/admin.py:2185 ishtar_common/admin.py:2295 +#: ishtar_common/admin.py:2331 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2208 +#: ishtar_common/admin.py:2206 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2216 +#: ishtar_common/admin.py:2214 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" -#: ishtar_common/admin.py:2226 +#: ishtar_common/admin.py:2224 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2244 +#: ishtar_common/admin.py:2242 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2250 +#: ishtar_common/admin.py:2248 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2256 +#: ishtar_common/admin.py:2254 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2265 +#: ishtar_common/admin.py:2263 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2283 +#: ishtar_common/admin.py:2281 msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2318 +#: ishtar_common/admin.py:2316 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2340 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2347 +#: ishtar_common/admin.py:2345 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2360 +#: ishtar_common/admin.py:2358 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2393 +#: ishtar_common/admin.py:2391 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2394 +#: ishtar_common/admin.py:2392 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2402 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/admin.py:2405 ishtar_common/models.py:449 #: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 @@ -8344,21 +8291,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2409 +#: ishtar_common/admin.py:2407 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2439 +#: ishtar_common/admin.py:2437 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2472 +#: ishtar_common/admin.py:2470 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2480 +#: ishtar_common/admin.py:2478 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8394,173 +8341,173 @@ msgstr "" msgid "Ishtar - Common" msgstr "" -#: ishtar_common/data_importer.py:278 +#: ishtar_common/data_importer.py:279 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:297 +#: ishtar_common/data_importer.py:298 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:309 +#: ishtar_common/data_importer.py:310 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:319 +#: ishtar_common/data_importer.py:320 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:388 -#: ishtar_common/data_importer.py:678 +#: ishtar_common/data_importer.py:376 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:679 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:401 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:470 ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:471 ishtar_common/data_importer.py:764 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:478 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:479 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:707 +#: ishtar_common/data_importer.py:708 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:846 +#: ishtar_common/data_importer.py:847 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:852 +#: ishtar_common/data_importer.py:853 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 +#: ishtar_common/data_importer.py:855 ishtar_common/views.py:1619 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:855 +#: ishtar_common/data_importer.py:856 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:856 +#: ishtar_common/data_importer.py:857 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:857 +#: ishtar_common/data_importer.py:858 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:859 +#: ishtar_common/data_importer.py:860 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:863 +#: ishtar_common/data_importer.py:864 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:867 +#: ishtar_common/data_importer.py:868 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/data_importer.py:1554 ishtar_common/views.py:1697 #: ishtar_common/views.py:1707 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1842 +#: ishtar_common/data_importer.py:1845 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1847 +#: ishtar_common/data_importer.py:1850 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1929 +#: ishtar_common/data_importer.py:1932 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:2056 +#: ishtar_common/data_importer.py:2059 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2131 +#: ishtar_common/data_importer.py:2134 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2139 +#: ishtar_common/data_importer.py:2142 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2144 +#: ishtar_common/data_importer.py:2147 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2229 +#: ishtar_common/data_importer.py:2232 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2232 +#: ishtar_common/data_importer.py:2235 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2312 +#: ishtar_common/data_importer.py:2315 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2341 +#: ishtar_common/data_importer.py:2344 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2347 +#: ishtar_common/data_importer.py:2350 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2363 +#: ishtar_common/data_importer.py:2366 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8634,6 +8581,26 @@ msgstr "" msgid "Set to null" msgstr "" +#: ishtar_common/forms.py:1298 +msgid "Geo - Name" +msgstr "" + +#: ishtar_common/forms.py:1299 +msgid "Geo - Data type" +msgstr "" + +#: ishtar_common/forms.py:1300 +msgid "Geo - Origin" +msgstr "" + +#: ishtar_common/forms.py:1301 +msgid "Geo - Provider" +msgstr "" + +#: ishtar_common/forms.py:1302 +msgid "Geo - Comment" +msgstr "" + #: ishtar_common/forms_common.py:86 msgid "" "<p>Type name, department code of the town you would like to select. The " @@ -8666,7 +8633,7 @@ msgstr "" msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2542 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -8742,8 +8709,8 @@ msgstr "" #: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 #: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 -#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 -#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3075 +#: ishtar_common/models_common.py:3210 ishtar_common/wizards.py:1933 msgid "Email" msgstr "" @@ -8815,12 +8782,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3059 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 -#: ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3062 +#: ishtar_common/models_common.py:3065 msgid "Phone description 2" msgstr "" @@ -8828,11 +8795,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3069 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3067 msgid "Phone 3" msgstr "" @@ -8840,23 +8807,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3044 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3046 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3049 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3052 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3055 msgid "Other address: country" msgstr "" @@ -8865,7 +8832,7 @@ msgid "Already has an account" msgstr "" #: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 -#: ishtar_common/wizards.py:1930 +#: ishtar_common/wizards.py:1932 msgid "Username" msgstr "" @@ -8885,7 +8852,7 @@ msgid "Account" msgstr "" #: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 -#: ishtar_common/wizards.py:1966 +#: ishtar_common/wizards.py:1968 msgid "New password" msgstr "" @@ -9049,6 +9016,7 @@ msgstr "" #: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 #: ishtar_common/models.py:5185 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "" @@ -9292,16 +9260,19 @@ msgstr "" #: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" #: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" #: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" @@ -9314,6 +9285,21 @@ msgstr "" msgid "Buffer type" msgstr "" +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:3706 +msgid "Estimated error for X" +msgstr "" + +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2182 +#: ishtar_common/models_common.py:3709 +msgid "Estimated error for Y" +msgstr "" + +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2185 +#: ishtar_common/models_common.py:3712 +msgid "Estimated error for Z" +msgstr "" + #: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "" @@ -9322,44 +9308,48 @@ msgstr "" msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2859 +#: ishtar_common/forms_common.py:2855 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2864 +#: ishtar_common/forms_common.py:2860 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2869 +#: ishtar_common/forms_common.py:2865 msgid "A value is expected for Z." msgstr "" -#: ishtar_common/forms_common.py:2888 +#: ishtar_common/forms_common.py:2884 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:2924 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 -#: ishtar_common/models_common.py:3539 +#: ishtar_common/forms_common.py:2926 +msgid "Coordinates" +msgstr "" + +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3721 msgid "Point" msgstr "" -#: ishtar_common/forms_common.py:2931 +#: ishtar_common/forms_common.py:2928 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:2929 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:2933 +#: ishtar_common/forms_common.py:2930 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:2934 +#: ishtar_common/forms_common.py:2931 msgid "Multi-polygons" msgstr "" @@ -10315,6 +10305,11 @@ msgstr "" msgid "Error: general_contractor type is missing" msgstr "" +#: ishtar_common/models.py:2465 +msgctxt "key for text search" +msgid "precise-town" +msgstr "" + #: ishtar_common/models.py:2503 msgid "Organizations" msgstr "" @@ -10730,7 +10725,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3430 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -11128,11 +11123,23 @@ msgstr "" msgid "Data provider" msgstr "" +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:3702 +msgid "X" +msgstr "" + #: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 #: ishtar_common/models_common.py:2172 msgid "User input" msgstr "" +#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3703 +msgid "Y" +msgstr "" + +#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3704 +msgid "Z" +msgstr "" + #: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "" @@ -11145,7 +11152,11 @@ msgstr "" msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:3716 +msgid "Spatial Reference System" +msgstr "" + +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3722 msgid "Point (2D)" msgstr "" @@ -11169,101 +11180,134 @@ msgstr "" msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2274 +#: ishtar_common/models_common.py:2284 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2647 +#: ishtar_common/models_common.py:2702 +msgctxt "key for text search" +msgid "geo-name" +msgstr "" + +#: ishtar_common/models_common.py:2705 +msgctxt "key for text search" +msgid "geo-type" +msgstr "" + +#: ishtar_common/models_common.py:2708 +msgctxt "key for text search" +msgid "geo-origin" +msgstr "" + +#: ishtar_common/models_common.py:2711 +msgctxt "key for text search" +msgid "geo-provider" +msgstr "" + +#: ishtar_common/models_common.py:2714 +msgctxt "key for text search" +msgid "geo-comment" +msgstr "" + +#: ishtar_common/models_common.py:2736 +msgid "Add geographic item" +msgstr "" + +#: ishtar_common/models_common.py:2738 +msgid "geo." +msgstr "" + +#: ishtar_common/models_common.py:2808 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2651 +#: ishtar_common/models_common.py:2812 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2655 +#: ishtar_common/models_common.py:2816 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:2856 +#: ishtar_common/models_common.py:3038 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:2889 +#: ishtar_common/models_common.py:3071 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:2895 +#: ishtar_common/models_common.py:3077 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:3114 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3013 +#: ishtar_common/models_common.py:3195 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3023 +#: ishtar_common/models_common.py:3205 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3041 +#: ishtar_common/models_common.py:3223 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3252 +#: ishtar_common/models_common.py:3434 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3256 +#: ishtar_common/models_common.py:3438 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3332 +#: ishtar_common/models_common.py:3514 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3334 +#: ishtar_common/models_common.py:3516 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3517 +#: ishtar_common/models_common.py:3700 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3542 +#: ishtar_common/models_common.py:3724 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3727 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3729 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:3549 +#: ishtar_common/models_common.py:3731 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3556 +#: ishtar_common/models_common.py:3738 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4107 +#: ishtar_common/models_common.py:4254 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4109 +#: ishtar_common/models_common.py:4256 msgid "regen." msgstr "" @@ -11753,10 +11797,12 @@ msgid "Unarchive" msgstr "" #: ishtar_common/models_imports.py:1374 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "" #: ishtar_common/models_imports.py:1375 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 @@ -11765,7 +11811,7 @@ msgid "Delete" msgstr "" #: ishtar_common/models_imports.py:1469 ishtar_common/models_imports.py:1472 -#: ishtar_common/models_imports.py:1531 +#: ishtar_common/models_imports.py:1534 msgid "Invalid GIS file." msgstr "" @@ -11778,27 +11824,27 @@ msgstr "" msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1528 +#: ishtar_common/models_imports.py:1531 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1567 +#: ishtar_common/models_imports.py:1570 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1635 +#: ishtar_common/models_imports.py:1638 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1666 +#: ishtar_common/models_imports.py:1669 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1702 +#: ishtar_common/models_imports.py:1705 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1710 +#: ishtar_common/models_imports.py:1713 msgid "Import {} finished with no errors" msgstr "" @@ -12448,11 +12494,11 @@ msgstr "" msgid "Geometry" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:39 msgid "geo item" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_map.html:27 +#: ishtar_common/templates/ishtar/blocks/sheet_map.html:35 msgid "Associated context records" msgstr "" @@ -12616,6 +12662,44 @@ msgstr "" msgid "Are you sure you want to delete: " msgstr "" +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:11 +msgid "Are you sure to want to delete this geographic item?" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:12 +msgid "No rollback is possible." +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:43 +msgid "Geographic item for these towns" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:52 +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:97 +msgid "Geographic item for these operations" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:61 +msgid "Geographic item for these sites" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:70 +msgid "Geographic item for these context records" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:79 +msgid "Geographic item for these base finds" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:88 +msgid "Geographic item for these containers" +msgstr "" + +#: ishtar_common/templates/ishtar/forms/geo_delete_form.html:111 +#: ishtar_common/templates/ishtar/import_delete.html:45 +msgid "Are you sure to want to delete this import?" +msgstr "" + #: ishtar_common/templates/ishtar/forms/geo_form.html:7 msgid "" "Many items are attached to this geographic item. Only the ten first of each " @@ -12728,10 +12812,6 @@ msgid "" "every piece of information." msgstr "" -#: ishtar_common/templates/ishtar/import_delete.html:45 -msgid "Are you sure to want to delete this import?" -msgstr "" - #: ishtar_common/templates/ishtar/import_list.html:10 msgid "Autorefresh the table (useful when waiting for an import result)" msgstr "" @@ -13377,19 +13457,19 @@ msgstr "" msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:612 +#: ishtar_common/utils.py:614 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:690 +#: ishtar_common/utils.py:692 msgid "Information" msgstr "" -#: ishtar_common/utils.py:691 +#: ishtar_common/utils.py:693 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1710 +#: ishtar_common/utils.py:1520 msgid "The maximum supported file size is {} Mo." msgstr "" @@ -13538,18 +13618,23 @@ msgstr "" msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2862 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2803 +#: ishtar_common/views.py:2813 ishtar_common/views.py:2910 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 +#: ishtar_common/views.py:2851 ishtar_common/views.py:2899 +#: ishtar_common/views.py:2948 msgid "Main geo item for" msgstr "" +#: ishtar_common/views.py:2961 +msgid "Delete geographic item" +msgstr "" + #: ishtar_common/views_item.py:185 #, python-format msgid "New %s" @@ -13598,19 +13683,19 @@ msgstr "" msgid "Deleted" msgstr "" -#: ishtar_common/wizards.py:1061 +#: ishtar_common/wizards.py:1063 msgid "{} modified." msgstr "" -#: ishtar_common/wizards.py:1063 +#: ishtar_common/wizards.py:1065 msgid "{} created." msgstr "" -#: ishtar_common/wizards.py:1841 +#: ishtar_common/wizards.py:1843 msgid "{} deleted." msgstr "" -#: ishtar_common/wizards.py:2090 +#: ishtar_common/wizards.py:2092 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" |