diff options
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 4941 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 4929 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 5003 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 4929 |
4 files changed, 10742 insertions, 9060 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index bec42e5cd..22732e97f 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: 2023-09-27 14:17+0200\n" +"POT-Creation-Date: 2023-11-18 17:48+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,28 +21,29 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:718 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1181 -#: archaeological_finds/models_finds.py:2464 +#: archaeological_finds/models_finds.py:1036 +#: archaeological_finds/models_finds.py:2319 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1238 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1557 -#: archaeological_operations/models.py:2429 -#: archaeological_operations/models.py:2447 -#: archaeological_operations/models.py:2563 -#: archaeological_operations/models.py:2762 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:2435 +#: archaeological_operations/models.py:2453 +#: archaeological_operations/models.py:2569 +#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:3057 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2202 -#: ishtar_common/models.py:5234 ishtar_common/views.py:499 +#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2379 +#: ishtar_common/models.py:5248 ishtar_common/views.py:499 +#: na_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -88,17 +89,17 @@ msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 -#: archaeological_finds/forms.py:1260 archaeological_finds/forms.py:1966 +#: archaeological_finds/forms.py:1261 archaeological_finds/forms.py:1967 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1424 +#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1429 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:641 ishtar_common/forms_common.py:819 -#: ishtar_common/forms_common.py:1044 ishtar_common/forms_common.py:2119 +#: ishtar_common/forms_common.py:819 ishtar_common/forms_common.py:997 +#: ishtar_common/forms_common.py:1222 ishtar_common/forms_common.py:2296 msgid "Full text search" msgstr "" @@ -106,14 +107,14 @@ msgstr "" #: archaeological_context_records/forms.py:301 #: archaeological_context_records/forms.py:554 #: archaeological_context_records/forms.py:608 -#: archaeological_context_records/models.py:750 -#: archaeological_context_records/models.py:1457 +#: archaeological_context_records/models.py:730 +#: archaeological_context_records/models.py:1347 #: archaeological_warehouse/forms.py:454 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1739 +#: archaeological_operations/forms.py:1744 msgid "Code PATRIARCHE" msgstr "" @@ -124,7 +125,7 @@ msgid "Operation - name" msgstr "E-Mail-Adresse" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2213 +#: ishtar_common/forms_common.py:2389 #, fuzzy #| msgid "email address" msgid "Operation - year" @@ -136,14 +137,14 @@ msgstr "" #: archaeological_context_records/forms.py:157 #: archaeological_context_records/forms.py:715 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/models.py:724 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5235 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5249 msgid "Archaeological site" msgstr "" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1348 +#: archaeological_finds/forms.py:1349 msgid "Search within related operations" msgstr "" @@ -154,23 +155,24 @@ msgstr "" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:511 -#: archaeological_context_records/models.py:536 -#: archaeological_context_records/models.py:825 +#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:805 msgid "Activity" msgstr "" #: archaeological_context_records/forms.py:169 #: archaeological_context_records/forms.py:513 -#: archaeological_context_records/models.py:535 -#: archaeological_context_records/models.py:818 +#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:798 #: archaeological_finds/forms.py:273 archaeological_finds/forms.py:541 #: archaeological_finds/forms.py:717 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: ishtar_common/forms_common.py:1921 +#: ishtar_common/forms_common.py:2098 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 #: man_app/templates/ishtar/sheet_find.html:151 +#: na_app/templates/ishtar/sheet_find.html:159 msgid "Identification" msgstr "" @@ -178,18 +180,18 @@ msgstr "" #: archaeological_context_records/forms.py:292 #: archaeological_context_records/forms.py:556 #: archaeological_context_records/forms.py:609 -#: archaeological_context_records/models.py:522 -#: archaeological_context_records/models.py:523 -#: archaeological_context_records/models.py:722 -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 +#: archaeological_context_records/models.py:702 +#: archaeological_context_records/models.py:1349 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:127 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 -#: archaeological_finds/models_finds.py:1139 +#: archaeological_finds/models_finds.py:994 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1064 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:3075 -#: archaeological_operations/models.py:3350 +#: archaeological_operations/forms.py:1066 +#: archaeological_operations/forms.py:1443 +#: archaeological_operations/models.py:3081 +#: archaeological_operations/models.py:3375 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -206,8 +208,8 @@ msgstr "" #: archaeological_context_records/forms.py:175 #: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:537 -#: archaeological_context_records/models.py:830 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:810 msgid "Excavation techniques" msgstr "" @@ -221,17 +223,20 @@ msgstr "" #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:58 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:707 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:683 +#: archaeological_operations/forms.py:709 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1498 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 #: ishtar_common/templates/ishtar/sheet_area.html:30 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "" @@ -243,17 +248,17 @@ msgstr "" #: archaeological_context_records/forms.py:546 #: archaeological_context_records/forms.py:610 #: archaeological_context_records/forms.py:708 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:730 -#: archaeological_finds/models_finds.py:1136 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:710 +#: archaeological_finds/models_finds.py:991 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1036 -#: archaeological_operations/models.py:3056 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:3062 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:294 -#: ishtar_common/forms_common.py:88 ishtar_common/forms_common.py:110 -#: ishtar_common/models_common.py:3526 ishtar_common/models_common.py:4299 +#: ishtar_common/forms_common.py:92 ishtar_common/forms_common.py:114 +#: ishtar_common/models_common.py:3334 ishtar_common/models_common.py:4107 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" @@ -267,87 +272,89 @@ msgstr "" #: archaeological_context_records/forms.py:303 #: archaeological_context_records/forms.py:557 #: archaeological_context_records/forms.py:612 -#: archaeological_context_records/models.py:524 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:775 -#: archaeological_context_records/models.py:1458 +#: archaeological_context_records/models.py:504 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:1348 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:751 -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:731 +#: archaeological_context_records/models.py:1350 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_finds/forms.py:291 archaeological_finds/forms.py:293 #: archaeological_finds/forms.py:548 archaeological_finds/forms.py:550 #: archaeological_finds/forms.py:718 archaeological_finds/forms.py:764 -#: archaeological_finds/forms.py:1362 +#: archaeological_finds/forms.py:1363 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:426 -#: archaeological_finds/models_finds.py:1850 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/models_treatments.py:260 #: archaeological_finds/templates/ishtar/sheet_find.html:169 -#: ishtar_common/forms_common.py:1868 ishtar_common/forms_common.py:2136 -#: ishtar_common/models.py:1036 ishtar_common/models.py:4342 -#: ishtar_common/models_imports.py:153 ishtar_common/models_imports.py:581 -#: ishtar_common/models_imports.py:681 ishtar_common/models_imports.py:700 +#: ishtar_common/forms_common.py:2045 ishtar_common/forms_common.py:2313 +#: ishtar_common/models.py:1047 ishtar_common/models.py:4356 +#: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:434 +#: ishtar_common/models_imports.py:700 ishtar_common/models_imports.py:800 +#: ishtar_common/models_imports.py:819 #: man_app/templates/ishtar/sheet_find.html:170 +#: na_app/templates/ishtar/sheet_find.html:181 msgid "Description" msgstr "" #: archaeological_context_records/forms.py:307 -#: archaeological_context_records/models.py:781 +#: archaeological_context_records/models.py:761 msgid "Filling" msgstr "" #: archaeological_context_records/forms.py:309 -#: archaeological_context_records/models.py:752 +#: archaeological_context_records/models.py:732 msgid "General comment" msgstr "" #: archaeological_context_records/forms.py:320 #: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:639 archaeological_operations/forms.py:736 +#: archaeological_files/models.py:639 archaeological_operations/forms.py:738 msgid "Total surface (m2)" msgstr "" #: archaeological_context_records/forms.py:326 -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:735 msgid "Length (m)" msgstr "" #: archaeological_context_records/forms.py:327 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/models.py:736 msgid "Width (m)" msgstr "" #: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/models.py:737 msgid "Thickness (m)" msgstr "" #: archaeological_context_records/forms.py:329 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/models.py:738 msgid "Diameter (m)" msgstr "" #: archaeological_context_records/forms.py:330 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/models.py:739 msgid "Depth (m)" msgstr "" #: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/models.py:741 msgid "Depth of appearance (m)" msgstr "" #: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:753 +#: archaeological_context_records/models.py:733 msgid "Opening date" msgstr "" #: archaeological_context_records/forms.py:338 -#: archaeological_context_records/models.py:754 +#: archaeological_context_records/models.py:734 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_files/models.py:602 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -358,22 +365,24 @@ msgstr "" #: archaeological_finds/models_treatments.py:1142 #: archaeological_operations/models.py:1325 #: archaeological_operations/templates/ishtar/sheet_operation.html:204 -#: ishtar_common/forms.py:1005 ishtar_common/forms.py:1006 +#: ishtar_common/forms.py:1025 ishtar_common/forms.py:1026 +#: na_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "" #: archaeological_context_records/forms.py:341 -#: ishtar_common/forms_common.py:1708 +#: ishtar_common/forms_common.py:1885 msgid "Documentation" msgstr "" #: archaeological_context_records/forms.py:347 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:745 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:224 #: archaeological_finds/models_treatments.py:760 #: archaeological_warehouse/forms.py:737 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" @@ -388,23 +397,27 @@ msgstr "" #: archaeological_context_records/forms.py:441 #: archaeological_context_records/forms.py:463 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1154 archaeological_finds/forms.py:1175 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/forms.py:1155 archaeological_finds/forms.py:1176 +#: archaeological_finds/models_finds.py:1748 #: archaeological_finds/templates/ishtar/sheet_find.html:213 #: man_app/templates/ishtar/sheet_find.html:214 +#: na_app/templates/ishtar/sheet_find.html:225 msgid "Dating" msgstr "" #: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:534 -#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1161 -#: archaeological_finds/models_finds.py:1189 +#: archaeological_context_records/models.py:514 +#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1162 +#: archaeological_finds/models_finds.py:1044 #: archaeological_finds/templates/ishtar/sheet_find.html:221 -#: archaeological_operations/forms.py:827 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 +#: archaeological_operations/forms.py:829 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: man_app/templates/ishtar/sheet_find.html:222 +#: na_app/templates/ishtar/sheet_find.html:233 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:561 msgid "Chronological period" msgstr "" @@ -413,32 +426,36 @@ msgstr "" #: archaeological_files/forms.py:786 archaeological_files/models.py:75 #: archaeological_files/models.py:708 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1164 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3422 +#: archaeological_finds/models_finds.py:3157 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:758 #: archaeological_finds/templates/ishtar/sheet_find.html:222 #: 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_operations/forms.py:782 +#: archaeological_operations/forms.py:784 #: archaeological_operations/models.py:104 #: archaeological_operations/models.py:1326 -#: archaeological_operations/models.py:3354 +#: archaeological_operations/models.py:3379 #: man_app/templates/ishtar/sheet_find.html:223 -#: man_app/templates/ishtar/sheet_find.html:403 -#: man_app/templates/ishtar/sheet_find.html:441 -#: man_app/templates/ishtar/sheet_find.html:479 +#: man_app/templates/ishtar/sheet_find.html:391 +#: man_app/templates/ishtar/sheet_find.html:429 +#: man_app/templates/ishtar/sheet_find.html:467 +#: na_app/templates/ishtar/sheet_find.html:234 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:440 +#: na_app/templates/ishtar/sheet_find.html:478 msgid "Start date" msgstr "" #: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 -#: archaeological_files/models.py:709 archaeological_finds/forms.py:1164 -#: archaeological_finds/models_finds.py:3423 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:1165 +#: archaeological_finds/models_finds.py:3158 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:223 #: archaeological_finds/templates/ishtar/sheet_find.html:391 @@ -446,38 +463,46 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3355 -#: ishtar_common/models_imports.py:1290 +#: archaeological_operations/models.py:3380 +#: ishtar_common/models_imports.py:1416 #: man_app/templates/ishtar/sheet_find.html:224 -#: man_app/templates/ishtar/sheet_find.html:404 -#: man_app/templates/ishtar/sheet_find.html:442 -#: man_app/templates/ishtar/sheet_find.html:480 -#: man_app/templates/ishtar/sheet_find.html:518 +#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:506 +#: na_app/templates/ishtar/sheet_find.html:235 +#: na_app/templates/ishtar/sheet_find.html:403 +#: na_app/templates/ishtar/sheet_find.html:441 +#: na_app/templates/ishtar/sheet_find.html:479 +#: na_app/templates/ishtar/sheet_find.html:517 msgid "End date" msgstr "" #: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1165 +#: archaeological_finds/forms.py:1166 #: archaeological_finds/templates/ishtar/sheet_find.html:225 #: man_app/templates/ishtar/sheet_find.html:226 +#: na_app/templates/ishtar/sheet_find.html:237 msgid "Quality" msgstr "" #: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1162 +#: archaeological_finds/forms.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:224 #: man_app/templates/ishtar/sheet_find.html:225 +#: na_app/templates/ishtar/sheet_find.html:236 msgid "Dating type" msgstr "" #: archaeological_context_records/forms.py:453 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1167 #: archaeological_finds/templates/ishtar/sheet_find.html:226 #: man_app/templates/ishtar/sheet_find.html:227 +#: na_app/templates/ishtar/sheet_find.html:238 msgid "Precise on dating" msgstr "" @@ -488,15 +513,15 @@ msgstr "" #: archaeological_context_records/forms.py:476 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1588 +#: archaeological_context_records/models.py:1478 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:716 archaeological_finds/forms.py:734 -#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1132 -#: archaeological_finds/models_finds.py:2456 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:987 +#: archaeological_finds/models_finds.py:2311 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2215 ishtar_common/models.py:5236 +#: ishtar_common/forms_common.py:2391 ishtar_common/models.py:5250 #: ishtar_common/views.py:503 msgid "Context record" msgstr "" @@ -505,7 +530,9 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:82 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 -#: archaeological_operations/templates/ishtar/sheet_operation.html:374 +#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:382 msgid "Relations" msgstr "" @@ -515,7 +542,7 @@ msgstr "" #: archaeological_context_records/forms.py:500 #: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/models.py:762 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:48 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" @@ -526,22 +553,22 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:515 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/models.py:764 msgid "TAQ" msgstr "" #: archaeological_context_records/forms.py:516 -#: archaeological_context_records/models.py:793 +#: archaeological_context_records/models.py:773 msgid "Estimated TAQ" msgstr "" #: archaeological_context_records/forms.py:517 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/models.py:779 msgid "TPQ" msgstr "" #: archaeological_context_records/forms.py:518 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/models.py:788 msgid "Estimated TPQ" msgstr "" @@ -550,8 +577,8 @@ msgid "Comments on dating" msgstr "" #: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:616 -#: archaeological_operations/forms.py:629 +#: archaeological_operations/forms.py:618 +#: archaeological_operations/forms.py:631 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" @@ -566,9 +593,9 @@ msgid "Would you like to delete this context record?" msgstr "" #: archaeological_context_records/forms.py:644 -#: archaeological_finds/forms.py:970 archaeological_finds/forms.py:995 -#: archaeological_operations/forms.py:1809 ishtar_common/forms_common.py:2382 -#: ishtar_common/models.py:3284 ishtar_common/models.py:3654 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:996 +#: archaeological_operations/forms.py:1814 ishtar_common/forms_common.py:2558 +#: ishtar_common/models.py:3294 ishtar_common/models.py:3668 msgid " - duplicate" msgstr "" @@ -577,9 +604,9 @@ msgid "Context record - Quick action - Modify" msgstr "" #: archaeological_context_records/forms.py:694 -#: archaeological_context_records/models.py:1351 -#: archaeological_context_records/models.py:1390 -#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1239 +#: archaeological_context_records/models.py:1278 +#: archaeological_context_records/models.py:1346 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" @@ -640,7 +667,6 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:46 #: archaeological_warehouse/ishtar_menu.py:80 ishtar_common/ishtar_menu.py:48 #: ishtar_common/ishtar_menu.py:115 ishtar_common/ishtar_menu.py:192 -#: ishtar_common/templates/ishtar/import_table.html:31 msgid "Creation" msgstr "" @@ -696,8 +722,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:937 -#: archaeological_finds/tests.py:1341 archaeological_finds/tests.py:1541 +#: archaeological_context_records/tests.py:935 +#: archaeological_finds/tests.py:1386 archaeological_finds/tests.py:1586 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -744,13 +770,14 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2073 -#: archaeological_finds/models_finds.py:3388 -#: archaeological_finds/models_finds.py:3410 +#: archaeological_finds/models_finds.py:1928 +#: archaeological_finds/models_finds.py:3123 +#: archaeological_finds/models_finds.py:3145 #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2231 ishtar_common/models.py:5237 +#: ishtar_common/forms_common.py:2407 ishtar_common/models.py:5251 #: ishtar_common/views.py:507 man_app/templates/ishtar/sheet_find.html:5 +#: na_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "" @@ -765,21 +792,22 @@ msgstr "" #: archaeological_finds/models_finds.py:255 #: archaeological_finds/models_finds.py:299 #: archaeological_finds/models_finds.py:370 -#: archaeological_finds/models_finds.py:1845 +#: archaeological_finds/models_finds.py:1700 #: archaeological_finds/models_treatments.py:66 #: archaeological_finds/models_treatments.py:752 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3381 +#: archaeological_operations/models.py:3406 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:734 -#: archaeological_warehouse/models.py:766 ishtar_common/models.py:673 -#: ishtar_common/models.py:729 ishtar_common/models.py:772 -#: ishtar_common/models.py:1807 ishtar_common/models.py:3663 -#: ishtar_common/models.py:5009 ishtar_common/models_common.py:2219 -#: ishtar_common/models_common.py:2255 ishtar_common/models_common.py:2272 -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:2302 +#: archaeological_warehouse/models.py:766 ishtar_common/models.py:684 +#: ishtar_common/models.py:740 ishtar_common/models.py:783 +#: ishtar_common/models.py:1817 ishtar_common/models.py:3677 +#: ishtar_common/models.py:5023 ishtar_common/models_common.py:2029 +#: ishtar_common/models_common.py:2065 ishtar_common/models_common.py:2082 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2112 +#: ishtar_common/models_imports.py:469 msgid "Order" msgstr "" @@ -820,7 +848,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:955 +#: ishtar_common/models_imports.py:1074 msgid "Documentation type" msgstr "" @@ -828,15 +856,15 @@ msgstr "" msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:511 -#: archaeological_context_records/models.py:512 -#: archaeological_context_records/models.py:1461 -#: archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1152 +#: archaeological_context_records/models.py:491 +#: archaeological_context_records/models.py:492 +#: archaeological_context_records/models.py:1351 +#: archaeological_finds/models_finds.py:1006 +#: archaeological_finds/models_finds.py:1007 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1124 -#: archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1126 +#: archaeological_operations/forms.py:1223 +#: archaeological_operations/forms.py:1341 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:495 @@ -847,169 +875,170 @@ msgstr "" msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:493 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:494 +#: archaeological_context_records/models.py:495 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:496 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:517 -#: archaeological_finds/models_finds.py:1137 +#: archaeological_context_records/models.py:497 +#: archaeological_finds/models_finds.py:992 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:498 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:501 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:538 -#: archaeological_finds/models_finds.py:1201 +#: archaeological_context_records/models.py:518 +#: archaeological_finds/models_finds.py:1056 #: archaeological_operations/models.py:317 #: archaeological_operations/models.py:994 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:539 -#: archaeological_finds/models_finds.py:1202 +#: archaeological_context_records/models.py:519 +#: archaeological_finds/models_finds.py:1057 #: archaeological_operations/models.py:318 #: archaeological_operations/models.py:995 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:558 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_context_records/tests.py:763 -#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1285 +#: archaeological_context_records/models.py:561 +#: archaeological_context_records/tests.py:761 +#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1140 #: archaeological_operations/models.py:379 #: archaeological_operations/models.py:1138 -#: archaeological_operations/tests.py:3052 -#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4120 +#: archaeological_operations/tests.py:3097 +#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4134 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:584 ishtar_common/models.py:4084 +#: archaeological_context_records/models.py:564 ishtar_common/models.py:4098 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:587 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1390 +#: archaeological_context_records/models.py:567 +#: archaeological_finds/models_finds.py:1505 archaeological_finds/tests.py:1435 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:591 +#: archaeological_context_records/models.py:571 #: archaeological_operations/models.py:1134 -#: archaeological_operations/models.py:2593 -#: archaeological_operations/tests.py:4540 +#: archaeological_operations/models.py:2599 +#: archaeological_operations/tests.py:4604 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:595 -#: archaeological_finds/models_finds.py:1293 +#: archaeological_context_records/models.py:575 +#: archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:599 -#: archaeological_context_records/models.py:664 -#: archaeological_finds/models_finds.py:1394 -#: archaeological_finds/models_finds.py:1766 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:644 +#: archaeological_finds/models_finds.py:1249 +#: archaeological_finds/models_finds.py:1621 #: archaeological_operations/models.py:414 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4076 -#: ishtar_common/models.py:4189 +#: archaeological_operations/models.py:440 ishtar_common/models.py:4090 +#: ishtar_common/models.py:4203 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:603 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1309 +#: archaeological_context_records/models.py:583 +#: archaeological_context_records/models.py:647 +#: archaeological_finds/models_finds.py:1164 #: archaeological_operations/models.py:1222 #: archaeological_operations/models.py:1287 -#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4112 -#: ishtar_common/models.py:4198 +#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4126 +#: ishtar_common/models.py:4212 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:607 -#: archaeological_context_records/tests.py:830 -#: archaeological_finds/models_finds.py:1332 +#: archaeological_context_records/models.py:587 +#: archaeological_context_records/tests.py:828 +#: archaeological_finds/models_finds.py:1187 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:611 +#: archaeological_context_records/models.py:591 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1180 -#: archaeological_operations/tests.py:3030 -#: archaeological_operations/tests.py:3068 -#: archaeological_operations/tests.py:3228 +#: archaeological_operations/tests.py:3075 +#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3252 +#: archaeological_operations/tests.py:3292 msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:615 -#: archaeological_context_records/tests.py:889 +#: archaeological_context_records/models.py:595 +#: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:618 +#: archaeological_context_records/models.py:598 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:621 +#: archaeological_context_records/models.py:601 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:625 +#: archaeological_context_records/models.py:605 #: archaeological_files/models.py:477 archaeological_operations/models.py:1144 -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2617 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:609 #: archaeological_operations/models.py:1241 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:632 -#: archaeological_context_records/tests.py:795 +#: archaeological_context_records/models.py:612 +#: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:636 +#: archaeological_context_records/models.py:616 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:682 -#: archaeological_finds/models_finds.py:1725 +#: archaeological_context_records/models.py:662 +#: archaeological_finds/models_finds.py:1580 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1270 #: archaeological_warehouse/models.py:342 @@ -1017,101 +1046,101 @@ msgstr "" msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:689 -#: archaeological_finds/models_finds.py:1718 +#: archaeological_context_records/models.py:669 +#: archaeological_finds/models_finds.py:1573 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1263 #: archaeological_warehouse/models.py:334 -#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2578 -#: ishtar_common/models.py:2855 ishtar_common/models.py:4215 +#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2588 +#: ishtar_common/models.py:2865 ishtar_common/models.py:4229 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:699 -#: archaeological_context_records/models.py:1147 +#: archaeological_context_records/models.py:679 +#: archaeological_context_records/models.py:1039 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:915 -#: archaeological_finds/models_finds.py:1735 -#: archaeological_finds/models_finds.py:2362 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:770 +#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:2217 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 #: archaeological_finds/views.py:1316 archaeological_operations/models.py:484 #: archaeological_operations/models.py:661 #: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:1917 +#: archaeological_operations/models.py:1923 #: archaeological_operations/views.py:886 #: archaeological_operations/views.py:901 #: archaeological_operations/views.py:908 #: archaeological_operations/views.py:925 ishtar_common/admin.py:1589 -#: ishtar_common/admin.py:1709 ishtar_common/models.py:4224 -#: ishtar_common/models.py:4571 ishtar_common/views.py:2722 -#: ishtar_common/views.py:2740 +#: ishtar_common/admin.py:1732 ishtar_common/models.py:4238 +#: ishtar_common/models.py:4585 ishtar_common/views.py:2985 +#: ishtar_common/views.py:3003 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:696 #: archaeological_files/models.py:540 archaeological_finds/models_finds.py:421 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1694 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:1110 -#: archaeological_operations/models.py:3064 +#: archaeological_operations/models.py:3070 #: archaeological_warehouse/models.py:396 -#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4250 +#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4264 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:718 +#: archaeological_context_records/models.py:698 #: archaeological_files/models.py:543 archaeological_finds/models_finds.py:423 -#: archaeological_finds/models_finds.py:1841 -#: archaeological_operations/models.py:3067 +#: archaeological_finds/models_finds.py:1696 +#: archaeological_operations/models.py:3073 #: archaeological_warehouse/models.py:398 #: archaeological_warehouse/models.py:1175 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:763 -#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3485 +#: archaeological_context_records/models.py:743 +#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3293 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/models.py:748 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:752 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:788 +#: archaeological_context_records/models.py:768 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:796 +#: archaeological_context_records/models.py:776 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:783 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:811 +#: archaeological_context_records/models.py:791 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:839 +#: archaeological_context_records/models.py:819 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:91 -#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:2034 +#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:1889 #: archaeological_finds/models_treatments.py:277 #: archaeological_finds/models_treatments.py:1160 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:534 #: archaeological_operations/models.py:1453 -#: archaeological_operations/models.py:2811 +#: archaeological_operations/models.py:2817 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:96 #: archaeological_warehouse/models.py:385 @@ -1119,138 +1148,143 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:193 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:984 ishtar_common/models.py:2360 -#: ishtar_common/models.py:3768 ishtar_common/models.py:3786 -#: ishtar_common/models.py:3815 ishtar_common/models.py:3829 -#: ishtar_common/models.py:3839 ishtar_common/models.py:4368 -#: ishtar_common/models.py:4379 ishtar_common/models_common.py:3513 +#: ishtar_common/models.py:995 ishtar_common/models.py:2370 +#: ishtar_common/models.py:3782 ishtar_common/models.py:3800 +#: ishtar_common/models.py:3829 ishtar_common/models.py:3843 +#: ishtar_common/models.py:3853 ishtar_common/models.py:4382 +#: ishtar_common/models.py:4393 ishtar_common/models_common.py:3321 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_find.html:67 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_find.html:65 +#: na_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:846 -#: archaeological_finds/models_finds.py:2040 +#: archaeological_context_records/models.py:826 +#: archaeological_finds/models_finds.py:1895 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1167 #: archaeological_operations/models.py:540 #: archaeological_operations/models.py:1459 -#: archaeological_operations/models.py:2818 +#: archaeological_operations/models.py:2824 #: archaeological_warehouse/models.py:392 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2366 -#: ishtar_common/models_common.py:3519 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2376 +#: ishtar_common/models_common.py:3327 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:851 -#: archaeological_finds/models_finds.py:2052 +#: archaeological_context_records/models.py:831 +#: archaeological_finds/models_finds.py:1907 #: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1542 +#: archaeological_operations/models.py:1548 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:854 -#: archaeological_context_records/models.py:860 -#: archaeological_finds/models_finds.py:2055 -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2067 +#: archaeological_context_records/models.py:834 +#: archaeological_context_records/models.py:840 +#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1922 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:554 #: archaeological_operations/models.py:560 #: archaeological_operations/models.py:1539 #: archaeological_operations/models.py:1545 #: archaeological_operations/models.py:1551 -#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4475 +#: archaeological_operations/models.py:1557 +#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4283 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:837 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:864 -#: archaeological_context_records/models.py:865 +#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:845 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:434 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/models.py:866 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:921 -#: archaeological_finds/models_finds.py:2234 +#: archaeological_context_records/models.py:901 +#: archaeological_finds/models_finds.py:2089 #, fuzzy #| msgid "email address" msgid "List of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1135 +#: archaeological_context_records/models.py:1027 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1137 +#: archaeological_context_records/models.py:1029 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1240 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1385 +#: archaeological_context_records/models.py:1273 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1386 +#: archaeological_context_records/models.py:1274 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1387 +#: archaeological_context_records/models.py:1275 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1388 +#: archaeological_context_records/models.py:1276 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1277 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1279 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1280 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1281 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1282 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:1283 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1402 +#: archaeological_context_records/models.py:1292 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1403 +#: archaeological_context_records/models.py:1293 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1594 +#: archaeological_context_records/models.py:1484 msgid "Context record parent" msgstr "" @@ -1286,6 +1320,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:40 #: archaeological_finds/templates/ishtar/sheet_find.html:48 #: man_app/templates/ishtar/sheet_find.html:50 +#: na_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "" @@ -1300,7 +1335,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:73 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:264 -#: archaeological_finds/forms.py:1763 archaeological_finds/models_finds.py:93 +#: archaeological_finds/forms.py:1764 archaeological_finds/models_finds.py:93 #: archaeological_finds/models_finds.py:107 #: archaeological_finds/models_finds.py:124 #: archaeological_finds/models_finds.py:235 @@ -1315,19 +1350,24 @@ msgstr "" #: archaeological_finds/models_finds.py:362 #: archaeological_finds/models_finds.py:376 #: archaeological_finds/models_finds.py:503 -#: archaeological_finds/models_finds.py:928 -#: archaeological_finds/models_finds.py:2074 -#: archaeological_finds/models_finds.py:2085 -#: archaeological_finds/models_finds.py:3431 +#: archaeological_finds/models_finds.py:783 +#: archaeological_finds/models_finds.py:1929 +#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/models_finds.py:3166 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 -#: archaeological_operations/templates/ishtar/sheet_operation.html:433 -#: archaeological_operations/templates/ishtar/sheet_operation.html:525 +#: archaeological_operations/templates/ishtar/sheet_operation.html:463 +#: archaeological_operations/templates/ishtar/sheet_operation.html:555 #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_container.html:235 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: na_app/templates/ishtar/sheet_container.html:195 +#: na_app/templates/ishtar/sheet_container.html:242 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:441 +#: na_app/templates/ishtar/sheet_operation.html:533 msgid "Finds" msgstr "" @@ -1341,7 +1381,11 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 #: man_app/templates/ishtar/sheet_find.html:76 -#: man_app/templates/ishtar/sheet_find.html:600 +#: man_app/templates/ishtar/sheet_find.html:546 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:74 +#: na_app/templates/ishtar/sheet_find.html:557 +#: na_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "" @@ -1349,6 +1393,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: man_app/templates/ishtar/sheet_find.html:85 +#: na_app/templates/ishtar/sheet_find.html:83 +#: na_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "" @@ -1359,8 +1405,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4478 +#: ishtar_common/models_common.py:4286 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_operation.html:138 msgid "Complete identifier" msgstr "" @@ -1370,6 +1419,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:212 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:212 msgid "Surface" msgstr "" @@ -1377,12 +1427,14 @@ msgstr "" #: archaeological_files/forms.py:286 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 -#: archaeological_operations/templates/ishtar/sheet_operation.html:292 +#: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:55 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:300 msgid "Geographic localisation" msgstr "" @@ -1391,10 +1443,12 @@ msgstr "" #: archaeological_finds/forms.py:719 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: archaeological_operations/templates/ishtar/sheet_operation.html:313 +#: archaeological_operations/templates/ishtar/sheet_operation.html:343 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: man_app/templates/ishtar/sheet_basefind.html:65 -#: man_app/templates/ishtar/sheet_find.html:270 +#: man_app/templates/ishtar/sheet_find.html:258 +#: na_app/templates/ishtar/sheet_find.html:269 +#: na_app/templates/ishtar/sheet_operation.html:321 msgid "Sheet" msgstr "" @@ -1403,7 +1457,8 @@ msgid "Operation summary" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:215 -#: archaeological_operations/templates/ishtar/sheet_operation.html:277 +#: archaeological_operations/templates/ishtar/sheet_operation.html:293 +#: na_app/templates/ishtar/sheet_operation.html:285 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -1420,30 +1475,37 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:424 #: archaeological_finds/templates/ishtar/sheet_find.html:462 #: archaeological_operations/templates/ishtar/sheet_operation.html:175 -#: ishtar_common/models.py:3359 ishtar_common/models.py:5128 -#: ishtar_common/models.py:5265 ishtar_common/models.py:5344 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2163 -#: ishtar_common/models_imports.py:1279 -#: man_app/templates/ishtar/sheet_find.html:399 -#: man_app/templates/ishtar/sheet_find.html:437 -#: man_app/templates/ishtar/sheet_find.html:475 +#: ishtar_common/models.py:3369 ishtar_common/models.py:5142 +#: ishtar_common/models.py:5279 ishtar_common/models.py:5358 +#: ishtar_common/models_common.py:1958 ishtar_common/models_common.py:1973 +#: ishtar_common/models_imports.py:1511 ishtar_common/models_imports.py:1908 +#: man_app/templates/ishtar/sheet_find.html:387 +#: man_app/templates/ishtar/sheet_find.html:425 +#: man_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:398 +#: na_app/templates/ishtar/sheet_find.html:436 +#: na_app/templates/ishtar/sheet_find.html:474 +#: na_app/templates/ishtar/sheet_operation.html:175 msgid "State" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:180 +#: na_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: na_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:206 +#: na_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "" @@ -1458,12 +1520,14 @@ msgid "No associated finds." msgstr "E-Mail-Adresse" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:273 -#: archaeological_operations/templates/ishtar/sheet_operation.html:438 +#: archaeological_operations/templates/ishtar/sheet_operation.html:468 +#: na_app/templates/ishtar/sheet_operation.html:446 msgid "Documents from associated finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:286 -#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: archaeological_operations/templates/ishtar/sheet_operation.html:434 +#: na_app/templates/ishtar/sheet_operation.html:412 msgid "Context record relations" msgstr "" @@ -1496,7 +1560,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1906 +#: archaeological_operations/models.py:1912 msgid "Add context record" msgstr "" @@ -1533,7 +1597,7 @@ msgstr "" #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:387 archaeological_files/models.py:532 #: archaeological_files/templates/ishtar/sheet_file.html:217 -#: archaeological_finds/forms.py:1275 +#: archaeological_finds/forms.py:1276 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1541,20 +1605,20 @@ msgstr "" #: archaeological_finds/forms_treatments.py:644 #: archaeological_finds/forms_treatments.py:726 #: archaeological_finds/forms_treatments.py:840 -#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1038 #: archaeological_finds/models_treatments.py:202 #: archaeological_finds/models_treatments.py:1104 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:727 -#: archaeological_operations/forms.py:1428 -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/forms.py:1746 #: archaeological_operations/models.py:986 #: archaeological_operations/models.py:1363 -#: archaeological_operations/models.py:2561 -#: archaeological_operations/models.py:2790 -#: archaeological_operations/models.py:3054 +#: archaeological_operations/models.py:2567 +#: archaeological_operations/models.py:2796 +#: archaeological_operations/models.py:3060 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1117 msgid "Year" msgstr "" @@ -1566,22 +1630,22 @@ msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1121 -#: archaeological_operations/forms.py:1218 -#: archaeological_operations/forms.py:1333 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1507 +#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1123 +#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/forms.py:1512 #: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2799 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 #: archaeological_files/forms.py:1167 archaeological_files/models.py:1357 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/models.py:2433 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3493 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/models.py:2439 ishtar_common/models_common.py:1981 +#: ishtar_common/models_common.py:3301 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1619,30 +1683,30 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:616 #: archaeological_files/forms.py:664 archaeological_files/models.py:648 #: archaeological_finds/forms.py:336 archaeological_finds/forms.py:586 -#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2017 +#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1414 archaeological_finds/forms.py:2018 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:427 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1827 #: archaeological_finds/models_treatments.py:259 #: archaeological_finds/models_treatments.py:1156 #: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:741 -#: archaeological_operations/forms.py:1226 -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1444 -#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1352 +#: archaeological_operations/forms.py:1449 +#: archaeological_operations/forms.py:1511 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1448 -#: archaeological_operations/models.py:2807 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:375 -#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:1866 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2715 -#: ishtar_common/models.py:2893 ishtar_common/models.py:3547 -#: ishtar_common/models.py:4351 ishtar_common/models_common.py:183 -#: ishtar_common/models_common.py:2399 ishtar_common/models_imports.py:764 +#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:2043 +#: ishtar_common/forms_common.py:2348 ishtar_common/forms_common.py:2896 +#: ishtar_common/models.py:2903 ishtar_common/models.py:3561 +#: ishtar_common/models.py:4365 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2209 ishtar_common/models_imports.py:883 #: 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 @@ -1668,7 +1732,7 @@ msgstr "" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1446 ishtar_common/forms.py:931 +#: archaeological_operations/forms.py:1451 ishtar_common/forms.py:951 msgid "Created by" msgstr "" @@ -1676,7 +1740,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1457 msgid "Modified by" msgstr "" @@ -1690,9 +1754,9 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:615 #: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:1861 -#: ishtar_common/forms_common.py:2341 ishtar_common/models.py:4336 -#: ishtar_common/models_imports.py:1287 +#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:2038 +#: ishtar_common/forms_common.py:2517 ishtar_common/models.py:4350 +#: ishtar_common/models_imports.py:1413 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1702,7 +1766,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1146 #: archaeological_finds/templates/ishtar/sheet_find.html:504 -#: man_app/templates/ishtar/sheet_find.html:517 +#: man_app/templates/ishtar/sheet_find.html:505 +#: na_app/templates/ishtar/sheet_find.html:516 msgid "Reception date" msgstr "" @@ -1732,28 +1797,29 @@ msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 #: archaeological_files/models.py:454 archaeological_files/models.py:612 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/forms.py:1034 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1055 -#: archaeological_operations/forms.py:1383 +#: archaeological_operations/forms.py:723 +#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1057 +#: archaeological_operations/forms.py:1388 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1071 #: archaeological_operations/models.py:1073 #: archaeological_operations/models.py:1384 -#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:2808 #: archaeological_operations/templates/ishtar/sheet_operation.html:146 -#: ishtar_common/forms_common.py:1513 ishtar_common/forms_common.py:1526 -#: ishtar_common/forms_common.py:1527 ishtar_common/models.py:2347 -#: ishtar_common/models_common.py:3527 +#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:1703 +#: ishtar_common/forms_common.py:1704 ishtar_common/models.py:2357 +#: ishtar_common/models_common.py:3335 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: na_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:651 -#: archaeological_operations/models.py:2796 ishtar_common/models_common.py:2172 +#: archaeological_operations/models.py:2802 ishtar_common/models_common.py:1982 msgid "Departments" msgstr "" @@ -1775,8 +1841,8 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:598 -#: ishtar_common/forms_common.py:985 ishtar_common/models_common.py:3769 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:774 +#: ishtar_common/forms_common.py:1163 ishtar_common/models_common.py:3577 msgid "Postal code" msgstr "" @@ -1792,8 +1858,8 @@ msgstr "" #: archaeological_files/forms.py:326 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:981 -#: ishtar_common/models_common.py:3764 ishtar_common/models_common.py:3950 +#: ishtar_common/forms_common.py:770 ishtar_common/forms_common.py:1159 +#: ishtar_common/models_common.py:3572 ishtar_common/models_common.py:3758 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -1859,7 +1925,7 @@ msgstr "" #: archaeological_files/forms.py:596 archaeological_files/models.py:675 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2747 +#: archaeological_operations/models.py:2753 msgid "Scientist in charge" msgstr "" @@ -1911,7 +1977,7 @@ msgstr "" msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:1925 +#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2102 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "" @@ -2018,10 +2084,11 @@ msgstr "" #: archaeological_finds/models_treatments.py:203 #: archaeological_finds/models_treatments.py:1105 #: archaeological_finds/templates/ishtar/sheet_find.html:358 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1562 -#: archaeological_operations/models.py:2732 ishtar_common/admin.py:573 -#: ishtar_common/models.py:4249 man_app/templates/ishtar/sheet_find.html:371 +#: archaeological_operations/forms.py:1434 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/models.py:2738 ishtar_common/admin.py:573 +#: ishtar_common/models.py:4263 man_app/templates/ishtar/sheet_find.html:359 +#: na_app/templates/ishtar/sheet_find.html:370 msgid "Index" msgstr "" @@ -2031,10 +2098,11 @@ msgstr "" #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2463 -#: archaeological_operations/models.py:2722 ishtar_common/models_imports.py:950 +#: archaeological_operations/forms.py:1440 +#: archaeological_operations/forms.py:1501 +#: archaeological_operations/models.py:2469 +#: archaeological_operations/models.py:2728 +#: ishtar_common/models_imports.py:1069 msgid "Act type" msgstr "" @@ -2045,17 +2113,17 @@ msgstr "" #: archaeological_files/forms.py:1162 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1436 -#: archaeological_operations/forms.py:1632 +#: archaeological_operations/forms.py:1441 +#: archaeological_operations/forms.py:1637 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1169 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1442 -#: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1508 +#: archaeological_operations/models.py:2797 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2099,12 +2167,12 @@ msgstr "" #: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:751 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:220 archaeological_files/wizards.py:232 -#: archaeological_operations/forms.py:673 -#: archaeological_operations/forms.py:933 -#: archaeological_operations/models.py:1926 -#: archaeological_operations/models.py:2446 -#: archaeological_operations/models.py:2562 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/forms.py:675 +#: archaeological_operations/forms.py:935 +#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2776 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:498 msgid "Archaeological file" msgstr "" @@ -2117,9 +2185,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:3413 +#: archaeological_finds/models_finds.py:3148 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2827 +#: archaeological_operations/models.py:2833 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2130,7 +2198,8 @@ msgstr "" #: archaeological_files/models.py:353 archaeological_files/models.py:1403 #: archaeological_files/models.py:1420 archaeological_files/models.py:1445 #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: ishtar_common/models.py:5067 +#: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: ishtar_common/models.py:5081 msgid "Preventive" msgstr "" @@ -2196,6 +2265,7 @@ msgstr "" #: archaeological_files/models.py:187 #: archaeological_operations/templates/ishtar/sheet_operation.html:229 +#: na_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "" @@ -2216,12 +2286,12 @@ msgid "Equipment/Service" msgstr "" #: archaeological_files/models.py:212 archaeological_warehouse/forms.py:207 -#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:174 -#: ishtar_common/models_common.py:205 +#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:176 +#: ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:216 ishtar_common/models_common.py:178 +#: archaeological_files/models.py:216 ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2239,7 +2309,7 @@ msgstr "" msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:227 ishtar_common/models_imports.py:951 +#: archaeological_files/models.py:227 ishtar_common/models_imports.py:1070 msgid "Unit" msgstr "" @@ -2251,16 +2321,16 @@ msgstr "" msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:235 ishtar_common/models.py:1630 -#: ishtar_common/models.py:2047 ishtar_common/models.py:3558 -#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:193 -#: ishtar_common/models_imports.py:826 +#: archaeological_files/models.py:235 ishtar_common/models.py:1640 +#: ishtar_common/models.py:2057 ishtar_common/models.py:3572 +#: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:203 +#: ishtar_common/models_imports.py:436 ishtar_common/models_imports.py:945 msgid "Available" msgstr "" #: archaeological_files/models.py:241 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1135 ishtar_common/models.py:2354 -#: ishtar_common/models_common.py:716 +#: ishtar_common/admin.py:1135 ishtar_common/models.py:2364 +#: ishtar_common/models_common.py:718 msgid "Parent" msgstr "" @@ -2320,30 +2390,36 @@ msgstr "" msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1184 +#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1039 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:987 ishtar_common/admin.py:1318 -#: ishtar_common/forms_common.py:2248 ishtar_common/models.py:2372 +#: ishtar_common/forms_common.py:2424 ishtar_common/models.py:2382 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1187 +#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1042 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:988 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1208 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 -#: ishtar_common/models.py:1931 ishtar_common/models_common.py:749 -#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2160 +#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1063 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 +#: ishtar_common/models.py:1941 ishtar_common/models_common.py:751 +#: ishtar_common/models_common.py:1954 ishtar_common/models_common.py:1970 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: na_app/templates/ishtar/sheet_operation.html:551 +#: na_app/templates/ishtar/sheet_operation.html:561 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Number" msgstr "" @@ -2355,13 +2431,13 @@ msgstr "" msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1289 +#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:157 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1125 -#: archaeological_operations/models.py:2586 -#: archaeological_operations/tests.py:3036 -#: archaeological_operations/tests.py:3128 +#: archaeological_operations/models.py:2592 +#: archaeological_operations/tests.py:3081 +#: archaeological_operations/tests.py:3173 msgctxt "key for text search" msgid "year" msgstr "" @@ -2369,7 +2445,7 @@ msgstr "" #: archaeological_files/models.py:467 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:363 -#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4006 +#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4020 msgctxt "key for text search" msgid "reference" msgstr "" @@ -2390,9 +2466,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:366 #: archaeological_operations/models.py:1152 -#: archaeological_operations/tests.py:3172 -#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2564 -#: ishtar_common/models.py:2821 ishtar_common/models.py:3408 +#: archaeological_operations/tests.py:3217 +#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2574 +#: ishtar_common/models.py:2831 ishtar_common/models.py:3418 msgctxt "key for text search" msgid "name" msgstr "" @@ -2401,12 +2477,12 @@ msgstr "" #: archaeological_finds/models_treatments.py:160 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1158 -#: archaeological_operations/models.py:2597 -#: archaeological_operations/tests.py:3185 +#: archaeological_operations/models.py:2603 +#: archaeological_operations/tests.py:3230 #: archaeological_warehouse/models.py:320 -#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2567 -#: ishtar_common/models.py:2836 ishtar_common/models.py:3419 -#: ishtar_common/models.py:4002 +#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2577 +#: ishtar_common/models.py:2846 ishtar_common/models.py:3429 +#: ishtar_common/models.py:4016 msgctxt "key for text search" msgid "type" msgstr "" @@ -2431,35 +2507,35 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1487 +#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1342 #: archaeological_operations/models.py:385 #: archaeological_operations/models.py:1200 -#: archaeological_operations/models.py:2707 -#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4066 +#: archaeological_operations/models.py:2713 +#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4080 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1493 #: archaeological_finds/models_treatments.py:1065 -#: archaeological_finds/tests.py:1435 +#: archaeological_finds/tests.py:1480 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:513 archaeological_operations/models.py:2642 +#: archaeological_files/models.py:513 archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2646 +#: archaeological_files/models.py:517 archaeological_operations/models.py:2652 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:537 #: archaeological_finds/models_treatments.py:1107 -#: ishtar_common/forms_common.py:1853 ishtar_common/forms_common.py:2135 +#: ishtar_common/forms_common.py:2030 ishtar_common/forms_common.py:2312 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" @@ -2470,34 +2546,34 @@ msgstr "" #: archaeological_finds/models_treatments.py:1112 #: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1120 -#: archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1797 +#: archaeological_operations/forms.py:1122 +#: archaeological_operations/forms.py:1220 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1802 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 -#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:644 ishtar_common/forms_common.py:822 -#: ishtar_common/forms_common.py:953 ishtar_common/forms_common.py:1048 -#: ishtar_common/forms_common.py:1300 ishtar_common/forms_common.py:1353 -#: ishtar_common/forms_common.py:2685 ishtar_common/models.py:672 -#: ishtar_common/models.py:712 ishtar_common/models.py:1030 -#: ishtar_common/models.py:1628 ishtar_common/models.py:2017 -#: ishtar_common/models.py:2588 ishtar_common/models.py:2888 -#: ishtar_common/models.py:3216 ishtar_common/models.py:3353 -#: ishtar_common/models.py:5103 ishtar_common/models_common.py:2367 -#: ishtar_common/models_common.py:3484 ishtar_common/models_common.py:3545 -#: ishtar_common/models_imports.py:115 ishtar_common/models_imports.py:150 -#: ishtar_common/models_imports.py:680 ishtar_common/models_imports.py:698 -#: ishtar_common/models_imports.py:821 ishtar_common/models_imports.py:1199 -#: ishtar_common/models_rest.py:110 +#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:822 ishtar_common/forms_common.py:1000 +#: ishtar_common/forms_common.py:1131 ishtar_common/forms_common.py:1226 +#: ishtar_common/forms_common.py:1480 ishtar_common/forms_common.py:1530 +#: ishtar_common/forms_common.py:2861 ishtar_common/models.py:683 +#: ishtar_common/models.py:723 ishtar_common/models.py:1041 +#: ishtar_common/models.py:1638 ishtar_common/models.py:2027 +#: ishtar_common/models.py:2598 ishtar_common/models.py:2898 +#: ishtar_common/models.py:3226 ishtar_common/models.py:3363 +#: ishtar_common/models.py:5117 ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:3292 ishtar_common/models_common.py:3353 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:154 +#: ishtar_common/models_imports.py:431 ishtar_common/models_imports.py:799 +#: ishtar_common/models_imports.py:817 ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:1368 ishtar_common/models_rest.py:110 #: 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 +#: ishtar_common/templates/ishtar/import_table.html:55 #: ishtar_common/templates/ishtar/merge_organization.html:9 #: ishtar_common/templates/ishtar/merge_organization.html:20 #: ishtar_common/templates/ishtar/merge_person.html:10 @@ -2506,7 +2582,9 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 #: ishtar_common/templates/ishtar/sheet_town.html:63 -#: man_app/templates/ishtar/sheet_find.html:513 +#: man_app/templates/ishtar/sheet_find.html:501 +#: na_app/templates/ishtar/sheet_find.html:512 +#: na_app/templates/ishtar/sheet_operation.html:153 msgid "Name" msgstr "" @@ -2514,7 +2592,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1121 #: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:363 -#: man_app/templates/ishtar/sheet_find.html:514 +#: man_app/templates/ishtar/sheet_find.html:502 +#: na_app/templates/ishtar/sheet_find.html:513 msgid "Person in charge" msgstr "" @@ -2555,10 +2634,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:250 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:372 -#: ishtar_common/forms_common.py:577 ishtar_common/forms_common.py:829 -#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:1053 -#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2608 -#: ishtar_common/models.py:2816 ishtar_common/models.py:3397 +#: ishtar_common/forms_common.py:753 ishtar_common/forms_common.py:1007 +#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1231 +#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2618 +#: ishtar_common/models.py:2826 ishtar_common/models.py:3407 #: ishtar_common/templates/ishtar/merge_person.html:11 #: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 @@ -2602,11 +2681,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1251 archaeological_operations/models.py:1884 +#: archaeological_files/models.py:1251 archaeological_operations/models.py:1890 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1253 archaeological_operations/models.py:1886 +#: archaeological_files/models.py:1253 archaeological_operations/models.py:1892 msgid "parcels" msgstr "" @@ -2640,7 +2719,7 @@ msgid "operation" msgstr "" #: archaeological_files/models.py:1354 archaeological_operations/models.py:1368 -#: archaeological_operations/models.py:3041 +#: archaeological_operations/models.py:3047 msgid "File" msgstr "" @@ -2730,7 +2809,8 @@ msgid "Developed surface" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:181 -#: archaeological_operations/templates/ishtar/sheet_operation.html:345 +#: archaeological_operations/templates/ishtar/sheet_operation.html:375 +#: na_app/templates/ishtar/sheet_operation.html:353 msgid "Associated parcels" msgstr "" @@ -2738,9 +2818,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2828 -#: archaeological_operations/templates/ishtar/sheet_operation.html:350 -#: archaeological_operations/templates/ishtar/sheet_operation.html:487 +#: archaeological_operations/models.py:2834 +#: archaeological_operations/templates/ishtar/sheet_operation.html:380 +#: archaeological_operations/templates/ishtar/sheet_operation.html:517 +#: na_app/templates/ishtar/sheet_operation.html:358 +#: na_app/templates/ishtar/sheet_operation.html:495 msgid "Administrative acts" msgstr "" @@ -2751,12 +2833,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2560 -#: archaeological_operations/models.py:2863 +#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2869 #: 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/models.py:733 ishtar_common/models.py:4251 +#: archaeological_warehouse/models.py:733 ishtar_common/models.py:4265 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" @@ -2771,34 +2853,40 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 #: archaeological_warehouse/models.py:293 -#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:645 -#: ishtar_common/forms_common.py:827 ishtar_common/forms_common.py:1051 -#: ishtar_common/forms_common.py:1298 ishtar_common/forms_common.py:1727 -#: ishtar_common/forms_common.py:2133 ishtar_common/forms_common.py:2366 -#: ishtar_common/forms_common.py:3007 ishtar_common/models.py:727 -#: ishtar_common/models.py:2590 ishtar_common/models.py:3965 -#: ishtar_common/models.py:4255 ishtar_common/models_imports.py:156 -#: ishtar_common/models_imports.py:997 +#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:823 +#: ishtar_common/forms_common.py:1005 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1478 ishtar_common/forms_common.py:1904 +#: ishtar_common/forms_common.py:2310 ishtar_common/forms_common.py:2542 +#: ishtar_common/forms_common.py:3209 ishtar_common/models.py:738 +#: ishtar_common/models.py:2600 ishtar_common/models.py:3979 +#: ishtar_common/models.py:4269 ishtar_common/models_imports.py:160 +#: ishtar_common/models_imports.py:1116 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 -#: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/import_table.html:56 #: ishtar_common/templates/ishtar/merge_organization.html:10 #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: man_app/templates/ishtar/sheet_find.html:398 -#: man_app/templates/ishtar/sheet_find.html:436 -#: man_app/templates/ishtar/sheet_find.html:474 -#: man_app/templates/ishtar/sheet_find.html:512 +#: man_app/templates/ishtar/sheet_find.html:386 +#: man_app/templates/ishtar/sheet_find.html:424 +#: man_app/templates/ishtar/sheet_find.html:462 +#: man_app/templates/ishtar/sheet_find.html:500 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:435 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:511 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Type" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 -#: archaeological_operations/forms.py:783 +#: archaeological_operations/forms.py:785 #: archaeological_operations/models.py:1328 msgid "Excavation end date" msgstr "" @@ -2813,8 +2901,8 @@ 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:696 -#: ishtar_common/models_imports.py:996 +#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:707 +#: ishtar_common/models_imports.py:1115 msgid "Date" msgstr "" @@ -2847,6 +2935,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:393 #: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/sheet_operation.html:220 +#: na_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" @@ -2857,7 +2946,9 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:269 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 -#: ishtar_common/models.py:1924 ishtar_common/models.py:1956 +#: ishtar_common/models.py:1934 ishtar_common/models.py:1966 +#: na_app/templates/ishtar/sheet_container.html:252 +#: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" @@ -2962,185 +3053,187 @@ msgid "Simple find - 020 - General" msgstr "" #: archaeological_finds/forms.py:276 archaeological_finds/forms.py:544 -#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:956 -#: archaeological_finds/forms.py:1263 archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:957 +#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1904 #: archaeological_finds/models_finds.py:420 -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1701 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:546 -#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:958 -#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1970 -#: archaeological_finds/models_finds.py:1847 +#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:959 +#: archaeological_finds/forms.py:1265 archaeological_finds/forms.py:1971 +#: archaeological_finds/models_finds.py:1702 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:1265 archaeological_finds/models_finds.py:1974 +#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:1829 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:752 -#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1848 +#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1703 msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1849 +#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1704 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:754 -#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:1844 +#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1699 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:755 -#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1971 +#: archaeological_finds/forms.py:1271 archaeological_finds/models_finds.py:1826 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:2031 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1886 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:553 -#: archaeological_finds/forms.py:1376 archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:1377 archaeological_finds/models_finds.py:1769 msgid "Is complete?" msgstr "" #: archaeological_finds/forms.py:300 archaeological_finds/forms.py:556 #: archaeological_finds/forms.py:767 archaeological_finds/models_finds.py:91 -#: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1008 +#: archaeological_finds/models_finds.py:1009 +#: archaeological_finds/models_finds.py:1712 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:559 -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1861 -#: ishtar_common/models_imports.py:975 +#: archaeological_finds/forms.py:1386 archaeological_finds/models_finds.py:1716 +#: ishtar_common/models_imports.py:1094 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1387 -#: archaeological_finds/models_finds.py:1868 +#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1388 +#: archaeological_finds/models_finds.py:1723 msgid "Comment on the material" msgstr "" #: archaeological_finds/forms.py:309 archaeological_finds/forms.py:562 #: archaeological_finds/forms.py:770 archaeological_finds/models_finds.py:271 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1010 +#: archaeological_finds/models_finds.py:1011 +#: archaeological_finds/models_finds.py:1771 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:566 -#: archaeological_finds/forms.py:1394 archaeological_finds/models_finds.py:1920 +#: archaeological_finds/forms.py:1395 archaeological_finds/models_finds.py:1775 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:316 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1396 archaeological_finds/models_finds.py:286 +#: archaeological_finds/forms.py:1397 archaeological_finds/models_finds.py:286 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:568 -#: archaeological_finds/forms.py:1403 archaeological_finds/forms.py:1909 -#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/forms.py:1404 archaeological_finds/forms.py:1910 +#: archaeological_finds/models_finds.py:1730 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:570 -#: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1951 +#: archaeological_finds/forms.py:1406 archaeological_finds/models_finds.py:1806 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:574 -#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1851 +#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1706 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:577 -#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1852 +#: archaeological_finds/forms.py:1411 archaeological_finds/models_finds.py:1707 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:580 -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1408 -#: archaeological_finds/models_finds.py:1854 +#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1409 +#: archaeological_finds/models_finds.py:1709 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:583 -#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1412 -#: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:1946 +#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1413 +#: archaeological_finds/models_finds.py:1051 +#: archaeological_finds/models_finds.py:1801 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1416 -#: archaeological_finds/models_finds.py:1896 -#: archaeological_operations/forms.py:1223 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1417 +#: archaeological_finds/models_finds.py:1751 +#: archaeological_operations/forms.py:1226 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:589 -#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1418 -#: archaeological_finds/models_finds.py:1973 +#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1419 +#: archaeological_finds/models_finds.py:1828 msgid "Comment on dating" msgstr "" #: archaeological_finds/forms.py:345 archaeological_finds/forms.py:592 -#: archaeological_finds/forms.py:1217 +#: archaeological_finds/forms.py:1218 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: man_app/templates/ishtar/sheet_find.html:194 +#: na_app/templates/ishtar/sheet_find.html:205 msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:593 -#: archaeological_finds/models_finds.py:1953 +#: archaeological_finds/models_finds.py:1808 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:594 -#: archaeological_finds/models_finds.py:1954 +#: archaeological_finds/models_finds.py:1809 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:595 -#: archaeological_finds/models_finds.py:1955 +#: archaeological_finds/models_finds.py:1810 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:598 -#: archaeological_finds/models_finds.py:1958 +#: archaeological_finds/models_finds.py:1813 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:596 -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1811 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:597 -#: archaeological_finds/models_finds.py:1957 +#: archaeological_finds/models_finds.py:1812 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:599 -#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1870 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:1725 #: archaeological_warehouse/models.py:731 msgid "Volume (l)" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:600 -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1909 #: archaeological_finds/templates/ishtar/sheet_find.html:202 #: man_app/templates/ishtar/sheet_find.html:203 +#: na_app/templates/ishtar/sheet_find.html:214 msgid "Weight (g)" msgstr "" @@ -3157,19 +3250,19 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:611 -#: archaeological_finds/forms.py:1489 archaeological_finds/models_finds.py:1969 +#: archaeological_finds/forms.py:1490 archaeological_finds/models_finds.py:1824 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:615 -#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1494 -#: archaeological_finds/models_finds.py:1197 -#: archaeological_finds/models_finds.py:1978 +#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1495 +#: archaeological_finds/models_finds.py:1052 +#: archaeological_finds/models_finds.py:1833 msgid "Check" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:617 -#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1838 msgid "Check date" msgstr "" @@ -3182,7 +3275,7 @@ msgid "Find - 020 - General" msgstr "" #: archaeological_finds/forms.py:497 archaeological_finds/forms.py:750 -#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:425 +#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:425 msgid "Excavation ID" msgstr "" @@ -3198,7 +3291,7 @@ msgstr "" msgid "Discovery date (end)" msgstr "" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1375 +#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1376 #: archaeological_finds/models_finds.py:445 msgid "Batch/object" msgstr "" @@ -3207,12 +3300,12 @@ msgstr "" msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1492 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1493 #: archaeological_finds/models_finds.py:453 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1900 +#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1901 msgid "Resulting find" msgstr "" @@ -3220,7 +3313,7 @@ msgstr "" msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1915 +#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1916 msgid "Resulting finds" msgstr "" @@ -3250,12 +3343,12 @@ msgstr "" msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:936 -#: archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:937 +#: archaeological_finds/forms.py:1004 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1012 +#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1013 msgid "Find - Quick action - Modify" msgstr "" @@ -3263,56 +3356,57 @@ msgstr "" msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1065 -#: archaeological_finds/forms.py:1245 +#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1246 #: archaeological_finds/templates/ishtar/sheet_find.html:279 -#: man_app/templates/ishtar/sheet_find.html:292 +#: man_app/templates/ishtar/sheet_find.html:280 +#: na_app/templates/ishtar/sheet_find.html:291 msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1503 archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1101 +#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1053 +#: archaeological_finds/models_finds.py:1868 #: archaeological_warehouse/forms.py:586 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1106 -#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1199 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1107 +#: archaeological_finds/forms.py:1505 archaeological_finds/models_finds.py:1054 +#: archaeological_finds/models_finds.py:1872 #: archaeological_warehouse/forms.py:587 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1097 -#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1193 -#: archaeological_finds/models_finds.py:1998 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:959 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1502 archaeological_finds/models_finds.py:1048 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1078 msgid "Conservatory state" msgstr "" -#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1118 -#: archaeological_finds/forms.py:1508 archaeological_finds/models_finds.py:1200 -#: archaeological_finds/models_finds.py:2023 +#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1119 +#: archaeological_finds/forms.py:1509 archaeological_finds/models_finds.py:1055 +#: archaeological_finds/models_finds.py:1878 #: archaeological_warehouse/forms.py:591 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1091 -#: archaeological_finds/forms.py:1500 archaeological_finds/models_finds.py:1195 -#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1092 +#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1050 +#: archaeological_finds/models_finds.py:1795 #: archaeological_warehouse/forms.py:584 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1123 -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1124 +#: archaeological_finds/models_finds.py:1884 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1121 -#: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2028 +#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1122 +#: archaeological_finds/models_finds.py:1066 +#: archaeological_finds/models_finds.py:1883 msgid "Insurance value" msgstr "" @@ -3320,412 +3414,416 @@ msgstr "" msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:879 +#: archaeological_finds/forms.py:880 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:899 archaeological_finds/forms.py:1355 -#: archaeological_finds/forms.py:2119 archaeological_finds/forms.py:2124 -#: archaeological_finds/forms.py:2141 archaeological_finds/forms.py:2146 +#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1356 +#: archaeological_finds/forms.py:2120 archaeological_finds/forms.py:2125 +#: archaeological_finds/forms.py:2142 archaeological_finds/forms.py:2147 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:922 -#: archaeological_finds/models_finds.py:1742 +#: archaeological_finds/models_finds.py:777 +#: archaeological_finds/models_finds.py:1597 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:922 +#: archaeological_finds/forms.py:923 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:929 +#: archaeological_finds/forms.py:930 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:933 archaeological_finds/forms.py:1000 +#: archaeological_finds/forms.py:934 archaeological_finds/forms.py:1001 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1022 archaeological_finds/forms.py:2015 -#: ishtar_common/models.py:1031 ishtar_common/models.py:2018 -#: ishtar_common/models.py:3548 ishtar_common/models_imports.py:151 -#: ishtar_common/models_imports.py:699 +#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: ishtar_common/models.py:1042 ishtar_common/models.py:2028 +#: ishtar_common/models.py:3562 ishtar_common/models_imports.py:155 +#: ishtar_common/models_imports.py:432 ishtar_common/models_imports.py:818 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: archaeological_finds/forms.py:1024 archaeological_finds/forms.py:2017 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1028 archaeological_finds/forms.py:2021 -#: archaeological_finds/forms.py:2063 ishtar_common/models.py:3561 +#: archaeological_finds/forms.py:1029 archaeological_finds/forms.py:2022 +#: archaeological_finds/forms.py:2064 ishtar_common/models.py:3575 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1035 archaeological_finds/forms.py:2028 -#: archaeological_finds/forms.py:2070 ishtar_common/models.py:3567 +#: archaeological_finds/forms.py:1036 archaeological_finds/forms.py:2029 +#: archaeological_finds/forms.py:2071 ishtar_common/models.py:3581 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1067 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1085 archaeological_finds/forms.py:1499 -#: archaeological_finds/models_finds.py:1194 -#: archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1500 +#: archaeological_finds/models_finds.py:1049 +#: archaeological_finds/models_finds.py:1789 #: archaeological_warehouse/forms.py:583 msgid "Integrity / interest" msgstr "" -#: archaeological_finds/forms.py:1112 archaeological_finds/forms.py:1506 -#: archaeological_finds/models_finds.py:1192 -#: archaeological_finds/models_finds.py:2008 +#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1507 +#: archaeological_finds/models_finds.py:1047 +#: archaeological_finds/models_finds.py:1863 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1120 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:1984 +#: archaeological_finds/forms.py:1121 archaeological_finds/models_finds.py:1065 +#: archaeological_finds/models_finds.py:1839 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1126 archaeological_finds/forms.py:1502 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1503 +#: archaeological_finds/models_finds.py:1859 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1176 +#: archaeological_finds/forms.py:1177 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1182 +#: archaeological_finds/forms.py:1183 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1186 +#: archaeological_finds/forms.py:1187 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1208 +#: archaeological_finds/forms.py:1209 #: archaeological_finds/templates/ishtar/sheet_basefind.html:26 #: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "" -#: archaeological_finds/forms.py:1272 archaeological_finds/models_finds.py:1133 +#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:988 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:1134 +#: archaeological_finds/forms.py:1274 archaeological_finds/models_finds.py:989 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1277 +#: archaeological_finds/forms.py:1278 #, fuzzy #| msgid "email address" msgid "Operation - number (index by year)" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1280 +#: archaeological_finds/forms.py:1281 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1283 +#: archaeological_finds/forms.py:1284 #, fuzzy #| msgid "email address" msgid "Operation - Type" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1287 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1289 +#: archaeological_finds/forms.py:1290 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1300 +#: archaeological_finds/forms.py:1301 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1303 +#: archaeological_finds/forms.py:1304 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1308 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1310 +#: archaeological_finds/forms.py:1311 #, fuzzy #| msgid "email address" msgid "Operation - Remains" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1313 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1225 ishtar_common/forms_common.py:1299 -#: ishtar_common/models.py:2373 ishtar_common/models.py:3221 +#: archaeological_finds/forms.py:1314 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1228 ishtar_common/forms_common.py:1479 +#: ishtar_common/models.py:2383 ishtar_common/models.py:3231 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1316 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1317 archaeological_warehouse/forms.py:530 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1324 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1325 archaeological_warehouse/forms.py:538 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1327 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1328 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1335 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1336 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1338 +#: archaeological_finds/forms.py:1339 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1352 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1364 +#: archaeological_finds/forms.py:1365 msgid "Discovery date (exact or beginning) after" msgstr "" -#: archaeological_finds/forms.py:1367 +#: archaeological_finds/forms.py:1368 msgid "Discovery date (exact or beginning) before" msgstr "" -#: archaeological_finds/forms.py:1370 +#: archaeological_finds/forms.py:1371 msgid "Discovery date (end) after" msgstr "" -#: archaeological_finds/forms.py:1373 +#: archaeological_finds/forms.py:1374 msgid "Discovery date (end) before" msgstr "" -#: archaeological_finds/forms.py:1378 archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1379 archaeological_finds/forms.py:1907 #: archaeological_finds/models_finds.py:90 -#: archaeological_finds/models_finds.py:1190 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 +#: archaeological_finds/models_finds.py:1045 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 #: archaeological_warehouse/forms.py:572 +#: na_app/templates/ishtar/sheet_operation.html:541 msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1389 archaeological_finds/models_finds.py:270 -#: archaeological_finds/models_finds.py:1191 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:968 +#: archaeological_finds/forms.py:1390 archaeological_finds/models_finds.py:270 +#: archaeological_finds/models_finds.py:1046 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:1087 +#: na_app/templates/ishtar/sheet_operation.html:551 msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1421 +#: archaeological_finds/forms.py:1422 msgid "Length - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1424 +#: archaeological_finds/forms.py:1425 msgid "Length - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1427 +#: archaeological_finds/forms.py:1428 msgid "Width - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1430 +#: archaeological_finds/forms.py:1431 msgid "Width - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1433 +#: archaeological_finds/forms.py:1434 msgid "Height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1436 +#: archaeological_finds/forms.py:1437 msgid "Height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1439 +#: archaeological_finds/forms.py:1440 msgid "Thickness - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1442 +#: archaeological_finds/forms.py:1443 msgid "Thickness - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1445 +#: archaeological_finds/forms.py:1446 msgid "Diameter - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1448 +#: archaeological_finds/forms.py:1449 msgid "Diameter - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1452 msgid "Circumference - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1454 +#: archaeological_finds/forms.py:1455 msgid "Circumference - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1457 +#: archaeological_finds/forms.py:1458 msgid "Volume - lower than (l)" msgstr "" -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:1459 msgid "Volume - higher than (l)" msgstr "" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1461 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1464 msgid "Weight - higher than (g)" msgstr "" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1467 msgid "Clutter long side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1470 +#: archaeological_finds/forms.py:1471 msgid "Clutter long side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1474 +#: archaeological_finds/forms.py:1475 msgid "Clutter short side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1478 +#: archaeological_finds/forms.py:1479 msgid "Clutter short side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1482 +#: archaeological_finds/forms.py:1483 msgid "Clutter height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1486 +#: archaeological_finds/forms.py:1487 msgid "Clutter height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1495 +#: archaeological_finds/forms.py:1496 msgid "Check date after" msgstr "" -#: archaeological_finds/forms.py:1497 +#: archaeological_finds/forms.py:1498 msgid "Check date before" msgstr "" -#: archaeological_finds/forms.py:1510 +#: archaeological_finds/forms.py:1511 msgid "Estimated value - higher than" msgstr "" -#: archaeological_finds/forms.py:1511 +#: archaeological_finds/forms.py:1512 msgid "Estimated value - lower than" msgstr "" -#: archaeological_finds/forms.py:1512 +#: archaeological_finds/forms.py:1513 msgid "Insurance value - higher than" msgstr "" -#: archaeological_finds/forms.py:1513 +#: archaeological_finds/forms.py:1514 msgid "Insurance value - lower than" msgstr "" -#: archaeological_finds/forms.py:1515 +#: archaeological_finds/forms.py:1516 msgid "Appraisal date after" msgstr "" -#: archaeological_finds/forms.py:1518 +#: archaeological_finds/forms.py:1519 msgid "Appraisal date before" msgstr "" -#: archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1522 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1524 msgid "Treatment file end date before" msgstr "" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1527 msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1592 archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1908 +#: archaeological_finds/forms.py:1593 archaeological_finds/models_finds.py:1005 +#: archaeological_finds/models_finds.py:1763 #: archaeological_finds/templates/ishtar/sheet_find.html:300 -#: ishtar_common/forms_common.py:1745 -#: man_app/templates/ishtar/sheet_find.html:313 +#: ishtar_common/forms_common.py:1922 +#: man_app/templates/ishtar/sheet_find.html:301 +#: na_app/templates/ishtar/sheet_find.html:312 msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1600 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1618 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1619 archaeological_finds/models_finds.py:1004 #: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: ishtar_common/forms_common.py:1737 -#: man_app/templates/ishtar/sheet_find.html:338 +#: ishtar_common/forms_common.py:1914 +#: man_app/templates/ishtar/sheet_find.html:326 +#: na_app/templates/ishtar/sheet_find.html:337 msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1626 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1645 archaeological_finds/forms.py:1666 -#: archaeological_finds/forms.py:1722 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:1646 archaeological_finds/forms.py:1667 +#: archaeological_finds/forms.py:1723 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:1761 archaeological_finds/forms.py:1924 +#: archaeological_finds/forms.py:1762 archaeological_finds/forms.py:1925 #: archaeological_finds/models_treatments.py:397 #: archaeological_finds/templates/ishtar/sheet_treatment.html:110 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:1784 +#: archaeological_finds/forms.py:1785 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:1905 +#: archaeological_finds/forms.py:1906 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1921 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1964 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1975 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1976 archaeological_finds/forms.py:1994 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2010 +#: archaeological_finds/forms.py:2011 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2013 +#: archaeological_finds/forms.py:2014 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:198 @@ -3733,22 +3831,25 @@ 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 -#: ishtar_common/forms_common.py:1679 ishtar_common/models.py:959 -#: ishtar_common/models.py:1806 ishtar_common/models.py:3546 -#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 -#: ishtar_common/models_common.py:2143 ishtar_common/models_common.py:2159 -#: ishtar_common/models_imports.py:576 -#: man_app/templates/ishtar/sheet_find.html:397 -#: man_app/templates/ishtar/sheet_find.html:435 -#: man_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/forms_common.py:1856 ishtar_common/models.py:970 +#: ishtar_common/models.py:1816 ishtar_common/models.py:3560 +#: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 +#: ishtar_common/models_common.py:1953 ishtar_common/models_common.py:1969 +#: ishtar_common/models_imports.py:692 +#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:423 +#: man_app/templates/ishtar/sheet_find.html:461 +#: na_app/templates/ishtar/sheet_find.html:396 +#: na_app/templates/ishtar/sheet_find.html:434 +#: na_app/templates/ishtar/sheet_find.html:472 msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2055 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:2056 archaeological_finds/forms.py:2111 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2102 +#: archaeological_finds/forms.py:2103 msgid "Another basket already exists with this name." msgstr "" @@ -3776,7 +3877,7 @@ msgstr "" #: archaeological_finds/models_finds.py:177 #: archaeological_finds/models_treatments.py:213 #: archaeological_finds/models_treatments.py:757 -#: ishtar_common/models_imports.py:963 +#: ishtar_common/models_imports.py:1082 msgid "Treatment type" msgstr "" @@ -3795,8 +3896,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:746 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2449 -#: archaeological_operations/models.py:2786 ishtar_common/views.py:510 +#: archaeological_operations/models.py:2455 +#: archaeological_operations/models.py:2792 ishtar_common/views.py:510 msgid "Treatment" msgstr "" @@ -3893,8 +3994,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1181 #: archaeological_finds/models_treatments.py:1201 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2448 -#: archaeological_operations/models.py:2778 ishtar_common/views.py:509 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2454 +#: archaeological_operations/models.py:2784 ishtar_common/views.py:509 msgid "Treatment request" msgstr "" @@ -3909,8 +4010,8 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_finds/models_finds.py:3395 +#: archaeological_finds/models_finds.py:1755 +#: archaeological_finds/models_finds.py:3130 #: archaeological_finds/models_treatments.py:267 #: archaeological_finds/models_treatments.py:761 #: archaeological_finds/templates/ishtar/sheet_find.html:389 @@ -3920,16 +4021,20 @@ msgstr "" #: archaeological_warehouse/models.py:1199 #: archaeological_warehouse/models.py:2064 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2240 ishtar_common/forms_common.py:2431 +#: ishtar_common/forms_common.py:2416 ishtar_common/forms_common.py:2607 #: ishtar_common/templates/ishtar/sheet_document.html:100 -#: man_app/templates/ishtar/sheet_find.html:402 -#: man_app/templates/ishtar/sheet_find.html:440 -#: man_app/templates/ishtar/sheet_find.html:478 +#: man_app/templates/ishtar/sheet_find.html:390 +#: man_app/templates/ishtar/sheet_find.html:428 +#: man_app/templates/ishtar/sheet_find.html:466 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:439 +#: na_app/templates/ishtar/sheet_find.html:477 msgid "Container" msgstr "" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2438 +#: ishtar_common/forms_common.py:2614 msgid "Change " msgstr "" @@ -3938,12 +4043,12 @@ msgid "reference and current containers" msgstr "" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2442 +#: ishtar_common/forms_common.py:2618 msgid "the reference container" msgstr "" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2443 +#: ishtar_common/forms_common.py:2619 msgid "the current container" msgstr "" @@ -3992,7 +4097,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4252 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4266 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4002,7 +4107,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1129 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 -#: man_app/templates/ishtar/sheet_find.html:515 +#: man_app/templates/ishtar/sheet_find.html:503 +#: na_app/templates/ishtar/sheet_find.html:514 msgid "Applicant" msgstr "" @@ -4011,7 +4117,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1137 #: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 -#: man_app/templates/ishtar/sheet_find.html:516 +#: man_app/templates/ishtar/sheet_find.html:504 +#: na_app/templates/ishtar/sheet_find.html:515 msgid "Applicant organisation" msgstr "" @@ -4115,7 +4222,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2453 ishtar_common/models.py:3762 +#: archaeological_operations/models.py:2459 ishtar_common/models.py:3776 msgid "Code" msgstr "" @@ -4204,7 +4311,7 @@ msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:1901 #: archaeological_finds/models_treatments.py:75 #: archaeological_finds/models_treatments.py:291 #: archaeological_finds/models_treatments.py:303 @@ -4222,7 +4329,8 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:244 ishtar_common/models_imports.py:970 +#: archaeological_finds/models_finds.py:244 +#: ishtar_common/models_imports.py:1089 msgid "Remarkability type" msgstr "" @@ -4230,7 +4338,8 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:258 ishtar_common/models_imports.py:973 +#: archaeological_finds/models_finds.py:258 +#: ishtar_common/models_imports.py:1092 msgid "Batch type" msgstr "" @@ -4239,8 +4348,8 @@ msgid "Batch types" msgstr "" #: archaeological_finds/models_finds.py:285 -#: archaeological_finds/models_finds.py:1928 -#: ishtar_common/models_imports.py:976 +#: archaeological_finds/models_finds.py:1783 +#: ishtar_common/models_imports.py:1095 msgid "Functional area" msgstr "" @@ -4252,7 +4361,8 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:314 ishtar_common/models_imports.py:971 +#: archaeological_finds/models_finds.py:314 +#: ishtar_common/models_imports.py:1090 msgid "Alteration type" msgstr "" @@ -4260,7 +4370,8 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:329 ishtar_common/models_imports.py:972 +#: archaeological_finds/models_finds.py:329 +#: ishtar_common/models_imports.py:1091 msgid "Alteration cause type" msgstr "" @@ -4268,7 +4379,8 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:344 ishtar_common/models_imports.py:966 +#: archaeological_finds/models_finds.py:344 +#: ishtar_common/models_imports.py:1085 msgid "Treatment emergency type" msgstr "" @@ -4284,7 +4396,8 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:373 ishtar_common/models_imports.py:974 +#: archaeological_finds/models_finds.py:373 +#: ishtar_common/models_imports.py:1093 msgid "Checked type" msgstr "" @@ -4301,6 +4414,7 @@ msgid "Material index" msgstr "" #: archaeological_finds/models_finds.py:456 +#: ishtar_common/models_imports.py:2777 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4311,7 +4425,7 @@ msgid "Short ID" msgstr "" #: archaeological_finds/models_finds.py:462 -#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4362 +#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4376 msgid "Cached value - do not edit" msgstr "" @@ -4324,7 +4438,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:492 -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1692 msgid "Base find" msgstr "" @@ -4332,15 +4446,15 @@ msgstr "" msgid "Base finds" msgstr "" -#: archaeological_finds/models_finds.py:893 +#: archaeological_finds/models_finds.py:748 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:894 +#: archaeological_finds/models_finds.py:749 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:906 +#: archaeological_finds/models_finds.py:761 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -4352,702 +4466,704 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:962 archaeological_finds/views.py:537 +#: archaeological_finds/models_finds.py:817 archaeological_finds/views.py:537 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:974 +#: archaeological_finds/models_finds.py:829 #: archaeological_warehouse/models.py:1930 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:985 +#: archaeological_finds/models_finds.py:840 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1135 +#: archaeological_finds/models_finds.py:990 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1140 +#: archaeological_finds/models_finds.py:995 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:996 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:997 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1144 +#: archaeological_finds/models_finds.py:999 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1146 +#: archaeological_finds/models_finds.py:1001 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:1002 msgid "Base find - Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/models_finds.py:1003 msgid "Base find - Discovery date (end)" msgstr "" -#: archaeological_finds/models_finds.py:1177 +#: archaeological_finds/models_finds.py:1032 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:714 -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1746 +#: archaeological_operations/forms.py:716 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1751 #: archaeological_operations/models.py:985 #: archaeological_operations/models.py:1072 -#: archaeological_operations/models.py:1376 ishtar_common/models.py:5014 -#: ishtar_common/models_imports.py:945 +#: archaeological_operations/models.py:1376 ishtar_common/models.py:5028 +#: ishtar_common/models_imports.py:1064 msgid "Operation type" msgstr "" -#: archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:1064 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1271 +#: archaeological_finds/models_finds.py:1126 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1275 +#: archaeological_finds/models_finds.py:1130 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1279 +#: archaeological_finds/models_finds.py:1134 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1137 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1297 archaeological_finds/tests.py:1358 -#: archaeological_finds/tests.py:1542 archaeological_warehouse/models.py:973 +#: archaeological_finds/models_finds.py:1152 archaeological_finds/tests.py:1403 +#: archaeological_finds/tests.py:1587 archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1301 ishtar_common/models.py:4080 +#: archaeological_finds/models_finds.py:1156 ishtar_common/models.py:4094 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1160 #: archaeological_operations/models.py:382 -#: archaeological_operations/models.py:1141 ishtar_common/models.py:4124 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4138 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1314 +#: archaeological_finds/models_finds.py:1169 #: archaeological_warehouse/models.py:982 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1174 +#: archaeological_finds/models_finds.py:1630 #: archaeological_warehouse/models.py:987 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1324 +#: archaeological_finds/models_finds.py:1179 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_finds/models_finds.py:1770 -#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4088 -#: ishtar_common/models.py:4193 +#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1625 +#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4102 +#: ishtar_common/models.py:4207 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1336 +#: archaeological_finds/models_finds.py:1191 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1340 archaeological_finds/tests.py:1265 -#: archaeological_finds/tests.py:1540 archaeological_warehouse/models.py:1008 +#: archaeological_finds/models_finds.py:1195 archaeological_finds/tests.py:1310 +#: archaeological_finds/tests.py:1585 archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1344 +#: archaeological_finds/models_finds.py:1199 #: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1348 +#: archaeological_finds/models_finds.py:1203 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1352 archaeological_finds/tests.py:1483 +#: archaeological_finds/models_finds.py:1207 archaeological_finds/tests.py:1528 #: archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1356 +#: archaeological_finds/models_finds.py:1211 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1360 +#: archaeological_finds/models_finds.py:1215 #: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1364 archaeological_finds/tests.py:1407 -#: ishtar_common/models.py:4014 +#: archaeological_finds/models_finds.py:1219 archaeological_finds/tests.py:1452 +#: ishtar_common/models.py:4028 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1222 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1226 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1375 ishtar_common/models.py:4108 +#: archaeological_finds/models_finds.py:1230 ishtar_common/models.py:4122 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1379 -#: archaeological_finds/models_finds.py:1773 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_finds/models_finds.py:1628 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1383 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1387 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1391 +#: archaeological_finds/models_finds.py:1246 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1398 +#: archaeological_finds/models_finds.py:1253 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1402 -#: ishtar_common/models_common.py:1479 +#: archaeological_finds/models_finds.py:1257 +#: ishtar_common/models_common.py:1509 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1405 archaeological_finds/tests.py:1562 +#: archaeological_finds/models_finds.py:1260 archaeological_finds/tests.py:1607 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1262 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1266 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1270 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1422 +#: archaeological_finds/models_finds.py:1277 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1425 +#: archaeological_finds/models_finds.py:1280 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1429 +#: archaeological_finds/models_finds.py:1284 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1287 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1291 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1294 msgctxt "key for text search" msgid "discovery-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1298 msgctxt "key for text search" msgid "discovery-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1302 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1306 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "" -#: archaeological_finds/models_finds.py:1455 +#: archaeological_finds/models_finds.py:1310 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1313 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1317 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1321 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1469 +#: archaeological_finds/models_finds.py:1324 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1328 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1483 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1490 +#: archaeological_finds/models_finds.py:1345 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1494 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1498 +#: archaeological_finds/models_finds.py:1353 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1357 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1505 +#: archaeological_finds/models_finds.py:1360 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1508 +#: archaeological_finds/models_finds.py:1363 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1511 +#: archaeological_finds/models_finds.py:1366 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1372 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1376 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1524 +#: archaeological_finds/models_finds.py:1379 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1382 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1531 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1535 +#: archaeological_finds/models_finds.py:1390 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1394 msgctxt "key for text search" msgid "length-higher" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1397 msgctxt "key for text search" msgid "width-higher" msgstr "" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1403 msgctxt "key for text search" msgid "thickness-higher" msgstr "" -#: archaeological_finds/models_finds.py:1551 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "diameter-higher" msgstr "" -#: archaeological_finds/models_finds.py:1554 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "circumference-higher" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "volume-higher" msgstr "" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1416 msgctxt "key for text search" msgid "weight-higher" msgstr "" -#: archaeological_finds/models_finds.py:1564 +#: archaeological_finds/models_finds.py:1419 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1423 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1572 +#: archaeological_finds/models_finds.py:1427 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1431 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1580 +#: archaeological_finds/models_finds.py:1435 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1584 +#: archaeological_finds/models_finds.py:1439 msgctxt "key for text search" msgid "check-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1442 msgctxt "key for text search" msgid "check-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1445 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1449 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1453 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1457 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1618 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1481 #: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1423 +#: archaeological_finds/models_finds.py:1489 archaeological_finds/tests.py:1468 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-address" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:1642 +#: archaeological_finds/models_finds.py:1497 #: archaeological_operations/models.py:1169 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1378 +#: archaeological_finds/models_finds.py:1501 archaeological_finds/tests.py:1423 #: archaeological_operations/models.py:1173 -#: archaeological_operations/tests.py:2879 -#: archaeological_operations/tests.py:3357 +#: archaeological_operations/tests.py:2924 +#: archaeological_operations/tests.py:3421 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1509 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-remain" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1749 -#: archaeological_finds/models_finds.py:2397 +#: archaeological_finds/models_finds.py:1604 +#: archaeological_finds/models_finds.py:2252 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4231 -#: ishtar_common/models.py:4582 +#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4245 +#: ishtar_common/models.py:4596 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2748 +#: ishtar_common/views.py:3011 msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1612 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1871 +#: archaeological_finds/models_finds.py:1726 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1873 +#: archaeological_finds/models_finds.py:1728 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1882 +#: archaeological_finds/models_finds.py:1737 #: archaeological_finds/templates/ishtar/sheet_find.html:417 -#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:418 +#: na_app/templates/ishtar/sheet_find.html:429 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:1744 #: archaeological_finds/templates/ishtar/sheet_find.html:455 -#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:456 +#: na_app/templates/ishtar/sheet_find.html:467 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1960 +#: archaeological_finds/models_finds.py:1815 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1963 +#: archaeological_finds/models_finds.py:1818 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1966 +#: archaeological_finds/models_finds.py:1821 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1842 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1847 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2049 +#: archaeological_finds/models_finds.py:1904 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2058 +#: archaeological_finds/models_finds.py:1913 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2064 +#: archaeological_finds/models_finds.py:1919 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2097 +#: archaeological_finds/models_finds.py:1952 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/models_finds.py:2090 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2236 +#: archaeological_finds/models_finds.py:2091 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2237 +#: archaeological_finds/models_finds.py:2092 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2238 +#: archaeological_finds/models_finds.py:2093 #, fuzzy #| msgid "email address" msgid "Complete ID of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2094 #, fuzzy #| msgid "email address" msgid "Label of associated context records" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2370 +#: archaeological_finds/models_finds.py:2225 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2378 +#: archaeological_finds/models_finds.py:2233 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2386 +#: archaeological_finds/models_finds.py:2241 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2971 +#: archaeological_finds/models_finds.py:2706 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2977 +#: archaeological_finds/models_finds.py:2712 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3418 ishtar_common/forms_common.py:122 -#: ishtar_common/forms_common.py:2516 ishtar_common/ishtar_menu.py:38 -#: ishtar_common/models.py:2909 ishtar_common/models.py:3240 -#: ishtar_common/models.py:3434 ishtar_common/models.py:3683 +#: archaeological_finds/models_finds.py:3153 ishtar_common/forms_common.py:126 +#: ishtar_common/forms_common.py:2692 ishtar_common/ishtar_menu.py:38 +#: ishtar_common/models.py:2919 ishtar_common/models.py:3250 +#: ishtar_common/models.py:3444 ishtar_common/models.py:3697 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3426 +#: archaeological_finds/models_finds.py:3161 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3427 +#: archaeological_finds/models_finds.py:3162 msgid "Properties" msgstr "" @@ -5078,7 +5194,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2588 +#: archaeological_operations/models.py:2594 msgctxt "key for text search" msgid "index" msgstr "" @@ -5125,9 +5241,12 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:388 #: archaeological_finds/templates/ishtar/sheet_find.html:426 #: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:401 -#: man_app/templates/ishtar/sheet_find.html:439 -#: man_app/templates/ishtar/sheet_find.html:477 +#: man_app/templates/ishtar/sheet_find.html:389 +#: man_app/templates/ishtar/sheet_find.html:427 +#: man_app/templates/ishtar/sheet_find.html:465 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:438 +#: na_app/templates/ishtar/sheet_find.html:476 msgid "Doer" msgstr "" @@ -5177,7 +5296,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:494 -#: man_app/templates/ishtar/sheet_find.html:507 +#: man_app/templates/ishtar/sheet_find.html:495 +#: na_app/templates/ishtar/sheet_find.html:506 msgid "Treatment requests" msgstr "" @@ -5238,6 +5358,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: man_app/templates/ishtar/sheet_find.html:16 +#: na_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -5245,40 +5366,48 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:41 #: man_app/templates/ishtar/sheet_find.html:43 +#: na_app/templates/ishtar/sheet_find.html:41 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: man_app/templates/ishtar/sheet_find.html:58 +#: na_app/templates/ishtar/sheet_find.html:56 msgid "Preservation / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_find.html:176 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: man_app/templates/ishtar/sheet_find.html:272 +#: man_app/templates/ishtar/sheet_find.html:260 +#: na_app/templates/ishtar/sheet_find.html:271 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:296 -#: man_app/templates/ishtar/sheet_find.html:309 +#: man_app/templates/ishtar/sheet_find.html:297 +#: na_app/templates/ishtar/sheet_find.html:308 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: man_app/templates/ishtar/sheet_find.html:339 +#: man_app/templates/ishtar/sheet_find.html:327 +#: na_app/templates/ishtar/sheet_find.html:338 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:372 -#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:373 +#: na_app/templates/ishtar/sheet_find.html:384 msgid "Container information not available." msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:379 -#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:380 +#: na_app/templates/ishtar/sheet_find.html:391 msgid "Simple treatments" msgstr "" @@ -5286,19 +5415,26 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:421 #: archaeological_finds/templates/ishtar/sheet_find.html:459 #: archaeological_finds/templates/ishtar/sheet_find.html:498 -#: man_app/templates/ishtar/sheet_find.html:396 -#: man_app/templates/ishtar/sheet_find.html:434 -#: man_app/templates/ishtar/sheet_find.html:472 -#: man_app/templates/ishtar/sheet_find.html:511 +#: man_app/templates/ishtar/sheet_find.html:384 +#: man_app/templates/ishtar/sheet_find.html:422 +#: man_app/templates/ishtar/sheet_find.html:460 +#: man_app/templates/ishtar/sheet_find.html:499 +#: na_app/templates/ishtar/sheet_find.html:395 +#: na_app/templates/ishtar/sheet_find.html:433 +#: na_app/templates/ishtar/sheet_find.html:471 +#: na_app/templates/ishtar/sheet_find.html:510 msgid "Year - index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:387 #: archaeological_finds/templates/ishtar/sheet_find.html:425 #: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: man_app/templates/ishtar/sheet_find.html:400 -#: man_app/templates/ishtar/sheet_find.html:438 -#: man_app/templates/ishtar/sheet_find.html:476 +#: man_app/templates/ishtar/sheet_find.html:388 +#: man_app/templates/ishtar/sheet_find.html:426 +#: man_app/templates/ishtar/sheet_find.html:464 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:437 +#: na_app/templates/ishtar/sheet_find.html:475 msgid "Related finds (max. 15 displayed)" msgstr "" @@ -5308,7 +5444,8 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 -#: man_app/templates/ishtar/sheet_find.html:464 +#: man_app/templates/ishtar/sheet_find.html:452 +#: na_app/templates/ishtar/sheet_find.html:463 msgid "Export as CSV" msgstr "" @@ -5318,8 +5455,10 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 -#: man_app/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:503 +#: man_app/templates/ishtar/sheet_find.html:452 +#: man_app/templates/ishtar/sheet_find.html:491 +#: na_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:502 msgid "CSV" msgstr "" @@ -5327,7 +5466,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: ishtar_common/templates/ishtar/sheet_document.html:138 -#: man_app/templates/ishtar/sheet_find.html:587 +#: man_app/templates/ishtar/sheet_find.html:533 +#: na_app/templates/ishtar/sheet_find.html:544 msgid "Associated documents" msgstr "" @@ -5338,8 +5478,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 -#: ishtar_common/forms_common.py:1923 +#: ishtar_common/forms_common.py:2100 #: ishtar_common/templates/ishtar/sheet_document.html:57 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -5412,23 +5553,27 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:945 archaeological_warehouse/models.py:1682 +#: archaeological_finds/tests.py:714 ishtar_common/forms_common.py:406 +msgid "This importer need a document archive." +msgstr "" + +#: archaeological_finds/tests.py:984 archaeological_warehouse/models.py:1682 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1565 archaeological_finds/tests.py:1591 -#: archaeological_finds/tests.py:1601 archaeological_operations/tests.py:3115 -#: ishtar_common/forms.py:1172 ishtar_common/forms.py:1251 +#: archaeological_finds/tests.py:1610 archaeological_finds/tests.py:1636 +#: archaeological_finds/tests.py:1646 archaeological_operations/tests.py:3160 +#: ishtar_common/forms.py:1193 ishtar_common/forms.py:1272 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:606 ishtar_common/views_item.py:876 -#: ishtar_common/views_item.py:913 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:638 ishtar_common/views_item.py:908 +#: ishtar_common/views_item.py:945 ishtar_common/wizards.py:501 msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1566 archaeological_finds/tests.py:1592 -#: archaeological_finds/tests.py:1602 ishtar_common/forms.py:1173 -#: ishtar_common/forms.py:1253 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1637 +#: archaeological_finds/tests.py:1647 ishtar_common/forms.py:1194 +#: ishtar_common/forms.py:1274 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:503 msgid "No" msgstr "" @@ -5525,29 +5670,30 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1061 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:3076 -#: archaeological_operations/templates/ishtar/sheet_operation.html:493 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1079 +#: archaeological_operations/forms.py:1085 +#: archaeological_operations/models.py:3082 +#: archaeological_operations/templates/ishtar/sheet_operation.html:523 +#: na_app/templates/ishtar/sheet_operation.html:501 msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3064 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3060 +#: archaeological_operations/models.py:3066 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3062 -#: archaeological_operations/models.py:3090 -#: archaeological_operations/models.py:3158 +#: archaeological_operations/models.py:3068 +#: archaeological_operations/models.py:3096 +#: archaeological_operations/models.py:3164 msgid "Public domain" msgstr "" @@ -5604,19 +5750,19 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:732 +#: archaeological_operations/forms.py:734 #: archaeological_operations/models.py:1407 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:713 +#: archaeological_operations/forms.py:715 #: archaeological_operations/models.py:1504 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:720 #: archaeological_operations/models.py:1447 msgid "Address / Locality" msgstr "" @@ -5626,23 +5772,23 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:769 -#: archaeological_operations/models.py:2729 +#: archaeological_operations/forms.py:771 +#: archaeological_operations/models.py:2735 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:758 -#: archaeological_operations/forms.py:1684 +#: archaeological_operations/forms.py:760 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:1346 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1127 -#: archaeological_operations/forms.py:1221 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/forms.py:1848 +#: archaeological_operations/forms.py:1129 +#: archaeological_operations/forms.py:1224 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1853 #: archaeological_operations/models.py:307 #: archaeological_operations/models.py:316 #: archaeological_operations/models.py:497 @@ -5674,33 +5820,33 @@ msgid "Abstract (full text search)" msgstr "" #: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1450 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:823 #: archaeological_operations/models.py:991 #: archaeological_operations/models.py:1485 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:787 +#: archaeological_operations/forms.py:789 #: archaeological_operations/models.py:1402 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:740 +#: archaeological_operations/forms.py:742 #: archaeological_operations/models.py:1476 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1692 +#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:1697 #: archaeological_operations/models.py:992 #: archaeological_operations/models.py:1495 msgid "Documentation received" @@ -5715,8 +5861,8 @@ msgid "Documentation deadline after" msgstr "" #: archaeological_operations/forms.py:579 -#: archaeological_operations/forms.py:815 -#: archaeological_operations/forms.py:1696 +#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:1701 #: archaeological_operations/models.py:993 #: archaeological_operations/models.py:1500 msgid "Finds received" @@ -5730,385 +5876,386 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:669 ishtar_common/models.py:4242 +#: archaeological_operations/forms.py:671 ishtar_common/models.py:4256 msgid "Associated file" msgstr "" -#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:684 msgid "Operation - 010 - General" msgstr "" -#: archaeological_operations/forms.py:716 -#: archaeological_operations/forms.py:1744 +#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:1749 #: archaeological_operations/models.py:1446 msgid "Generic name" msgstr "" -#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:745 msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:745 +#: archaeological_operations/forms.py:747 msgid "Head scientist" msgstr "" -#: archaeological_operations/forms.py:766 +#: archaeological_operations/forms.py:768 #: archaeological_operations/models.py:1444 msgid "Operator reference" msgstr "" -#: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1346 -#: archaeological_operations/forms.py:1700 -#: archaeological_operations/forms.py:1837 +#: archaeological_operations/forms.py:782 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1842 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1360 msgid "Collaborators" msgstr "" -#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:783 msgid "Dates / Administrative" msgstr "" -#: archaeological_operations/forms.py:785 +#: archaeological_operations/forms.py:787 #: archaeological_operations/models.py:1331 msgid "Report delivery date" msgstr "" -#: archaeological_operations/forms.py:807 +#: archaeological_operations/forms.py:809 #: archaeological_operations/models.py:1492 msgid "Deadline for submission of the documentation" msgstr "" -#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:814 #: archaeological_operations/models.py:1498 msgid "Deadline for submission of the finds" msgstr "" -#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:819 msgid "Scientific" msgstr "" -#: archaeological_operations/forms.py:824 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:948 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:1067 msgid "Remain type" msgstr "" -#: archaeological_operations/forms.py:830 +#: archaeological_operations/forms.py:832 #: archaeological_operations/models.py:1490 msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:884 +#: archaeological_operations/forms.py:886 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:889 +#: archaeological_operations/forms.py:891 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:919 +#: archaeological_operations/forms.py:921 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:923 +#: archaeological_operations/forms.py:925 msgid "Bad operation code" msgstr "" -#: archaeological_operations/forms.py:929 -#: archaeological_operations/models.py:1942 +#: archaeological_operations/forms.py:931 +#: archaeological_operations/models.py:1948 msgid "Operation code" msgstr "" -#: archaeological_operations/forms.py:964 -#: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: archaeological_operations/forms.py:966 +#: archaeological_operations/templates/ishtar/sheet_operation.html:312 +#: na_app/templates/ishtar/sheet_operation.html:290 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:965 +#: archaeological_operations/forms.py:967 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:974 +#: archaeological_operations/forms.py:976 #: archaeological_operations/models.py:1507 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:977 +#: archaeological_operations/forms.py:979 #: archaeological_operations/models.py:1509 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:983 +#: archaeological_operations/forms.py:985 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:989 +#: archaeological_operations/forms.py:991 #: archaeological_operations/models.py:1521 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:995 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1529 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1000 +#: archaeological_operations/forms.py:1002 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1001 +#: archaeological_operations/forms.py:1003 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1004 +#: archaeological_operations/forms.py:1006 #: archaeological_operations/models.py:1386 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1007 #: archaeological_operations/models.py:1390 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1007 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1394 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1009 +#: archaeological_operations/forms.py:1011 #: archaeological_operations/models.py:1398 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1019 +#: archaeological_operations/forms.py:1021 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1022 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1027 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1030 +#: archaeological_operations/forms.py:1032 #: archaeological_operations/models.py:1425 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1051 +#: archaeological_operations/forms.py:1053 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1056 +#: archaeological_operations/forms.py:1058 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1078 +#: archaeological_operations/forms.py:1080 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1085 +#: archaeological_operations/forms.py:1087 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1119 -#: archaeological_operations/forms.py:1215 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1796 +#: archaeological_operations/forms.py:1121 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1801 #: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:1848 -#: ishtar_common/forms_common.py:2134 ishtar_common/forms_common.py:2365 -#: ishtar_common/models.py:2349 +#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:2025 +#: ishtar_common/forms_common.py:2311 ishtar_common/forms_common.py:2541 +#: ishtar_common/models.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "" -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1342 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1848 msgid "Cultural attributions" msgstr "" -#: archaeological_operations/forms.py:1152 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/forms.py:1816 +#: archaeological_operations/forms.py:1154 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/forms.py:1821 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1195 +#: archaeological_operations/forms.py:1198 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1200 +#: archaeological_operations/forms.py:1203 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1209 +#: archaeological_operations/forms.py:1212 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1232 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1350 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1355 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1248 -#: archaeological_operations/forms.py:1398 +#: archaeological_operations/forms.py:1251 +#: archaeological_operations/forms.py:1403 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1250 -#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1253 +#: archaeological_operations/forms.py:1405 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1252 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1407 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1255 -#: archaeological_operations/forms.py:1410 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1415 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1404 +#: archaeological_operations/forms.py:1261 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1260 -#: archaeological_operations/forms.py:1406 +#: archaeological_operations/forms.py:1263 +#: archaeological_operations/forms.py:1411 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1413 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1327 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1384 +#: archaeological_operations/forms.py:1389 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1398 #: archaeological_operations/templates/ishtar/sheet_site.html:53 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1394 +#: archaeological_operations/forms.py:1399 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1478 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1590 -#: archaeological_operations/forms.py:1657 +#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:1595 +#: archaeological_operations/forms.py:1662 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1498 -#: archaeological_operations/models.py:2754 +#: archaeological_operations/forms.py:1503 +#: archaeological_operations/models.py:2760 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:2789 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:2795 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1521 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1550 +#: archaeological_operations/forms.py:1555 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1554 +#: archaeological_operations/forms.py:1559 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1572 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1572 ishtar_common/forms.py:1288 -#: ishtar_common/models.py:2021 +#: archaeological_operations/forms.py:1577 ishtar_common/forms.py:1309 +#: ishtar_common/models.py:2031 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1596 -#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1601 +#: archaeological_operations/forms.py:1605 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1623 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1620 +#: archaeological_operations/forms.py:1625 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1646 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:730 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1662 +#: archaeological_operations/forms.py:1667 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1771 +#: archaeological_operations/forms.py:1776 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1827 +#: archaeological_operations/forms.py:1832 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6148,7 +6295,7 @@ msgstr "" msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:944 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:1063 msgid "Cultural attribution type" msgstr "" @@ -6158,7 +6305,7 @@ msgstr "" #: archaeological_operations/models.py:376 #: archaeological_operations/models.py:1177 -#: archaeological_operations/tests.py:3101 +#: archaeological_operations/tests.py:3146 msgctxt "key for text search" msgid "remain" msgstr "" @@ -6220,19 +6367,20 @@ msgid "Create associated operation" msgstr "E-Mail-Adresse" #: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1542 #: archaeological_warehouse/models.py:406 msgid "Cached town label" msgstr "" #: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1554 msgid "Cached remains label" msgstr "" #: archaeological_operations/models.py:567 #: archaeological_operations/models.py:1465 -#: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: archaeological_operations/templates/ishtar/sheet_operation.html:354 +#: na_app/templates/ishtar/sheet_operation.html:332 msgid "Archaeological sites" msgstr "" @@ -6256,9 +6404,9 @@ msgstr "" msgid "top ope." msgstr "" -#: archaeological_operations/models.py:803 ishtar_common/forms.py:1171 -#: ishtar_common/models.py:5142 ishtar_common/models.py:5303 -#: ishtar_common/models.py:5363 ishtar_common/views_item.py:1607 +#: archaeological_operations/models.py:803 ishtar_common/forms.py:1192 +#: ishtar_common/models.py:5156 ishtar_common/models.py:5317 +#: ishtar_common/models.py:5377 ishtar_common/views_item.py:1653 msgid "Unknown" msgstr "" @@ -6331,7 +6479,7 @@ msgid "address" msgstr "" #: archaeological_operations/models.py:1162 -#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3158 msgctxt "key for text search" msgid "is-open" msgstr "" @@ -6362,7 +6510,7 @@ msgid "end-after" msgstr "" #: archaeological_operations/models.py:1197 -#: archaeological_operations/tests.py:3156 +#: archaeological_operations/tests.py:3201 msgctxt "key for text search" msgid "relation-types" msgstr "" @@ -6383,6 +6531,7 @@ msgid "record-quality" msgstr "" #: archaeological_operations/models.py:1214 +#: archaeological_operations/tests.py:3248 msgctxt "key for text search" msgid "report-processing" msgstr "" @@ -6427,8 +6576,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1288 ishtar_common/models.py:4104 -#: ishtar_common/models.py:4196 +#: archaeological_operations/models.py:1288 ishtar_common/models.py:4118 +#: ishtar_common/models.py:4210 msgctxt "key for text search" msgid "file" msgstr "" @@ -6454,284 +6603,298 @@ msgstr "" msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1558 +#: archaeological_operations/models.py:1536 +#, fuzzy +#| msgid "email address" +msgid "Cached label" +msgstr "E-Mail-Adresse" + +#: archaeological_operations/models.py:1564 #: archaeological_operations/templates/ishtar/sheet_site.html:86 -#: ishtar_common/models.py:988 +#: ishtar_common/models.py:999 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1598 +#: archaeological_operations/models.py:1604 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1599 +#: archaeological_operations/models.py:1605 #, fuzzy #| msgid "email address" msgid "List of associated containers" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1672 +#: archaeological_operations/models.py:1678 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1784 +#: archaeological_operations/models.py:1775 +#, fuzzy +#| msgid "email address" +msgid "No associated town" +msgstr "E-Mail-Adresse" + +#: archaeological_operations/models.py:1790 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1908 +#: archaeological_operations/models.py:1914 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1927 +#: archaeological_operations/models.py:1933 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1975 +#: archaeological_operations/models.py:1981 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:2036 +#: archaeological_operations/models.py:2042 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2052 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2054 +#: archaeological_operations/models.py:2060 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2062 +#: archaeological_operations/models.py:2068 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2116 +#: archaeological_operations/models.py:2122 #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2178 -#: archaeological_operations/models.py:2257 +#: archaeological_operations/models.py:2184 +#: archaeological_operations/models.py:2263 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2222 +#: archaeological_operations/models.py:2228 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2273 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2359 ishtar_common/models_imports.py:949 +#: archaeological_operations/models.py:2365 +#: ishtar_common/models_imports.py:1068 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2360 +#: archaeological_operations/models.py:2366 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2391 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2386 +#: archaeological_operations/models.py:2392 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2458 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2457 +#: archaeological_operations/models.py:2463 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2460 +#: archaeological_operations/models.py:2466 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2464 +#: archaeological_operations/models.py:2470 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2600 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2603 +#: archaeological_operations/models.py:2609 #: archaeological_warehouse/models.py:963 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2613 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2619 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2623 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2627 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2636 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2640 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2638 +#: archaeological_operations/models.py:2644 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2650 +#: archaeological_operations/models.py:2656 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2660 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2657 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2661 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2665 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2669 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2673 +#: archaeological_operations/models.py:2679 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:2683 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2680 +#: archaeological_operations/models.py:2686 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2683 +#: archaeological_operations/models.py:2689 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2687 +#: archaeological_operations/models.py:2693 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:2697 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2695 +#: archaeological_operations/models.py:2701 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2699 +#: archaeological_operations/models.py:2705 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2703 +#: archaeological_operations/models.py:2709 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2737 +#: archaeological_operations/models.py:2743 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2799 +#: archaeological_operations/models.py:2805 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2811 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2979 +#: archaeological_operations/models.py:2985 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:3069 +#: archaeological_operations/models.py:3075 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3071 ishtar_common/models.py:2602 -#: ishtar_common/models.py:2904 ishtar_common/models.py:3691 -#: ishtar_common/models_common.py:3510 ishtar_common/models_common.py:3545 -#: ishtar_common/models_common.py:4471 +#: archaeological_operations/models.py:3077 ishtar_common/models.py:2612 +#: ishtar_common/models.py:2914 ishtar_common/models.py:3705 +#: ishtar_common/models_common.py:3318 ishtar_common/models_common.py:3353 +#: ishtar_common/models_common.py:4279 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3344 ishtar_common/models.py:3556 +#: archaeological_operations/models.py:3369 ishtar_common/models.py:3570 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3359 +#: archaeological_operations/models.py:3384 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3360 +#: archaeological_operations/models.py:3385 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3382 ishtar_common/models.py:5010 +#: archaeological_operations/models.py:3407 ishtar_common/models.py:5024 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3385 +#: archaeological_operations/models.py:3410 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3386 +#: archaeological_operations/models.py:3411 msgid "Operation types old" msgstr "" @@ -6753,60 +6916,75 @@ msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:53 +#: na_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 -#: archaeological_operations/templates/ishtar/sheet_operation.html:400 -#: archaeological_operations/templates/ishtar/sheet_operation.html:498 -#: ishtar_common/models.py:988 +#: archaeological_operations/templates/ishtar/sheet_operation.html:430 +#: archaeological_operations/templates/ishtar/sheet_operation.html:528 +#: ishtar_common/models.py:999 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:408 +#: na_app/templates/ishtar/sheet_operation.html:506 msgid "Context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 -#: archaeological_operations/templates/ishtar/sheet_operation.html:467 +#: archaeological_operations/templates/ishtar/sheet_operation.html:497 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:208 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:215 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:475 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:159 +#: na_app/templates/ishtar/sheet_operation.html:159 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:228 +#: na_app/templates/ishtar/sheet_operation.html:228 msgid "Duration" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:270 +#: archaeological_operations/templates/ishtar/sheet_operation.html:286 +#: na_app/templates/ishtar/sheet_operation.html:278 msgid "This operation is virtual." msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:359 +#: archaeological_operations/templates/ishtar/sheet_operation.html:389 +#: na_app/templates/ishtar/sheet_operation.html:367 msgid "Document from this operation" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:391 +#: archaeological_operations/templates/ishtar/sheet_operation.html:421 +#: na_app/templates/ishtar/sheet_operation.html:399 msgid "No relations" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:410 +#: archaeological_operations/templates/ishtar/sheet_operation.html:440 +#: na_app/templates/ishtar/sheet_operation.html:418 msgid "Documents from associated context records" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: archaeological_operations/templates/ishtar/sheet_operation.html:445 +#: na_app/templates/ishtar/sheet_operation.html:423 msgid "Diagram of stratigraphic relations" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:444 +#: archaeological_operations/templates/ishtar/sheet_operation.html:474 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:452 msgid "Associated containers" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:472 +#: archaeological_operations/templates/ishtar/sheet_operation.html:502 #: archaeological_warehouse/templates/ishtar/sheet_container.html:213 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 #: ishtar_common/models_rest.py:77 @@ -6816,26 +6994,34 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:79 #: ishtar_common/templates/ishtar/blocks/window_nav.html:85 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:220 +#: na_app/templates/ishtar/sheet_operation.html:480 msgid "Export" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:477 +#: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:218 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: na_app/templates/ishtar/sheet_container.html:225 +#: na_app/templates/ishtar/sheet_operation.html:485 msgid "Regenerate statistics" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:482 +#: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:223 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: na_app/templates/ishtar/sheet_container.html:230 +#: na_app/templates/ishtar/sheet_operation.html:490 msgid "Last update:" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:562 +#: archaeological_operations/templates/ishtar/sheet_operation.html:592 +#: na_app/templates/ishtar/sheet_operation.html:570 msgid "Sources" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:580 +#: archaeological_operations/templates/ishtar/sheet_operation.html:610 +#: na_app/templates/ishtar/sheet_operation.html:588 msgid "Finds by context records" msgstr "" @@ -6843,73 +7029,73 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:841 +#: archaeological_operations/tests.py:885 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:871 +#: archaeological_operations/tests.py:915 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:909 +#: archaeological_operations/tests.py:953 #: 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:1823 +#: archaeological_operations/tests.py:1867 #: archaeological_operations/views.py:459 msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" -#: archaeological_operations/tests.py:2552 ishtar_common/forms.py:447 +#: archaeological_operations/tests.py:2597 ishtar_common/forms.py:457 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2565 +#: archaeological_operations/tests.py:2610 #: ishtar_common/templates/ishtar/sheet.html:139 msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4700 +#: archaeological_operations/tests.py:4764 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4713 +#: archaeological_operations/tests.py:4777 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4731 +#: archaeological_operations/tests.py:4795 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4738 ishtar_common/admin.py:2476 +#: archaeological_operations/tests.py:4802 ishtar_common/admin.py:2518 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4744 +#: archaeological_operations/tests.py:4808 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4817 ishtar_common/admin.py:2564 +#: archaeological_operations/tests.py:4881 ishtar_common/admin.py:2606 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4823 ishtar_common/models_rest.py:377 +#: archaeological_operations/tests.py:4887 ishtar_common/models_rest.py:377 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4830 ishtar_common/models_rest.py:356 +#: archaeological_operations/tests.py:4894 ishtar_common/models_rest.py:356 #: ishtar_common/models_rest.py:362 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -6935,7 +7121,7 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:570 ishtar_common/models.py:996 +#: archaeological_operations/views.py:570 ishtar_common/models.py:1007 msgid "Site deletion" msgstr "" @@ -6969,7 +7155,7 @@ msgstr "" #: archaeological_warehouse/models.py:414 #: archaeological_warehouse/models.py:929 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1928 ishtar_common/models.py:5238 +#: ishtar_common/forms_common.py:2105 ishtar_common/models.py:5252 #: ishtar_common/views.py:505 msgid "Warehouse" msgstr "" @@ -6993,6 +7179,7 @@ msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:378 #: archaeological_warehouse/templates/ishtar/sheet_container.html:181 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -7006,7 +7193,7 @@ msgstr "" #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:263 -#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:962 +#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:1081 msgid "Warehouse type" msgstr "" @@ -7035,32 +7222,32 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:596 -#: ishtar_common/forms_common.py:983 ishtar_common/models_common.py:3766 -#: ishtar_common/models_common.py:3955 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:772 +#: ishtar_common/forms_common.py:1161 ishtar_common/models_common.py:3574 +#: ishtar_common/models_common.py:3763 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:599 -#: ishtar_common/forms_common.py:986 ishtar_common/models_common.py:3771 +#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:775 +#: ishtar_common/forms_common.py:1164 ishtar_common/models_common.py:3579 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:601 -#: ishtar_common/forms_common.py:988 ishtar_common/models_common.py:3777 +#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:777 +#: ishtar_common/forms_common.py:1166 ishtar_common/models_common.py:3585 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:603 -#: ishtar_common/forms_common.py:959 ishtar_common/models_common.py:3791 -#: ishtar_common/models_common.py:3967 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:1137 ishtar_common/models_common.py:3599 +#: ishtar_common/models_common.py:3775 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:605 -#: ishtar_common/forms_common.py:969 ishtar_common/models_common.py:3807 +#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:781 +#: ishtar_common/forms_common.py:1147 ishtar_common/models_common.py:3615 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7092,7 +7279,8 @@ msgstr "" #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1141 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:1079 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" @@ -7225,6 +7413,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:183 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -7360,7 +7549,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4100 +#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4114 msgctxt "key for text search" msgid "find-denomination" msgstr "" @@ -7415,7 +7604,7 @@ msgstr "" msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4344 +#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4358 msgid "Container ID" msgstr "" @@ -7479,49 +7668,60 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of owned finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:128 +#: na_app/templates/ishtar/sheet_container.html:135 msgid "Measured weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Calculated weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:133 +#: na_app/templates/ishtar/sheet_container.html:140 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:231 +#: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:261 +#: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:289 +#: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "" @@ -7702,7 +7902,7 @@ msgstr "" msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:724 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:902 msgid "At least two items have to be selected." msgstr "" @@ -7723,7 +7923,7 @@ msgstr "" msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:495 ishtar_common/models.py:1486 +#: ishtar_common/admin.py:495 ishtar_common/models.py:1496 msgid "Maps - default center" msgstr "" @@ -7750,14 +7950,14 @@ msgid "" "might be required." msgstr "" -#: ishtar_common/admin.py:660 ishtar_common/models.py:965 +#: ishtar_common/admin.py:660 ishtar_common/models.py:976 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1295 -#: ishtar_common/forms_common.py:1330 ishtar_common/forms_common.py:1331 -#: ishtar_common/models.py:3020 +#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1475 +#: ishtar_common/forms_common.py:1507 ishtar_common/forms_common.py:1508 +#: ishtar_common/models.py:3030 msgid "Profiles" msgstr "" @@ -7878,10 +8078,12 @@ msgid "Parents" msgstr "" #: ishtar_common/admin.py:1177 ishtar_common/admin.py:1642 +#: ishtar_common/admin.py:1665 msgid "Make available" msgstr "" #: ishtar_common/admin.py:1178 ishtar_common/admin.py:1643 +#: ishtar_common/admin.py:1666 msgid "Make unavailable" msgstr "" @@ -7925,159 +8127,160 @@ msgstr "" msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1694 +#: ishtar_common/admin.py:1717 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1725 +#: ishtar_common/admin.py:1748 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1738 +#: ishtar_common/admin.py:1761 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1765 +#: ishtar_common/admin.py:1788 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1772 +#: ishtar_common/admin.py:1795 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1786 +#: ishtar_common/admin.py:1809 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1821 +#: ishtar_common/admin.py:1844 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1976 +#: ishtar_common/admin.py:2018 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1977 +#: ishtar_common/admin.py:2019 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:2007 ishtar_common/models.py:1629 +#: ishtar_common/admin.py:2049 ishtar_common/models.py:1639 msgid "Form" msgstr "" -#: ishtar_common/admin.py:2028 ishtar_common/models.py:1769 +#: ishtar_common/admin.py:2070 ishtar_common/models.py:1779 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2159 ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2201 ishtar_common/admin.py:2253 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2166 +#: ishtar_common/admin.py:2208 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2178 +#: ishtar_common/admin.py:2220 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2218 +#: ishtar_common/admin.py:2260 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2230 ishtar_common/models_imports.py:1427 +#: ishtar_common/admin.py:2272 ishtar_common/models_imports.py:1597 +#: ishtar_common/models_imports.py:2249 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2298 ishtar_common/models.py:962 +#: ishtar_common/admin.py:2340 ishtar_common/models.py:973 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2361 ishtar_common/admin.py:2499 -#: ishtar_common/admin.py:2543 +#: ishtar_common/admin.py:2403 ishtar_common/admin.py:2541 +#: ishtar_common/admin.py:2585 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2383 +#: ishtar_common/admin.py:2425 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2391 +#: ishtar_common/admin.py:2433 msgid "" "Bad response for {} - {}. Response status code {} != 200. No access to {}. " "If it is not expected, check your key." msgstr "" -#: ishtar_common/admin.py:2403 +#: ishtar_common/admin.py:2445 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2438 +#: ishtar_common/admin.py:2480 msgid "Table/exports configuration updated" msgstr "" -#: ishtar_common/admin.py:2444 +#: ishtar_common/admin.py:2486 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2450 +#: ishtar_common/admin.py:2492 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2456 +#: ishtar_common/admin.py:2498 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2465 +#: ishtar_common/admin.py:2507 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2484 +#: ishtar_common/admin.py:2526 msgid "Update table, export format and types from source" msgstr "" -#: ishtar_common/admin.py:2508 +#: ishtar_common/admin.py:2550 msgid "" "Document not generated: is the LibreOffice daemon configured and running?" msgstr "" -#: ishtar_common/admin.py:2528 +#: ishtar_common/admin.py:2570 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2552 +#: ishtar_common/admin.py:2594 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2557 +#: ishtar_common/admin.py:2599 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2570 +#: ishtar_common/admin.py:2612 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2604 +#: ishtar_common/admin.py:2646 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2605 +#: ishtar_common/admin.py:2647 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2615 ishtar_common/models_rest.py:81 +#: ishtar_common/admin.py:2657 ishtar_common/models_rest.py:81 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2618 ishtar_common/models.py:715 -#: ishtar_common/models_common.py:809 ishtar_common/models_imports.py:851 -#: ishtar_common/models_imports.py:1950 ishtar_common/models_rest.py:111 +#: ishtar_common/admin.py:2660 ishtar_common/models.py:726 +#: ishtar_common/models_common.py:811 ishtar_common/models_imports.py:970 +#: ishtar_common/models_imports.py:2827 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8086,21 +8289,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2620 +#: ishtar_common/admin.py:2662 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2650 +#: ishtar_common/admin.py:2692 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2683 +#: ishtar_common/admin.py:2725 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2691 +#: ishtar_common/admin.py:2733 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8171,173 +8374,173 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:279 +#: ishtar_common/data_importer.py:277 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:298 +#: ishtar_common/data_importer.py:296 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:310 +#: ishtar_common/data_importer.py:308 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:320 +#: ishtar_common/data_importer.py:318 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:377 ishtar_common/data_importer.py:391 -#: ishtar_common/data_importer.py:615 +#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:613 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:404 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:473 +#: ishtar_common/data_importer.py:471 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:480 +#: ishtar_common/data_importer.py:478 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:482 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:644 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:753 +#: ishtar_common/data_importer.py:752 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:759 +#: ishtar_common/data_importer.py:758 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:761 ishtar_common/views.py:1702 +#: ishtar_common/data_importer.py:760 ishtar_common/views.py:1818 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:762 +#: ishtar_common/data_importer.py:761 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:762 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:764 +#: ishtar_common/data_importer.py:763 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:766 +#: ishtar_common/data_importer.py:765 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:770 +#: ishtar_common/data_importer.py:769 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:774 +#: ishtar_common/data_importer.py:773 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1361 ishtar_common/views.py:1780 -#: ishtar_common/views.py:1790 +#: ishtar_common/data_importer.py:1391 ishtar_common/views.py:1896 +#: ishtar_common/views.py:1906 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1655 +#: ishtar_common/data_importer.py:1681 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1660 +#: ishtar_common/data_importer.py:1686 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1742 +#: ishtar_common/data_importer.py:1770 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1869 +#: ishtar_common/data_importer.py:1901 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:1944 +#: ishtar_common/data_importer.py:1971 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:1952 +#: ishtar_common/data_importer.py:1979 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:1957 +#: ishtar_common/data_importer.py:1984 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2043 +#: ishtar_common/data_importer.py:2072 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2046 +#: ishtar_common/data_importer.py:2075 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2126 +#: ishtar_common/data_importer.py:2158 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2210 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8350,8 +8553,8 @@ msgstr "" msgid "File too large. Size should not exceed {} Mo." msgstr "" -#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1337 -#: ishtar_common/views.py:2671 +#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1514 +#: ishtar_common/views.py:2934 msgid "Confirm" msgstr "" @@ -8359,101 +8562,101 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: ishtar_common/forms.py:437 ishtar_common/forms.py:1027 +#: ishtar_common/forms.py:447 ishtar_common/forms.py:1047 msgid "You should select an item." msgstr "" -#: ishtar_common/forms.py:445 +#: ishtar_common/forms.py:455 msgid "Invalid selection." msgstr "" -#: ishtar_common/forms.py:526 +#: ishtar_common/forms.py:536 msgid "There are identical items." msgstr "" -#: ishtar_common/forms.py:938 +#: ishtar_common/forms.py:958 msgid "Created before" msgstr "" -#: ishtar_common/forms.py:941 +#: ishtar_common/forms.py:961 msgid "Created after" msgstr "" -#: ishtar_common/forms.py:944 man_app/templates/ishtar/sheet_basefind.html:74 +#: ishtar_common/forms.py:964 man_app/templates/ishtar/sheet_basefind.html:74 msgid "Last modified by" msgstr "" -#: ishtar_common/forms.py:951 +#: ishtar_common/forms.py:971 msgid "Modified before" msgstr "" -#: ishtar_common/forms.py:954 +#: ishtar_common/forms.py:974 msgid "Modified after" msgstr "" -#: ishtar_common/forms.py:956 +#: ishtar_common/forms.py:976 msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:984 ishtar_common/forms_common.py:2175 +#: ishtar_common/forms.py:1004 ishtar_common/forms_common.py:2352 msgid "Has an image?" msgstr "" -#: ishtar_common/forms.py:986 +#: ishtar_common/forms.py:1006 msgid "Has an attached file?" msgstr "" -#: ishtar_common/forms.py:989 +#: ishtar_common/forms.py:1009 #, fuzzy #| msgid "email address" msgid "Has a web address?" msgstr "E-Mail-Adresse" -#: ishtar_common/forms.py:1029 +#: ishtar_common/forms.py:1049 msgid "Add a new item" msgstr "" -#: ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1237 msgid " - append to existing" msgstr "" -#: ishtar_common/forms.py:1219 +#: ishtar_common/forms.py:1240 msgid " - replace" msgstr "" -#: ishtar_common/forms.py:1249 +#: ishtar_common/forms.py:1270 msgid "Set to null" msgstr "" -#: ishtar_common/forms.py:1311 +#: ishtar_common/forms.py:1332 msgid "Geo - Name" msgstr "" -#: ishtar_common/forms.py:1312 +#: ishtar_common/forms.py:1333 msgid "Geo - Data type" msgstr "" -#: ishtar_common/forms.py:1313 +#: ishtar_common/forms.py:1334 msgid "Geo - Origin" msgstr "" -#: ishtar_common/forms.py:1314 +#: ishtar_common/forms.py:1335 msgid "Geo - Provider" msgstr "" -#: ishtar_common/forms.py:1315 +#: ishtar_common/forms.py:1336 msgid "Geo - Z - higher than" msgstr "" -#: ishtar_common/forms.py:1316 +#: ishtar_common/forms.py:1337 msgid "Geo - Z - lower than" msgstr "" -#: ishtar_common/forms.py:1317 +#: ishtar_common/forms.py:1338 msgid "Geo - Comment" msgstr "" -#: ishtar_common/forms_common.py:90 +#: ishtar_common/forms_common.py:94 msgid "" "<p>Type name, department code of the town you would like to select. The " "search is insensitive to case.</p>\n" @@ -8463,67 +8666,92 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: ishtar_common/forms_common.py:148 +#: ishtar_common/forms_common.py:152 msgid "Password" msgstr "" -#: ishtar_common/forms_common.py:157 ishtar_common/forms_common.py:1220 -#: ishtar_common/forms_common.py:1235 ishtar_common/wizards.py:2003 +#: ishtar_common/forms_common.py:162 ishtar_common/forms_common.py:1398 +#: ishtar_common/forms_common.py:1417 ishtar_common/wizards.py:2003 msgid "New password" msgstr "" -#: ishtar_common/forms_common.py:164 +#: ishtar_common/forms_common.py:170 msgid "New password confirmation" msgstr "" -#: ishtar_common/forms_common.py:173 +#: ishtar_common/forms_common.py:180 msgid "Old password" msgstr "" -#: ishtar_common/forms_common.py:211 ishtar_common/forms_common.py:306 +#: ishtar_common/forms_common.py:218 msgid "Associated images (web link to a zip file)" msgstr "" -#: ishtar_common/forms_common.py:233 ishtar_common/forms_common.py:324 +#: ishtar_common/forms_common.py:240 ishtar_common/forms_common.py:370 msgid "Import (table)" msgstr "" -#: ishtar_common/forms_common.py:285 -msgid "This is not a valid CSV file. Check file format and encoding." +#: ishtar_common/forms_common.py:241 ishtar_common/forms_common.py:371 +#: ishtar_common/forms_common.py:455 ishtar_common/forms_common.py:522 +msgid "CSV options" msgstr "" #: ishtar_common/forms_common.py:297 +msgid "Bad format. Extension of the file must be {}." +msgstr "" + +#: ishtar_common/forms_common.py:299 +msgid "Bad format. Extension of the file must be: {} or {}." +msgstr "" + +#: ishtar_common/forms_common.py:320 +msgid "This is not a valid CSV file. Check file format and encoding." +msgstr "" + +#: ishtar_common/forms_common.py:332 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." msgstr "" -#: ishtar_common/forms_common.py:332 +#: ishtar_common/forms_common.py:352 +msgid "Associated documents (web link to a zip file)" +msgstr "" + +#: ishtar_common/forms_common.py:372 ishtar_common/forms_common.py:523 +msgid "Documents/Images" +msgstr "" + +#: ishtar_common/forms_common.py:384 msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:343 ishtar_common/tests.py:2591 +#: ishtar_common/forms_common.py:395 ishtar_common/tests.py:2884 msgid "\"Associated images\" field must be a valid zip file." msgstr "" -#: ishtar_common/forms_common.py:356 +#: ishtar_common/forms_common.py:417 msgid "Invalid link or no file is available for this link." msgstr "" -#: ishtar_common/forms_common.py:399 +#: ishtar_common/forms_common.py:454 msgid "Import (GIS)" msgstr "" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:484 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" -#: ishtar_common/forms_common.py:450 +#: ishtar_common/forms_common.py:521 +msgid "Import (group)" +msgstr "" + +#: ishtar_common/forms_common.py:551 ishtar_common/models_imports.py:538 msgid "Target" msgstr "" -#: ishtar_common/forms_common.py:451 ishtar_common/models.py:1832 -#: ishtar_common/models_imports.py:852 +#: ishtar_common/forms_common.py:552 ishtar_common/models.py:1842 +#: ishtar_common/models_imports.py:971 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8531,699 +8759,702 @@ msgstr "" msgid "Value" msgstr "" -#: ishtar_common/forms_common.py:452 +#: ishtar_common/forms_common.py:553 msgid "Remember" msgstr "" -#: ishtar_common/forms_common.py:477 +#: ishtar_common/forms_common.py:579 msgid "Set to NULL" msgstr "" -#: ishtar_common/forms_common.py:484 +#: ishtar_common/forms_common.py:586 msgid "this import only" msgstr "" -#: ishtar_common/forms_common.py:485 +#: ishtar_common/forms_common.py:587 msgid "me" msgstr "" -#: ishtar_common/forms_common.py:498 +#: ishtar_common/forms_common.py:600 msgid "the current group: {}" msgstr "" -#: ishtar_common/forms_common.py:504 +#: ishtar_common/forms_common.py:606 msgid "all users" msgstr "" -#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:698 -#: ishtar_common/models.py:2514 ishtar_common/models_imports.py:929 -#: ishtar_common/models_imports.py:930 +#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:876 +#: ishtar_common/models.py:2524 ishtar_common/models_imports.py:1048 +#: ishtar_common/models_imports.py:1049 msgid "Organization type" msgstr "" -#: ishtar_common/forms_common.py:587 ishtar_common/forms_common.py:2140 -#: ishtar_common/models.py:2592 +#: ishtar_common/forms_common.py:763 ishtar_common/forms_common.py:2317 +#: ishtar_common/models.py:2602 #, fuzzy #| msgid "email address" msgid "Web address" msgstr "E-Mail-Adresse" -#: ishtar_common/forms_common.py:589 ishtar_common/forms_common.py:701 -#: ishtar_common/models.py:2490 ishtar_common/models.py:2507 -#: ishtar_common/models.py:2594 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:879 +#: ishtar_common/models.py:2500 ishtar_common/models.py:2517 +#: ishtar_common/models.py:2604 msgid "Grammatical gender" msgstr "" -#: ishtar_common/forms_common.py:592 ishtar_common/forms_common.py:704 +#: ishtar_common/forms_common.py:768 ishtar_common/forms_common.py:882 msgid "Can be used by templates" msgstr "" -#: ishtar_common/forms_common.py:602 ishtar_common/forms_common.py:826 -#: ishtar_common/forms_common.py:955 ishtar_common/forms_common.py:1050 -#: ishtar_common/forms_common.py:1217 ishtar_common/models_common.py:3809 -#: ishtar_common/models_common.py:3977 ishtar_common/wizards.py:1968 +#: ishtar_common/forms_common.py:778 ishtar_common/forms_common.py:1004 +#: ishtar_common/forms_common.py:1133 ishtar_common/forms_common.py:1228 +#: ishtar_common/forms_common.py:1395 ishtar_common/models_common.py:3617 +#: ishtar_common/models_common.py:3785 ishtar_common/wizards.py:1968 msgid "Email" msgstr "E-Mail-Adresse" -#: ishtar_common/forms_common.py:655 ishtar_common/forms_common.py:671 +#: ishtar_common/forms_common.py:833 ishtar_common/forms_common.py:849 #: ishtar_common/views.py:335 msgid "Organization search" msgstr "" -#: ishtar_common/forms_common.py:688 +#: ishtar_common/forms_common.py:866 msgid "Organization - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:741 +#: ishtar_common/forms_common.py:919 msgid "Merge all items into" msgstr "" -#: ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:957 msgid "Organization to merge" msgstr "" -#: ishtar_common/forms_common.py:823 ishtar_common/forms_common.py:951 -#: ishtar_common/forms_common.py:1049 ishtar_common/models.py:2879 +#: ishtar_common/forms_common.py:1001 ishtar_common/forms_common.py:1129 +#: ishtar_common/forms_common.py:1227 ishtar_common/models.py:2889 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "" -#: ishtar_common/forms_common.py:824 ishtar_common/forms_common.py:889 -#: ishtar_common/forms_common.py:948 ishtar_common/forms_common.py:1722 -#: ishtar_common/forms_common.py:2132 ishtar_common/forms_common.py:2364 -#: ishtar_common/models.py:2866 ishtar_common/models.py:2870 -#: ishtar_common/models.py:4240 ishtar_common/models_imports.py:932 +#: ishtar_common/forms_common.py:1002 ishtar_common/forms_common.py:1067 +#: ishtar_common/forms_common.py:1126 ishtar_common/forms_common.py:1899 +#: ishtar_common/forms_common.py:2309 ishtar_common/forms_common.py:2540 +#: ishtar_common/models.py:2876 ishtar_common/models.py:2880 +#: ishtar_common/models.py:4254 ishtar_common/models_imports.py:1051 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "" -#: ishtar_common/forms_common.py:825 ishtar_common/forms_common.py:949 -#: ishtar_common/models.py:2876 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1127 +#: ishtar_common/models.py:2886 #: ishtar_common/templates/ishtar/merge_person.html:12 #: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "" -#: ishtar_common/forms_common.py:844 ishtar_common/forms_common.py:860 -#: ishtar_common/forms_common.py:1025 ishtar_common/views.py:276 +#: ishtar_common/forms_common.py:1022 ishtar_common/forms_common.py:1038 +#: ishtar_common/forms_common.py:1203 ishtar_common/views.py:276 msgid "Person search" msgstr "" -#: ishtar_common/forms_common.py:878 +#: ishtar_common/forms_common.py:1056 msgid "Person - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:900 ishtar_common/models.py:2671 +#: ishtar_common/forms_common.py:1078 ishtar_common/models.py:2681 msgid "Person types" msgstr "" -#: ishtar_common/forms_common.py:918 +#: ishtar_common/forms_common.py:1096 msgid "Person to merge" msgstr "" -#: ishtar_common/forms_common.py:940 +#: ishtar_common/forms_common.py:1118 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "" -#: ishtar_common/forms_common.py:954 ishtar_common/models.py:2889 +#: ishtar_common/forms_common.py:1132 ishtar_common/models.py:2899 #: ishtar_common/templates/ishtar/merge_person.html:9 #: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:957 ishtar_common/models_common.py:3793 +#: ishtar_common/forms_common.py:1135 ishtar_common/models_common.py:3601 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:961 ishtar_common/models_common.py:3796 -#: ishtar_common/models_common.py:3799 +#: ishtar_common/forms_common.py:1139 ishtar_common/models_common.py:3604 +#: ishtar_common/models_common.py:3607 msgid "Phone description 2" msgstr "" -#: ishtar_common/forms_common.py:963 +#: ishtar_common/forms_common.py:1141 msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:965 ishtar_common/models_common.py:3803 +#: ishtar_common/forms_common.py:1143 ishtar_common/models_common.py:3611 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:967 ishtar_common/models_common.py:3801 +#: ishtar_common/forms_common.py:1145 ishtar_common/models_common.py:3609 msgid "Phone 3" msgstr "" -#: ishtar_common/forms_common.py:972 +#: ishtar_common/forms_common.py:1150 msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:990 ishtar_common/models_common.py:3778 +#: ishtar_common/forms_common.py:1168 ishtar_common/models_common.py:3586 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:993 ishtar_common/models_common.py:3780 +#: ishtar_common/forms_common.py:1171 ishtar_common/models_common.py:3588 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:998 ishtar_common/models_common.py:3783 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3591 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1001 ishtar_common/models_common.py:3786 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3594 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1004 ishtar_common/models_common.py:3789 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:3597 msgid "Other address: country" msgstr "" -#: ishtar_common/forms_common.py:1016 +#: ishtar_common/forms_common.py:1194 msgid "Already has an account" msgstr "" -#: ishtar_common/forms_common.py:1017 ishtar_common/forms_common.py:1355 -#: ishtar_common/models.py:3197 ishtar_common/models.py:3218 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/forms_common.py:1195 ishtar_common/forms_common.py:1532 +#: ishtar_common/models.py:3207 ishtar_common/models.py:3228 +#: ishtar_common/models_imports.py:1056 msgid "Profile type" msgstr "" -#: ishtar_common/forms_common.py:1047 ishtar_common/models.py:3398 +#: ishtar_common/forms_common.py:1225 ishtar_common/models.py:3408 #: ishtar_common/wizards.py:1967 msgid "Username" msgstr "Benutzername" -#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1247 ishtar_common/forms_common.py:1260 msgid "Account search" msgstr "" -#: ishtar_common/forms_common.py:1144 ishtar_common/forms_common.py:1192 -#: ishtar_common/forms_common.py:1196 ishtar_common/models.py:2670 -#: ishtar_common/models_imports.py:931 +#: ishtar_common/forms_common.py:1322 ishtar_common/forms_common.py:1370 +#: ishtar_common/forms_common.py:1374 ishtar_common/models.py:2680 +#: ishtar_common/models_imports.py:1050 msgid "Person type" msgstr "" -#: ishtar_common/forms_common.py:1211 ishtar_common/forms_common.py:1215 +#: ishtar_common/forms_common.py:1389 ishtar_common/forms_common.py:1393 #: ishtar_common/ishtar_menu.py:80 msgid "Account" msgstr "" -#: ishtar_common/forms_common.py:1227 +#: ishtar_common/forms_common.py:1407 msgid "New password (confirmation)" msgstr "" -#: ishtar_common/forms_common.py:1237 +#: ishtar_common/forms_common.py:1419 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." msgstr "" -#: ishtar_common/forms_common.py:1275 +#: ishtar_common/forms_common.py:1457 msgid "Your password and confirmation password do not match." msgstr "" -#: ishtar_common/forms_common.py:1281 +#: ishtar_common/forms_common.py:1463 msgid "You must provide a correct password." msgstr "" -#: ishtar_common/forms_common.py:1290 +#: ishtar_common/forms_common.py:1470 msgid "This username already exists." msgstr "" -#: ishtar_common/forms_common.py:1322 +#: ishtar_common/forms_common.py:1499 msgid "Choose different name for profiles." msgstr "" -#: ishtar_common/forms_common.py:1339 +#: ishtar_common/forms_common.py:1516 msgid "Send the new password by email?" msgstr "" -#: ishtar_common/forms_common.py:1352 ishtar_common/models.py:3226 -#: ishtar_common/views.py:1344 +#: ishtar_common/forms_common.py:1529 ishtar_common/models.py:3236 +#: ishtar_common/views.py:1345 msgid "Current profile" msgstr "" -#: ishtar_common/forms_common.py:1358 +#: ishtar_common/forms_common.py:1535 msgid "Pin automatically items on creation and modification" msgstr "" -#: ishtar_common/forms_common.py:1363 +#: ishtar_common/forms_common.py:1540 msgid "Duplicate this profile" msgstr "" -#: ishtar_common/forms_common.py:1366 +#: ishtar_common/forms_common.py:1543 msgid "Delete this profile" msgstr "" -#: ishtar_common/forms_common.py:1403 ishtar_common/forms_common.py:1411 +#: ishtar_common/forms_common.py:1580 ishtar_common/forms_common.py:1588 msgid "External source - {}" msgstr "" -#: ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1637 msgid "A profile with the same name exists." msgstr "" -#: ishtar_common/forms_common.py:1493 +#: ishtar_common/forms_common.py:1670 msgid " (duplicate)" msgstr "" -#: ishtar_common/forms_common.py:1522 +#: ishtar_common/forms_common.py:1699 msgid "There are identical towns." msgstr "" -#: ishtar_common/forms_common.py:1609 +#: ishtar_common/forms_common.py:1786 msgid "Only one choice can be checked." msgstr "" -#: ishtar_common/forms_common.py:1659 +#: ishtar_common/forms_common.py:1836 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: ishtar_common/forms_common.py:1684 +#: ishtar_common/forms_common.py:1861 msgid "This value already exist" msgstr "" -#: ishtar_common/forms_common.py:1700 ishtar_common/models.py:3836 -#: ishtar_common/models_imports.py:940 +#: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3850 +#: ishtar_common/models_imports.py:1059 msgid "Document tag" msgstr "" -#: ishtar_common/forms_common.py:1709 +#: ishtar_common/forms_common.py:1886 msgid "Document - General" msgstr "" -#: ishtar_common/forms_common.py:1730 ishtar_common/forms_common.py:2138 -#: ishtar_common/forms_common.py:2344 ishtar_common/models.py:4306 +#: ishtar_common/forms_common.py:1907 ishtar_common/forms_common.py:2315 +#: ishtar_common/forms_common.py:2520 ishtar_common/models.py:4320 msgid "Medium" msgstr "" -#: ishtar_common/forms_common.py:1733 ishtar_common/forms_common.py:1922 -#: ishtar_common/forms_common.py:2137 ishtar_common/forms_common.py:2343 -#: ishtar_common/models.py:4313 ishtar_common/models_imports.py:936 -#: ishtar_common/models_imports.py:938 +#: ishtar_common/forms_common.py:1910 ishtar_common/forms_common.py:2099 +#: ishtar_common/forms_common.py:2314 ishtar_common/forms_common.py:2519 +#: ishtar_common/models.py:4327 ishtar_common/models_imports.py:1055 +#: ishtar_common/models_imports.py:1057 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "" -#: ishtar_common/forms_common.py:1735 ishtar_common/forms_common.py:2139 -#: ishtar_common/forms_common.py:2345 ishtar_common/models.py:4318 +#: ishtar_common/forms_common.py:1912 ishtar_common/forms_common.py:2316 +#: ishtar_common/forms_common.py:2521 ishtar_common/models.py:4332 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" -#: ishtar_common/forms_common.py:1753 ishtar_common/forms_common.py:1924 -#: ishtar_common/forms_common.py:2571 ishtar_common/forms_common.py:2572 -#: ishtar_common/models.py:3697 ishtar_common/models.py:3963 -#: ishtar_common/models.py:4320 +#: ishtar_common/forms_common.py:1930 ishtar_common/forms_common.py:2101 +#: ishtar_common/forms_common.py:2747 ishtar_common/forms_common.py:2748 +#: ishtar_common/models.py:3711 ishtar_common/models.py:3977 +#: ishtar_common/models.py:4334 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "" -#: ishtar_common/forms_common.py:1759 ishtar_common/forms_common.py:2143 -#: ishtar_common/models.py:4262 +#: ishtar_common/forms_common.py:1936 ishtar_common/forms_common.py:2320 +#: ishtar_common/models.py:4276 msgid "Publisher" msgstr "" -#: ishtar_common/forms_common.py:1783 ishtar_common/forms_common.py:2165 -#: ishtar_common/models.py:4269 +#: ishtar_common/forms_common.py:1960 ishtar_common/forms_common.py:2342 +#: ishtar_common/models.py:4283 msgid "Year of publication" msgstr "" -#: ishtar_common/forms_common.py:1788 +#: ishtar_common/forms_common.py:1965 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "" -#: ishtar_common/forms_common.py:1791 ishtar_common/forms_common.py:2346 -#: ishtar_common/models.py:4274 +#: ishtar_common/forms_common.py:1968 ishtar_common/forms_common.py:2522 +#: ishtar_common/models.py:4288 msgid "Tags" msgstr "" -#: ishtar_common/forms_common.py:1797 ishtar_common/forms_common.py:2166 -#: ishtar_common/models.py:982 ishtar_common/models.py:4277 -#: ishtar_common/models_imports.py:941 overload_translation/models.py:11 +#: ishtar_common/forms_common.py:1974 ishtar_common/forms_common.py:2343 +#: ishtar_common/models.py:993 ishtar_common/models.py:4291 +#: ishtar_common/models_imports.py:1060 overload_translation/models.py:11 msgid "Language" msgstr "" -#: ishtar_common/forms_common.py:1800 ishtar_common/forms_common.py:2168 -#: ishtar_common/models.py:4282 +#: ishtar_common/forms_common.py:1977 ishtar_common/forms_common.py:2345 +#: ishtar_common/models.py:4296 msgid "ISSN" msgstr "" -#: ishtar_common/forms_common.py:1806 ishtar_common/forms_common.py:2167 -#: ishtar_common/models.py:4283 +#: ishtar_common/forms_common.py:1983 ishtar_common/forms_common.py:2344 +#: ishtar_common/models.py:4297 msgid "ISBN" msgstr "" -#: ishtar_common/forms_common.py:1812 ishtar_common/forms_common.py:1927 -#: ishtar_common/forms_common.py:2177 ishtar_common/models.py:4286 -#: ishtar_common/models.py:5354 +#: ishtar_common/forms_common.py:1989 ishtar_common/forms_common.py:2104 +#: ishtar_common/forms_common.py:2354 ishtar_common/models.py:4300 +#: ishtar_common/models.py:5368 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 +#: ishtar_common/templates/ishtar/import_table.html:2 #: ishtar_common/templates/ishtar/sheet_document.html:93 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:2 +#: ishtar_common/views.py:2239 msgid "Source" msgstr "" -#: ishtar_common/forms_common.py:1815 ishtar_common/forms_common.py:2183 -#: ishtar_common/models.py:4293 +#: ishtar_common/forms_common.py:1992 ishtar_common/forms_common.py:2360 +#: ishtar_common/models.py:4307 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:1820 ishtar_common/models.py:4299 +#: ishtar_common/forms_common.py:1997 ishtar_common/models.py:4313 msgid "Source - page range" msgstr "" -#: ishtar_common/forms_common.py:1824 +#: ishtar_common/forms_common.py:2001 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:1830 ishtar_common/models.py:4330 +#: ishtar_common/forms_common.py:2007 ishtar_common/models.py:4344 msgid "Numerical ressource (web address)" msgstr "" -#: ishtar_common/forms_common.py:1833 +#: ishtar_common/forms_common.py:2010 msgid "Image" msgstr "" -#: ishtar_common/forms_common.py:1841 +#: ishtar_common/forms_common.py:2018 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:1858 ishtar_common/models.py:4333 +#: ishtar_common/forms_common.py:2035 ishtar_common/models.py:4347 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:1864 ishtar_common/models.py:4339 +#: ishtar_common/forms_common.py:2041 ishtar_common/models.py:4353 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:1871 ishtar_common/models.py:4353 +#: ishtar_common/forms_common.py:2048 ishtar_common/models.py:4367 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2173 -#: ishtar_common/models.py:4355 +#: ishtar_common/forms_common.py:2050 ishtar_common/forms_common.py:2350 +#: ishtar_common/models.py:4369 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" -#: ishtar_common/forms_common.py:1920 ishtar_common/forms_common.py:2743 +#: ishtar_common/forms_common.py:2097 ishtar_common/forms_common.py:2933 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "" -#: ishtar_common/forms_common.py:1926 +#: ishtar_common/forms_common.py:2103 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "" -#: ishtar_common/forms_common.py:1929 +#: ishtar_common/forms_common.py:2106 msgid "Advanced" msgstr "" -#: ishtar_common/forms_common.py:1976 +#: ishtar_common/forms_common.py:2153 msgid "Incorrect page range." msgstr "" -#: ishtar_common/forms_common.py:2063 +#: ishtar_common/forms_common.py:2240 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." msgstr "" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2249 msgid "A document has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2115 +#: ishtar_common/forms_common.py:2292 msgid "Document - 001 - Search" msgstr "" -#: ishtar_common/forms_common.py:2128 ishtar_common/forms_common.py:2338 -#: ishtar_common/forms_common.py:2507 ishtar_common/forms_common.py:2558 -#: ishtar_common/models.py:3696 +#: ishtar_common/forms_common.py:2305 ishtar_common/forms_common.py:2514 +#: ishtar_common/forms_common.py:2683 ishtar_common/forms_common.py:2734 +#: ishtar_common/models.py:3710 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2318 msgid "Tag" msgstr "" -#: ishtar_common/forms_common.py:2169 ishtar_common/models.py:4272 +#: ishtar_common/forms_common.py:2346 ishtar_common/models.py:4286 msgid "License" msgstr "" -#: ishtar_common/forms_common.py:2172 +#: ishtar_common/forms_common.py:2349 msgid "Additional informations" msgstr "" -#: ishtar_common/forms_common.py:2174 +#: ishtar_common/forms_common.py:2351 msgid "Has a file?" msgstr "" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2362 msgid "Warehouse - Container" msgstr "" -#: ishtar_common/forms_common.py:2193 +#: ishtar_common/forms_common.py:2370 msgid "Warehouse - Reference container" msgstr "" -#: ishtar_common/forms_common.py:2210 +#: ishtar_common/forms_common.py:2387 #, fuzzy #| msgid "email address" msgid "Operation - type" msgstr "E-Mail-Adresse" -#: ishtar_common/forms_common.py:2223 +#: ishtar_common/forms_common.py:2399 msgid "Basket - Finds" msgstr "" -#: ishtar_common/forms_common.py:2238 +#: ishtar_common/forms_common.py:2414 msgid "Find - denomination" msgstr "" -#: ishtar_common/forms_common.py:2250 ishtar_common/forms_common.py:2262 +#: ishtar_common/forms_common.py:2426 ishtar_common/forms_common.py:2438 msgid "Receipt date before" msgstr "" -#: ishtar_common/forms_common.py:2253 ishtar_common/forms_common.py:2265 +#: ishtar_common/forms_common.py:2429 ishtar_common/forms_common.py:2441 msgid "Receipt date after" msgstr "" -#: ishtar_common/forms_common.py:2256 +#: ishtar_common/forms_common.py:2432 msgid "Creation date before" msgstr "" -#: ishtar_common/forms_common.py:2259 +#: ishtar_common/forms_common.py:2435 msgid "Creation date after" msgstr "" -#: ishtar_common/forms_common.py:2288 ishtar_common/forms_common.py:2303 +#: ishtar_common/forms_common.py:2464 ishtar_common/forms_common.py:2479 msgid "Document search" msgstr "" -#: ishtar_common/forms_common.py:2322 +#: ishtar_common/forms_common.py:2498 msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2336 ishtar_common/models_imports.py:933 -#: ishtar_common/models_imports.py:934 +#: ishtar_common/forms_common.py:2512 ishtar_common/models_imports.py:1052 +#: ishtar_common/models_imports.py:1053 msgid "Source type" msgstr "" -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2543 msgid "Edit duplicated item" msgstr "" -#: ishtar_common/forms_common.py:2441 +#: ishtar_common/forms_common.py:2617 msgid "current and reference containers" msgstr "" -#: ishtar_common/forms_common.py:2480 -#: ishtar_common/templates/ishtar/import_table.html:33 +#: ishtar_common/forms_common.py:2656 +#: ishtar_common/templates/ishtar/import_table.html:58 msgid "Action" msgstr "" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Lock" msgstr "" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Unlock" msgstr "" -#: ishtar_common/forms_common.py:2498 +#: ishtar_common/forms_common.py:2674 msgid "Would you like to delete this documentation?" msgstr "" -#: ishtar_common/forms_common.py:2518 ishtar_common/models.py:3666 -#: ishtar_common/models.py:3688 ishtar_common/models_imports.py:935 +#: ishtar_common/forms_common.py:2694 ishtar_common/models.py:3680 +#: ishtar_common/models.py:3702 ishtar_common/models_imports.py:1054 msgid "Author type" msgstr "" -#: ishtar_common/forms_common.py:2535 +#: ishtar_common/forms_common.py:2711 msgid "This author already exist." msgstr "" -#: ishtar_common/forms_common.py:2547 +#: ishtar_common/forms_common.py:2723 msgid "Author selection" msgstr "" -#: ishtar_common/forms_common.py:2565 +#: ishtar_common/forms_common.py:2741 msgid "There are identical authors." msgstr "" -#: ishtar_common/forms_common.py:2578 ishtar_common/forms_common.py:2643 -#: ishtar_common/models.py:960 +#: ishtar_common/forms_common.py:2754 ishtar_common/forms_common.py:2819 +#: ishtar_common/models.py:971 msgid "Query" msgstr "" -#: ishtar_common/forms_common.py:2582 ishtar_common/models.py:967 +#: ishtar_common/forms_common.py:2758 ishtar_common/models.py:978 msgid "Is an alert" msgstr "" -#: ishtar_common/forms_common.py:2604 +#: ishtar_common/forms_common.py:2780 msgid "A label is required for a new search query." msgstr "" -#: ishtar_common/forms_common.py:2608 +#: ishtar_common/forms_common.py:2784 msgid "Select the search query to update" msgstr "" -#: ishtar_common/forms_common.py:2615 ishtar_common/forms_common.py:2636 +#: ishtar_common/forms_common.py:2791 ishtar_common/forms_common.py:2812 msgid "Query does not exist." msgstr "" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2847 msgid "Geo item" msgstr "" -#: ishtar_common/forms_common.py:2672 +#: ishtar_common/forms_common.py:2848 msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2689 ishtar_common/models_common.py:2373 +#: ishtar_common/forms_common.py:2865 ishtar_common/models_common.py:2183 msgid "Import key" msgstr "" -#: ishtar_common/forms_common.py:2692 +#: ishtar_common/forms_common.py:2869 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2700 ishtar_common/models_common.py:2388 +#: ishtar_common/forms_common.py:2880 ishtar_common/models_common.py:2198 #: 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:2703 ishtar_common/models_common.py:2380 +#: ishtar_common/forms_common.py:2883 ishtar_common/models_common.py:2190 #: 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:2706 ishtar_common/models_common.py:2396 +#: ishtar_common/forms_common.py:2886 ishtar_common/models_common.py:2206 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" -#: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:2746 -#: ishtar_common/models_common.py:2362 +#: ishtar_common/forms_common.py:2889 ishtar_common/forms_common.py:2937 +#: ishtar_common/models_common.py:2172 msgid "Buffer" msgstr "" -#: ishtar_common/forms_common.py:2713 +#: ishtar_common/forms_common.py:2894 msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2717 ishtar_common/models_common.py:2409 -#: ishtar_common/models_common.py:4305 +#: ishtar_common/forms_common.py:2898 ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:4113 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:2721 ishtar_common/models_common.py:2412 -#: ishtar_common/models_common.py:4308 +#: ishtar_common/forms_common.py:2903 ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:4116 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:2725 ishtar_common/models_common.py:2415 -#: ishtar_common/models_common.py:4311 +#: ishtar_common/forms_common.py:2908 ishtar_common/models_common.py:2225 +#: ishtar_common/models_common.py:4119 msgid "Estimated error for Z" msgstr "" -#: ishtar_common/forms_common.py:2744 +#: ishtar_common/forms_common.py:2935 msgid "Metadata" msgstr "" -#: ishtar_common/forms_common.py:2745 ishtar_common/models.py:2375 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2232 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2281 -#: ishtar_common/models_common.py:2298 ishtar_common/models_common.py:2311 -#: ishtar_common/models_common.py:2440 ishtar_common/models_common.py:3531 +#: ishtar_common/forms_common.py:2936 ishtar_common/models.py:2385 +#: ishtar_common/models_common.py:1984 ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2074 ishtar_common/models_common.py:2091 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2121 +#: ishtar_common/models_common.py:2250 ishtar_common/models_common.py:3339 msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:3133 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:3137 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2937 +#: ishtar_common/forms_common.py:3140 msgid "A value is expected for Z." msgstr "" -#: ishtar_common/forms_common.py:2956 +#: ishtar_common/forms_common.py:3158 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2996 +#: ishtar_common/forms_common.py:3198 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2998 +#: ishtar_common/forms_common.py:3200 msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:2999 ishtar_common/models_common.py:2331 -#: ishtar_common/models_common.py:4320 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2141 +#: ishtar_common/models_common.py:4128 msgid "Point" msgstr "" -#: ishtar_common/forms_common.py:3000 +#: ishtar_common/forms_common.py:3202 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:3001 +#: ishtar_common/forms_common.py:3203 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:3002 +#: ishtar_common/forms_common.py:3204 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:3003 +#: ishtar_common/forms_common.py:3205 msgid "Multi-polygons" msgstr "" @@ -9232,12 +9463,12 @@ msgstr "" msgid "Home" msgstr "" -#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2517 -#: ishtar_common/models.py:2619 ishtar_common/models.py:2673 -#: ishtar_common/models.py:2747 ishtar_common/models.py:2921 -#: ishtar_common/models.py:3200 ishtar_common/models.py:3212 -#: ishtar_common/models.py:3249 ishtar_common/models.py:3453 -#: ishtar_common/models.py:3669 ishtar_common/models.py:3705 +#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2527 +#: ishtar_common/models.py:2629 ishtar_common/models.py:2683 +#: ishtar_common/models.py:2757 ishtar_common/models.py:2931 +#: ishtar_common/models.py:3210 ishtar_common/models.py:3222 +#: ishtar_common/models.py:3259 ishtar_common/models.py:3463 +#: ishtar_common/models.py:3683 ishtar_common/models.py:3719 msgid "Directory" msgstr "" @@ -9245,22 +9476,23 @@ msgstr "" msgid "Addition/modification" msgstr "" -#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:201 -#: ishtar_common/models_imports.py:449 ishtar_common/models_imports.py:507 -#: ishtar_common/models_imports.py:614 ishtar_common/models_imports.py:668 -#: ishtar_common/models_imports.py:688 ishtar_common/models_imports.py:717 -#: ishtar_common/models_imports.py:771 ishtar_common/models_imports.py:831 -#: ishtar_common/models_imports.py:874 ishtar_common/models_imports.py:1053 -#: ishtar_common/models_imports.py:1313 ishtar_common/models_imports.py:1314 -#: ishtar_common/models_imports.py:1971 +#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:220 +#: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:555 +#: ishtar_common/models_imports.py:623 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:787 ishtar_common/models_imports.py:807 +#: ishtar_common/models_imports.py:836 ishtar_common/models_imports.py:890 +#: ishtar_common/models_imports.py:950 ishtar_common/models_imports.py:993 +#: ishtar_common/models_imports.py:1187 ishtar_common/models_imports.py:1523 +#: ishtar_common/models_imports.py:1948 ishtar_common/models_imports.py:2820 +#: ishtar_common/models_imports.py:2848 msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1519 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1586 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:1999 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2115 msgid "Old imports" msgstr "" @@ -9268,96 +9500,96 @@ msgstr "" msgid "Documentation / Images" msgstr "" -#: ishtar_common/models.py:390 +#: ishtar_common/models.py:399 msgid "Not a valid item." msgstr "" -#: ishtar_common/models.py:405 +#: ishtar_common/models.py:414 msgid "A selected item is not a valid item." msgstr "" -#: ishtar_common/models.py:415 +#: ishtar_common/models.py:424 msgid "This item already exists." msgstr "" -#: ishtar_common/models.py:579 +#: ishtar_common/models.py:590 msgid "Generated relation image (SVG)" msgstr "" -#: ishtar_common/models.py:586 +#: ishtar_common/models.py:597 msgid "Generated relation image (PNG)" msgstr "" -#: ishtar_common/models.py:593 +#: ishtar_common/models.py:604 msgid "Generated relation image (DOT)" msgstr "" -#: ishtar_common/models.py:600 +#: ishtar_common/models.py:611 msgid "Generated above relation image (SVG)" msgstr "" -#: ishtar_common/models.py:607 +#: ishtar_common/models.py:618 msgid "Generated above relation image (DOT)" msgstr "" -#: ishtar_common/models.py:614 +#: ishtar_common/models.py:625 msgid "Generated above relation image (PNG)" msgstr "" -#: ishtar_common/models.py:621 +#: ishtar_common/models.py:632 msgid "Generated below relation image (SVG)" msgstr "" -#: ishtar_common/models.py:628 +#: ishtar_common/models.py:639 msgid "Generated below relation image (DOT)" msgstr "" -#: ishtar_common/models.py:635 +#: ishtar_common/models.py:646 msgid "Generated below relation image (PNG)" msgstr "" -#: ishtar_common/models.py:677 +#: ishtar_common/models.py:688 msgid "Custom data - Menu" msgstr "" -#: ishtar_common/models.py:678 +#: ishtar_common/models.py:689 msgid "Custom data - Menus" msgstr "" -#: ishtar_common/models.py:681 ishtar_common/models.py:745 -#: ishtar_common/models.py:1663 ishtar_common/models.py:1815 +#: ishtar_common/models.py:692 ishtar_common/models.py:756 +#: ishtar_common/models.py:1673 ishtar_common/models.py:1825 msgid "Custom data / custom forms" msgstr "" -#: ishtar_common/models.py:691 +#: ishtar_common/models.py:702 msgid "Text" msgstr "" -#: ishtar_common/models.py:692 +#: ishtar_common/models.py:703 msgid "Long text" msgstr "" -#: ishtar_common/models.py:693 ishtar_common/models_imports.py:993 +#: ishtar_common/models.py:704 ishtar_common/models_imports.py:1112 msgid "Integer" msgstr "" -#: ishtar_common/models.py:694 +#: ishtar_common/models.py:705 msgid "Boolean" msgstr "" -#: ishtar_common/models.py:695 ishtar_common/models_imports.py:994 +#: ishtar_common/models.py:706 ishtar_common/models_imports.py:1113 msgid "Float" msgstr "" -#: ishtar_common/models.py:697 +#: ishtar_common/models.py:708 msgid "Choices" msgstr "" -#: ishtar_common/models.py:698 +#: ishtar_common/models.py:709 msgid "Multi-choices" msgstr "" -#: ishtar_common/models.py:718 +#: ishtar_common/models.py:729 msgid "" "Value of the key in the JSON schema. For hierarchical key use \"__\" to " "explain it. For instance for the key 'my_subkey' with data such as " @@ -9365,222 +9597,222 @@ msgid "" "my_key__my_subkey." msgstr "" -#: ishtar_common/models.py:725 +#: ishtar_common/models.py:736 msgid "Display" msgstr "" -#: ishtar_common/models.py:730 +#: ishtar_common/models.py:741 msgid "Use in search indexes" msgstr "" -#: ishtar_common/models.py:741 +#: ishtar_common/models.py:752 msgid "Custom data - Field" msgstr "" -#: ishtar_common/models.py:742 +#: ishtar_common/models.py:753 msgid "Custom data - Fields" msgstr "" -#: ishtar_common/models.py:758 +#: ishtar_common/models.py:769 msgid "Content types of the field and of the menu do not match" msgstr "" -#: ishtar_common/models.py:763 +#: ishtar_common/models.py:774 msgid "Above" msgstr "" -#: ishtar_common/models.py:764 +#: ishtar_common/models.py:775 msgid "Below" msgstr "" -#: ishtar_common/models.py:765 +#: ishtar_common/models.py:776 msgid "Equal" msgstr "" -#: ishtar_common/models.py:766 +#: ishtar_common/models.py:777 msgid "Include" msgstr "" -#: ishtar_common/models.py:767 +#: ishtar_common/models.py:778 msgid "Is included" msgstr "" -#: ishtar_common/models.py:773 +#: ishtar_common/models.py:784 msgid "Symmetrical" msgstr "" -#: ishtar_common/models.py:774 +#: ishtar_common/models.py:785 msgid "Tiny label" msgstr "" -#: ishtar_common/models.py:777 +#: ishtar_common/models.py:788 msgid "Inverse relation" msgstr "" -#: ishtar_common/models.py:783 +#: ishtar_common/models.py:794 msgid "Logical relation" msgstr "" -#: ishtar_common/models.py:796 +#: ishtar_common/models.py:807 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: ishtar_common/models.py:970 +#: ishtar_common/models.py:981 msgid "Search query" msgstr "" -#: ishtar_common/models.py:971 +#: ishtar_common/models.py:982 msgid "Search queries" msgstr "" -#: ishtar_common/models.py:979 +#: ishtar_common/models.py:990 msgid "ISO code" msgstr "" -#: ishtar_common/models.py:983 +#: ishtar_common/models.py:994 msgid "Languages" msgstr "" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "Euro" msgstr "" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "US dollar" msgstr "" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Site" msgstr "" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Archaeological entity" msgstr "" -#: ishtar_common/models.py:993 +#: ishtar_common/models.py:1004 msgid "Site search" msgstr "" -#: ishtar_common/models.py:994 +#: ishtar_common/models.py:1005 msgid "New site" msgstr "" -#: ishtar_common/models.py:995 +#: ishtar_common/models.py:1006 msgid "Site modification" msgstr "" -#: ishtar_common/models.py:997 +#: ishtar_common/models.py:1008 msgid "Site (attached to the operation)" msgstr "" -#: ishtar_common/models.py:998 +#: ishtar_common/models.py:1009 msgid "Site name (attached to the operation)" msgstr "" -#: ishtar_common/models.py:999 +#: ishtar_common/models.py:1010 msgid "Site (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1000 +#: ishtar_common/models.py:1011 msgid "Site name (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1003 +#: ishtar_common/models.py:1014 msgid "Archaeological entity search" msgstr "" -#: ishtar_common/models.py:1004 +#: ishtar_common/models.py:1015 msgid "New archaeological entity" msgstr "" -#: ishtar_common/models.py:1005 +#: ishtar_common/models.py:1016 msgid "Archaeological entity modification" msgstr "" -#: ishtar_common/models.py:1006 +#: ishtar_common/models.py:1017 msgid "Archaeological entity deletion" msgstr "" -#: ishtar_common/models.py:1008 +#: ishtar_common/models.py:1019 msgid "Archaeological entity (attached to the operation)" msgstr "" -#: ishtar_common/models.py:1011 +#: ishtar_common/models.py:1022 msgid "Archaeological entity name (attached to the operation)" msgstr "" -#: ishtar_common/models.py:1014 +#: ishtar_common/models.py:1025 msgid "Archaeological entity (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1017 +#: ishtar_common/models.py:1028 msgid "Archaeological entity name (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1023 +#: ishtar_common/models.py:1034 msgid "name.firstname" msgstr "" -#: ishtar_common/models.py:1024 +#: ishtar_common/models.py:1035 msgid "firstname.name" msgstr "" -#: ishtar_common/models.py:1032 +#: ishtar_common/models.py:1043 msgid "Current active" msgstr "" -#: ishtar_common/models.py:1034 +#: ishtar_common/models.py:1045 msgid "Activate experimental feature" msgstr "" -#: ishtar_common/models.py:1037 +#: ishtar_common/models.py:1048 msgid "Warning name" msgstr "" -#: ishtar_common/models.py:1038 +#: ishtar_common/models.py:1049 msgid "Warning message" msgstr "" -#: ishtar_common/models.py:1039 +#: ishtar_common/models.py:1050 msgid "Footer text" msgstr "" -#: ishtar_common/models.py:1040 ishtar_common/models.py:1640 +#: ishtar_common/models.py:1051 ishtar_common/models.py:1650 msgid "You can use markdown syntax." msgstr "" -#: ishtar_common/models.py:1042 +#: ishtar_common/models.py:1053 msgid "Import - Delete image/document zip on archive" msgstr "" -#: ishtar_common/models.py:1045 +#: ishtar_common/models.py:1056 msgid "Document - Remove redundant association" msgstr "" -#: ishtar_common/models.py:1048 +#: ishtar_common/models.py:1059 msgid "" "For instance, remove operation association of a document also associated to " "a find of this operation. Only manage association of operations, context " "records and finds." msgstr "" -#: ishtar_common/models.py:1055 +#: ishtar_common/models.py:1066 msgid "Container - calculate weight only when all find has a weight" msgstr "" -#: ishtar_common/models.py:1059 +#: ishtar_common/models.py:1070 msgid "Parent relations engine" msgstr "" -#: ishtar_common/models.py:1061 +#: ishtar_common/models.py:1072 msgid "SQL views" msgstr "" -#: ishtar_common/models.py:1062 +#: ishtar_common/models.py:1073 msgid "Cache tables" msgstr "" -#: ishtar_common/models.py:1067 +#: ishtar_common/models.py:1078 msgid "" "If you experience performance problems with complex relations (for instance: " "complex statigraphic relations), set it to \"Cache tables\" in order to use " @@ -9588,602 +9820,602 @@ msgid "" "\"migrate_relations_cache_tables\" manage.py command." msgstr "" -#: ishtar_common/models.py:1075 +#: ishtar_common/models.py:1086 msgid "Alternate configuration" msgstr "" -#: ishtar_common/models.py:1078 +#: ishtar_common/models.py:1089 msgid "Choose an alternate configuration for label, index management" msgstr "" -#: ishtar_common/models.py:1082 +#: ishtar_common/models.py:1093 msgid "Files module" msgstr "" -#: ishtar_common/models.py:1084 +#: ishtar_common/models.py:1095 msgid "Archaeological site module" msgstr "" -#: ishtar_common/models.py:1087 +#: ishtar_common/models.py:1098 msgid "Archaeological site type" msgstr "" -#: ishtar_common/models.py:1092 +#: ishtar_common/models.py:1103 msgid "Context records module" msgstr "" -#: ishtar_common/models.py:1094 +#: ishtar_common/models.py:1105 msgid "Finds module" msgstr "" -#: ishtar_common/models.py:1096 +#: ishtar_common/models.py:1107 msgid "Need context records module" msgstr "" -#: ishtar_common/models.py:1099 +#: ishtar_common/models.py:1110 msgid "Find index is based on" msgstr "" -#: ishtar_common/models.py:1104 +#: ishtar_common/models.py:1115 msgid "" "To prevent irrelevant indexes, change this parameter only if there is no " "find in the database" msgstr "" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Warehouses module" msgstr "" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Need finds module" msgstr "" -#: ishtar_common/models.py:1111 +#: ishtar_common/models.py:1122 msgid "Preservation module" msgstr "" -#: ishtar_common/models.py:1112 +#: ishtar_common/models.py:1123 msgid "Mapping module" msgstr "" -#: ishtar_common/models.py:1114 +#: ishtar_common/models.py:1125 msgid "Point precision (search and sheets)" msgstr "" -#: ishtar_common/models.py:1118 +#: ishtar_common/models.py:1129 msgid "" "Number of digit to round from the decimal point for coordinates in WGS84 " "(latitude, longitude). Empty value means no round." msgstr "" -#: ishtar_common/models.py:1123 +#: ishtar_common/models.py:1134 msgid "Locate warehouse and containers" msgstr "" -#: ishtar_common/models.py:1126 +#: ishtar_common/models.py:1137 msgid "" "Mapping module must be activated. With many containers and background task " "not activated, activating this option may consume many resources." msgstr "" -#: ishtar_common/models.py:1132 +#: ishtar_common/models.py:1143 msgid "Use town to locate when coordinates are missing" msgstr "" -#: ishtar_common/models.py:1134 +#: ishtar_common/models.py:1145 msgid "Generate relation graph" msgstr "" -#: ishtar_common/models.py:1136 +#: ishtar_common/models.py:1147 msgid "Preventive operator module" msgstr "" -#: ishtar_common/models.py:1138 +#: ishtar_common/models.py:1149 msgid "Underwater module" msgstr "" -#: ishtar_common/models.py:1140 +#: ishtar_common/models.py:1151 msgid "Parcel are mandatory for context records" msgstr "" -#: ishtar_common/models.py:1143 +#: ishtar_common/models.py:1154 msgid "Home page" msgstr "" -#: ishtar_common/models.py:1147 +#: ishtar_common/models.py:1158 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: ishtar_common/models.py:1153 +#: ishtar_common/models.py:1164 msgid "Main operation code prefix" msgstr "" -#: ishtar_common/models.py:1160 +#: ishtar_common/models.py:1171 msgid "Default operation code prefix" msgstr "" -#: ishtar_common/models.py:1167 +#: ishtar_common/models.py:1178 msgid "Operation region code" msgstr "" -#: ishtar_common/models.py:1170 +#: ishtar_common/models.py:1181 msgid "Operation complete identifier" msgstr "" -#: ishtar_common/models.py:1173 +#: ishtar_common/models.py:1185 msgid "Formula to manage operation complete identifier." msgstr "" -#: ishtar_common/models.py:1176 +#: ishtar_common/models.py:1188 msgid "Operation custom index key" msgstr "" -#: ishtar_common/models.py:1180 +#: ishtar_common/models.py:1192 msgid "" "Keys to be used to manage operation custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1185 +#: ishtar_common/models.py:1197 #, fuzzy #| msgid "email address" msgid "Operation cached label" msgstr "E-Mail-Adresse" -#: ishtar_common/models.py:1189 ishtar_common/models.py:1212 -#: ishtar_common/models.py:1245 ishtar_common/models.py:1264 -#: ishtar_common/models.py:1297 ishtar_common/models.py:1330 -#: ishtar_common/models.py:1363 ishtar_common/models.py:1396 -#: ishtar_common/models.py:1429 ishtar_common/models.py:1462 +#: ishtar_common/models.py:1201 ishtar_common/models.py:1224 +#: ishtar_common/models.py:1257 ishtar_common/models.py:1276 +#: ishtar_common/models.py:1308 ishtar_common/models.py:1341 +#: ishtar_common/models.py:1373 ishtar_common/models.py:1406 +#: ishtar_common/models.py:1439 ishtar_common/models.py:1472 msgid "Formula to manage cached label. If not set a default formula is used." msgstr "" -#: ishtar_common/models.py:1193 +#: ishtar_common/models.py:1205 msgid "Archaeological site complete identifier" msgstr "" -#: ishtar_common/models.py:1196 +#: ishtar_common/models.py:1208 msgid "Formula to manage archaeological site complete identifier." msgstr "" -#: ishtar_common/models.py:1199 +#: ishtar_common/models.py:1211 msgid "Archaeological site custom index key" msgstr "" -#: ishtar_common/models.py:1203 +#: ishtar_common/models.py:1215 msgid "" "Keys to be used to manage archaeological site custom index. Separate keys " "with a semicolon." msgstr "" -#: ishtar_common/models.py:1208 +#: ishtar_common/models.py:1220 msgid "Site cached label" msgstr "" -#: ishtar_common/models.py:1216 +#: ishtar_common/models.py:1228 msgid "File external id" msgstr "" -#: ishtar_common/models.py:1219 +#: ishtar_common/models.py:1231 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1226 +#: ishtar_common/models.py:1238 msgid "Archaeological file complete identifier" msgstr "" -#: ishtar_common/models.py:1229 +#: ishtar_common/models.py:1241 msgid "Formula to manage archaeological file complete identifier." msgstr "" -#: ishtar_common/models.py:1232 +#: ishtar_common/models.py:1244 msgid "Archaeological file custom index key" msgstr "" -#: ishtar_common/models.py:1236 +#: ishtar_common/models.py:1248 msgid "" "Keys to be used to manage archaeological file custom index. Separate keys " "with a semicolon." msgstr "" -#: ishtar_common/models.py:1241 +#: ishtar_common/models.py:1253 msgid "File cached label" msgstr "" -#: ishtar_common/models.py:1249 +#: ishtar_common/models.py:1261 msgid "Parcel external id" msgstr "" -#: ishtar_common/models.py:1253 +#: ishtar_common/models.py:1265 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1260 +#: ishtar_common/models.py:1272 msgid "Parcel cached label" msgstr "" -#: ishtar_common/models.py:1268 +#: ishtar_common/models.py:1280 msgid "Context record external id" msgstr "" -#: ishtar_common/models.py:1271 +#: ishtar_common/models.py:1283 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1278 +#: ishtar_common/models.py:1290 msgid "Context record complete identifier" msgstr "" -#: ishtar_common/models.py:1281 +#: ishtar_common/models.py:1293 msgid "Formula to manage context record complete identifier." msgstr "" -#: ishtar_common/models.py:1284 +#: ishtar_common/models.py:1296 msgid "Context record custom index key" msgstr "" -#: ishtar_common/models.py:1288 +#: ishtar_common/models.py:1300 msgid "" "Keys to be used to manage context record custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1293 +#: ishtar_common/models.py:1305 msgid "Context record cached label" msgstr "" -#: ishtar_common/models.py:1301 +#: ishtar_common/models.py:1312 msgid "Base find external id" msgstr "" -#: ishtar_common/models.py:1304 +#: ishtar_common/models.py:1315 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1311 +#: ishtar_common/models.py:1322 msgid "Base find complete identifier" msgstr "" -#: ishtar_common/models.py:1314 +#: ishtar_common/models.py:1325 msgid "Formula to manage base find complete identifier." msgstr "" -#: ishtar_common/models.py:1317 +#: ishtar_common/models.py:1328 msgid "Base find custom index key" msgstr "" -#: ishtar_common/models.py:1321 +#: ishtar_common/models.py:1332 msgid "" "Keys to be used to manage base find custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1326 +#: ishtar_common/models.py:1337 msgid "Base find cached label" msgstr "" -#: ishtar_common/models.py:1334 +#: ishtar_common/models.py:1345 msgid "Find external id" msgstr "" -#: ishtar_common/models.py:1337 +#: ishtar_common/models.py:1348 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1344 +#: ishtar_common/models.py:1355 msgid "Find complete identifier" msgstr "" -#: ishtar_common/models.py:1347 +#: ishtar_common/models.py:1358 msgid "Formula to manage find complete identifier." msgstr "" -#: ishtar_common/models.py:1350 +#: ishtar_common/models.py:1361 msgid "Find custom index key" msgstr "" -#: ishtar_common/models.py:1354 +#: ishtar_common/models.py:1365 msgid "" "Keys to be used to manage find custom index. Separate keys with a semicolon." msgstr "" -#: ishtar_common/models.py:1359 +#: ishtar_common/models.py:1370 msgid "Find cached label" msgstr "" -#: ishtar_common/models.py:1367 +#: ishtar_common/models.py:1377 msgid "Container external id" msgstr "" -#: ishtar_common/models.py:1370 +#: ishtar_common/models.py:1380 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1377 +#: ishtar_common/models.py:1387 msgid "Container complete identifier" msgstr "" -#: ishtar_common/models.py:1380 +#: ishtar_common/models.py:1390 msgid "Formula to manage container complete identifier." msgstr "" -#: ishtar_common/models.py:1383 +#: ishtar_common/models.py:1393 msgid "Container custom index key" msgstr "" -#: ishtar_common/models.py:1387 +#: ishtar_common/models.py:1397 msgid "" "Keys to be used to manage container custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1392 +#: ishtar_common/models.py:1402 msgid "Container cached label" msgstr "" -#: ishtar_common/models.py:1400 +#: ishtar_common/models.py:1410 msgid "Warehouse external id" msgstr "" -#: ishtar_common/models.py:1403 +#: ishtar_common/models.py:1413 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1410 +#: ishtar_common/models.py:1420 msgid "Warehouse complete identifier" msgstr "" -#: ishtar_common/models.py:1413 +#: ishtar_common/models.py:1423 msgid "Formula to manage warehouse complete identifier." msgstr "" -#: ishtar_common/models.py:1416 +#: ishtar_common/models.py:1426 msgid "Warehouse custom index key" msgstr "" -#: ishtar_common/models.py:1420 +#: ishtar_common/models.py:1430 msgid "" "Keys to be used to manage warehouse custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1425 +#: ishtar_common/models.py:1435 msgid "Warehouse cached label" msgstr "" -#: ishtar_common/models.py:1433 +#: ishtar_common/models.py:1443 msgid "Document external id" msgstr "" -#: ishtar_common/models.py:1436 +#: ishtar_common/models.py:1446 msgid "" "Formula to manage document external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1443 +#: ishtar_common/models.py:1453 msgid "Document complete identifier" msgstr "" -#: ishtar_common/models.py:1446 +#: ishtar_common/models.py:1456 msgid "Formula to manage document complete identifier." msgstr "" -#: ishtar_common/models.py:1449 +#: ishtar_common/models.py:1459 msgid "Document custom index key" msgstr "" -#: ishtar_common/models.py:1453 +#: ishtar_common/models.py:1463 msgid "" "Keys to be used to manage document custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1458 +#: ishtar_common/models.py:1468 msgid "Document cached label" msgstr "" -#: ishtar_common/models.py:1466 +#: ishtar_common/models.py:1476 msgid "Raw name for person" msgstr "" -#: ishtar_common/models.py:1469 +#: ishtar_common/models.py:1479 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1475 +#: ishtar_common/models.py:1485 msgid "Use auto index for finds" msgstr "" -#: ishtar_common/models.py:1477 +#: ishtar_common/models.py:1487 msgid "Currency" msgstr "" -#: ishtar_common/models.py:1480 +#: ishtar_common/models.py:1490 msgid "Naming style for accounts" msgstr "" -#: ishtar_common/models.py:1488 +#: ishtar_common/models.py:1498 msgid "Maps - default zoom" msgstr "" -#: ishtar_common/models.py:1491 +#: ishtar_common/models.py:1501 msgid "Spatial Reference System for display" msgstr "" -#: ishtar_common/models.py:1495 +#: ishtar_common/models.py:1505 msgid "Spatial Reference System used for display when no SRS is defined" msgstr "" -#: ishtar_common/models.py:1502 +#: ishtar_common/models.py:1512 msgid "Spatial Reference System in database" msgstr "" -#: ishtar_common/models.py:1506 +#: ishtar_common/models.py:1516 msgid "" "Set it to the most used spatial reference system. Warning: after change " "launch the migrate_srid script." msgstr "" -#: ishtar_common/models.py:1514 +#: ishtar_common/models.py:1524 msgid "Default language for documentation" msgstr "" -#: ishtar_common/models.py:1518 +#: ishtar_common/models.py:1528 msgid "" "If set, by default the selected language will be set for localized documents." msgstr "" -#: ishtar_common/models.py:1526 +#: ishtar_common/models.py:1536 msgid "Ishtar site profile" msgstr "" -#: ishtar_common/models.py:1527 +#: ishtar_common/models.py:1537 msgid "Ishtar site profiles" msgstr "" -#: ishtar_common/models.py:1529 ishtar_common/models.py:1839 -#: ishtar_common/models.py:2062 ishtar_common/models.py:5109 -#: ishtar_common/models.py:5139 ishtar_common/models_imports.py:123 +#: ishtar_common/models.py:1539 ishtar_common/models.py:1849 +#: ishtar_common/models.py:2072 ishtar_common/models.py:5123 +#: ishtar_common/models.py:5153 ishtar_common/models_imports.py:132 msgid "General settings" msgstr "" -#: ishtar_common/models.py:1632 +#: ishtar_common/models.py:1642 msgid "Enable this form" msgstr "" -#: ishtar_common/models.py:1635 +#: ishtar_common/models.py:1645 msgid "" "Disable with caution: disabling a form with mandatory fields may lead to " "database errors." msgstr "" -#: ishtar_common/models.py:1639 +#: ishtar_common/models.py:1649 msgid "Header text" msgstr "" -#: ishtar_common/models.py:1642 +#: ishtar_common/models.py:1652 msgid "Apply to all" msgstr "" -#: ishtar_common/models.py:1645 +#: ishtar_common/models.py:1655 msgid "" "Apply this form to all users. If set to True, selecting user and user type " "is useless." msgstr "" -#: ishtar_common/models.py:1651 +#: ishtar_common/models.py:1661 msgid "Deprecated - use profile types" msgstr "" -#: ishtar_common/models.py:1659 +#: ishtar_common/models.py:1669 msgid "Custom form" msgstr "" -#: ishtar_common/models.py:1660 +#: ishtar_common/models.py:1670 msgid "Custom forms" msgstr "" -#: ishtar_common/models.py:1675 ishtar_common/models_imports.py:170 -#: ishtar_common/models_rest.py:116 +#: ishtar_common/models.py:1685 ishtar_common/models_imports.py:178 +#: ishtar_common/models_imports.py:437 ishtar_common/models_rest.py:116 msgid "Users" msgstr "" -#: ishtar_common/models.py:1681 +#: ishtar_common/models.py:1691 msgid "User types" msgstr "" -#: ishtar_common/models.py:1773 +#: ishtar_common/models.py:1783 msgid "Excluded field" msgstr "" -#: ishtar_common/models.py:1774 +#: ishtar_common/models.py:1784 msgid "Excluded fields" msgstr "" -#: ishtar_common/models.py:1808 +#: ishtar_common/models.py:1818 #: ishtar_common/templates/blocks/form_flex_snippet.html:18 #: ishtar_common/templates/blocks/table_form_snippet.html:9 msgid "Help" msgstr "" -#: ishtar_common/models.py:1812 +#: ishtar_common/models.py:1822 msgid "Custom forms - Json data field" msgstr "" -#: ishtar_common/models.py:1813 +#: ishtar_common/models.py:1823 msgid "Custom forms - Json data fields" msgstr "" -#: ishtar_common/models.py:1828 +#: ishtar_common/models.py:1838 msgid "Variable name" msgstr "" -#: ishtar_common/models.py:1830 +#: ishtar_common/models.py:1840 msgid "Description of the variable" msgstr "" -#: ishtar_common/models.py:1836 +#: ishtar_common/models.py:1846 msgid "Global variable" msgstr "" -#: ishtar_common/models.py:1837 +#: ishtar_common/models.py:1847 msgid "Global variables" msgstr "" -#: ishtar_common/models.py:1868 +#: ishtar_common/models.py:1878 msgid "Model name" msgstr "" -#: ishtar_common/models.py:1869 +#: ishtar_common/models.py:1879 msgid "Associated primary key" msgstr "" -#: ishtar_common/models.py:1875 +#: ishtar_common/models.py:1885 msgid "Cache for stats" msgstr "" -#: ishtar_common/models.py:1876 +#: ishtar_common/models.py:1886 msgid "Caches for stats" msgstr "" -#: ishtar_common/models.py:2028 +#: ishtar_common/models.py:2038 msgid "Base template for labels" msgstr "" -#: ishtar_common/models.py:2035 +#: ishtar_common/models.py:2045 msgid "Labels: targets for labels in the LibreOffice file" msgstr "" -#: ishtar_common/models.py:2039 +#: ishtar_common/models.py:2049 msgid "" "Each target is separated by a semi-colon. The first target is the name of " "the object including the data in base template. Following targets will be " @@ -10191,1326 +10423,1408 @@ msgid "" "Cadre3;Cadre4;Cadre5;Cadre6\" for a sheet with 6 labels." msgstr "" -#: ishtar_common/models.py:2048 +#: ishtar_common/models.py:2058 msgid "Used for labels" msgstr "" -#: ishtar_common/models.py:2050 +#: ishtar_common/models.py:2060 msgid "Number of label per page" msgstr "" -#: ishtar_common/models.py:2053 +#: ishtar_common/models.py:2063 msgid "Only relevant for label template" msgstr "" -#: ishtar_common/models.py:2059 +#: ishtar_common/models.py:2069 msgid "Document template" msgstr "" -#: ishtar_common/models.py:2060 +#: ishtar_common/models.py:2070 msgid "Document templates" msgstr "" -#: ishtar_common/models.py:2073 +#: ishtar_common/models.py:2083 msgid "For label template, you must provide number of label per page." msgstr "" -#: ishtar_common/models.py:2355 +#: ishtar_common/models.py:2365 msgid "Only four level of parent are managed." msgstr "" -#: ishtar_common/models.py:2412 +#: ishtar_common/models.py:2422 msgid "Communal area boundaries" msgstr "" -#: ishtar_common/models.py:2463 +#: ishtar_common/models.py:2473 msgid "Male" msgstr "" -#: ishtar_common/models.py:2464 +#: ishtar_common/models.py:2474 msgid "Female" msgstr "" -#: ishtar_common/models.py:2465 +#: ishtar_common/models.py:2475 msgid "Neutral" msgstr "" -#: ishtar_common/models.py:2515 +#: ishtar_common/models.py:2525 msgid "Organization types" msgstr "" -#: ishtar_common/models.py:2525 +#: ishtar_common/models.py:2535 msgid "Error: planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2533 ishtar_common/models.py:2709 +#: ishtar_common/models.py:2543 ishtar_common/models.py:2719 msgid "Error: general_contractor type is missing" msgstr "" -#: ishtar_common/models.py:2571 +#: ishtar_common/models.py:2581 msgctxt "key for text search" msgid "precise-town" msgstr "" -#: ishtar_common/models.py:2609 +#: ishtar_common/models.py:2619 msgid "Organizations" msgstr "" -#: ishtar_common/models.py:2638 +#: ishtar_common/models.py:2648 msgid "unknown organization" msgstr "" -#: ishtar_common/models.py:2687 +#: ishtar_common/models.py:2697 msgid "/" msgstr "" -#: ishtar_common/models.py:2693 +#: ishtar_common/models.py:2703 msgid "Error: sra_agent and head_scientist types are missing" msgstr "" -#: ishtar_common/models.py:2701 +#: ishtar_common/models.py:2711 msgid "Error: sra_agent type is missing" msgstr "" -#: ishtar_common/models.py:2717 +#: ishtar_common/models.py:2727 msgid "Error: responsible_planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2729 +#: ishtar_common/models.py:2739 msgid "Error: publisher type is missing" msgstr "" -#: ishtar_common/models.py:2737 +#: ishtar_common/models.py:2747 msgid "Error: operator type is missing" msgstr "" -#: ishtar_common/models.py:2741 ishtar_common/models.py:2755 +#: ishtar_common/models.py:2751 ishtar_common/models.py:2765 msgid "Long title" msgstr "" -#: ishtar_common/models.py:2744 ishtar_common/models_imports.py:987 +#: ishtar_common/models.py:2754 ishtar_common/models_imports.py:1106 msgid "Title type" msgstr "" -#: ishtar_common/models.py:2745 +#: ishtar_common/models.py:2755 msgid "Title types" msgstr "" -#: ishtar_common/models.py:2772 +#: ishtar_common/models.py:2782 msgid "Mr" msgstr "" -#: ishtar_common/models.py:2773 +#: ishtar_common/models.py:2783 msgid "Miss" msgstr "" -#: ishtar_common/models.py:2774 +#: ishtar_common/models.py:2784 msgid "Mr and Mrs" msgstr "" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2785 msgid "Mrs" msgstr "" -#: ishtar_common/models.py:2776 +#: ishtar_common/models.py:2786 msgid "Doctor" msgstr "" -#: ishtar_common/models.py:2824 ishtar_common/models.py:3411 +#: ishtar_common/models.py:2834 ishtar_common/models.py:3421 msgctxt "key for text search" msgid "surname" msgstr "" -#: ishtar_common/models.py:2827 ishtar_common/models.py:3415 +#: ishtar_common/models.py:2837 ishtar_common/models.py:3425 msgctxt "key for text search" msgid "email" msgstr "e-mail-adresse" -#: ishtar_common/models.py:2830 ishtar_common/models.py:3999 +#: ishtar_common/models.py:2840 ishtar_common/models.py:4013 msgctxt "key for text search" msgid "title" msgstr "" -#: ishtar_common/models.py:2833 +#: ishtar_common/models.py:2843 msgctxt "key for text search" msgid "salutation" msgstr "" -#: ishtar_common/models.py:2840 ishtar_common/models.py:3423 +#: ishtar_common/models.py:2850 ishtar_common/models.py:3433 msgctxt "key for text search" msgid "organization" msgstr "" -#: ishtar_common/models.py:2844 +#: ishtar_common/models.py:2854 msgctxt "key for text search" msgid "has-account" msgstr "" -#: ishtar_common/models.py:2848 +#: ishtar_common/models.py:2858 msgctxt "key for text search" msgid "profile-type" msgstr "" -#: ishtar_common/models.py:2884 +#: ishtar_common/models.py:2894 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." msgstr "" -#: ishtar_common/models.py:2891 +#: ishtar_common/models.py:2901 msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2894 ishtar_common/models.py:3014 +#: ishtar_common/models.py:2904 ishtar_common/models.py:3024 msgid "Types" msgstr "" -#: ishtar_common/models.py:2899 +#: ishtar_common/models.py:2909 msgid "Is attached to" msgstr "" -#: ishtar_common/models.py:2910 +#: ishtar_common/models.py:2920 msgid "Persons" msgstr "" -#: ishtar_common/models.py:3171 +#: ishtar_common/models.py:3181 msgid "Manage account" msgstr "" -#: ishtar_common/models.py:3194 +#: ishtar_common/models.py:3204 msgid "Groups" msgstr "" -#: ishtar_common/models.py:3198 +#: ishtar_common/models.py:3208 msgid "Profile types" msgstr "" -#: ishtar_common/models.py:3210 +#: ishtar_common/models.py:3220 msgid "Profile type summary" msgstr "" -#: ishtar_common/models.py:3211 +#: ishtar_common/models.py:3221 msgid "Profile types summary" msgstr "" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3237 msgid "Show field number" msgstr "" -#: ishtar_common/models.py:3228 +#: ishtar_common/models.py:3238 msgid "Automatically pin" msgstr "" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3239 msgid "Display pin menu" msgstr "" -#: ishtar_common/models.py:3231 +#: ishtar_common/models.py:3241 msgid "Use background tasks" msgstr "" -#: ishtar_common/models.py:3232 +#: ishtar_common/models.py:3242 msgid "" "If set to true, each import, export, document generation is set as a " "background task." msgstr "" -#: ishtar_common/models.py:3236 +#: ishtar_common/models.py:3246 msgid "Send email when the task is finished" msgstr "" -#: ishtar_common/models.py:3246 +#: ishtar_common/models.py:3256 msgid "User profile" msgstr "" -#: ishtar_common/models.py:3247 +#: ishtar_common/models.py:3257 msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3334 ishtar_common/models.py:5116 +#: ishtar_common/models.py:3344 ishtar_common/models.py:5130 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3335 ishtar_common/models.py:5117 +#: ishtar_common/models.py:3345 ishtar_common/models.py:5131 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3336 ishtar_common/models.py:5119 -#: ishtar_common/models_imports.py:1131 +#: ishtar_common/models.py:3346 ishtar_common/models.py:5133 +#: ishtar_common/models_imports.py:1285 ishtar_common/models_imports.py:1299 msgid "Finished" msgstr "" -#: ishtar_common/models.py:3342 +#: ishtar_common/models.py:3352 msgid "Generate label" msgstr "" -#: ishtar_common/models.py:3354 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/models.py:3364 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:12 msgid "View" msgstr "" -#: ishtar_common/models.py:3356 +#: ishtar_common/models.py:3366 msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3364 ishtar_common/models.py:5133 -#: ishtar_common/models.py:5292 +#: ishtar_common/models.py:3374 ishtar_common/models.py:5147 +#: ishtar_common/models.py:5306 +#: ishtar_common/templates/ishtar/import_table.html:4 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:4 +#: ishtar_common/views.py:2241 msgid "Result" msgstr "" -#: ishtar_common/models.py:3367 +#: ishtar_common/models.py:3377 msgid "Background task" msgstr "" -#: ishtar_common/models.py:3368 +#: ishtar_common/models.py:3378 msgid "Background tasks" msgstr "" -#: ishtar_common/models.py:3404 +#: ishtar_common/models.py:3414 msgctxt "key for text search" msgid "username" msgstr "" -#: ishtar_common/models.py:3439 +#: ishtar_common/models.py:3449 msgid "Password last update" msgstr "" -#: ishtar_common/models.py:3442 +#: ishtar_common/models.py:3452 msgid "Advanced shortcut menu" msgstr "" -#: ishtar_common/models.py:3445 +#: ishtar_common/models.py:3455 msgid "Latest news version" msgstr "" -#: ishtar_common/models.py:3447 +#: ishtar_common/models.py:3457 #, fuzzy #| msgid "email address" msgid "Display news" msgstr "E-Mail-Adresse" -#: ishtar_common/models.py:3450 +#: ishtar_common/models.py:3460 msgid "Ishtar user" msgstr "" -#: ishtar_common/models.py:3451 +#: ishtar_common/models.py:3461 msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:3549 +#: ishtar_common/models.py:3563 msgid "Public" msgstr "" -#: ishtar_common/models.py:3667 +#: ishtar_common/models.py:3681 msgid "Author types" msgstr "" -#: ishtar_common/models.py:3752 +#: ishtar_common/models.py:3766 msgid "COInS export - type" msgstr "" -#: ishtar_common/models.py:3755 +#: ishtar_common/models.py:3769 msgid "COInS export - genre" msgstr "" -#: ishtar_common/models.py:3758 +#: ishtar_common/models.py:3772 msgid "Is localized" msgstr "" -#: ishtar_common/models.py:3760 +#: ishtar_common/models.py:3774 msgid "Setting a language for this type of document is relevant" msgstr "" -#: ishtar_common/models.py:3765 +#: ishtar_common/models.py:3779 msgid "Document type" msgstr "" -#: ishtar_common/models.py:3766 +#: ishtar_common/models.py:3780 msgid "Document types" msgstr "" -#: ishtar_common/models.py:3780 ishtar_common/models.py:3808 +#: ishtar_common/models.py:3794 ishtar_common/models.py:3822 msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3784 ishtar_common/models_imports.py:942 -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models.py:3798 ishtar_common/models_imports.py:1061 +#: ishtar_common/models_imports.py:1105 msgid "Support type" msgstr "" -#: ishtar_common/models.py:3785 +#: ishtar_common/models.py:3799 msgid "Support types" msgstr "" -#: ishtar_common/models.py:3795 +#: ishtar_common/models.py:3809 msgid "Iframe template" msgstr "" -#: ishtar_common/models.py:3799 +#: ishtar_common/models.py:3813 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." msgstr "" -#: ishtar_common/models.py:3812 +#: ishtar_common/models.py:3826 msgid "Format type" msgstr "" -#: ishtar_common/models.py:3813 +#: ishtar_common/models.py:3827 msgid "Format types" msgstr "" -#: ishtar_common/models.py:3823 ishtar_common/models_rest.py:109 +#: ishtar_common/models.py:3837 ishtar_common/models_rest.py:109 #: ishtar_common/templates/ishtar/merge_organization.html:11 #: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "" -#: ishtar_common/models.py:3826 ishtar_common/models_imports.py:939 +#: ishtar_common/models.py:3840 ishtar_common/models_imports.py:1058 msgid "License type" msgstr "" -#: ishtar_common/models.py:3827 +#: ishtar_common/models.py:3841 msgid "License types" msgstr "" -#: ishtar_common/models.py:3837 +#: ishtar_common/models.py:3851 msgid "Document tags" msgstr "" -#: ishtar_common/models.py:3964 +#: ishtar_common/models.py:3978 msgid "Identifier" msgstr "" -#: ishtar_common/models.py:3987 +#: ishtar_common/models.py:4001 msgctxt "key for text search" msgid "author" msgstr "" -#: ishtar_common/models.py:3991 +#: ishtar_common/models.py:4005 msgctxt "key for text search" msgid "publisher" msgstr "" -#: ishtar_common/models.py:3995 +#: ishtar_common/models.py:4009 msgctxt "key for text search" msgid "publishing-year" msgstr "" -#: ishtar_common/models.py:4010 +#: ishtar_common/models.py:4024 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: ishtar_common/models.py:4018 +#: ishtar_common/models.py:4032 msgctxt "key for text search" msgid "tag" msgstr "" -#: ishtar_common/models.py:4021 +#: ishtar_common/models.py:4035 msgctxt "key for text search" msgid "format" msgstr "" -#: ishtar_common/models.py:4025 +#: ishtar_common/models.py:4039 msgctxt "key for text search" msgid "medium" msgstr "" -#: ishtar_common/models.py:4029 +#: ishtar_common/models.py:4043 msgctxt "key for text search" msgid "language" msgstr "" -#: ishtar_common/models.py:4033 +#: ishtar_common/models.py:4047 msgctxt "key for text search" msgid "license" msgstr "" -#: ishtar_common/models.py:4037 +#: ishtar_common/models.py:4051 msgctxt "key for text search" msgid "scale" msgstr "" -#: ishtar_common/models.py:4040 +#: ishtar_common/models.py:4054 msgctxt "key for text search" msgid "url" msgstr "" -#: ishtar_common/models.py:4044 +#: ishtar_common/models.py:4058 msgctxt "key for text search" msgid "isbn" msgstr "" -#: ishtar_common/models.py:4047 +#: ishtar_common/models.py:4061 msgctxt "key for text search" msgid "issn" msgstr "" -#: ishtar_common/models.py:4050 +#: ishtar_common/models.py:4064 msgctxt "key for text search" msgid "source" msgstr "" -#: ishtar_common/models.py:4054 +#: ishtar_common/models.py:4068 msgctxt "key for text search" msgid "source-free-input" msgstr "" -#: ishtar_common/models.py:4058 +#: ishtar_common/models.py:4072 msgctxt "key for text search" msgid "warehouse-container" msgstr "" -#: ishtar_common/models.py:4062 +#: ishtar_common/models.py:4076 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "" -#: ishtar_common/models.py:4069 +#: ishtar_common/models.py:4083 msgctxt "key for text search" msgid "additional-information" msgstr "" -#: ishtar_common/models.py:4073 +#: ishtar_common/models.py:4087 msgctxt "key for text search" msgid "has-duplicate" msgstr "" -#: ishtar_common/models.py:4092 +#: ishtar_common/models.py:4106 msgctxt "key for text search" msgid "basket-finds" msgstr "" -#: ishtar_common/models.py:4096 ishtar_common/models.py:4197 +#: ishtar_common/models.py:4110 ishtar_common/models.py:4211 msgctxt "key for text search" msgid "find" msgstr "" -#: ishtar_common/models.py:4116 ishtar_common/models.py:4200 +#: ishtar_common/models.py:4130 ishtar_common/models.py:4214 msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4128 ishtar_common/models_common.py:1967 +#: ishtar_common/models.py:4142 ishtar_common/models_common.py:1777 msgctxt "key for text search" msgid "has-image" msgstr "" -#: ishtar_common/models.py:4131 +#: ishtar_common/models.py:4145 msgctxt "key for text search" msgid "has-file" msgstr "" -#: ishtar_common/models.py:4135 +#: ishtar_common/models.py:4149 msgctxt "key for text search" msgid "receipt-date-before" msgstr "" -#: ishtar_common/models.py:4139 +#: ishtar_common/models.py:4153 msgctxt "key for text search" msgid "receipt-date-after" msgstr "" -#: ishtar_common/models.py:4144 +#: ishtar_common/models.py:4158 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "" -#: ishtar_common/models.py:4149 +#: ishtar_common/models.py:4163 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "" -#: ishtar_common/models.py:4153 +#: ishtar_common/models.py:4167 msgctxt "key for text search" msgid "creation-date-before" msgstr "" -#: ishtar_common/models.py:4157 +#: ishtar_common/models.py:4171 msgctxt "key for text search" msgid "creation-date-after" msgstr "" -#: ishtar_common/models.py:4204 +#: ishtar_common/models.py:4218 msgctxt "key for text search" msgid "treatment" msgstr "" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4222 msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4324 +#: ishtar_common/models.py:4338 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4341 +#: ishtar_common/models.py:4355 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4348 +#: ishtar_common/models.py:4362 msgid "Container reference ID" msgstr "" -#: ishtar_common/models.py:4356 +#: ishtar_common/models.py:4370 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4358 +#: ishtar_common/models.py:4372 msgid "Related" msgstr "" -#: ishtar_common/models.py:4367 +#: ishtar_common/models.py:4381 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4371 +#: ishtar_common/models.py:4385 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4372 +#: ishtar_common/models.py:4386 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4373 +#: ishtar_common/models.py:4387 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4374 +#: ishtar_common/models.py:4388 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4594 +#: ishtar_common/models.py:4608 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4596 +#: ishtar_common/models.py:4610 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:5011 +#: ishtar_common/models.py:5025 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:5015 +#: ishtar_common/models.py:5029 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:5065 +#: ishtar_common/models.py:5079 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:5069 +#: ishtar_common/models.py:5083 msgid "Research" msgstr "" -#: ishtar_common/models.py:5102 +#: ishtar_common/models.py:5116 msgid "Filename" msgstr "" -#: ishtar_common/models.py:5106 +#: ishtar_common/models.py:5120 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:5107 +#: ishtar_common/models.py:5121 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:5118 ishtar_common/models_imports.py:1130 +#: ishtar_common/models.py:5132 ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1298 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:5136 +#: ishtar_common/models.py:5150 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:5137 +#: ishtar_common/models.py:5151 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:5157 +#: ishtar_common/models.py:5171 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5169 +#: ishtar_common/models.py:5183 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5182 +#: ishtar_common/models.py:5196 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5200 +#: ishtar_common/models.py:5214 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5242 ishtar_common/models_imports.py:1121 +#: ishtar_common/models.py:5256 ishtar_common/models_imports.py:1275 +#: ishtar_common/models_imports.py:1292 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "" -#: ishtar_common/models.py:5247 +#: ishtar_common/models.py:5261 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5250 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5264 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5253 +#: ishtar_common/models.py:5267 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5256 +#: ishtar_common/models.py:5270 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5259 +#: ishtar_common/models.py:5273 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5267 +#: ishtar_common/models.py:5281 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5272 +#: ishtar_common/models.py:5286 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5276 +#: ishtar_common/models.py:5290 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5281 +#: ishtar_common/models.py:5295 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5282 +#: ishtar_common/models.py:5296 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5283 +#: ishtar_common/models.py:5297 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5284 +#: ishtar_common/models.py:5298 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5285 +#: ishtar_common/models.py:5299 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5286 +#: ishtar_common/models.py:5300 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5287 +#: ishtar_common/models.py:5301 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5294 +#: ishtar_common/models.py:5308 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5297 +#: ishtar_common/models.py:5311 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5298 +#: ishtar_common/models.py:5312 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5300 ishtar_common/models.py:5360 -#: ishtar_common/templates/ishtar/import_table.html:51 +#: ishtar_common/models.py:5314 ishtar_common/models.py:5374 +#: ishtar_common/templates/ishtar/import_table.html:107 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "" -#: ishtar_common/models.py:5310 +#: ishtar_common/models.py:5324 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5322 +#: ishtar_common/models.py:5336 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5334 +#: ishtar_common/models.py:5348 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5338 +#: ishtar_common/models.py:5352 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5347 +#: ishtar_common/models.py:5361 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5349 +#: ishtar_common/models.py:5363 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5352 +#: ishtar_common/models.py:5366 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5357 +#: ishtar_common/models.py:5371 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5358 +#: ishtar_common/models.py:5372 msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1440 +#: ishtar_common/models_common.py:1085 +msgid "Timestamp geo" +msgstr "" + +#: ishtar_common/models_common.py:1086 +msgid "Timestamp label" +msgstr "" + +#: ishtar_common/models_common.py:1470 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1448 +#: ishtar_common/models_common.py:1478 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1455 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:1485 ishtar_common/models_common.py:2176 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1457 +#: ishtar_common/models_common.py:1487 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1463 +#: ishtar_common/models_common.py:1493 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1483 +#: ishtar_common/models_common.py:1513 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1487 +#: ishtar_common/models_common.py:1517 msgctxt "key for text search" msgid "created-before" msgstr "" -#: ishtar_common/models_common.py:1491 +#: ishtar_common/models_common.py:1521 msgctxt "key for text search" msgid "created-after" msgstr "" -#: ishtar_common/models_common.py:1494 +#: ishtar_common/models_common.py:1524 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1498 +#: ishtar_common/models_common.py:1528 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1501 +#: ishtar_common/models_common.py:1531 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1971 +#: ishtar_common/models_common.py:1781 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1975 +#: ishtar_common/models_common.py:1785 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:2055 +#: ishtar_common/models_common.py:1865 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:2057 +#: ishtar_common/models_common.py:1867 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2220 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2051 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2221 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2051 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:2032 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2223 +#: ishtar_common/models_common.py:2033 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:2036 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2227 +#: ishtar_common/models_common.py:2037 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2258 +#: ishtar_common/models_common.py:2068 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2259 +#: ishtar_common/models_common.py:2069 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2275 +#: ishtar_common/models_common.py:2085 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2086 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2102 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2103 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2305 +#: ishtar_common/models_common.py:2115 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2306 +#: ishtar_common/models_common.py:2116 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2332 +#: ishtar_common/models_common.py:2142 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2333 +#: ishtar_common/models_common.py:2143 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2334 +#: ishtar_common/models_common.py:2144 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2374 +#: ishtar_common/models_common.py:2184 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2381 +#: ishtar_common/models_common.py:2191 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2389 +#: ishtar_common/models_common.py:2199 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2397 +#: ishtar_common/models_common.py:2207 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:4301 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:4109 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:2401 -#: ishtar_common/models_common.py:2402 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:2212 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2401 ishtar_common/models_common.py:4302 +#: ishtar_common/models_common.py:2211 ishtar_common/models_common.py:4110 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2402 ishtar_common/models_common.py:4303 +#: ishtar_common/models_common.py:2212 ishtar_common/models_common.py:4111 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2405 +#: ishtar_common/models_common.py:2215 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2406 +#: ishtar_common/models_common.py:2216 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2407 +#: ishtar_common/models_common.py:2217 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2419 ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:4123 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2424 ishtar_common/models_common.py:4321 +#: ishtar_common/models_common.py:2234 ishtar_common/models_common.py:4129 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2425 +#: ishtar_common/models_common.py:2235 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:2236 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2427 +#: ishtar_common/models_common.py:2237 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2428 +#: ishtar_common/models_common.py:2238 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2431 ishtar_common/models_common.py:2432 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:2242 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2560 +#: ishtar_common/models_common.py:2370 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:3022 +#: ishtar_common/models_common.py:2832 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:3026 +#: ishtar_common/models_common.py:2836 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:2840 #, fuzzy #| msgid "username" msgctxt "key for text search" msgid "geo-name" msgstr "Benutzername" -#: ishtar_common/models_common.py:3033 +#: ishtar_common/models_common.py:2843 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:3036 +#: ishtar_common/models_common.py:2846 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:3039 +#: ishtar_common/models_common.py:2849 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:3042 +#: ishtar_common/models_common.py:2852 msgctxt "key for text search" msgid "z-higher" msgstr "" -#: ishtar_common/models_common.py:3046 +#: ishtar_common/models_common.py:2856 msgctxt "key for text search" msgid "z-lower" msgstr "" -#: ishtar_common/models_common.py:3050 +#: ishtar_common/models_common.py:2860 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:3072 +#: ishtar_common/models_common.py:2882 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:3074 +#: ishtar_common/models_common.py:2884 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3273 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3467 +#: ishtar_common/models_common.py:3275 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3487 +#: ishtar_common/models_common.py:3295 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3489 +#: ishtar_common/models_common.py:3297 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3499 +#: ishtar_common/models_common.py:3307 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3503 +#: ishtar_common/models_common.py:3311 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3507 +#: ishtar_common/models_common.py:3315 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3773 +#: ishtar_common/models_common.py:3581 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3805 +#: ishtar_common/models_common.py:3613 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3811 +#: ishtar_common/models_common.py:3619 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3844 +#: ishtar_common/models_common.py:3652 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3881 +#: ishtar_common/models_common.py:3689 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3962 +#: ishtar_common/models_common.py:3770 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3972 +#: ishtar_common/models_common.py:3780 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3990 +#: ishtar_common/models_common.py:3798 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4323 +#: ishtar_common/models_common.py:4131 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4326 +#: ishtar_common/models_common.py:4134 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4328 +#: ishtar_common/models_common.py:4136 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4330 +#: ishtar_common/models_common.py:4138 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4337 +#: ishtar_common/models_common.py:4145 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_imports.py:116 +#: ishtar_common/models_imports.py:125 msgid "Class name" msgstr "" -#: ishtar_common/models_imports.py:120 +#: ishtar_common/models_imports.py:129 msgid "Data model" msgstr "" -#: ishtar_common/models_imports.py:121 +#: ishtar_common/models_imports.py:130 msgid "Data models" msgstr "" -#: ishtar_common/models_imports.py:138 +#: ishtar_common/models_imports.py:142 #: ishtar_common/templates/blocks/DataTables-stats.html:32 #: ishtar_common/templates/blocks/DataTables-tabs.html:8 msgid "Table" msgstr "" -#: ishtar_common/models_imports.py:139 +#: ishtar_common/models_imports.py:143 msgid "GIS" msgstr "" -#: ishtar_common/models_imports.py:159 +#: ishtar_common/models_imports.py:163 +msgid "Tab number" +msgstr "" + +#: ishtar_common/models_imports.py:164 +msgid "" +"When using an Excel or Calc file choose the tab number. Keep it to 1 by " +"default." +msgstr "" + +#: ishtar_common/models_imports.py:167 #, fuzzy #| msgid "username" msgid "Layer name" msgstr "Benutzername" -#: ishtar_common/models_imports.py:163 +#: ishtar_common/models_imports.py:171 msgid "For GIS file with multiple layers" msgstr "" -#: ishtar_common/models_imports.py:166 +#: ishtar_common/models_imports.py:174 msgid "Set as main geometry" msgstr "" -#: ishtar_common/models_imports.py:168 +#: ishtar_common/models_imports.py:176 msgid "Only relevant for GIS files" msgstr "" -#: ishtar_common/models_imports.py:173 +#: ishtar_common/models_imports.py:181 msgid "Associated model" msgstr "" -#: ishtar_common/models_imports.py:181 +#: ishtar_common/models_imports.py:189 msgid "Models that can accept new items" msgstr "" -#: ishtar_common/models_imports.py:183 +#: ishtar_common/models_imports.py:191 msgid "Leave blank for no restrictions" msgstr "" -#: ishtar_common/models_imports.py:186 +#: ishtar_common/models_imports.py:194 msgid "Can be exported" msgstr "" -#: ishtar_common/models_imports.py:188 +#: ishtar_common/models_imports.py:195 +msgid "Can be import" +msgstr "" + +#: ishtar_common/models_imports.py:196 +msgid "Archive required" +msgstr "" + +#: ishtar_common/models_imports.py:198 msgid "Unicity keys (separator \";\")" msgstr "" -#: ishtar_common/models_imports.py:189 +#: ishtar_common/models_imports.py:199 msgid "" "Mandatory for update importer. Set to key that identify items without " "ambiguity. Warning: __ is not supported, only use level 1 key." msgstr "" -#: ishtar_common/models_imports.py:198 +#: ishtar_common/models_imports.py:205 +msgid "Pre-import form message" +msgstr "" + +#: ishtar_common/models_imports.py:208 +msgid "Error messages to ignore" +msgstr "" + +#: ishtar_common/models_imports.py:209 +msgid "" +"If an error is encountered with the following character strings, the error " +"is not reported in the error file. Each message is separated with a line " +"break." +msgstr "" + +#: ishtar_common/models_imports.py:217 msgid "Importer - Type" msgstr "" -#: ishtar_common/models_imports.py:199 +#: ishtar_common/models_imports.py:218 msgid "Importer - Types" msgstr "" -#: ishtar_common/models_imports.py:223 ishtar_common/models_rest.py:277 +#: ishtar_common/models_imports.py:250 ishtar_common/models_rest.py:277 msgid "List types" msgstr "" -#: ishtar_common/models_imports.py:402 ishtar_common/models_imports.py:419 +#: ishtar_common/models_imports.py:440 +msgid "Importer - Group" +msgstr "" + +#: ishtar_common/models_imports.py:441 +msgid "Importer - Groups" +msgstr "" + +#: ishtar_common/models_imports.py:475 +msgid "Importer - Group <-> Importer" +msgstr "" + +#: ishtar_common/models_imports.py:496 ishtar_common/models_imports.py:513 msgid "" "Importer configuration error: \"{}\" is not available for \"{}\". Check your " "default and column configuration" msgstr "" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:539 +msgid "" +"The target of the default values. Can be set to empty with \"-\". Use the " +"\"__\" notation to pass between models." +msgstr "" + +#: ishtar_common/models_imports.py:543 +msgid "Required fields" +msgstr "" + +#: ishtar_common/models_imports.py:545 +msgid "" +"Theses defaults values only apply if the designated fields are not empty. " +"Use the \"__\" notation to pass between models.Leave empty to always apply." +msgstr "" + +#: ishtar_common/models_imports.py:552 msgid "Importer - Default" msgstr "" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:553 msgid "Importer - Defaults" msgstr "" -#: ishtar_common/models_imports.py:504 +#: ishtar_common/models_imports.py:620 msgid "Importer - Default value" msgstr "" -#: ishtar_common/models_imports.py:505 +#: ishtar_common/models_imports.py:621 msgid "Importer - Default values" msgstr "" -#: ishtar_common/models_imports.py:580 +#: ishtar_common/models_imports.py:697 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "" -#: ishtar_common/models_imports.py:596 +#: ishtar_common/models_imports.py:698 +msgid "" +"Column number in the table. Put 0 or negative number for pre-importer field." +msgstr "" + +#: ishtar_common/models_imports.py:715 msgid "Required" msgstr "" -#: ishtar_common/models_imports.py:598 +#: ishtar_common/models_imports.py:717 msgid "Export field name" msgstr "" -#: ishtar_common/models_imports.py:603 +#: ishtar_common/models_imports.py:722 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: ishtar_common/models_imports.py:610 +#: ishtar_common/models_imports.py:729 msgid "Importer - Column" msgstr "" -#: ishtar_common/models_imports.py:611 +#: ishtar_common/models_imports.py:730 msgid "Importer - Columns" msgstr "" -#: ishtar_common/models_imports.py:654 +#: ishtar_common/models_imports.py:773 msgid "Field name" msgstr "" -#: ishtar_common/models_imports.py:656 ishtar_common/models_imports.py:759 +#: ishtar_common/models_imports.py:775 ishtar_common/models_imports.py:878 msgid "Force creation of new items" msgstr "" -#: ishtar_common/models_imports.py:657 ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:776 ishtar_common/models_imports.py:879 msgid "Concatenate with existing" msgstr "" -#: ishtar_common/models_imports.py:659 ishtar_common/models_imports.py:762 +#: ishtar_common/models_imports.py:778 ishtar_common/models_imports.py:881 msgid "Concatenate character" msgstr "" -#: ishtar_common/models_imports.py:664 +#: ishtar_common/models_imports.py:783 msgid "Importer - Duplicate field" msgstr "" -#: ishtar_common/models_imports.py:665 +#: ishtar_common/models_imports.py:784 msgid "Importer - Duplicate fields" msgstr "" -#: ishtar_common/models_imports.py:682 +#: ishtar_common/models_imports.py:801 msgid "Regular expression" msgstr "" -#: ishtar_common/models_imports.py:686 +#: ishtar_common/models_imports.py:805 msgid "Importer - Regular expression" msgstr "" -#: ishtar_common/models_imports.py:687 +#: ishtar_common/models_imports.py:806 msgid "Importer - Regular expressions" msgstr "" -#: ishtar_common/models_imports.py:702 +#: ishtar_common/models_imports.py:821 msgid "Format string" msgstr "" -#: ishtar_common/models_imports.py:705 +#: ishtar_common/models_imports.py:824 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " @@ -11518,394 +11832,452 @@ msgid "" "a string." msgstr "" -#: ishtar_common/models_imports.py:715 +#: ishtar_common/models_imports.py:834 msgid "Importer - Value format" msgstr "" -#: ishtar_common/models_imports.py:716 +#: ishtar_common/models_imports.py:835 msgid "Importer - Value formats" msgstr "" -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:848 msgid "The string provided generate an error. Fix it." msgstr "" -#: ishtar_common/models_imports.py:768 +#: ishtar_common/models_imports.py:887 msgid "Importer - Target" msgstr "" -#: ishtar_common/models_imports.py:769 +#: ishtar_common/models_imports.py:888 msgid "Importer - Targets" msgstr "" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:607 -#: ishtar_common/views_item.py:1425 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:639 +#: ishtar_common/views_item.py:1471 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:1427 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:1473 msgid "False" msgstr "" -#: ishtar_common/models_imports.py:822 +#: ishtar_common/models_imports.py:941 msgid "All users can use it" msgstr "" -#: ishtar_common/models_imports.py:824 +#: ishtar_common/models_imports.py:943 msgid "All users can modify it" msgstr "" -#: ishtar_common/models_imports.py:829 +#: ishtar_common/models_imports.py:948 msgid "Importer - Target key group" msgstr "" -#: ishtar_common/models_imports.py:830 +#: ishtar_common/models_imports.py:949 msgid "Importer - Target key groups" msgstr "" -#: ishtar_common/models_imports.py:853 +#: ishtar_common/models_imports.py:972 msgid "Is set" msgstr "" -#: ishtar_common/models_imports.py:871 +#: ishtar_common/models_imports.py:990 msgid "Importer - Target key" msgstr "" -#: ishtar_common/models_imports.py:872 +#: ishtar_common/models_imports.py:991 msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:1065 msgid "Period" msgstr "" -#: ishtar_common/models_imports.py:947 +#: ishtar_common/models_imports.py:1066 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:952 +#: ishtar_common/models_imports.py:1071 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:1076 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:958 +#: ishtar_common/models_imports.py:1077 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:1080 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:969 +#: ishtar_common/models_imports.py:1088 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:979 +#: ishtar_common/models_imports.py:1098 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:1102 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:1104 msgid "Spatial reference system" msgstr "" -#: ishtar_common/models_imports.py:995 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:1114 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:999 +#: ishtar_common/models_imports.py:1118 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:1000 +#: ishtar_common/models_imports.py:1119 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1120 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:1002 +#: ishtar_common/models_imports.py:1121 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:1003 +#: ishtar_common/models_imports.py:1122 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:1004 +#: ishtar_common/models_imports.py:1123 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:1023 +#: ishtar_common/models_imports.py:1142 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1143 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:1025 +#: ishtar_common/models_imports.py:1144 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:1042 +#: ishtar_common/models_imports.py:1174 +#, fuzzy +#| msgid "email address" +msgid "Formater type" +msgstr "E-Mail-Adresse" + +#: ishtar_common/models_imports.py:1176 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:1044 +#: ishtar_common/models_imports.py:1178 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:1049 +#: ishtar_common/models_imports.py:1183 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:1050 +#: ishtar_common/models_imports.py:1184 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:1122 +#: ishtar_common/models_imports.py:1276 ishtar_common/models_imports.py:1293 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:1123 +#: ishtar_common/models_imports.py:1277 ishtar_common/models_imports.py:1294 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:1124 +#: ishtar_common/models_imports.py:1278 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1279 ishtar_common/models_imports.py:1295 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1280 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:1127 +#: ishtar_common/models_imports.py:1281 ishtar_common/models_imports.py:1296 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:1128 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1297 msgid "Post-processing in progress" msgstr "" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1283 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1286 ishtar_common/models_imports.py:1300 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:1201 -msgid "Importer type" -msgstr "" - -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1370 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:1211 -msgid "Associated images (zip file)" -msgstr "" +#: ishtar_common/models_imports.py:1378 +#, fuzzy +#| msgid "email address" +msgid "Associated documents (zip file)" +msgstr "E-Mail-Adresse" -#: ishtar_common/models_imports.py:1224 -msgid "If a group is selected, target key saved in this group will be used." +#: ishtar_common/models_imports.py:1386 +msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:1228 +#: ishtar_common/models_imports.py:1394 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:1229 +#: ishtar_common/models_imports.py:1395 msgid "Only required for CSV file" msgstr "" -#: ishtar_common/models_imports.py:1232 +#: ishtar_common/models_imports.py:1398 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:1237 +#: ishtar_common/models_imports.py:1403 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1408 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:1244 +#: ishtar_common/models_imports.py:1410 msgid "" "Number of header lines in your file (can be 0 and should be 0 for geopackage " "or Shapefile)." msgstr "" -#: ishtar_common/models_imports.py:1247 +#: ishtar_common/models_imports.py:1508 +msgid "Importer group type" +msgstr "" + +#: ishtar_common/models_imports.py:1509 +msgid "Current import" +msgstr "" + +#: ishtar_common/models_imports.py:1515 +msgid "Import - Group" +msgstr "" + +#: ishtar_common/models_imports.py:1516 +msgid "Import - Groups" +msgstr "" + +#: ishtar_common/models_imports.py:1593 ishtar_common/models_imports.py:2245 +msgid "Analyse" +msgstr "" + +#: ishtar_common/models_imports.py:1595 ishtar_common/models_imports.py:1599 +#: ishtar_common/models_imports.py:2247 ishtar_common/models_imports.py:2257 +msgid "Re-analyse" +msgstr "" + +#: ishtar_common/models_imports.py:1600 ishtar_common/models_imports.py:2258 +msgid "Re-import" +msgstr "" + +#: ishtar_common/models_imports.py:1601 ishtar_common/models_imports.py:2265 +msgid "Archive" +msgstr "" + +#: ishtar_common/models_imports.py:1604 ishtar_common/models_imports.py:2268 +msgid "Unarchive" +msgstr "" + +#: ishtar_common/models_imports.py:1606 ishtar_common/models_imports.py:2272 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 +#: ishtar_common/templates/ishtar/form_delete.html:11 +#: ishtar_common/views.py:2782 ishtar_common/widgets.py:453 +#: ishtar_common/widgets.py:489 +msgid "Delete" +msgstr "" + +#: ishtar_common/models_imports.py:1864 +msgid "Importer type" +msgstr "" + +#: ishtar_common/models_imports.py:1872 +msgid "If a group is selected, target key saved in this group will be used." +msgstr "" + +#: ishtar_common/models_imports.py:1876 +msgid "Imported values" +msgstr "" + +#: ishtar_common/models_imports.py:1884 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1892 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1263 +#: ishtar_common/models_imports.py:1900 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1271 -msgid "Archive file" -msgstr "" - -#: ishtar_common/models_imports.py:1282 +#: ishtar_common/models_imports.py:1911 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1913 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1293 +#: ishtar_common/models_imports.py:1916 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1295 +#: ishtar_common/models_imports.py:1918 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1296 +#: ishtar_common/models_imports.py:1919 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1298 +#: ishtar_common/models_imports.py:1921 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1303 +#: ishtar_common/models_imports.py:1926 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1305 +#: ishtar_common/models_imports.py:1928 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1312 -msgid "Import" +#: ishtar_common/models_imports.py:1934 +#: ishtar_common/templates/ishtar/import_table.html:76 +msgid "Group" msgstr "" -#: ishtar_common/models_imports.py:1355 ishtar_common/models_imports.py:1499 -msgid "Error in the CSV file." +#: ishtar_common/models_imports.py:1937 +msgid "Next import" msgstr "" -#: ishtar_common/models_imports.py:1424 -msgid "Analyse" +#: ishtar_common/models_imports.py:1940 +msgid "Import - Import" msgstr "" -#: ishtar_common/models_imports.py:1426 ishtar_common/models_imports.py:1435 -msgid "Re-analyse" +#: ishtar_common/models_imports.py:1941 +msgid "Import - Imports" msgstr "" -#: ishtar_common/models_imports.py:1430 +#: ishtar_common/models_imports.py:2174 ishtar_common/models_imports.py:2322 +msgid "Error in the CSV file." +msgstr "" + +#: ishtar_common/models_imports.py:2252 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1431 ishtar_common/models_imports.py:1440 +#: ishtar_common/models_imports.py:2253 ishtar_common/models_imports.py:2262 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1433 ishtar_common/models_imports.py:1442 +#: ishtar_common/models_imports.py:2255 ishtar_common/models_imports.py:2264 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1436 -msgid "Re-import" -msgstr "" - -#: ishtar_common/models_imports.py:1439 +#: ishtar_common/models_imports.py:2261 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1443 -msgid "Archive" -msgstr "" - -#: ishtar_common/models_imports.py:1446 -msgid "Unarchive" -msgstr "" - -#: ishtar_common/models_imports.py:1448 +#: ishtar_common/models_imports.py:2270 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "" -#: ishtar_common/models_imports.py:1449 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 -#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 -#: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2519 ishtar_common/widgets.py:453 -#: ishtar_common/widgets.py:489 -msgid "Delete" -msgstr "" - -#: ishtar_common/models_imports.py:1543 ishtar_common/models_imports.py:1546 -#: ishtar_common/models_imports.py:1608 +#: ishtar_common/models_imports.py:2366 ishtar_common/models_imports.py:2369 +#: ishtar_common/models_imports.py:2431 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:1556 +#: ishtar_common/models_imports.py:2379 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:2401 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1605 +#: ishtar_common/models_imports.py:2428 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1644 +#: ishtar_common/models_imports.py:2469 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1712 +#: ishtar_common/models_imports.py:2537 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1743 +#: ishtar_common/models_imports.py:2568 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1779 +#: ishtar_common/models_imports.py:2604 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1787 +#: ishtar_common/models_imports.py:2612 msgid "Import {} finished with no errors" msgstr "" -#: ishtar_common/models_imports.py:1958 +#: ishtar_common/models_imports.py:2778 +msgid "Ignored" +msgstr "" + +#: ishtar_common/models_imports.py:2781 ishtar_common/models_imports.py:2782 +msgid "Import - Ignored error" +msgstr "" + +#: ishtar_common/models_imports.py:2817 +msgid "Import - Pre-import value" +msgstr "" + +#: ishtar_common/models_imports.py:2818 +msgid "Import - Pre-import values" +msgstr "" + +#: ishtar_common/models_imports.py:2835 msgid "Specific key to an import" msgstr "" -#: ishtar_common/models_imports.py:1969 -msgid "Importer - Item key" +#: ishtar_common/models_imports.py:2846 +msgid "Import - Item key" msgstr "" -#: ishtar_common/models_imports.py:1970 -msgid "Imports - Item keys" +#: ishtar_common/models_imports.py:2847 +msgid "Import - Item keys" msgstr "" #: ishtar_common/models_rest.py:49 ishtar_common/models_rest.py:63 @@ -12121,15 +12493,15 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1757 -#: ishtar_common/views.py:1761 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1873 +#: ishtar_common/views.py:1877 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1764 -#: ishtar_common/views.py:1766 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1880 +#: ishtar_common/views.py:1882 msgid "Next" msgstr "" @@ -12289,7 +12661,6 @@ msgstr "" #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 -#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "" @@ -12404,8 +12775,8 @@ msgstr "" msgid ", " msgstr "" -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2346 -#: ishtar_common/utils.py:2354 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2636 +#: ishtar_common/utils.py:2644 msgid "." msgstr "" @@ -12483,6 +12854,10 @@ msgid "" "a free software under AGPL v3 license." msgstr "" +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:15 +msgid "Download" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:5 msgctxt "Sheet" msgid "Creation" @@ -12493,6 +12868,14 @@ msgctxt "Sheet" msgid "Modification" msgstr "" +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:23 +msgid "Imports (creation)" +msgstr "" + +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:32 +msgid "Imports (update)" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "" @@ -12531,6 +12914,10 @@ msgstr "" msgid "Generate image" msgstr "" +#: ishtar_common/templates/ishtar/blocks/view_import_csv.html:19 +msgid "Ignore" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:78 msgid "Support" msgstr "" @@ -12597,7 +12984,7 @@ msgid "Link" msgstr "" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1238 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1239 msgid "Changelog" msgstr "" @@ -12612,7 +12999,7 @@ msgstr "" #: ishtar_common/templates/ishtar/forms/search_query.html:77 #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 -#: ishtar_common/templates/ishtar/import_list.html:38 +#: ishtar_common/templates/ishtar/import_list.html:41 #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 @@ -12665,7 +13052,7 @@ 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 +#: ishtar_common/templates/ishtar/import_delete.html:28 msgid "Are you sure to want to delete this import?" msgstr "" @@ -12793,6 +13180,10 @@ msgstr "" msgid "import (GIS)" msgstr "" +#: ishtar_common/templates/ishtar/import_list.html:27 +msgid "import (group)" +msgstr "" + #: ishtar_common/templates/ishtar/import_step_by_step.html:14 msgid "Add/modified" msgstr "" @@ -12814,7 +13205,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1600 +#: ishtar_common/views.py:1716 msgid "Import step by step" msgstr "" @@ -12827,7 +13218,9 @@ msgid "Column" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 -#: ishtar_common/templates/ishtar/import_table.html:35 +#: ishtar_common/templates/ishtar/import_table.html:5 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:5 +#: ishtar_common/views.py:2240 msgid "Error" msgstr "" @@ -12889,7 +13282,6 @@ msgid "Objects matched with no changes" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:263 -#: ishtar_common/templates/ishtar/import_table.html:49 msgid "Source file" msgstr "" @@ -12911,45 +13303,46 @@ msgid "" "modification before import." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:23 -msgid "No pending imports." +#: ishtar_common/templates/ishtar/import_table.html:3 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:3 +msgid "Media" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:29 -msgctxt "file" -msgid "File" +#: ishtar_common/templates/ishtar/import_table.html:6 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:6 +#: ishtar_common/views.py:2242 +msgid "Match" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:30 -msgid "Media" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgid "No pending imports." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:32 +#: ishtar_common/templates/ishtar/import_table.html:57 msgid "Status" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:34 -msgid "Unmatched items" +#: ishtar_common/templates/ishtar/import_table.html:59 +msgctxt "file" +msgid "Files" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:36 -msgid "Control" +#: ishtar_common/templates/ishtar/import_table.html:60 +msgid "Pré-import form / matching" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:37 -#: ishtar_common/templates/ishtar/import_table.html:77 -msgid "Match" +#: ishtar_common/templates/ishtar/import_table.html:61 +msgid "Diagnostic files" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:56 -msgid "Media file" +#: ishtar_common/templates/ishtar/import_table.html:119 +#: ishtar_common/templates/ishtar/import_table.html:192 +msgid "Pre-import values" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:81 -#: ishtar_common/templates/ishtar/import_table.html:84 -#: ishtar_common/templates/ishtar/import_table.html:87 -msgctxt "not a directory" -msgid "File" +#: ishtar_common/templates/ishtar/import_table.html:126 +#: ishtar_common/templates/ishtar/import_table.html:199 +msgid "Make match" msgstr "" #: ishtar_common/templates/ishtar/manage_basket.html:9 @@ -13019,6 +13412,28 @@ msgstr "" msgid "Other" msgstr "" +#: ishtar_common/templates/ishtar/sheet_import.html:4 +msgid "Import" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:32 +msgid "Updated" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:98 +#, fuzzy +#| msgid "email address" +msgid "Associated imports" +msgstr "E-Mail-Adresse" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:106 +msgid "Pre-import values " +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_importgroup.html:4 +msgid "Import group" +msgstr "" + #: ishtar_common/templates/ishtar/sheet_organization.html:21 msgid "Person in the organization" msgstr "" @@ -13569,47 +13984,47 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:200 ishtar_common/views.py:125 +#: ishtar_common/utils.py:207 ishtar_common/views.py:125 msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:692 +#: ishtar_common/utils.py:968 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:770 +#: ishtar_common/utils.py:1046 msgid "Information" msgstr "" -#: ishtar_common/utils.py:771 +#: ishtar_common/utils.py:1047 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1637 +#: ishtar_common/utils.py:1927 msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/utils.py:2323 +#: ishtar_common/utils.py:2613 msgid "uppercase letter" msgstr "" -#: ishtar_common/utils.py:2324 +#: ishtar_common/utils.py:2614 msgid "lowercase letter" msgstr "" -#: ishtar_common/utils.py:2325 +#: ishtar_common/utils.py:2615 msgid "number" msgstr "" -#: ishtar_common/utils.py:2326 +#: ishtar_common/utils.py:2616 msgid "punctuation sign" msgstr "" -#: ishtar_common/utils.py:2345 +#: ishtar_common/utils.py:2635 msgid "This password must contain one of this character: " msgstr "" -#: ishtar_common/utils.py:2351 +#: ishtar_common/utils.py:2641 msgid "Your password must contain each of these characters: " msgstr "" @@ -13657,128 +14072,136 @@ msgstr "" msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:1104 ishtar_common/views_item.py:177 +#: ishtar_common/views.py:1105 ishtar_common/views_item.py:177 #: ishtar_common/views_item.py:218 ishtar_common/views_item.py:235 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1471 +#: ishtar_common/views.py:1490 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1491 -msgid "Edit import" +#: ishtar_common/views.py:1515 +msgid "Import: edit (table)" msgstr "" -#: ishtar_common/views.py:1513 +#: ishtar_common/views.py:1522 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1949 +#: ishtar_common/views.py:1529 +msgid "Import: create (group)" +msgstr "" + +#: ishtar_common/views.py:1535 +msgid "Import: pre-form" +msgstr "" + +#: ishtar_common/views.py:2065 msgid "Col. " msgstr "" -#: ishtar_common/views.py:1956 ishtar_common/views.py:1971 +#: ishtar_common/views.py:2072 ishtar_common/views.py:2087 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:2013 +#: ishtar_common/views.py:2173 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:2049 +#: ishtar_common/views.py:2211 ishtar_common/views.py:2222 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2087 +#: ishtar_common/views.py:2350 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2111 +#: ishtar_common/views.py:2374 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2119 +#: ishtar_common/views.py:2382 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2129 +#: ishtar_common/views.py:2392 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2169 ishtar_common/views.py:2184 +#: ishtar_common/views.py:2432 ishtar_common/views.py:2447 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2198 +#: ishtar_common/views.py:2461 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2211 +#: ishtar_common/views.py:2474 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2231 +#: ishtar_common/views.py:2494 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2299 +#: ishtar_common/views.py:2562 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2327 +#: ishtar_common/views.py:2590 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2352 +#: ishtar_common/views.py:2615 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2389 +#: ishtar_common/views.py:2652 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2495 +#: ishtar_common/views.py:2758 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2518 +#: ishtar_common/views.py:2781 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2561 +#: ishtar_common/views.py:2824 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2562 +#: ishtar_common/views.py:2825 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2567 +#: ishtar_common/views.py:2830 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2568 +#: ishtar_common/views.py:2831 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:2687 +#: ishtar_common/views.py:2950 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2803 ishtar_common/views.py:2898 +#: ishtar_common/views.py:3066 ishtar_common/views.py:3161 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2935 ishtar_common/views.py:2986 +#: ishtar_common/views.py:3198 ishtar_common/views.py:3249 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:2946 +#: ishtar_common/views.py:3209 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2999 +#: ishtar_common/views.py:3262 msgid "Delete geographic item" msgstr "" @@ -13792,7 +14215,7 @@ msgstr "" msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:923 +#: ishtar_common/views_item.py:955 msgctxt "key for text search" msgid "today" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index db47ae29a..cc7275c83 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: 2023-09-27 14:17+0200\n" +"POT-Creation-Date: 2023-11-18 17:48+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,28 +20,29 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:718 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1181 -#: archaeological_finds/models_finds.py:2464 +#: archaeological_finds/models_finds.py:1036 +#: archaeological_finds/models_finds.py:2319 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1238 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1557 -#: archaeological_operations/models.py:2429 -#: archaeological_operations/models.py:2447 -#: archaeological_operations/models.py:2563 -#: archaeological_operations/models.py:2762 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:2435 +#: archaeological_operations/models.py:2453 +#: archaeological_operations/models.py:2569 +#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:3057 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2202 -#: ishtar_common/models.py:5234 ishtar_common/views.py:499 +#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2379 +#: ishtar_common/models.py:5248 ishtar_common/views.py:499 +#: na_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -87,17 +88,17 @@ msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 -#: archaeological_finds/forms.py:1260 archaeological_finds/forms.py:1966 +#: archaeological_finds/forms.py:1261 archaeological_finds/forms.py:1967 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1424 +#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1429 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:641 ishtar_common/forms_common.py:819 -#: ishtar_common/forms_common.py:1044 ishtar_common/forms_common.py:2119 +#: ishtar_common/forms_common.py:819 ishtar_common/forms_common.py:997 +#: ishtar_common/forms_common.py:1222 ishtar_common/forms_common.py:2296 msgid "Full text search" msgstr "" @@ -105,14 +106,14 @@ msgstr "" #: archaeological_context_records/forms.py:301 #: archaeological_context_records/forms.py:554 #: archaeological_context_records/forms.py:608 -#: archaeological_context_records/models.py:750 -#: archaeological_context_records/models.py:1457 +#: archaeological_context_records/models.py:730 +#: archaeological_context_records/models.py:1347 #: archaeological_warehouse/forms.py:454 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1739 +#: archaeological_operations/forms.py:1744 msgid "Code PATRIARCHE" msgstr "" @@ -121,7 +122,7 @@ msgid "Operation - name" msgstr "" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2213 +#: ishtar_common/forms_common.py:2389 msgid "Operation - year" msgstr "" @@ -131,14 +132,14 @@ msgstr "" #: archaeological_context_records/forms.py:157 #: archaeological_context_records/forms.py:715 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/models.py:724 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5235 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5249 msgid "Archaeological site" msgstr "" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1348 +#: archaeological_finds/forms.py:1349 msgid "Search within related operations" msgstr "" @@ -149,23 +150,24 @@ msgstr "" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:511 -#: archaeological_context_records/models.py:536 -#: archaeological_context_records/models.py:825 +#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:805 msgid "Activity" msgstr "" #: archaeological_context_records/forms.py:169 #: archaeological_context_records/forms.py:513 -#: archaeological_context_records/models.py:535 -#: archaeological_context_records/models.py:818 +#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:798 #: archaeological_finds/forms.py:273 archaeological_finds/forms.py:541 #: archaeological_finds/forms.py:717 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: ishtar_common/forms_common.py:1921 +#: ishtar_common/forms_common.py:2098 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 #: man_app/templates/ishtar/sheet_find.html:151 +#: na_app/templates/ishtar/sheet_find.html:159 msgid "Identification" msgstr "" @@ -173,18 +175,18 @@ msgstr "" #: archaeological_context_records/forms.py:292 #: archaeological_context_records/forms.py:556 #: archaeological_context_records/forms.py:609 -#: archaeological_context_records/models.py:522 -#: archaeological_context_records/models.py:523 -#: archaeological_context_records/models.py:722 -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 +#: archaeological_context_records/models.py:702 +#: archaeological_context_records/models.py:1349 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:127 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 -#: archaeological_finds/models_finds.py:1139 +#: archaeological_finds/models_finds.py:994 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1064 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:3075 -#: archaeological_operations/models.py:3350 +#: archaeological_operations/forms.py:1066 +#: archaeological_operations/forms.py:1443 +#: archaeological_operations/models.py:3081 +#: archaeological_operations/models.py:3375 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -201,8 +203,8 @@ msgstr "" #: archaeological_context_records/forms.py:175 #: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:537 -#: archaeological_context_records/models.py:830 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:810 msgid "Excavation techniques" msgstr "" @@ -216,17 +218,20 @@ msgstr "" #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:58 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:707 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:683 +#: archaeological_operations/forms.py:709 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1498 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 #: ishtar_common/templates/ishtar/sheet_area.html:30 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "" @@ -238,17 +243,17 @@ msgstr "" #: archaeological_context_records/forms.py:546 #: archaeological_context_records/forms.py:610 #: archaeological_context_records/forms.py:708 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:730 -#: archaeological_finds/models_finds.py:1136 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:710 +#: archaeological_finds/models_finds.py:991 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1036 -#: archaeological_operations/models.py:3056 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:3062 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:294 -#: ishtar_common/forms_common.py:88 ishtar_common/forms_common.py:110 -#: ishtar_common/models_common.py:3526 ishtar_common/models_common.py:4299 +#: ishtar_common/forms_common.py:92 ishtar_common/forms_common.py:114 +#: ishtar_common/models_common.py:3334 ishtar_common/models_common.py:4107 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" @@ -262,87 +267,89 @@ msgstr "" #: archaeological_context_records/forms.py:303 #: archaeological_context_records/forms.py:557 #: archaeological_context_records/forms.py:612 -#: archaeological_context_records/models.py:524 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:775 -#: archaeological_context_records/models.py:1458 +#: archaeological_context_records/models.py:504 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:1348 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:751 -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:731 +#: archaeological_context_records/models.py:1350 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_finds/forms.py:291 archaeological_finds/forms.py:293 #: archaeological_finds/forms.py:548 archaeological_finds/forms.py:550 #: archaeological_finds/forms.py:718 archaeological_finds/forms.py:764 -#: archaeological_finds/forms.py:1362 +#: archaeological_finds/forms.py:1363 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:426 -#: archaeological_finds/models_finds.py:1850 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/models_treatments.py:260 #: archaeological_finds/templates/ishtar/sheet_find.html:169 -#: ishtar_common/forms_common.py:1868 ishtar_common/forms_common.py:2136 -#: ishtar_common/models.py:1036 ishtar_common/models.py:4342 -#: ishtar_common/models_imports.py:153 ishtar_common/models_imports.py:581 -#: ishtar_common/models_imports.py:681 ishtar_common/models_imports.py:700 +#: ishtar_common/forms_common.py:2045 ishtar_common/forms_common.py:2313 +#: ishtar_common/models.py:1047 ishtar_common/models.py:4356 +#: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:434 +#: ishtar_common/models_imports.py:700 ishtar_common/models_imports.py:800 +#: ishtar_common/models_imports.py:819 #: man_app/templates/ishtar/sheet_find.html:170 +#: na_app/templates/ishtar/sheet_find.html:181 msgid "Description" msgstr "" #: archaeological_context_records/forms.py:307 -#: archaeological_context_records/models.py:781 +#: archaeological_context_records/models.py:761 msgid "Filling" msgstr "" #: archaeological_context_records/forms.py:309 -#: archaeological_context_records/models.py:752 +#: archaeological_context_records/models.py:732 msgid "General comment" msgstr "" #: archaeological_context_records/forms.py:320 #: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:639 archaeological_operations/forms.py:736 +#: archaeological_files/models.py:639 archaeological_operations/forms.py:738 msgid "Total surface (m2)" msgstr "" #: archaeological_context_records/forms.py:326 -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:735 msgid "Length (m)" msgstr "" #: archaeological_context_records/forms.py:327 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/models.py:736 msgid "Width (m)" msgstr "" #: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/models.py:737 msgid "Thickness (m)" msgstr "" #: archaeological_context_records/forms.py:329 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/models.py:738 msgid "Diameter (m)" msgstr "" #: archaeological_context_records/forms.py:330 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/models.py:739 msgid "Depth (m)" msgstr "" #: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/models.py:741 msgid "Depth of appearance (m)" msgstr "" #: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:753 +#: archaeological_context_records/models.py:733 msgid "Opening date" msgstr "" #: archaeological_context_records/forms.py:338 -#: archaeological_context_records/models.py:754 +#: archaeological_context_records/models.py:734 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_files/models.py:602 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -353,22 +360,24 @@ msgstr "" #: archaeological_finds/models_treatments.py:1142 #: archaeological_operations/models.py:1325 #: archaeological_operations/templates/ishtar/sheet_operation.html:204 -#: ishtar_common/forms.py:1005 ishtar_common/forms.py:1006 +#: ishtar_common/forms.py:1025 ishtar_common/forms.py:1026 +#: na_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "" #: archaeological_context_records/forms.py:341 -#: ishtar_common/forms_common.py:1708 +#: ishtar_common/forms_common.py:1885 msgid "Documentation" msgstr "" #: archaeological_context_records/forms.py:347 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:745 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:224 #: archaeological_finds/models_treatments.py:760 #: archaeological_warehouse/forms.py:737 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" @@ -383,23 +392,27 @@ msgstr "" #: archaeological_context_records/forms.py:441 #: archaeological_context_records/forms.py:463 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1154 archaeological_finds/forms.py:1175 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/forms.py:1155 archaeological_finds/forms.py:1176 +#: archaeological_finds/models_finds.py:1748 #: archaeological_finds/templates/ishtar/sheet_find.html:213 #: man_app/templates/ishtar/sheet_find.html:214 +#: na_app/templates/ishtar/sheet_find.html:225 msgid "Dating" msgstr "" #: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:534 -#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1161 -#: archaeological_finds/models_finds.py:1189 +#: archaeological_context_records/models.py:514 +#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1162 +#: archaeological_finds/models_finds.py:1044 #: archaeological_finds/templates/ishtar/sheet_find.html:221 -#: archaeological_operations/forms.py:827 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 +#: archaeological_operations/forms.py:829 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: man_app/templates/ishtar/sheet_find.html:222 +#: na_app/templates/ishtar/sheet_find.html:233 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:561 msgid "Chronological period" msgstr "" @@ -408,32 +421,36 @@ msgstr "" #: archaeological_files/forms.py:786 archaeological_files/models.py:75 #: archaeological_files/models.py:708 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1164 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3422 +#: archaeological_finds/models_finds.py:3157 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:758 #: archaeological_finds/templates/ishtar/sheet_find.html:222 #: 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_operations/forms.py:782 +#: archaeological_operations/forms.py:784 #: archaeological_operations/models.py:104 #: archaeological_operations/models.py:1326 -#: archaeological_operations/models.py:3354 +#: archaeological_operations/models.py:3379 #: man_app/templates/ishtar/sheet_find.html:223 -#: man_app/templates/ishtar/sheet_find.html:403 -#: man_app/templates/ishtar/sheet_find.html:441 -#: man_app/templates/ishtar/sheet_find.html:479 +#: man_app/templates/ishtar/sheet_find.html:391 +#: man_app/templates/ishtar/sheet_find.html:429 +#: man_app/templates/ishtar/sheet_find.html:467 +#: na_app/templates/ishtar/sheet_find.html:234 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:440 +#: na_app/templates/ishtar/sheet_find.html:478 msgid "Start date" msgstr "" #: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 -#: archaeological_files/models.py:709 archaeological_finds/forms.py:1164 -#: archaeological_finds/models_finds.py:3423 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:1165 +#: archaeological_finds/models_finds.py:3158 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:223 #: archaeological_finds/templates/ishtar/sheet_find.html:391 @@ -441,38 +458,46 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3355 -#: ishtar_common/models_imports.py:1290 +#: archaeological_operations/models.py:3380 +#: ishtar_common/models_imports.py:1416 #: man_app/templates/ishtar/sheet_find.html:224 -#: man_app/templates/ishtar/sheet_find.html:404 -#: man_app/templates/ishtar/sheet_find.html:442 -#: man_app/templates/ishtar/sheet_find.html:480 -#: man_app/templates/ishtar/sheet_find.html:518 +#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:506 +#: na_app/templates/ishtar/sheet_find.html:235 +#: na_app/templates/ishtar/sheet_find.html:403 +#: na_app/templates/ishtar/sheet_find.html:441 +#: na_app/templates/ishtar/sheet_find.html:479 +#: na_app/templates/ishtar/sheet_find.html:517 msgid "End date" msgstr "" #: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1165 +#: archaeological_finds/forms.py:1166 #: archaeological_finds/templates/ishtar/sheet_find.html:225 #: man_app/templates/ishtar/sheet_find.html:226 +#: na_app/templates/ishtar/sheet_find.html:237 msgid "Quality" msgstr "" #: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1162 +#: archaeological_finds/forms.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:224 #: man_app/templates/ishtar/sheet_find.html:225 +#: na_app/templates/ishtar/sheet_find.html:236 msgid "Dating type" msgstr "" #: archaeological_context_records/forms.py:453 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1167 #: archaeological_finds/templates/ishtar/sheet_find.html:226 #: man_app/templates/ishtar/sheet_find.html:227 +#: na_app/templates/ishtar/sheet_find.html:238 msgid "Precise on dating" msgstr "" @@ -483,15 +508,15 @@ msgstr "" #: archaeological_context_records/forms.py:476 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1588 +#: archaeological_context_records/models.py:1478 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:716 archaeological_finds/forms.py:734 -#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1132 -#: archaeological_finds/models_finds.py:2456 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:987 +#: archaeological_finds/models_finds.py:2311 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2215 ishtar_common/models.py:5236 +#: ishtar_common/forms_common.py:2391 ishtar_common/models.py:5250 #: ishtar_common/views.py:503 msgid "Context record" msgstr "" @@ -500,7 +525,9 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:82 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 -#: archaeological_operations/templates/ishtar/sheet_operation.html:374 +#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:382 msgid "Relations" msgstr "" @@ -510,7 +537,7 @@ msgstr "" #: archaeological_context_records/forms.py:500 #: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/models.py:762 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:48 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" @@ -521,22 +548,22 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:515 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/models.py:764 msgid "TAQ" msgstr "" #: archaeological_context_records/forms.py:516 -#: archaeological_context_records/models.py:793 +#: archaeological_context_records/models.py:773 msgid "Estimated TAQ" msgstr "" #: archaeological_context_records/forms.py:517 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/models.py:779 msgid "TPQ" msgstr "" #: archaeological_context_records/forms.py:518 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/models.py:788 msgid "Estimated TPQ" msgstr "" @@ -545,8 +572,8 @@ msgid "Comments on dating" msgstr "" #: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:616 -#: archaeological_operations/forms.py:629 +#: archaeological_operations/forms.py:618 +#: archaeological_operations/forms.py:631 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" @@ -561,9 +588,9 @@ msgid "Would you like to delete this context record?" msgstr "" #: archaeological_context_records/forms.py:644 -#: archaeological_finds/forms.py:970 archaeological_finds/forms.py:995 -#: archaeological_operations/forms.py:1809 ishtar_common/forms_common.py:2382 -#: ishtar_common/models.py:3284 ishtar_common/models.py:3654 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:996 +#: archaeological_operations/forms.py:1814 ishtar_common/forms_common.py:2558 +#: ishtar_common/models.py:3294 ishtar_common/models.py:3668 msgid " - duplicate" msgstr "" @@ -572,9 +599,9 @@ msgid "Context record - Quick action - Modify" msgstr "" #: archaeological_context_records/forms.py:694 -#: archaeological_context_records/models.py:1351 -#: archaeological_context_records/models.py:1390 -#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1239 +#: archaeological_context_records/models.py:1278 +#: archaeological_context_records/models.py:1346 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" @@ -633,7 +660,6 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:46 #: archaeological_warehouse/ishtar_menu.py:80 ishtar_common/ishtar_menu.py:48 #: ishtar_common/ishtar_menu.py:115 ishtar_common/ishtar_menu.py:192 -#: ishtar_common/templates/ishtar/import_table.html:31 msgid "Creation" msgstr "" @@ -689,8 +715,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:937 -#: archaeological_finds/tests.py:1341 archaeological_finds/tests.py:1541 +#: archaeological_context_records/tests.py:935 +#: archaeological_finds/tests.py:1386 archaeological_finds/tests.py:1586 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -737,13 +763,14 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2073 -#: archaeological_finds/models_finds.py:3388 -#: archaeological_finds/models_finds.py:3410 +#: archaeological_finds/models_finds.py:1928 +#: archaeological_finds/models_finds.py:3123 +#: archaeological_finds/models_finds.py:3145 #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2231 ishtar_common/models.py:5237 +#: ishtar_common/forms_common.py:2407 ishtar_common/models.py:5251 #: ishtar_common/views.py:507 man_app/templates/ishtar/sheet_find.html:5 +#: na_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "" @@ -758,21 +785,22 @@ msgstr "" #: archaeological_finds/models_finds.py:255 #: archaeological_finds/models_finds.py:299 #: archaeological_finds/models_finds.py:370 -#: archaeological_finds/models_finds.py:1845 +#: archaeological_finds/models_finds.py:1700 #: archaeological_finds/models_treatments.py:66 #: archaeological_finds/models_treatments.py:752 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3381 +#: archaeological_operations/models.py:3406 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:734 -#: archaeological_warehouse/models.py:766 ishtar_common/models.py:673 -#: ishtar_common/models.py:729 ishtar_common/models.py:772 -#: ishtar_common/models.py:1807 ishtar_common/models.py:3663 -#: ishtar_common/models.py:5009 ishtar_common/models_common.py:2219 -#: ishtar_common/models_common.py:2255 ishtar_common/models_common.py:2272 -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:2302 +#: archaeological_warehouse/models.py:766 ishtar_common/models.py:684 +#: ishtar_common/models.py:740 ishtar_common/models.py:783 +#: ishtar_common/models.py:1817 ishtar_common/models.py:3677 +#: ishtar_common/models.py:5023 ishtar_common/models_common.py:2029 +#: ishtar_common/models_common.py:2065 ishtar_common/models_common.py:2082 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2112 +#: ishtar_common/models_imports.py:469 msgid "Order" msgstr "" @@ -813,7 +841,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:955 +#: ishtar_common/models_imports.py:1074 msgid "Documentation type" msgstr "" @@ -821,15 +849,15 @@ msgstr "" msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:511 -#: archaeological_context_records/models.py:512 -#: archaeological_context_records/models.py:1461 -#: archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1152 +#: archaeological_context_records/models.py:491 +#: archaeological_context_records/models.py:492 +#: archaeological_context_records/models.py:1351 +#: archaeological_finds/models_finds.py:1006 +#: archaeological_finds/models_finds.py:1007 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1124 -#: archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1126 +#: archaeological_operations/forms.py:1223 +#: archaeological_operations/forms.py:1341 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:495 @@ -840,169 +868,170 @@ msgstr "" msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:493 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:494 +#: archaeological_context_records/models.py:495 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:496 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:517 -#: archaeological_finds/models_finds.py:1137 +#: archaeological_context_records/models.py:497 +#: archaeological_finds/models_finds.py:992 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:498 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:501 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:538 -#: archaeological_finds/models_finds.py:1201 +#: archaeological_context_records/models.py:518 +#: archaeological_finds/models_finds.py:1056 #: archaeological_operations/models.py:317 #: archaeological_operations/models.py:994 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:539 -#: archaeological_finds/models_finds.py:1202 +#: archaeological_context_records/models.py:519 +#: archaeological_finds/models_finds.py:1057 #: archaeological_operations/models.py:318 #: archaeological_operations/models.py:995 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:558 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_context_records/tests.py:763 -#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1285 +#: archaeological_context_records/models.py:561 +#: archaeological_context_records/tests.py:761 +#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1140 #: archaeological_operations/models.py:379 #: archaeological_operations/models.py:1138 -#: archaeological_operations/tests.py:3052 -#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4120 +#: archaeological_operations/tests.py:3097 +#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4134 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:584 ishtar_common/models.py:4084 +#: archaeological_context_records/models.py:564 ishtar_common/models.py:4098 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:587 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1390 +#: archaeological_context_records/models.py:567 +#: archaeological_finds/models_finds.py:1505 archaeological_finds/tests.py:1435 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:591 +#: archaeological_context_records/models.py:571 #: archaeological_operations/models.py:1134 -#: archaeological_operations/models.py:2593 -#: archaeological_operations/tests.py:4540 +#: archaeological_operations/models.py:2599 +#: archaeological_operations/tests.py:4604 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:595 -#: archaeological_finds/models_finds.py:1293 +#: archaeological_context_records/models.py:575 +#: archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:599 -#: archaeological_context_records/models.py:664 -#: archaeological_finds/models_finds.py:1394 -#: archaeological_finds/models_finds.py:1766 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:644 +#: archaeological_finds/models_finds.py:1249 +#: archaeological_finds/models_finds.py:1621 #: archaeological_operations/models.py:414 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4076 -#: ishtar_common/models.py:4189 +#: archaeological_operations/models.py:440 ishtar_common/models.py:4090 +#: ishtar_common/models.py:4203 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:603 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1309 +#: archaeological_context_records/models.py:583 +#: archaeological_context_records/models.py:647 +#: archaeological_finds/models_finds.py:1164 #: archaeological_operations/models.py:1222 #: archaeological_operations/models.py:1287 -#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4112 -#: ishtar_common/models.py:4198 +#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4126 +#: ishtar_common/models.py:4212 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:607 -#: archaeological_context_records/tests.py:830 -#: archaeological_finds/models_finds.py:1332 +#: archaeological_context_records/models.py:587 +#: archaeological_context_records/tests.py:828 +#: archaeological_finds/models_finds.py:1187 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:611 +#: archaeological_context_records/models.py:591 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1180 -#: archaeological_operations/tests.py:3030 -#: archaeological_operations/tests.py:3068 -#: archaeological_operations/tests.py:3228 +#: archaeological_operations/tests.py:3075 +#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3252 +#: archaeological_operations/tests.py:3292 msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:615 -#: archaeological_context_records/tests.py:889 +#: archaeological_context_records/models.py:595 +#: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:618 +#: archaeological_context_records/models.py:598 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:621 +#: archaeological_context_records/models.py:601 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:625 +#: archaeological_context_records/models.py:605 #: archaeological_files/models.py:477 archaeological_operations/models.py:1144 -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2617 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:609 #: archaeological_operations/models.py:1241 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:632 -#: archaeological_context_records/tests.py:795 +#: archaeological_context_records/models.py:612 +#: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:636 +#: archaeological_context_records/models.py:616 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:682 -#: archaeological_finds/models_finds.py:1725 +#: archaeological_context_records/models.py:662 +#: archaeological_finds/models_finds.py:1580 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1270 #: archaeological_warehouse/models.py:342 @@ -1010,101 +1039,101 @@ msgstr "" msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:689 -#: archaeological_finds/models_finds.py:1718 +#: archaeological_context_records/models.py:669 +#: archaeological_finds/models_finds.py:1573 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1263 #: archaeological_warehouse/models.py:334 -#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2578 -#: ishtar_common/models.py:2855 ishtar_common/models.py:4215 +#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2588 +#: ishtar_common/models.py:2865 ishtar_common/models.py:4229 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:699 -#: archaeological_context_records/models.py:1147 +#: archaeological_context_records/models.py:679 +#: archaeological_context_records/models.py:1039 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:915 -#: archaeological_finds/models_finds.py:1735 -#: archaeological_finds/models_finds.py:2362 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:770 +#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:2217 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 #: archaeological_finds/views.py:1316 archaeological_operations/models.py:484 #: archaeological_operations/models.py:661 #: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:1917 +#: archaeological_operations/models.py:1923 #: archaeological_operations/views.py:886 #: archaeological_operations/views.py:901 #: archaeological_operations/views.py:908 #: archaeological_operations/views.py:925 ishtar_common/admin.py:1589 -#: ishtar_common/admin.py:1709 ishtar_common/models.py:4224 -#: ishtar_common/models.py:4571 ishtar_common/views.py:2722 -#: ishtar_common/views.py:2740 +#: ishtar_common/admin.py:1732 ishtar_common/models.py:4238 +#: ishtar_common/models.py:4585 ishtar_common/views.py:2985 +#: ishtar_common/views.py:3003 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:696 #: archaeological_files/models.py:540 archaeological_finds/models_finds.py:421 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1694 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:1110 -#: archaeological_operations/models.py:3064 +#: archaeological_operations/models.py:3070 #: archaeological_warehouse/models.py:396 -#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4250 +#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4264 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:718 +#: archaeological_context_records/models.py:698 #: archaeological_files/models.py:543 archaeological_finds/models_finds.py:423 -#: archaeological_finds/models_finds.py:1841 -#: archaeological_operations/models.py:3067 +#: archaeological_finds/models_finds.py:1696 +#: archaeological_operations/models.py:3073 #: archaeological_warehouse/models.py:398 #: archaeological_warehouse/models.py:1175 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:763 -#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3485 +#: archaeological_context_records/models.py:743 +#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3293 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/models.py:748 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:752 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:788 +#: archaeological_context_records/models.py:768 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:796 +#: archaeological_context_records/models.py:776 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:783 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:811 +#: archaeological_context_records/models.py:791 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:839 +#: archaeological_context_records/models.py:819 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:91 -#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:2034 +#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:1889 #: archaeological_finds/models_treatments.py:277 #: archaeological_finds/models_treatments.py:1160 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:534 #: archaeological_operations/models.py:1453 -#: archaeological_operations/models.py:2811 +#: archaeological_operations/models.py:2817 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:96 #: archaeological_warehouse/models.py:385 @@ -1112,136 +1141,141 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:193 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:984 ishtar_common/models.py:2360 -#: ishtar_common/models.py:3768 ishtar_common/models.py:3786 -#: ishtar_common/models.py:3815 ishtar_common/models.py:3829 -#: ishtar_common/models.py:3839 ishtar_common/models.py:4368 -#: ishtar_common/models.py:4379 ishtar_common/models_common.py:3513 +#: ishtar_common/models.py:995 ishtar_common/models.py:2370 +#: ishtar_common/models.py:3782 ishtar_common/models.py:3800 +#: ishtar_common/models.py:3829 ishtar_common/models.py:3843 +#: ishtar_common/models.py:3853 ishtar_common/models.py:4382 +#: ishtar_common/models.py:4393 ishtar_common/models_common.py:3321 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_find.html:67 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_find.html:65 +#: na_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:846 -#: archaeological_finds/models_finds.py:2040 +#: archaeological_context_records/models.py:826 +#: archaeological_finds/models_finds.py:1895 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1167 #: archaeological_operations/models.py:540 #: archaeological_operations/models.py:1459 -#: archaeological_operations/models.py:2818 +#: archaeological_operations/models.py:2824 #: archaeological_warehouse/models.py:392 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2366 -#: ishtar_common/models_common.py:3519 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2376 +#: ishtar_common/models_common.py:3327 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:851 -#: archaeological_finds/models_finds.py:2052 +#: archaeological_context_records/models.py:831 +#: archaeological_finds/models_finds.py:1907 #: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1542 +#: archaeological_operations/models.py:1548 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:854 -#: archaeological_context_records/models.py:860 -#: archaeological_finds/models_finds.py:2055 -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2067 +#: archaeological_context_records/models.py:834 +#: archaeological_context_records/models.py:840 +#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1922 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:554 #: archaeological_operations/models.py:560 #: archaeological_operations/models.py:1539 #: archaeological_operations/models.py:1545 #: archaeological_operations/models.py:1551 -#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4475 +#: archaeological_operations/models.py:1557 +#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4283 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:837 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:864 -#: archaeological_context_records/models.py:865 +#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:845 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:434 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/models.py:866 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:921 -#: archaeological_finds/models_finds.py:2234 +#: archaeological_context_records/models.py:901 +#: archaeological_finds/models_finds.py:2089 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1135 +#: archaeological_context_records/models.py:1027 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1137 +#: archaeological_context_records/models.py:1029 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1240 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1385 +#: archaeological_context_records/models.py:1273 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1386 +#: archaeological_context_records/models.py:1274 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1387 +#: archaeological_context_records/models.py:1275 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1388 +#: archaeological_context_records/models.py:1276 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1277 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1279 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1280 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1281 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1282 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:1283 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1402 +#: archaeological_context_records/models.py:1292 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1403 +#: archaeological_context_records/models.py:1293 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1594 +#: archaeological_context_records/models.py:1484 msgid "Context record parent" msgstr "" @@ -1277,6 +1311,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:40 #: archaeological_finds/templates/ishtar/sheet_find.html:48 #: man_app/templates/ishtar/sheet_find.html:50 +#: na_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "" @@ -1291,7 +1326,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:73 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:264 -#: archaeological_finds/forms.py:1763 archaeological_finds/models_finds.py:93 +#: archaeological_finds/forms.py:1764 archaeological_finds/models_finds.py:93 #: archaeological_finds/models_finds.py:107 #: archaeological_finds/models_finds.py:124 #: archaeological_finds/models_finds.py:235 @@ -1306,19 +1341,24 @@ msgstr "" #: archaeological_finds/models_finds.py:362 #: archaeological_finds/models_finds.py:376 #: archaeological_finds/models_finds.py:503 -#: archaeological_finds/models_finds.py:928 -#: archaeological_finds/models_finds.py:2074 -#: archaeological_finds/models_finds.py:2085 -#: archaeological_finds/models_finds.py:3431 +#: archaeological_finds/models_finds.py:783 +#: archaeological_finds/models_finds.py:1929 +#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/models_finds.py:3166 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 -#: archaeological_operations/templates/ishtar/sheet_operation.html:433 -#: archaeological_operations/templates/ishtar/sheet_operation.html:525 +#: archaeological_operations/templates/ishtar/sheet_operation.html:463 +#: archaeological_operations/templates/ishtar/sheet_operation.html:555 #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_container.html:235 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: na_app/templates/ishtar/sheet_container.html:195 +#: na_app/templates/ishtar/sheet_container.html:242 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:441 +#: na_app/templates/ishtar/sheet_operation.html:533 msgid "Finds" msgstr "" @@ -1332,7 +1372,11 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 #: man_app/templates/ishtar/sheet_find.html:76 -#: man_app/templates/ishtar/sheet_find.html:600 +#: man_app/templates/ishtar/sheet_find.html:546 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:74 +#: na_app/templates/ishtar/sheet_find.html:557 +#: na_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "" @@ -1340,6 +1384,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: man_app/templates/ishtar/sheet_find.html:85 +#: na_app/templates/ishtar/sheet_find.html:83 +#: na_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "" @@ -1350,8 +1396,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4478 +#: ishtar_common/models_common.py:4286 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_operation.html:138 msgid "Complete identifier" msgstr "" @@ -1361,6 +1410,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:212 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:212 msgid "Surface" msgstr "" @@ -1368,12 +1418,14 @@ msgstr "" #: archaeological_files/forms.py:286 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 -#: archaeological_operations/templates/ishtar/sheet_operation.html:292 +#: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:55 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:300 msgid "Geographic localisation" msgstr "" @@ -1382,10 +1434,12 @@ msgstr "" #: archaeological_finds/forms.py:719 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: archaeological_operations/templates/ishtar/sheet_operation.html:313 +#: archaeological_operations/templates/ishtar/sheet_operation.html:343 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: man_app/templates/ishtar/sheet_basefind.html:65 -#: man_app/templates/ishtar/sheet_find.html:270 +#: man_app/templates/ishtar/sheet_find.html:258 +#: na_app/templates/ishtar/sheet_find.html:269 +#: na_app/templates/ishtar/sheet_operation.html:321 msgid "Sheet" msgstr "" @@ -1394,7 +1448,8 @@ msgid "Operation summary" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:215 -#: archaeological_operations/templates/ishtar/sheet_operation.html:277 +#: archaeological_operations/templates/ishtar/sheet_operation.html:293 +#: na_app/templates/ishtar/sheet_operation.html:285 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -1411,30 +1466,37 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:424 #: archaeological_finds/templates/ishtar/sheet_find.html:462 #: archaeological_operations/templates/ishtar/sheet_operation.html:175 -#: ishtar_common/models.py:3359 ishtar_common/models.py:5128 -#: ishtar_common/models.py:5265 ishtar_common/models.py:5344 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2163 -#: ishtar_common/models_imports.py:1279 -#: man_app/templates/ishtar/sheet_find.html:399 -#: man_app/templates/ishtar/sheet_find.html:437 -#: man_app/templates/ishtar/sheet_find.html:475 +#: ishtar_common/models.py:3369 ishtar_common/models.py:5142 +#: ishtar_common/models.py:5279 ishtar_common/models.py:5358 +#: ishtar_common/models_common.py:1958 ishtar_common/models_common.py:1973 +#: ishtar_common/models_imports.py:1511 ishtar_common/models_imports.py:1908 +#: man_app/templates/ishtar/sheet_find.html:387 +#: man_app/templates/ishtar/sheet_find.html:425 +#: man_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:398 +#: na_app/templates/ishtar/sheet_find.html:436 +#: na_app/templates/ishtar/sheet_find.html:474 +#: na_app/templates/ishtar/sheet_operation.html:175 msgid "State" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:180 +#: na_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: na_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:206 +#: na_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "" @@ -1447,12 +1509,14 @@ msgid "No associated finds." msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:273 -#: archaeological_operations/templates/ishtar/sheet_operation.html:438 +#: archaeological_operations/templates/ishtar/sheet_operation.html:468 +#: na_app/templates/ishtar/sheet_operation.html:446 msgid "Documents from associated finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:286 -#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: archaeological_operations/templates/ishtar/sheet_operation.html:434 +#: na_app/templates/ishtar/sheet_operation.html:412 msgid "Context record relations" msgstr "" @@ -1485,7 +1549,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1906 +#: archaeological_operations/models.py:1912 msgid "Add context record" msgstr "" @@ -1522,7 +1586,7 @@ msgstr "" #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:387 archaeological_files/models.py:532 #: archaeological_files/templates/ishtar/sheet_file.html:217 -#: archaeological_finds/forms.py:1275 +#: archaeological_finds/forms.py:1276 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1530,20 +1594,20 @@ msgstr "" #: archaeological_finds/forms_treatments.py:644 #: archaeological_finds/forms_treatments.py:726 #: archaeological_finds/forms_treatments.py:840 -#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1038 #: archaeological_finds/models_treatments.py:202 #: archaeological_finds/models_treatments.py:1104 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:727 -#: archaeological_operations/forms.py:1428 -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/forms.py:1746 #: archaeological_operations/models.py:986 #: archaeological_operations/models.py:1363 -#: archaeological_operations/models.py:2561 -#: archaeological_operations/models.py:2790 -#: archaeological_operations/models.py:3054 +#: archaeological_operations/models.py:2567 +#: archaeological_operations/models.py:2796 +#: archaeological_operations/models.py:3060 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1117 msgid "Year" msgstr "" @@ -1555,22 +1619,22 @@ msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1121 -#: archaeological_operations/forms.py:1218 -#: archaeological_operations/forms.py:1333 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1507 +#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1123 +#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/forms.py:1512 #: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2799 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 #: archaeological_files/forms.py:1167 archaeological_files/models.py:1357 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/models.py:2433 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3493 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/models.py:2439 ishtar_common/models_common.py:1981 +#: ishtar_common/models_common.py:3301 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1608,30 +1672,30 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:616 #: archaeological_files/forms.py:664 archaeological_files/models.py:648 #: archaeological_finds/forms.py:336 archaeological_finds/forms.py:586 -#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2017 +#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1414 archaeological_finds/forms.py:2018 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:427 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1827 #: archaeological_finds/models_treatments.py:259 #: archaeological_finds/models_treatments.py:1156 #: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:741 -#: archaeological_operations/forms.py:1226 -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1444 -#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1352 +#: archaeological_operations/forms.py:1449 +#: archaeological_operations/forms.py:1511 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1448 -#: archaeological_operations/models.py:2807 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:375 -#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:1866 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2715 -#: ishtar_common/models.py:2893 ishtar_common/models.py:3547 -#: ishtar_common/models.py:4351 ishtar_common/models_common.py:183 -#: ishtar_common/models_common.py:2399 ishtar_common/models_imports.py:764 +#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:2043 +#: ishtar_common/forms_common.py:2348 ishtar_common/forms_common.py:2896 +#: ishtar_common/models.py:2903 ishtar_common/models.py:3561 +#: ishtar_common/models.py:4365 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2209 ishtar_common/models_imports.py:883 #: 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 @@ -1657,7 +1721,7 @@ msgstr "" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1446 ishtar_common/forms.py:931 +#: archaeological_operations/forms.py:1451 ishtar_common/forms.py:951 msgid "Created by" msgstr "" @@ -1665,7 +1729,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1457 msgid "Modified by" msgstr "" @@ -1679,9 +1743,9 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:615 #: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:1861 -#: ishtar_common/forms_common.py:2341 ishtar_common/models.py:4336 -#: ishtar_common/models_imports.py:1287 +#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:2038 +#: ishtar_common/forms_common.py:2517 ishtar_common/models.py:4350 +#: ishtar_common/models_imports.py:1413 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1691,7 +1755,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1146 #: archaeological_finds/templates/ishtar/sheet_find.html:504 -#: man_app/templates/ishtar/sheet_find.html:517 +#: man_app/templates/ishtar/sheet_find.html:505 +#: na_app/templates/ishtar/sheet_find.html:516 msgid "Reception date" msgstr "" @@ -1721,28 +1786,29 @@ msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 #: archaeological_files/models.py:454 archaeological_files/models.py:612 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/forms.py:1034 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1055 -#: archaeological_operations/forms.py:1383 +#: archaeological_operations/forms.py:723 +#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1057 +#: archaeological_operations/forms.py:1388 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1071 #: archaeological_operations/models.py:1073 #: archaeological_operations/models.py:1384 -#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:2808 #: archaeological_operations/templates/ishtar/sheet_operation.html:146 -#: ishtar_common/forms_common.py:1513 ishtar_common/forms_common.py:1526 -#: ishtar_common/forms_common.py:1527 ishtar_common/models.py:2347 -#: ishtar_common/models_common.py:3527 +#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:1703 +#: ishtar_common/forms_common.py:1704 ishtar_common/models.py:2357 +#: ishtar_common/models_common.py:3335 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: na_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:651 -#: archaeological_operations/models.py:2796 ishtar_common/models_common.py:2172 +#: archaeological_operations/models.py:2802 ishtar_common/models_common.py:1982 msgid "Departments" msgstr "" @@ -1764,8 +1830,8 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:598 -#: ishtar_common/forms_common.py:985 ishtar_common/models_common.py:3769 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:774 +#: ishtar_common/forms_common.py:1163 ishtar_common/models_common.py:3577 msgid "Postal code" msgstr "" @@ -1781,8 +1847,8 @@ msgstr "" #: archaeological_files/forms.py:326 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:981 -#: ishtar_common/models_common.py:3764 ishtar_common/models_common.py:3950 +#: ishtar_common/forms_common.py:770 ishtar_common/forms_common.py:1159 +#: ishtar_common/models_common.py:3572 ishtar_common/models_common.py:3758 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -1848,7 +1914,7 @@ msgstr "" #: archaeological_files/forms.py:596 archaeological_files/models.py:675 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2747 +#: archaeological_operations/models.py:2753 msgid "Scientist in charge" msgstr "" @@ -1900,7 +1966,7 @@ msgstr "" msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:1925 +#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2102 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "" @@ -2007,10 +2073,11 @@ msgstr "" #: archaeological_finds/models_treatments.py:203 #: archaeological_finds/models_treatments.py:1105 #: archaeological_finds/templates/ishtar/sheet_find.html:358 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1562 -#: archaeological_operations/models.py:2732 ishtar_common/admin.py:573 -#: ishtar_common/models.py:4249 man_app/templates/ishtar/sheet_find.html:371 +#: archaeological_operations/forms.py:1434 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/models.py:2738 ishtar_common/admin.py:573 +#: ishtar_common/models.py:4263 man_app/templates/ishtar/sheet_find.html:359 +#: na_app/templates/ishtar/sheet_find.html:370 msgid "Index" msgstr "" @@ -2020,10 +2087,11 @@ msgstr "" #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2463 -#: archaeological_operations/models.py:2722 ishtar_common/models_imports.py:950 +#: archaeological_operations/forms.py:1440 +#: archaeological_operations/forms.py:1501 +#: archaeological_operations/models.py:2469 +#: archaeological_operations/models.py:2728 +#: ishtar_common/models_imports.py:1069 msgid "Act type" msgstr "" @@ -2034,17 +2102,17 @@ msgstr "" #: archaeological_files/forms.py:1162 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1436 -#: archaeological_operations/forms.py:1632 +#: archaeological_operations/forms.py:1441 +#: archaeological_operations/forms.py:1637 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1169 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1442 -#: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1508 +#: archaeological_operations/models.py:2797 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2088,12 +2156,12 @@ msgstr "" #: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:751 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:220 archaeological_files/wizards.py:232 -#: archaeological_operations/forms.py:673 -#: archaeological_operations/forms.py:933 -#: archaeological_operations/models.py:1926 -#: archaeological_operations/models.py:2446 -#: archaeological_operations/models.py:2562 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/forms.py:675 +#: archaeological_operations/forms.py:935 +#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2776 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:498 msgid "Archaeological file" msgstr "" @@ -2106,9 +2174,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:3413 +#: archaeological_finds/models_finds.py:3148 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2827 +#: archaeological_operations/models.py:2833 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2119,7 +2187,8 @@ msgstr "" #: archaeological_files/models.py:353 archaeological_files/models.py:1403 #: archaeological_files/models.py:1420 archaeological_files/models.py:1445 #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: ishtar_common/models.py:5067 +#: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: ishtar_common/models.py:5081 msgid "Preventive" msgstr "" @@ -2185,6 +2254,7 @@ msgstr "" #: archaeological_files/models.py:187 #: archaeological_operations/templates/ishtar/sheet_operation.html:229 +#: na_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "" @@ -2205,12 +2275,12 @@ msgid "Equipment/Service" msgstr "" #: archaeological_files/models.py:212 archaeological_warehouse/forms.py:207 -#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:174 -#: ishtar_common/models_common.py:205 +#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:176 +#: ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:216 ishtar_common/models_common.py:178 +#: archaeological_files/models.py:216 ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2228,7 +2298,7 @@ msgstr "" msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:227 ishtar_common/models_imports.py:951 +#: archaeological_files/models.py:227 ishtar_common/models_imports.py:1070 msgid "Unit" msgstr "" @@ -2240,16 +2310,16 @@ msgstr "" msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:235 ishtar_common/models.py:1630 -#: ishtar_common/models.py:2047 ishtar_common/models.py:3558 -#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:193 -#: ishtar_common/models_imports.py:826 +#: archaeological_files/models.py:235 ishtar_common/models.py:1640 +#: ishtar_common/models.py:2057 ishtar_common/models.py:3572 +#: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:203 +#: ishtar_common/models_imports.py:436 ishtar_common/models_imports.py:945 msgid "Available" msgstr "" #: archaeological_files/models.py:241 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1135 ishtar_common/models.py:2354 -#: ishtar_common/models_common.py:716 +#: ishtar_common/admin.py:1135 ishtar_common/models.py:2364 +#: ishtar_common/models_common.py:718 msgid "Parent" msgstr "" @@ -2309,30 +2379,36 @@ msgstr "" msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1184 +#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1039 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:987 ishtar_common/admin.py:1318 -#: ishtar_common/forms_common.py:2248 ishtar_common/models.py:2372 +#: ishtar_common/forms_common.py:2424 ishtar_common/models.py:2382 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1187 +#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1042 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:988 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1208 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 -#: ishtar_common/models.py:1931 ishtar_common/models_common.py:749 -#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2160 +#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1063 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 +#: ishtar_common/models.py:1941 ishtar_common/models_common.py:751 +#: ishtar_common/models_common.py:1954 ishtar_common/models_common.py:1970 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: na_app/templates/ishtar/sheet_operation.html:551 +#: na_app/templates/ishtar/sheet_operation.html:561 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Number" msgstr "" @@ -2344,13 +2420,13 @@ msgstr "" msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1289 +#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:157 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1125 -#: archaeological_operations/models.py:2586 -#: archaeological_operations/tests.py:3036 -#: archaeological_operations/tests.py:3128 +#: archaeological_operations/models.py:2592 +#: archaeological_operations/tests.py:3081 +#: archaeological_operations/tests.py:3173 msgctxt "key for text search" msgid "year" msgstr "" @@ -2358,7 +2434,7 @@ msgstr "" #: archaeological_files/models.py:467 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:363 -#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4006 +#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4020 msgctxt "key for text search" msgid "reference" msgstr "" @@ -2379,9 +2455,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:366 #: archaeological_operations/models.py:1152 -#: archaeological_operations/tests.py:3172 -#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2564 -#: ishtar_common/models.py:2821 ishtar_common/models.py:3408 +#: archaeological_operations/tests.py:3217 +#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2574 +#: ishtar_common/models.py:2831 ishtar_common/models.py:3418 msgctxt "key for text search" msgid "name" msgstr "" @@ -2390,12 +2466,12 @@ msgstr "" #: archaeological_finds/models_treatments.py:160 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1158 -#: archaeological_operations/models.py:2597 -#: archaeological_operations/tests.py:3185 +#: archaeological_operations/models.py:2603 +#: archaeological_operations/tests.py:3230 #: archaeological_warehouse/models.py:320 -#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2567 -#: ishtar_common/models.py:2836 ishtar_common/models.py:3419 -#: ishtar_common/models.py:4002 +#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2577 +#: ishtar_common/models.py:2846 ishtar_common/models.py:3429 +#: ishtar_common/models.py:4016 msgctxt "key for text search" msgid "type" msgstr "" @@ -2420,35 +2496,35 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1487 +#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1342 #: archaeological_operations/models.py:385 #: archaeological_operations/models.py:1200 -#: archaeological_operations/models.py:2707 -#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4066 +#: archaeological_operations/models.py:2713 +#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4080 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1493 #: archaeological_finds/models_treatments.py:1065 -#: archaeological_finds/tests.py:1435 +#: archaeological_finds/tests.py:1480 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:513 archaeological_operations/models.py:2642 +#: archaeological_files/models.py:513 archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2646 +#: archaeological_files/models.py:517 archaeological_operations/models.py:2652 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:537 #: archaeological_finds/models_treatments.py:1107 -#: ishtar_common/forms_common.py:1853 ishtar_common/forms_common.py:2135 +#: ishtar_common/forms_common.py:2030 ishtar_common/forms_common.py:2312 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" @@ -2459,34 +2535,34 @@ msgstr "" #: archaeological_finds/models_treatments.py:1112 #: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1120 -#: archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1797 +#: archaeological_operations/forms.py:1122 +#: archaeological_operations/forms.py:1220 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1802 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 -#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:644 ishtar_common/forms_common.py:822 -#: ishtar_common/forms_common.py:953 ishtar_common/forms_common.py:1048 -#: ishtar_common/forms_common.py:1300 ishtar_common/forms_common.py:1353 -#: ishtar_common/forms_common.py:2685 ishtar_common/models.py:672 -#: ishtar_common/models.py:712 ishtar_common/models.py:1030 -#: ishtar_common/models.py:1628 ishtar_common/models.py:2017 -#: ishtar_common/models.py:2588 ishtar_common/models.py:2888 -#: ishtar_common/models.py:3216 ishtar_common/models.py:3353 -#: ishtar_common/models.py:5103 ishtar_common/models_common.py:2367 -#: ishtar_common/models_common.py:3484 ishtar_common/models_common.py:3545 -#: ishtar_common/models_imports.py:115 ishtar_common/models_imports.py:150 -#: ishtar_common/models_imports.py:680 ishtar_common/models_imports.py:698 -#: ishtar_common/models_imports.py:821 ishtar_common/models_imports.py:1199 -#: ishtar_common/models_rest.py:110 +#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:822 ishtar_common/forms_common.py:1000 +#: ishtar_common/forms_common.py:1131 ishtar_common/forms_common.py:1226 +#: ishtar_common/forms_common.py:1480 ishtar_common/forms_common.py:1530 +#: ishtar_common/forms_common.py:2861 ishtar_common/models.py:683 +#: ishtar_common/models.py:723 ishtar_common/models.py:1041 +#: ishtar_common/models.py:1638 ishtar_common/models.py:2027 +#: ishtar_common/models.py:2598 ishtar_common/models.py:2898 +#: ishtar_common/models.py:3226 ishtar_common/models.py:3363 +#: ishtar_common/models.py:5117 ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:3292 ishtar_common/models_common.py:3353 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:154 +#: ishtar_common/models_imports.py:431 ishtar_common/models_imports.py:799 +#: ishtar_common/models_imports.py:817 ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:1368 ishtar_common/models_rest.py:110 #: 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 +#: ishtar_common/templates/ishtar/import_table.html:55 #: ishtar_common/templates/ishtar/merge_organization.html:9 #: ishtar_common/templates/ishtar/merge_organization.html:20 #: ishtar_common/templates/ishtar/merge_person.html:10 @@ -2495,7 +2571,9 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 #: ishtar_common/templates/ishtar/sheet_town.html:63 -#: man_app/templates/ishtar/sheet_find.html:513 +#: man_app/templates/ishtar/sheet_find.html:501 +#: na_app/templates/ishtar/sheet_find.html:512 +#: na_app/templates/ishtar/sheet_operation.html:153 msgid "Name" msgstr "" @@ -2503,7 +2581,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1121 #: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:363 -#: man_app/templates/ishtar/sheet_find.html:514 +#: man_app/templates/ishtar/sheet_find.html:502 +#: na_app/templates/ishtar/sheet_find.html:513 msgid "Person in charge" msgstr "" @@ -2544,10 +2623,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:250 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:372 -#: ishtar_common/forms_common.py:577 ishtar_common/forms_common.py:829 -#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:1053 -#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2608 -#: ishtar_common/models.py:2816 ishtar_common/models.py:3397 +#: ishtar_common/forms_common.py:753 ishtar_common/forms_common.py:1007 +#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1231 +#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2618 +#: ishtar_common/models.py:2826 ishtar_common/models.py:3407 #: ishtar_common/templates/ishtar/merge_person.html:11 #: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 @@ -2591,11 +2670,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1251 archaeological_operations/models.py:1884 +#: archaeological_files/models.py:1251 archaeological_operations/models.py:1890 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1253 archaeological_operations/models.py:1886 +#: archaeological_files/models.py:1253 archaeological_operations/models.py:1892 msgid "parcels" msgstr "" @@ -2629,7 +2708,7 @@ msgid "operation" msgstr "" #: archaeological_files/models.py:1354 archaeological_operations/models.py:1368 -#: archaeological_operations/models.py:3041 +#: archaeological_operations/models.py:3047 msgid "File" msgstr "" @@ -2719,7 +2798,8 @@ msgid "Developed surface" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:181 -#: archaeological_operations/templates/ishtar/sheet_operation.html:345 +#: archaeological_operations/templates/ishtar/sheet_operation.html:375 +#: na_app/templates/ishtar/sheet_operation.html:353 msgid "Associated parcels" msgstr "" @@ -2727,9 +2807,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2828 -#: archaeological_operations/templates/ishtar/sheet_operation.html:350 -#: archaeological_operations/templates/ishtar/sheet_operation.html:487 +#: archaeological_operations/models.py:2834 +#: archaeological_operations/templates/ishtar/sheet_operation.html:380 +#: archaeological_operations/templates/ishtar/sheet_operation.html:517 +#: na_app/templates/ishtar/sheet_operation.html:358 +#: na_app/templates/ishtar/sheet_operation.html:495 msgid "Administrative acts" msgstr "" @@ -2740,12 +2822,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2560 -#: archaeological_operations/models.py:2863 +#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2869 #: 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/models.py:733 ishtar_common/models.py:4251 +#: archaeological_warehouse/models.py:733 ishtar_common/models.py:4265 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" @@ -2760,34 +2842,40 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 #: archaeological_warehouse/models.py:293 -#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:645 -#: ishtar_common/forms_common.py:827 ishtar_common/forms_common.py:1051 -#: ishtar_common/forms_common.py:1298 ishtar_common/forms_common.py:1727 -#: ishtar_common/forms_common.py:2133 ishtar_common/forms_common.py:2366 -#: ishtar_common/forms_common.py:3007 ishtar_common/models.py:727 -#: ishtar_common/models.py:2590 ishtar_common/models.py:3965 -#: ishtar_common/models.py:4255 ishtar_common/models_imports.py:156 -#: ishtar_common/models_imports.py:997 +#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:823 +#: ishtar_common/forms_common.py:1005 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1478 ishtar_common/forms_common.py:1904 +#: ishtar_common/forms_common.py:2310 ishtar_common/forms_common.py:2542 +#: ishtar_common/forms_common.py:3209 ishtar_common/models.py:738 +#: ishtar_common/models.py:2600 ishtar_common/models.py:3979 +#: ishtar_common/models.py:4269 ishtar_common/models_imports.py:160 +#: ishtar_common/models_imports.py:1116 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 -#: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/import_table.html:56 #: ishtar_common/templates/ishtar/merge_organization.html:10 #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: man_app/templates/ishtar/sheet_find.html:398 -#: man_app/templates/ishtar/sheet_find.html:436 -#: man_app/templates/ishtar/sheet_find.html:474 -#: man_app/templates/ishtar/sheet_find.html:512 +#: man_app/templates/ishtar/sheet_find.html:386 +#: man_app/templates/ishtar/sheet_find.html:424 +#: man_app/templates/ishtar/sheet_find.html:462 +#: man_app/templates/ishtar/sheet_find.html:500 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:435 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:511 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Type" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 -#: archaeological_operations/forms.py:783 +#: archaeological_operations/forms.py:785 #: archaeological_operations/models.py:1328 msgid "Excavation end date" msgstr "" @@ -2802,8 +2890,8 @@ 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:696 -#: ishtar_common/models_imports.py:996 +#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:707 +#: ishtar_common/models_imports.py:1115 msgid "Date" msgstr "" @@ -2836,6 +2924,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:393 #: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/sheet_operation.html:220 +#: na_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" @@ -2846,7 +2935,9 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:269 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 -#: ishtar_common/models.py:1924 ishtar_common/models.py:1956 +#: ishtar_common/models.py:1934 ishtar_common/models.py:1966 +#: na_app/templates/ishtar/sheet_container.html:252 +#: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" @@ -2951,185 +3042,187 @@ msgid "Simple find - 020 - General" msgstr "" #: archaeological_finds/forms.py:276 archaeological_finds/forms.py:544 -#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:956 -#: archaeological_finds/forms.py:1263 archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:957 +#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1904 #: archaeological_finds/models_finds.py:420 -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1701 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:546 -#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:958 -#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1970 -#: archaeological_finds/models_finds.py:1847 +#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:959 +#: archaeological_finds/forms.py:1265 archaeological_finds/forms.py:1971 +#: archaeological_finds/models_finds.py:1702 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:1265 archaeological_finds/models_finds.py:1974 +#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:1829 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:752 -#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1848 +#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1703 msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1849 +#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1704 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:754 -#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:1844 +#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1699 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:755 -#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1971 +#: archaeological_finds/forms.py:1271 archaeological_finds/models_finds.py:1826 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:2031 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1886 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:553 -#: archaeological_finds/forms.py:1376 archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:1377 archaeological_finds/models_finds.py:1769 msgid "Is complete?" msgstr "" #: archaeological_finds/forms.py:300 archaeological_finds/forms.py:556 #: archaeological_finds/forms.py:767 archaeological_finds/models_finds.py:91 -#: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1008 +#: archaeological_finds/models_finds.py:1009 +#: archaeological_finds/models_finds.py:1712 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:559 -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1861 -#: ishtar_common/models_imports.py:975 +#: archaeological_finds/forms.py:1386 archaeological_finds/models_finds.py:1716 +#: ishtar_common/models_imports.py:1094 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1387 -#: archaeological_finds/models_finds.py:1868 +#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1388 +#: archaeological_finds/models_finds.py:1723 msgid "Comment on the material" msgstr "" #: archaeological_finds/forms.py:309 archaeological_finds/forms.py:562 #: archaeological_finds/forms.py:770 archaeological_finds/models_finds.py:271 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1010 +#: archaeological_finds/models_finds.py:1011 +#: archaeological_finds/models_finds.py:1771 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:566 -#: archaeological_finds/forms.py:1394 archaeological_finds/models_finds.py:1920 +#: archaeological_finds/forms.py:1395 archaeological_finds/models_finds.py:1775 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:316 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1396 archaeological_finds/models_finds.py:286 +#: archaeological_finds/forms.py:1397 archaeological_finds/models_finds.py:286 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:568 -#: archaeological_finds/forms.py:1403 archaeological_finds/forms.py:1909 -#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/forms.py:1404 archaeological_finds/forms.py:1910 +#: archaeological_finds/models_finds.py:1730 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:570 -#: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1951 +#: archaeological_finds/forms.py:1406 archaeological_finds/models_finds.py:1806 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:574 -#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1851 +#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1706 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:577 -#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1852 +#: archaeological_finds/forms.py:1411 archaeological_finds/models_finds.py:1707 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:580 -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1408 -#: archaeological_finds/models_finds.py:1854 +#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1409 +#: archaeological_finds/models_finds.py:1709 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:583 -#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1412 -#: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:1946 +#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1413 +#: archaeological_finds/models_finds.py:1051 +#: archaeological_finds/models_finds.py:1801 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1416 -#: archaeological_finds/models_finds.py:1896 -#: archaeological_operations/forms.py:1223 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1417 +#: archaeological_finds/models_finds.py:1751 +#: archaeological_operations/forms.py:1226 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:589 -#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1418 -#: archaeological_finds/models_finds.py:1973 +#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1419 +#: archaeological_finds/models_finds.py:1828 msgid "Comment on dating" msgstr "" #: archaeological_finds/forms.py:345 archaeological_finds/forms.py:592 -#: archaeological_finds/forms.py:1217 +#: archaeological_finds/forms.py:1218 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: man_app/templates/ishtar/sheet_find.html:194 +#: na_app/templates/ishtar/sheet_find.html:205 msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:593 -#: archaeological_finds/models_finds.py:1953 +#: archaeological_finds/models_finds.py:1808 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:594 -#: archaeological_finds/models_finds.py:1954 +#: archaeological_finds/models_finds.py:1809 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:595 -#: archaeological_finds/models_finds.py:1955 +#: archaeological_finds/models_finds.py:1810 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:598 -#: archaeological_finds/models_finds.py:1958 +#: archaeological_finds/models_finds.py:1813 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:596 -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1811 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:597 -#: archaeological_finds/models_finds.py:1957 +#: archaeological_finds/models_finds.py:1812 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:599 -#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1870 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:1725 #: archaeological_warehouse/models.py:731 msgid "Volume (l)" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:600 -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1909 #: archaeological_finds/templates/ishtar/sheet_find.html:202 #: man_app/templates/ishtar/sheet_find.html:203 +#: na_app/templates/ishtar/sheet_find.html:214 msgid "Weight (g)" msgstr "" @@ -3146,19 +3239,19 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:611 -#: archaeological_finds/forms.py:1489 archaeological_finds/models_finds.py:1969 +#: archaeological_finds/forms.py:1490 archaeological_finds/models_finds.py:1824 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:615 -#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1494 -#: archaeological_finds/models_finds.py:1197 -#: archaeological_finds/models_finds.py:1978 +#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1495 +#: archaeological_finds/models_finds.py:1052 +#: archaeological_finds/models_finds.py:1833 msgid "Check" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:617 -#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1838 msgid "Check date" msgstr "" @@ -3171,7 +3264,7 @@ msgid "Find - 020 - General" msgstr "" #: archaeological_finds/forms.py:497 archaeological_finds/forms.py:750 -#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:425 +#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:425 msgid "Excavation ID" msgstr "" @@ -3187,7 +3280,7 @@ msgstr "" msgid "Discovery date (end)" msgstr "" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1375 +#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1376 #: archaeological_finds/models_finds.py:445 msgid "Batch/object" msgstr "" @@ -3196,12 +3289,12 @@ msgstr "" msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1492 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1493 #: archaeological_finds/models_finds.py:453 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1900 +#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1901 msgid "Resulting find" msgstr "" @@ -3209,7 +3302,7 @@ msgstr "" msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1915 +#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1916 msgid "Resulting finds" msgstr "" @@ -3239,12 +3332,12 @@ msgstr "" msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:936 -#: archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:937 +#: archaeological_finds/forms.py:1004 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1012 +#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1013 msgid "Find - Quick action - Modify" msgstr "" @@ -3252,56 +3345,57 @@ msgstr "" msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1065 -#: archaeological_finds/forms.py:1245 +#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1246 #: archaeological_finds/templates/ishtar/sheet_find.html:279 -#: man_app/templates/ishtar/sheet_find.html:292 +#: man_app/templates/ishtar/sheet_find.html:280 +#: na_app/templates/ishtar/sheet_find.html:291 msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1503 archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1101 +#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1053 +#: archaeological_finds/models_finds.py:1868 #: archaeological_warehouse/forms.py:586 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1106 -#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1199 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1107 +#: archaeological_finds/forms.py:1505 archaeological_finds/models_finds.py:1054 +#: archaeological_finds/models_finds.py:1872 #: archaeological_warehouse/forms.py:587 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1097 -#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1193 -#: archaeological_finds/models_finds.py:1998 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:959 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1502 archaeological_finds/models_finds.py:1048 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1078 msgid "Conservatory state" msgstr "" -#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1118 -#: archaeological_finds/forms.py:1508 archaeological_finds/models_finds.py:1200 -#: archaeological_finds/models_finds.py:2023 +#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1119 +#: archaeological_finds/forms.py:1509 archaeological_finds/models_finds.py:1055 +#: archaeological_finds/models_finds.py:1878 #: archaeological_warehouse/forms.py:591 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1091 -#: archaeological_finds/forms.py:1500 archaeological_finds/models_finds.py:1195 -#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1092 +#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1050 +#: archaeological_finds/models_finds.py:1795 #: archaeological_warehouse/forms.py:584 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1123 -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1124 +#: archaeological_finds/models_finds.py:1884 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1121 -#: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2028 +#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1122 +#: archaeological_finds/models_finds.py:1066 +#: archaeological_finds/models_finds.py:1883 msgid "Insurance value" msgstr "" @@ -3309,406 +3403,410 @@ msgstr "" msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:879 +#: archaeological_finds/forms.py:880 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:899 archaeological_finds/forms.py:1355 -#: archaeological_finds/forms.py:2119 archaeological_finds/forms.py:2124 -#: archaeological_finds/forms.py:2141 archaeological_finds/forms.py:2146 +#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1356 +#: archaeological_finds/forms.py:2120 archaeological_finds/forms.py:2125 +#: archaeological_finds/forms.py:2142 archaeological_finds/forms.py:2147 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:922 -#: archaeological_finds/models_finds.py:1742 +#: archaeological_finds/models_finds.py:777 +#: archaeological_finds/models_finds.py:1597 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:922 +#: archaeological_finds/forms.py:923 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:929 +#: archaeological_finds/forms.py:930 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:933 archaeological_finds/forms.py:1000 +#: archaeological_finds/forms.py:934 archaeological_finds/forms.py:1001 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1022 archaeological_finds/forms.py:2015 -#: ishtar_common/models.py:1031 ishtar_common/models.py:2018 -#: ishtar_common/models.py:3548 ishtar_common/models_imports.py:151 -#: ishtar_common/models_imports.py:699 +#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: ishtar_common/models.py:1042 ishtar_common/models.py:2028 +#: ishtar_common/models.py:3562 ishtar_common/models_imports.py:155 +#: ishtar_common/models_imports.py:432 ishtar_common/models_imports.py:818 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: archaeological_finds/forms.py:1024 archaeological_finds/forms.py:2017 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1028 archaeological_finds/forms.py:2021 -#: archaeological_finds/forms.py:2063 ishtar_common/models.py:3561 +#: archaeological_finds/forms.py:1029 archaeological_finds/forms.py:2022 +#: archaeological_finds/forms.py:2064 ishtar_common/models.py:3575 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1035 archaeological_finds/forms.py:2028 -#: archaeological_finds/forms.py:2070 ishtar_common/models.py:3567 +#: archaeological_finds/forms.py:1036 archaeological_finds/forms.py:2029 +#: archaeological_finds/forms.py:2071 ishtar_common/models.py:3581 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1067 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1085 archaeological_finds/forms.py:1499 -#: archaeological_finds/models_finds.py:1194 -#: archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1500 +#: archaeological_finds/models_finds.py:1049 +#: archaeological_finds/models_finds.py:1789 #: archaeological_warehouse/forms.py:583 msgid "Integrity / interest" msgstr "" -#: archaeological_finds/forms.py:1112 archaeological_finds/forms.py:1506 -#: archaeological_finds/models_finds.py:1192 -#: archaeological_finds/models_finds.py:2008 +#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1507 +#: archaeological_finds/models_finds.py:1047 +#: archaeological_finds/models_finds.py:1863 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1120 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:1984 +#: archaeological_finds/forms.py:1121 archaeological_finds/models_finds.py:1065 +#: archaeological_finds/models_finds.py:1839 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1126 archaeological_finds/forms.py:1502 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1503 +#: archaeological_finds/models_finds.py:1859 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1176 +#: archaeological_finds/forms.py:1177 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1182 +#: archaeological_finds/forms.py:1183 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1186 +#: archaeological_finds/forms.py:1187 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1208 +#: archaeological_finds/forms.py:1209 #: archaeological_finds/templates/ishtar/sheet_basefind.html:26 #: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "" -#: archaeological_finds/forms.py:1272 archaeological_finds/models_finds.py:1133 +#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:988 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:1134 +#: archaeological_finds/forms.py:1274 archaeological_finds/models_finds.py:989 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1277 +#: archaeological_finds/forms.py:1278 msgid "Operation - number (index by year)" msgstr "" -#: archaeological_finds/forms.py:1280 +#: archaeological_finds/forms.py:1281 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1283 +#: archaeological_finds/forms.py:1284 msgid "Operation - Type" msgstr "" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1287 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1289 +#: archaeological_finds/forms.py:1290 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1300 +#: archaeological_finds/forms.py:1301 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1303 +#: archaeological_finds/forms.py:1304 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1308 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1310 +#: archaeological_finds/forms.py:1311 msgid "Operation - Remains" msgstr "" -#: archaeological_finds/forms.py:1313 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1225 ishtar_common/forms_common.py:1299 -#: ishtar_common/models.py:2373 ishtar_common/models.py:3221 +#: archaeological_finds/forms.py:1314 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1228 ishtar_common/forms_common.py:1479 +#: ishtar_common/models.py:2383 ishtar_common/models.py:3231 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1316 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1317 archaeological_warehouse/forms.py:530 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1324 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1325 archaeological_warehouse/forms.py:538 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1327 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1328 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1335 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1336 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1338 +#: archaeological_finds/forms.py:1339 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1352 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1364 +#: archaeological_finds/forms.py:1365 msgid "Discovery date (exact or beginning) after" msgstr "" -#: archaeological_finds/forms.py:1367 +#: archaeological_finds/forms.py:1368 msgid "Discovery date (exact or beginning) before" msgstr "" -#: archaeological_finds/forms.py:1370 +#: archaeological_finds/forms.py:1371 msgid "Discovery date (end) after" msgstr "" -#: archaeological_finds/forms.py:1373 +#: archaeological_finds/forms.py:1374 msgid "Discovery date (end) before" msgstr "" -#: archaeological_finds/forms.py:1378 archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1379 archaeological_finds/forms.py:1907 #: archaeological_finds/models_finds.py:90 -#: archaeological_finds/models_finds.py:1190 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 +#: archaeological_finds/models_finds.py:1045 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 #: archaeological_warehouse/forms.py:572 +#: na_app/templates/ishtar/sheet_operation.html:541 msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1389 archaeological_finds/models_finds.py:270 -#: archaeological_finds/models_finds.py:1191 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:968 +#: archaeological_finds/forms.py:1390 archaeological_finds/models_finds.py:270 +#: archaeological_finds/models_finds.py:1046 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:1087 +#: na_app/templates/ishtar/sheet_operation.html:551 msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1421 +#: archaeological_finds/forms.py:1422 msgid "Length - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1424 +#: archaeological_finds/forms.py:1425 msgid "Length - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1427 +#: archaeological_finds/forms.py:1428 msgid "Width - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1430 +#: archaeological_finds/forms.py:1431 msgid "Width - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1433 +#: archaeological_finds/forms.py:1434 msgid "Height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1436 +#: archaeological_finds/forms.py:1437 msgid "Height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1439 +#: archaeological_finds/forms.py:1440 msgid "Thickness - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1442 +#: archaeological_finds/forms.py:1443 msgid "Thickness - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1445 +#: archaeological_finds/forms.py:1446 msgid "Diameter - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1448 +#: archaeological_finds/forms.py:1449 msgid "Diameter - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1452 msgid "Circumference - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1454 +#: archaeological_finds/forms.py:1455 msgid "Circumference - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1457 +#: archaeological_finds/forms.py:1458 msgid "Volume - lower than (l)" msgstr "" -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:1459 msgid "Volume - higher than (l)" msgstr "" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1461 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1464 msgid "Weight - higher than (g)" msgstr "" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1467 msgid "Clutter long side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1470 +#: archaeological_finds/forms.py:1471 msgid "Clutter long side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1474 +#: archaeological_finds/forms.py:1475 msgid "Clutter short side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1478 +#: archaeological_finds/forms.py:1479 msgid "Clutter short side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1482 +#: archaeological_finds/forms.py:1483 msgid "Clutter height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1486 +#: archaeological_finds/forms.py:1487 msgid "Clutter height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1495 +#: archaeological_finds/forms.py:1496 msgid "Check date after" msgstr "" -#: archaeological_finds/forms.py:1497 +#: archaeological_finds/forms.py:1498 msgid "Check date before" msgstr "" -#: archaeological_finds/forms.py:1510 +#: archaeological_finds/forms.py:1511 msgid "Estimated value - higher than" msgstr "" -#: archaeological_finds/forms.py:1511 +#: archaeological_finds/forms.py:1512 msgid "Estimated value - lower than" msgstr "" -#: archaeological_finds/forms.py:1512 +#: archaeological_finds/forms.py:1513 msgid "Insurance value - higher than" msgstr "" -#: archaeological_finds/forms.py:1513 +#: archaeological_finds/forms.py:1514 msgid "Insurance value - lower than" msgstr "" -#: archaeological_finds/forms.py:1515 +#: archaeological_finds/forms.py:1516 msgid "Appraisal date after" msgstr "" -#: archaeological_finds/forms.py:1518 +#: archaeological_finds/forms.py:1519 msgid "Appraisal date before" msgstr "" -#: archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1522 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1524 msgid "Treatment file end date before" msgstr "" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1527 msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1592 archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1908 +#: archaeological_finds/forms.py:1593 archaeological_finds/models_finds.py:1005 +#: archaeological_finds/models_finds.py:1763 #: archaeological_finds/templates/ishtar/sheet_find.html:300 -#: ishtar_common/forms_common.py:1745 -#: man_app/templates/ishtar/sheet_find.html:313 +#: ishtar_common/forms_common.py:1922 +#: man_app/templates/ishtar/sheet_find.html:301 +#: na_app/templates/ishtar/sheet_find.html:312 msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1600 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1618 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1619 archaeological_finds/models_finds.py:1004 #: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: ishtar_common/forms_common.py:1737 -#: man_app/templates/ishtar/sheet_find.html:338 +#: ishtar_common/forms_common.py:1914 +#: man_app/templates/ishtar/sheet_find.html:326 +#: na_app/templates/ishtar/sheet_find.html:337 msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1626 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1645 archaeological_finds/forms.py:1666 -#: archaeological_finds/forms.py:1722 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:1646 archaeological_finds/forms.py:1667 +#: archaeological_finds/forms.py:1723 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:1761 archaeological_finds/forms.py:1924 +#: archaeological_finds/forms.py:1762 archaeological_finds/forms.py:1925 #: archaeological_finds/models_treatments.py:397 #: archaeological_finds/templates/ishtar/sheet_treatment.html:110 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:1784 +#: archaeological_finds/forms.py:1785 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:1905 +#: archaeological_finds/forms.py:1906 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1921 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1964 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1975 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1976 archaeological_finds/forms.py:1994 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2010 +#: archaeological_finds/forms.py:2011 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2013 +#: archaeological_finds/forms.py:2014 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:198 @@ -3716,22 +3814,25 @@ 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 -#: ishtar_common/forms_common.py:1679 ishtar_common/models.py:959 -#: ishtar_common/models.py:1806 ishtar_common/models.py:3546 -#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 -#: ishtar_common/models_common.py:2143 ishtar_common/models_common.py:2159 -#: ishtar_common/models_imports.py:576 -#: man_app/templates/ishtar/sheet_find.html:397 -#: man_app/templates/ishtar/sheet_find.html:435 -#: man_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/forms_common.py:1856 ishtar_common/models.py:970 +#: ishtar_common/models.py:1816 ishtar_common/models.py:3560 +#: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 +#: ishtar_common/models_common.py:1953 ishtar_common/models_common.py:1969 +#: ishtar_common/models_imports.py:692 +#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:423 +#: man_app/templates/ishtar/sheet_find.html:461 +#: na_app/templates/ishtar/sheet_find.html:396 +#: na_app/templates/ishtar/sheet_find.html:434 +#: na_app/templates/ishtar/sheet_find.html:472 msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2055 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:2056 archaeological_finds/forms.py:2111 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2102 +#: archaeological_finds/forms.py:2103 msgid "Another basket already exists with this name." msgstr "" @@ -3759,7 +3860,7 @@ msgstr "" #: archaeological_finds/models_finds.py:177 #: archaeological_finds/models_treatments.py:213 #: archaeological_finds/models_treatments.py:757 -#: ishtar_common/models_imports.py:963 +#: ishtar_common/models_imports.py:1082 msgid "Treatment type" msgstr "" @@ -3778,8 +3879,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:746 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2449 -#: archaeological_operations/models.py:2786 ishtar_common/views.py:510 +#: archaeological_operations/models.py:2455 +#: archaeological_operations/models.py:2792 ishtar_common/views.py:510 msgid "Treatment" msgstr "" @@ -3876,8 +3977,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1181 #: archaeological_finds/models_treatments.py:1201 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2448 -#: archaeological_operations/models.py:2778 ishtar_common/views.py:509 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2454 +#: archaeological_operations/models.py:2784 ishtar_common/views.py:509 msgid "Treatment request" msgstr "" @@ -3892,8 +3993,8 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_finds/models_finds.py:3395 +#: archaeological_finds/models_finds.py:1755 +#: archaeological_finds/models_finds.py:3130 #: archaeological_finds/models_treatments.py:267 #: archaeological_finds/models_treatments.py:761 #: archaeological_finds/templates/ishtar/sheet_find.html:389 @@ -3903,16 +4004,20 @@ msgstr "" #: archaeological_warehouse/models.py:1199 #: archaeological_warehouse/models.py:2064 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2240 ishtar_common/forms_common.py:2431 +#: ishtar_common/forms_common.py:2416 ishtar_common/forms_common.py:2607 #: ishtar_common/templates/ishtar/sheet_document.html:100 -#: man_app/templates/ishtar/sheet_find.html:402 -#: man_app/templates/ishtar/sheet_find.html:440 -#: man_app/templates/ishtar/sheet_find.html:478 +#: man_app/templates/ishtar/sheet_find.html:390 +#: man_app/templates/ishtar/sheet_find.html:428 +#: man_app/templates/ishtar/sheet_find.html:466 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:439 +#: na_app/templates/ishtar/sheet_find.html:477 msgid "Container" msgstr "" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2438 +#: ishtar_common/forms_common.py:2614 msgid "Change " msgstr "" @@ -3921,12 +4026,12 @@ msgid "reference and current containers" msgstr "" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2442 +#: ishtar_common/forms_common.py:2618 msgid "the reference container" msgstr "" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2443 +#: ishtar_common/forms_common.py:2619 msgid "the current container" msgstr "" @@ -3975,7 +4080,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4252 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4266 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -3985,7 +4090,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1129 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 -#: man_app/templates/ishtar/sheet_find.html:515 +#: man_app/templates/ishtar/sheet_find.html:503 +#: na_app/templates/ishtar/sheet_find.html:514 msgid "Applicant" msgstr "" @@ -3994,7 +4100,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1137 #: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 -#: man_app/templates/ishtar/sheet_find.html:516 +#: man_app/templates/ishtar/sheet_find.html:504 +#: na_app/templates/ishtar/sheet_find.html:515 msgid "Applicant organisation" msgstr "" @@ -4098,7 +4205,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2453 ishtar_common/models.py:3762 +#: archaeological_operations/models.py:2459 ishtar_common/models.py:3776 msgid "Code" msgstr "" @@ -4187,7 +4294,7 @@ msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:1901 #: archaeological_finds/models_treatments.py:75 #: archaeological_finds/models_treatments.py:291 #: archaeological_finds/models_treatments.py:303 @@ -4205,7 +4312,8 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:244 ishtar_common/models_imports.py:970 +#: archaeological_finds/models_finds.py:244 +#: ishtar_common/models_imports.py:1089 msgid "Remarkability type" msgstr "" @@ -4213,7 +4321,8 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:258 ishtar_common/models_imports.py:973 +#: archaeological_finds/models_finds.py:258 +#: ishtar_common/models_imports.py:1092 msgid "Batch type" msgstr "" @@ -4222,8 +4331,8 @@ msgid "Batch types" msgstr "" #: archaeological_finds/models_finds.py:285 -#: archaeological_finds/models_finds.py:1928 -#: ishtar_common/models_imports.py:976 +#: archaeological_finds/models_finds.py:1783 +#: ishtar_common/models_imports.py:1095 msgid "Functional area" msgstr "" @@ -4235,7 +4344,8 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:314 ishtar_common/models_imports.py:971 +#: archaeological_finds/models_finds.py:314 +#: ishtar_common/models_imports.py:1090 msgid "Alteration type" msgstr "" @@ -4243,7 +4353,8 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:329 ishtar_common/models_imports.py:972 +#: archaeological_finds/models_finds.py:329 +#: ishtar_common/models_imports.py:1091 msgid "Alteration cause type" msgstr "" @@ -4251,7 +4362,8 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:344 ishtar_common/models_imports.py:966 +#: archaeological_finds/models_finds.py:344 +#: ishtar_common/models_imports.py:1085 msgid "Treatment emergency type" msgstr "" @@ -4267,7 +4379,8 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:373 ishtar_common/models_imports.py:974 +#: archaeological_finds/models_finds.py:373 +#: ishtar_common/models_imports.py:1093 msgid "Checked type" msgstr "" @@ -4284,6 +4397,7 @@ msgid "Material index" msgstr "" #: archaeological_finds/models_finds.py:456 +#: ishtar_common/models_imports.py:2777 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4294,7 +4408,7 @@ msgid "Short ID" msgstr "" #: archaeological_finds/models_finds.py:462 -#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4362 +#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4376 msgid "Cached value - do not edit" msgstr "" @@ -4307,7 +4421,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:492 -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1692 msgid "Base find" msgstr "" @@ -4315,15 +4429,15 @@ msgstr "" msgid "Base finds" msgstr "" -#: archaeological_finds/models_finds.py:893 +#: archaeological_finds/models_finds.py:748 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:894 +#: archaeological_finds/models_finds.py:749 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:906 +#: archaeological_finds/models_finds.py:761 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -4335,694 +4449,696 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:962 archaeological_finds/views.py:537 +#: archaeological_finds/models_finds.py:817 archaeological_finds/views.py:537 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:974 +#: archaeological_finds/models_finds.py:829 #: archaeological_warehouse/models.py:1930 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:985 +#: archaeological_finds/models_finds.py:840 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1135 +#: archaeological_finds/models_finds.py:990 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1140 +#: archaeological_finds/models_finds.py:995 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:996 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:997 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1144 +#: archaeological_finds/models_finds.py:999 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1146 +#: archaeological_finds/models_finds.py:1001 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:1002 msgid "Base find - Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/models_finds.py:1003 msgid "Base find - Discovery date (end)" msgstr "" -#: archaeological_finds/models_finds.py:1177 +#: archaeological_finds/models_finds.py:1032 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:714 -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1746 +#: archaeological_operations/forms.py:716 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1751 #: archaeological_operations/models.py:985 #: archaeological_operations/models.py:1072 -#: archaeological_operations/models.py:1376 ishtar_common/models.py:5014 -#: ishtar_common/models_imports.py:945 +#: archaeological_operations/models.py:1376 ishtar_common/models.py:5028 +#: ishtar_common/models_imports.py:1064 msgid "Operation type" msgstr "" -#: archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:1064 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1271 +#: archaeological_finds/models_finds.py:1126 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1275 +#: archaeological_finds/models_finds.py:1130 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1279 +#: archaeological_finds/models_finds.py:1134 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1137 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1297 archaeological_finds/tests.py:1358 -#: archaeological_finds/tests.py:1542 archaeological_warehouse/models.py:973 +#: archaeological_finds/models_finds.py:1152 archaeological_finds/tests.py:1403 +#: archaeological_finds/tests.py:1587 archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1301 ishtar_common/models.py:4080 +#: archaeological_finds/models_finds.py:1156 ishtar_common/models.py:4094 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1160 #: archaeological_operations/models.py:382 -#: archaeological_operations/models.py:1141 ishtar_common/models.py:4124 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4138 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1314 +#: archaeological_finds/models_finds.py:1169 #: archaeological_warehouse/models.py:982 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1174 +#: archaeological_finds/models_finds.py:1630 #: archaeological_warehouse/models.py:987 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1324 +#: archaeological_finds/models_finds.py:1179 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_finds/models_finds.py:1770 -#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4088 -#: ishtar_common/models.py:4193 +#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1625 +#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4102 +#: ishtar_common/models.py:4207 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1336 +#: archaeological_finds/models_finds.py:1191 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1340 archaeological_finds/tests.py:1265 -#: archaeological_finds/tests.py:1540 archaeological_warehouse/models.py:1008 +#: archaeological_finds/models_finds.py:1195 archaeological_finds/tests.py:1310 +#: archaeological_finds/tests.py:1585 archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1344 +#: archaeological_finds/models_finds.py:1199 #: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1348 +#: archaeological_finds/models_finds.py:1203 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1352 archaeological_finds/tests.py:1483 +#: archaeological_finds/models_finds.py:1207 archaeological_finds/tests.py:1528 #: archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1356 +#: archaeological_finds/models_finds.py:1211 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1360 +#: archaeological_finds/models_finds.py:1215 #: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1364 archaeological_finds/tests.py:1407 -#: ishtar_common/models.py:4014 +#: archaeological_finds/models_finds.py:1219 archaeological_finds/tests.py:1452 +#: ishtar_common/models.py:4028 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1222 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1226 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1375 ishtar_common/models.py:4108 +#: archaeological_finds/models_finds.py:1230 ishtar_common/models.py:4122 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1379 -#: archaeological_finds/models_finds.py:1773 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_finds/models_finds.py:1628 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1383 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1387 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1391 +#: archaeological_finds/models_finds.py:1246 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1398 +#: archaeological_finds/models_finds.py:1253 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1402 -#: ishtar_common/models_common.py:1479 +#: archaeological_finds/models_finds.py:1257 +#: ishtar_common/models_common.py:1509 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1405 archaeological_finds/tests.py:1562 +#: archaeological_finds/models_finds.py:1260 archaeological_finds/tests.py:1607 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1262 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1266 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1270 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1422 +#: archaeological_finds/models_finds.py:1277 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1425 +#: archaeological_finds/models_finds.py:1280 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1429 +#: archaeological_finds/models_finds.py:1284 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1287 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1291 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1294 msgctxt "key for text search" msgid "discovery-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1298 msgctxt "key for text search" msgid "discovery-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1302 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1306 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "" -#: archaeological_finds/models_finds.py:1455 +#: archaeological_finds/models_finds.py:1310 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1313 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1317 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1321 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1469 +#: archaeological_finds/models_finds.py:1324 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1328 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1483 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1490 +#: archaeological_finds/models_finds.py:1345 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1494 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1498 +#: archaeological_finds/models_finds.py:1353 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1357 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1505 +#: archaeological_finds/models_finds.py:1360 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1508 +#: archaeological_finds/models_finds.py:1363 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1511 +#: archaeological_finds/models_finds.py:1366 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1372 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1376 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1524 +#: archaeological_finds/models_finds.py:1379 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1382 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1531 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1535 +#: archaeological_finds/models_finds.py:1390 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1394 msgctxt "key for text search" msgid "length-higher" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1397 msgctxt "key for text search" msgid "width-higher" msgstr "" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1403 msgctxt "key for text search" msgid "thickness-higher" msgstr "" -#: archaeological_finds/models_finds.py:1551 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "diameter-higher" msgstr "" -#: archaeological_finds/models_finds.py:1554 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "circumference-higher" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "volume-higher" msgstr "" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1416 msgctxt "key for text search" msgid "weight-higher" msgstr "" -#: archaeological_finds/models_finds.py:1564 +#: archaeological_finds/models_finds.py:1419 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1423 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1572 +#: archaeological_finds/models_finds.py:1427 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1431 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1580 +#: archaeological_finds/models_finds.py:1435 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1584 +#: archaeological_finds/models_finds.py:1439 msgctxt "key for text search" msgid "check-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1442 msgctxt "key for text search" msgid "check-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1445 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1449 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1453 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1457 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1618 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1481 #: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1423 +#: archaeological_finds/models_finds.py:1489 archaeological_finds/tests.py:1468 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1642 +#: archaeological_finds/models_finds.py:1497 #: archaeological_operations/models.py:1169 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1378 +#: archaeological_finds/models_finds.py:1501 archaeological_finds/tests.py:1423 #: archaeological_operations/models.py:1173 -#: archaeological_operations/tests.py:2879 -#: archaeological_operations/tests.py:3357 +#: archaeological_operations/tests.py:2924 +#: archaeological_operations/tests.py:3421 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "operation-remain" msgstr "" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1749 -#: archaeological_finds/models_finds.py:2397 +#: archaeological_finds/models_finds.py:1604 +#: archaeological_finds/models_finds.py:2252 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4231 -#: ishtar_common/models.py:4582 +#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4245 +#: ishtar_common/models.py:4596 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2748 +#: ishtar_common/views.py:3011 msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1612 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1871 +#: archaeological_finds/models_finds.py:1726 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1873 +#: archaeological_finds/models_finds.py:1728 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1882 +#: archaeological_finds/models_finds.py:1737 #: archaeological_finds/templates/ishtar/sheet_find.html:417 -#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:418 +#: na_app/templates/ishtar/sheet_find.html:429 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:1744 #: archaeological_finds/templates/ishtar/sheet_find.html:455 -#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:456 +#: na_app/templates/ishtar/sheet_find.html:467 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1960 +#: archaeological_finds/models_finds.py:1815 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1963 +#: archaeological_finds/models_finds.py:1818 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1966 +#: archaeological_finds/models_finds.py:1821 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1842 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1847 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2049 +#: archaeological_finds/models_finds.py:1904 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2058 +#: archaeological_finds/models_finds.py:1913 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2064 +#: archaeological_finds/models_finds.py:1919 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2097 +#: archaeological_finds/models_finds.py:1952 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/models_finds.py:2090 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2236 +#: archaeological_finds/models_finds.py:2091 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2237 +#: archaeological_finds/models_finds.py:2092 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2238 +#: archaeological_finds/models_finds.py:2093 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2094 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2370 +#: archaeological_finds/models_finds.py:2225 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2378 +#: archaeological_finds/models_finds.py:2233 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2386 +#: archaeological_finds/models_finds.py:2241 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2971 +#: archaeological_finds/models_finds.py:2706 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2977 +#: archaeological_finds/models_finds.py:2712 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3418 ishtar_common/forms_common.py:122 -#: ishtar_common/forms_common.py:2516 ishtar_common/ishtar_menu.py:38 -#: ishtar_common/models.py:2909 ishtar_common/models.py:3240 -#: ishtar_common/models.py:3434 ishtar_common/models.py:3683 +#: archaeological_finds/models_finds.py:3153 ishtar_common/forms_common.py:126 +#: ishtar_common/forms_common.py:2692 ishtar_common/ishtar_menu.py:38 +#: ishtar_common/models.py:2919 ishtar_common/models.py:3250 +#: ishtar_common/models.py:3444 ishtar_common/models.py:3697 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3426 +#: archaeological_finds/models_finds.py:3161 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3427 +#: archaeological_finds/models_finds.py:3162 msgid "Properties" msgstr "" @@ -5053,7 +5169,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2588 +#: archaeological_operations/models.py:2594 msgctxt "key for text search" msgid "index" msgstr "" @@ -5100,9 +5216,12 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:388 #: archaeological_finds/templates/ishtar/sheet_find.html:426 #: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:401 -#: man_app/templates/ishtar/sheet_find.html:439 -#: man_app/templates/ishtar/sheet_find.html:477 +#: man_app/templates/ishtar/sheet_find.html:389 +#: man_app/templates/ishtar/sheet_find.html:427 +#: man_app/templates/ishtar/sheet_find.html:465 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:438 +#: na_app/templates/ishtar/sheet_find.html:476 msgid "Doer" msgstr "" @@ -5152,7 +5271,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:494 -#: man_app/templates/ishtar/sheet_find.html:507 +#: man_app/templates/ishtar/sheet_find.html:495 +#: na_app/templates/ishtar/sheet_find.html:506 msgid "Treatment requests" msgstr "" @@ -5213,6 +5333,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: man_app/templates/ishtar/sheet_find.html:16 +#: na_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -5220,40 +5341,48 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:41 #: man_app/templates/ishtar/sheet_find.html:43 +#: na_app/templates/ishtar/sheet_find.html:41 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: man_app/templates/ishtar/sheet_find.html:58 +#: na_app/templates/ishtar/sheet_find.html:56 msgid "Preservation / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_find.html:176 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: man_app/templates/ishtar/sheet_find.html:272 +#: man_app/templates/ishtar/sheet_find.html:260 +#: na_app/templates/ishtar/sheet_find.html:271 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:296 -#: man_app/templates/ishtar/sheet_find.html:309 +#: man_app/templates/ishtar/sheet_find.html:297 +#: na_app/templates/ishtar/sheet_find.html:308 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: man_app/templates/ishtar/sheet_find.html:339 +#: man_app/templates/ishtar/sheet_find.html:327 +#: na_app/templates/ishtar/sheet_find.html:338 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:372 -#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:373 +#: na_app/templates/ishtar/sheet_find.html:384 msgid "Container information not available." msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:379 -#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:380 +#: na_app/templates/ishtar/sheet_find.html:391 msgid "Simple treatments" msgstr "" @@ -5261,19 +5390,26 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:421 #: archaeological_finds/templates/ishtar/sheet_find.html:459 #: archaeological_finds/templates/ishtar/sheet_find.html:498 -#: man_app/templates/ishtar/sheet_find.html:396 -#: man_app/templates/ishtar/sheet_find.html:434 -#: man_app/templates/ishtar/sheet_find.html:472 -#: man_app/templates/ishtar/sheet_find.html:511 +#: man_app/templates/ishtar/sheet_find.html:384 +#: man_app/templates/ishtar/sheet_find.html:422 +#: man_app/templates/ishtar/sheet_find.html:460 +#: man_app/templates/ishtar/sheet_find.html:499 +#: na_app/templates/ishtar/sheet_find.html:395 +#: na_app/templates/ishtar/sheet_find.html:433 +#: na_app/templates/ishtar/sheet_find.html:471 +#: na_app/templates/ishtar/sheet_find.html:510 msgid "Year - index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:387 #: archaeological_finds/templates/ishtar/sheet_find.html:425 #: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: man_app/templates/ishtar/sheet_find.html:400 -#: man_app/templates/ishtar/sheet_find.html:438 -#: man_app/templates/ishtar/sheet_find.html:476 +#: man_app/templates/ishtar/sheet_find.html:388 +#: man_app/templates/ishtar/sheet_find.html:426 +#: man_app/templates/ishtar/sheet_find.html:464 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:437 +#: na_app/templates/ishtar/sheet_find.html:475 msgid "Related finds (max. 15 displayed)" msgstr "" @@ -5283,7 +5419,8 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 -#: man_app/templates/ishtar/sheet_find.html:464 +#: man_app/templates/ishtar/sheet_find.html:452 +#: na_app/templates/ishtar/sheet_find.html:463 msgid "Export as CSV" msgstr "" @@ -5293,8 +5430,10 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 -#: man_app/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:503 +#: man_app/templates/ishtar/sheet_find.html:452 +#: man_app/templates/ishtar/sheet_find.html:491 +#: na_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:502 msgid "CSV" msgstr "" @@ -5302,7 +5441,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: ishtar_common/templates/ishtar/sheet_document.html:138 -#: man_app/templates/ishtar/sheet_find.html:587 +#: man_app/templates/ishtar/sheet_find.html:533 +#: na_app/templates/ishtar/sheet_find.html:544 msgid "Associated documents" msgstr "" @@ -5313,8 +5453,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 -#: ishtar_common/forms_common.py:1923 +#: ishtar_common/forms_common.py:2100 #: ishtar_common/templates/ishtar/sheet_document.html:57 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -5387,23 +5528,27 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:945 archaeological_warehouse/models.py:1682 +#: archaeological_finds/tests.py:714 ishtar_common/forms_common.py:406 +msgid "This importer need a document archive." +msgstr "" + +#: archaeological_finds/tests.py:984 archaeological_warehouse/models.py:1682 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1565 archaeological_finds/tests.py:1591 -#: archaeological_finds/tests.py:1601 archaeological_operations/tests.py:3115 -#: ishtar_common/forms.py:1172 ishtar_common/forms.py:1251 +#: archaeological_finds/tests.py:1610 archaeological_finds/tests.py:1636 +#: archaeological_finds/tests.py:1646 archaeological_operations/tests.py:3160 +#: ishtar_common/forms.py:1193 ishtar_common/forms.py:1272 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:606 ishtar_common/views_item.py:876 -#: ishtar_common/views_item.py:913 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:638 ishtar_common/views_item.py:908 +#: ishtar_common/views_item.py:945 ishtar_common/wizards.py:501 msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1566 archaeological_finds/tests.py:1592 -#: archaeological_finds/tests.py:1602 ishtar_common/forms.py:1173 -#: ishtar_common/forms.py:1253 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1637 +#: archaeological_finds/tests.py:1647 ishtar_common/forms.py:1194 +#: ishtar_common/forms.py:1274 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:503 msgid "No" msgstr "" @@ -5500,29 +5645,30 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1061 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:3076 -#: archaeological_operations/templates/ishtar/sheet_operation.html:493 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1079 +#: archaeological_operations/forms.py:1085 +#: archaeological_operations/models.py:3082 +#: archaeological_operations/templates/ishtar/sheet_operation.html:523 +#: na_app/templates/ishtar/sheet_operation.html:501 msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3064 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3060 +#: archaeological_operations/models.py:3066 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3062 -#: archaeological_operations/models.py:3090 -#: archaeological_operations/models.py:3158 +#: archaeological_operations/models.py:3068 +#: archaeological_operations/models.py:3096 +#: archaeological_operations/models.py:3164 msgid "Public domain" msgstr "" @@ -5579,19 +5725,19 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:732 +#: archaeological_operations/forms.py:734 #: archaeological_operations/models.py:1407 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:713 +#: archaeological_operations/forms.py:715 #: archaeological_operations/models.py:1504 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:720 #: archaeological_operations/models.py:1447 msgid "Address / Locality" msgstr "" @@ -5601,23 +5747,23 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:769 -#: archaeological_operations/models.py:2729 +#: archaeological_operations/forms.py:771 +#: archaeological_operations/models.py:2735 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:758 -#: archaeological_operations/forms.py:1684 +#: archaeological_operations/forms.py:760 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:1346 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1127 -#: archaeological_operations/forms.py:1221 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/forms.py:1848 +#: archaeological_operations/forms.py:1129 +#: archaeological_operations/forms.py:1224 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1853 #: archaeological_operations/models.py:307 #: archaeological_operations/models.py:316 #: archaeological_operations/models.py:497 @@ -5649,33 +5795,33 @@ msgid "Abstract (full text search)" msgstr "" #: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1450 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:823 #: archaeological_operations/models.py:991 #: archaeological_operations/models.py:1485 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:787 +#: archaeological_operations/forms.py:789 #: archaeological_operations/models.py:1402 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:740 +#: archaeological_operations/forms.py:742 #: archaeological_operations/models.py:1476 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1692 +#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:1697 #: archaeological_operations/models.py:992 #: archaeological_operations/models.py:1495 msgid "Documentation received" @@ -5690,8 +5836,8 @@ msgid "Documentation deadline after" msgstr "" #: archaeological_operations/forms.py:579 -#: archaeological_operations/forms.py:815 -#: archaeological_operations/forms.py:1696 +#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:1701 #: archaeological_operations/models.py:993 #: archaeological_operations/models.py:1500 msgid "Finds received" @@ -5705,385 +5851,386 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:669 ishtar_common/models.py:4242 +#: archaeological_operations/forms.py:671 ishtar_common/models.py:4256 msgid "Associated file" msgstr "" -#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:684 msgid "Operation - 010 - General" msgstr "" -#: archaeological_operations/forms.py:716 -#: archaeological_operations/forms.py:1744 +#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:1749 #: archaeological_operations/models.py:1446 msgid "Generic name" msgstr "" -#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:745 msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:745 +#: archaeological_operations/forms.py:747 msgid "Head scientist" msgstr "" -#: archaeological_operations/forms.py:766 +#: archaeological_operations/forms.py:768 #: archaeological_operations/models.py:1444 msgid "Operator reference" msgstr "" -#: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1346 -#: archaeological_operations/forms.py:1700 -#: archaeological_operations/forms.py:1837 +#: archaeological_operations/forms.py:782 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1842 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1360 msgid "Collaborators" msgstr "" -#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:783 msgid "Dates / Administrative" msgstr "" -#: archaeological_operations/forms.py:785 +#: archaeological_operations/forms.py:787 #: archaeological_operations/models.py:1331 msgid "Report delivery date" msgstr "" -#: archaeological_operations/forms.py:807 +#: archaeological_operations/forms.py:809 #: archaeological_operations/models.py:1492 msgid "Deadline for submission of the documentation" msgstr "" -#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:814 #: archaeological_operations/models.py:1498 msgid "Deadline for submission of the finds" msgstr "" -#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:819 msgid "Scientific" msgstr "" -#: archaeological_operations/forms.py:824 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:948 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:1067 msgid "Remain type" msgstr "" -#: archaeological_operations/forms.py:830 +#: archaeological_operations/forms.py:832 #: archaeological_operations/models.py:1490 msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:884 +#: archaeological_operations/forms.py:886 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:889 +#: archaeological_operations/forms.py:891 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:919 +#: archaeological_operations/forms.py:921 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:923 +#: archaeological_operations/forms.py:925 msgid "Bad operation code" msgstr "" -#: archaeological_operations/forms.py:929 -#: archaeological_operations/models.py:1942 +#: archaeological_operations/forms.py:931 +#: archaeological_operations/models.py:1948 msgid "Operation code" msgstr "" -#: archaeological_operations/forms.py:964 -#: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: archaeological_operations/forms.py:966 +#: archaeological_operations/templates/ishtar/sheet_operation.html:312 +#: na_app/templates/ishtar/sheet_operation.html:290 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:965 +#: archaeological_operations/forms.py:967 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:974 +#: archaeological_operations/forms.py:976 #: archaeological_operations/models.py:1507 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:977 +#: archaeological_operations/forms.py:979 #: archaeological_operations/models.py:1509 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:983 +#: archaeological_operations/forms.py:985 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:989 +#: archaeological_operations/forms.py:991 #: archaeological_operations/models.py:1521 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:995 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1529 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1000 +#: archaeological_operations/forms.py:1002 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1001 +#: archaeological_operations/forms.py:1003 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1004 +#: archaeological_operations/forms.py:1006 #: archaeological_operations/models.py:1386 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1007 #: archaeological_operations/models.py:1390 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1007 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1394 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1009 +#: archaeological_operations/forms.py:1011 #: archaeological_operations/models.py:1398 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1019 +#: archaeological_operations/forms.py:1021 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1022 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1027 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1030 +#: archaeological_operations/forms.py:1032 #: archaeological_operations/models.py:1425 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1051 +#: archaeological_operations/forms.py:1053 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1056 +#: archaeological_operations/forms.py:1058 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1078 +#: archaeological_operations/forms.py:1080 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1085 +#: archaeological_operations/forms.py:1087 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1119 -#: archaeological_operations/forms.py:1215 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1796 +#: archaeological_operations/forms.py:1121 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1801 #: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:1848 -#: ishtar_common/forms_common.py:2134 ishtar_common/forms_common.py:2365 -#: ishtar_common/models.py:2349 +#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:2025 +#: ishtar_common/forms_common.py:2311 ishtar_common/forms_common.py:2541 +#: ishtar_common/models.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "" -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1342 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1848 msgid "Cultural attributions" msgstr "" -#: archaeological_operations/forms.py:1152 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/forms.py:1816 +#: archaeological_operations/forms.py:1154 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/forms.py:1821 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1195 +#: archaeological_operations/forms.py:1198 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1200 +#: archaeological_operations/forms.py:1203 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1209 +#: archaeological_operations/forms.py:1212 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1232 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1350 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1355 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1248 -#: archaeological_operations/forms.py:1398 +#: archaeological_operations/forms.py:1251 +#: archaeological_operations/forms.py:1403 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1250 -#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1253 +#: archaeological_operations/forms.py:1405 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1252 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1407 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1255 -#: archaeological_operations/forms.py:1410 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1415 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1404 +#: archaeological_operations/forms.py:1261 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1260 -#: archaeological_operations/forms.py:1406 +#: archaeological_operations/forms.py:1263 +#: archaeological_operations/forms.py:1411 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1413 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1327 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1384 +#: archaeological_operations/forms.py:1389 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1398 #: archaeological_operations/templates/ishtar/sheet_site.html:53 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1394 +#: archaeological_operations/forms.py:1399 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1478 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1590 -#: archaeological_operations/forms.py:1657 +#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:1595 +#: archaeological_operations/forms.py:1662 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1498 -#: archaeological_operations/models.py:2754 +#: archaeological_operations/forms.py:1503 +#: archaeological_operations/models.py:2760 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:2789 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:2795 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1521 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1550 +#: archaeological_operations/forms.py:1555 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1554 +#: archaeological_operations/forms.py:1559 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1572 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1572 ishtar_common/forms.py:1288 -#: ishtar_common/models.py:2021 +#: archaeological_operations/forms.py:1577 ishtar_common/forms.py:1309 +#: ishtar_common/models.py:2031 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1596 -#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1601 +#: archaeological_operations/forms.py:1605 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1623 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1620 +#: archaeological_operations/forms.py:1625 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1646 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:730 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1662 +#: archaeological_operations/forms.py:1667 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1771 +#: archaeological_operations/forms.py:1776 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1827 +#: archaeological_operations/forms.py:1832 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6123,7 +6270,7 @@ msgstr "" msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:944 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:1063 msgid "Cultural attribution type" msgstr "" @@ -6133,7 +6280,7 @@ msgstr "" #: archaeological_operations/models.py:376 #: archaeological_operations/models.py:1177 -#: archaeological_operations/tests.py:3101 +#: archaeological_operations/tests.py:3146 msgctxt "key for text search" msgid "remain" msgstr "" @@ -6193,19 +6340,20 @@ msgid "Create associated operation" msgstr "" #: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1542 #: archaeological_warehouse/models.py:406 msgid "Cached town label" msgstr "" #: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1554 msgid "Cached remains label" msgstr "" #: archaeological_operations/models.py:567 #: archaeological_operations/models.py:1465 -#: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: archaeological_operations/templates/ishtar/sheet_operation.html:354 +#: na_app/templates/ishtar/sheet_operation.html:332 msgid "Archaeological sites" msgstr "" @@ -6229,9 +6377,9 @@ msgstr "" msgid "top ope." msgstr "" -#: archaeological_operations/models.py:803 ishtar_common/forms.py:1171 -#: ishtar_common/models.py:5142 ishtar_common/models.py:5303 -#: ishtar_common/models.py:5363 ishtar_common/views_item.py:1607 +#: archaeological_operations/models.py:803 ishtar_common/forms.py:1192 +#: ishtar_common/models.py:5156 ishtar_common/models.py:5317 +#: ishtar_common/models.py:5377 ishtar_common/views_item.py:1653 msgid "Unknown" msgstr "" @@ -6302,7 +6450,7 @@ msgid "address" msgstr "" #: archaeological_operations/models.py:1162 -#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3158 msgctxt "key for text search" msgid "is-open" msgstr "" @@ -6333,7 +6481,7 @@ msgid "end-after" msgstr "" #: archaeological_operations/models.py:1197 -#: archaeological_operations/tests.py:3156 +#: archaeological_operations/tests.py:3201 msgctxt "key for text search" msgid "relation-types" msgstr "" @@ -6354,6 +6502,7 @@ msgid "record-quality" msgstr "" #: archaeological_operations/models.py:1214 +#: archaeological_operations/tests.py:3248 msgctxt "key for text search" msgid "report-processing" msgstr "" @@ -6398,8 +6547,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1288 ishtar_common/models.py:4104 -#: ishtar_common/models.py:4196 +#: archaeological_operations/models.py:1288 ishtar_common/models.py:4118 +#: ishtar_common/models.py:4210 msgctxt "key for text search" msgid "file" msgstr "" @@ -6425,282 +6574,292 @@ msgstr "" msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1558 +#: archaeological_operations/models.py:1536 +msgid "Cached label" +msgstr "" + +#: archaeological_operations/models.py:1564 #: archaeological_operations/templates/ishtar/sheet_site.html:86 -#: ishtar_common/models.py:988 +#: ishtar_common/models.py:999 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1598 +#: archaeological_operations/models.py:1604 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1599 +#: archaeological_operations/models.py:1605 msgid "List of associated containers" msgstr "" -#: archaeological_operations/models.py:1672 +#: archaeological_operations/models.py:1678 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1784 +#: archaeological_operations/models.py:1775 +msgid "No associated town" +msgstr "" + +#: archaeological_operations/models.py:1790 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1908 +#: archaeological_operations/models.py:1914 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1927 +#: archaeological_operations/models.py:1933 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1975 +#: archaeological_operations/models.py:1981 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:2036 +#: archaeological_operations/models.py:2042 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2052 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2054 +#: archaeological_operations/models.py:2060 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2062 +#: archaeological_operations/models.py:2068 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2116 +#: archaeological_operations/models.py:2122 #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2178 -#: archaeological_operations/models.py:2257 +#: archaeological_operations/models.py:2184 +#: archaeological_operations/models.py:2263 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2222 +#: archaeological_operations/models.py:2228 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2273 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2359 ishtar_common/models_imports.py:949 +#: archaeological_operations/models.py:2365 +#: ishtar_common/models_imports.py:1068 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2360 +#: archaeological_operations/models.py:2366 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2391 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2386 +#: archaeological_operations/models.py:2392 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2458 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2457 +#: archaeological_operations/models.py:2463 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2460 +#: archaeological_operations/models.py:2466 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2464 +#: archaeological_operations/models.py:2470 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2600 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2603 +#: archaeological_operations/models.py:2609 #: archaeological_warehouse/models.py:963 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2613 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2619 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2623 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2627 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2636 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2640 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2638 +#: archaeological_operations/models.py:2644 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2650 +#: archaeological_operations/models.py:2656 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2660 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2657 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2661 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2665 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2669 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2673 +#: archaeological_operations/models.py:2679 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:2683 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2680 +#: archaeological_operations/models.py:2686 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2683 +#: archaeological_operations/models.py:2689 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2687 +#: archaeological_operations/models.py:2693 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:2697 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2695 +#: archaeological_operations/models.py:2701 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2699 +#: archaeological_operations/models.py:2705 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2703 +#: archaeological_operations/models.py:2709 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2737 +#: archaeological_operations/models.py:2743 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2799 +#: archaeological_operations/models.py:2805 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2811 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2979 +#: archaeological_operations/models.py:2985 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:3069 +#: archaeological_operations/models.py:3075 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3071 ishtar_common/models.py:2602 -#: ishtar_common/models.py:2904 ishtar_common/models.py:3691 -#: ishtar_common/models_common.py:3510 ishtar_common/models_common.py:3545 -#: ishtar_common/models_common.py:4471 +#: archaeological_operations/models.py:3077 ishtar_common/models.py:2612 +#: ishtar_common/models.py:2914 ishtar_common/models.py:3705 +#: ishtar_common/models_common.py:3318 ishtar_common/models_common.py:3353 +#: ishtar_common/models_common.py:4279 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3344 ishtar_common/models.py:3556 +#: archaeological_operations/models.py:3369 ishtar_common/models.py:3570 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3359 +#: archaeological_operations/models.py:3384 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3360 +#: archaeological_operations/models.py:3385 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3382 ishtar_common/models.py:5010 +#: archaeological_operations/models.py:3407 ishtar_common/models.py:5024 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3385 +#: archaeological_operations/models.py:3410 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3386 +#: archaeological_operations/models.py:3411 msgid "Operation types old" msgstr "" @@ -6722,60 +6881,75 @@ msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:53 +#: na_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 -#: archaeological_operations/templates/ishtar/sheet_operation.html:400 -#: archaeological_operations/templates/ishtar/sheet_operation.html:498 -#: ishtar_common/models.py:988 +#: archaeological_operations/templates/ishtar/sheet_operation.html:430 +#: archaeological_operations/templates/ishtar/sheet_operation.html:528 +#: ishtar_common/models.py:999 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:408 +#: na_app/templates/ishtar/sheet_operation.html:506 msgid "Context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 -#: archaeological_operations/templates/ishtar/sheet_operation.html:467 +#: archaeological_operations/templates/ishtar/sheet_operation.html:497 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:208 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:215 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:475 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:159 +#: na_app/templates/ishtar/sheet_operation.html:159 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:228 +#: na_app/templates/ishtar/sheet_operation.html:228 msgid "Duration" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:270 +#: archaeological_operations/templates/ishtar/sheet_operation.html:286 +#: na_app/templates/ishtar/sheet_operation.html:278 msgid "This operation is virtual." msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:359 +#: archaeological_operations/templates/ishtar/sheet_operation.html:389 +#: na_app/templates/ishtar/sheet_operation.html:367 msgid "Document from this operation" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:391 +#: archaeological_operations/templates/ishtar/sheet_operation.html:421 +#: na_app/templates/ishtar/sheet_operation.html:399 msgid "No relations" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:410 +#: archaeological_operations/templates/ishtar/sheet_operation.html:440 +#: na_app/templates/ishtar/sheet_operation.html:418 msgid "Documents from associated context records" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: archaeological_operations/templates/ishtar/sheet_operation.html:445 +#: na_app/templates/ishtar/sheet_operation.html:423 msgid "Diagram of stratigraphic relations" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:444 +#: archaeological_operations/templates/ishtar/sheet_operation.html:474 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:452 msgid "Associated containers" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:472 +#: archaeological_operations/templates/ishtar/sheet_operation.html:502 #: archaeological_warehouse/templates/ishtar/sheet_container.html:213 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 #: ishtar_common/models_rest.py:77 @@ -6785,26 +6959,34 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:79 #: ishtar_common/templates/ishtar/blocks/window_nav.html:85 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:220 +#: na_app/templates/ishtar/sheet_operation.html:480 msgid "Export" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:477 +#: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:218 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: na_app/templates/ishtar/sheet_container.html:225 +#: na_app/templates/ishtar/sheet_operation.html:485 msgid "Regenerate statistics" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:482 +#: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:223 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: na_app/templates/ishtar/sheet_container.html:230 +#: na_app/templates/ishtar/sheet_operation.html:490 msgid "Last update:" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:562 +#: archaeological_operations/templates/ishtar/sheet_operation.html:592 +#: na_app/templates/ishtar/sheet_operation.html:570 msgid "Sources" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:580 +#: archaeological_operations/templates/ishtar/sheet_operation.html:610 +#: na_app/templates/ishtar/sheet_operation.html:588 msgid "Finds by context records" msgstr "" @@ -6812,73 +6994,73 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:841 +#: archaeological_operations/tests.py:885 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:871 +#: archaeological_operations/tests.py:915 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:909 +#: archaeological_operations/tests.py:953 #: 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:1823 +#: archaeological_operations/tests.py:1867 #: archaeological_operations/views.py:459 msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" -#: archaeological_operations/tests.py:2552 ishtar_common/forms.py:447 +#: archaeological_operations/tests.py:2597 ishtar_common/forms.py:457 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2565 +#: archaeological_operations/tests.py:2610 #: ishtar_common/templates/ishtar/sheet.html:139 msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4700 +#: archaeological_operations/tests.py:4764 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4713 +#: archaeological_operations/tests.py:4777 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4731 +#: archaeological_operations/tests.py:4795 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4738 ishtar_common/admin.py:2476 +#: archaeological_operations/tests.py:4802 ishtar_common/admin.py:2518 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4744 +#: archaeological_operations/tests.py:4808 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4817 ishtar_common/admin.py:2564 +#: archaeological_operations/tests.py:4881 ishtar_common/admin.py:2606 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4823 ishtar_common/models_rest.py:377 +#: archaeological_operations/tests.py:4887 ishtar_common/models_rest.py:377 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4830 ishtar_common/models_rest.py:356 +#: archaeological_operations/tests.py:4894 ishtar_common/models_rest.py:356 #: ishtar_common/models_rest.py:362 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -6904,7 +7086,7 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:570 ishtar_common/models.py:996 +#: archaeological_operations/views.py:570 ishtar_common/models.py:1007 msgid "Site deletion" msgstr "" @@ -6938,7 +7120,7 @@ msgstr "" #: archaeological_warehouse/models.py:414 #: archaeological_warehouse/models.py:929 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1928 ishtar_common/models.py:5238 +#: ishtar_common/forms_common.py:2105 ishtar_common/models.py:5252 #: ishtar_common/views.py:505 msgid "Warehouse" msgstr "" @@ -6962,6 +7144,7 @@ msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:378 #: archaeological_warehouse/templates/ishtar/sheet_container.html:181 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -6975,7 +7158,7 @@ msgstr "" #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:263 -#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:962 +#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:1081 msgid "Warehouse type" msgstr "" @@ -7004,32 +7187,32 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:596 -#: ishtar_common/forms_common.py:983 ishtar_common/models_common.py:3766 -#: ishtar_common/models_common.py:3955 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:772 +#: ishtar_common/forms_common.py:1161 ishtar_common/models_common.py:3574 +#: ishtar_common/models_common.py:3763 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:599 -#: ishtar_common/forms_common.py:986 ishtar_common/models_common.py:3771 +#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:775 +#: ishtar_common/forms_common.py:1164 ishtar_common/models_common.py:3579 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:601 -#: ishtar_common/forms_common.py:988 ishtar_common/models_common.py:3777 +#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:777 +#: ishtar_common/forms_common.py:1166 ishtar_common/models_common.py:3585 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:603 -#: ishtar_common/forms_common.py:959 ishtar_common/models_common.py:3791 -#: ishtar_common/models_common.py:3967 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:1137 ishtar_common/models_common.py:3599 +#: ishtar_common/models_common.py:3775 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:605 -#: ishtar_common/forms_common.py:969 ishtar_common/models_common.py:3807 +#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:781 +#: ishtar_common/forms_common.py:1147 ishtar_common/models_common.py:3615 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7061,7 +7244,8 @@ msgstr "" #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1141 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:1079 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" @@ -7194,6 +7378,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:183 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -7329,7 +7514,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4100 +#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4114 msgctxt "key for text search" msgid "find-denomination" msgstr "" @@ -7384,7 +7569,7 @@ msgstr "" msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4344 +#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4358 msgid "Container ID" msgstr "" @@ -7446,49 +7631,60 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of owned finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:128 +#: na_app/templates/ishtar/sheet_container.html:135 msgid "Measured weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Calculated weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:133 +#: na_app/templates/ishtar/sheet_container.html:140 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:231 +#: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:261 +#: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:289 +#: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "" @@ -7667,7 +7863,7 @@ msgstr "" msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:724 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:902 msgid "At least two items have to be selected." msgstr "" @@ -7688,7 +7884,7 @@ msgstr "" msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:495 ishtar_common/models.py:1486 +#: ishtar_common/admin.py:495 ishtar_common/models.py:1496 msgid "Maps - default center" msgstr "" @@ -7715,14 +7911,14 @@ msgid "" "might be required." msgstr "" -#: ishtar_common/admin.py:660 ishtar_common/models.py:965 +#: ishtar_common/admin.py:660 ishtar_common/models.py:976 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1295 -#: ishtar_common/forms_common.py:1330 ishtar_common/forms_common.py:1331 -#: ishtar_common/models.py:3020 +#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1475 +#: ishtar_common/forms_common.py:1507 ishtar_common/forms_common.py:1508 +#: ishtar_common/models.py:3030 msgid "Profiles" msgstr "" @@ -7843,10 +8039,12 @@ msgid "Parents" msgstr "" #: ishtar_common/admin.py:1177 ishtar_common/admin.py:1642 +#: ishtar_common/admin.py:1665 msgid "Make available" msgstr "" #: ishtar_common/admin.py:1178 ishtar_common/admin.py:1643 +#: ishtar_common/admin.py:1666 msgid "Make unavailable" msgstr "" @@ -7890,159 +8088,160 @@ msgstr "" msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1694 +#: ishtar_common/admin.py:1717 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1725 +#: ishtar_common/admin.py:1748 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1738 +#: ishtar_common/admin.py:1761 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1765 +#: ishtar_common/admin.py:1788 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1772 +#: ishtar_common/admin.py:1795 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1786 +#: ishtar_common/admin.py:1809 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1821 +#: ishtar_common/admin.py:1844 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1976 +#: ishtar_common/admin.py:2018 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1977 +#: ishtar_common/admin.py:2019 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:2007 ishtar_common/models.py:1629 +#: ishtar_common/admin.py:2049 ishtar_common/models.py:1639 msgid "Form" msgstr "" -#: ishtar_common/admin.py:2028 ishtar_common/models.py:1769 +#: ishtar_common/admin.py:2070 ishtar_common/models.py:1779 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2159 ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2201 ishtar_common/admin.py:2253 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2166 +#: ishtar_common/admin.py:2208 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2178 +#: ishtar_common/admin.py:2220 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2218 +#: ishtar_common/admin.py:2260 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2230 ishtar_common/models_imports.py:1427 +#: ishtar_common/admin.py:2272 ishtar_common/models_imports.py:1597 +#: ishtar_common/models_imports.py:2249 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2298 ishtar_common/models.py:962 +#: ishtar_common/admin.py:2340 ishtar_common/models.py:973 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2361 ishtar_common/admin.py:2499 -#: ishtar_common/admin.py:2543 +#: ishtar_common/admin.py:2403 ishtar_common/admin.py:2541 +#: ishtar_common/admin.py:2585 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2383 +#: ishtar_common/admin.py:2425 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2391 +#: ishtar_common/admin.py:2433 msgid "" "Bad response for {} - {}. Response status code {} != 200. No access to {}. " "If it is not expected, check your key." msgstr "" -#: ishtar_common/admin.py:2403 +#: ishtar_common/admin.py:2445 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2438 +#: ishtar_common/admin.py:2480 msgid "Table/exports configuration updated" msgstr "" -#: ishtar_common/admin.py:2444 +#: ishtar_common/admin.py:2486 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2450 +#: ishtar_common/admin.py:2492 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2456 +#: ishtar_common/admin.py:2498 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2465 +#: ishtar_common/admin.py:2507 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2484 +#: ishtar_common/admin.py:2526 msgid "Update table, export format and types from source" msgstr "" -#: ishtar_common/admin.py:2508 +#: ishtar_common/admin.py:2550 msgid "" "Document not generated: is the LibreOffice daemon configured and running?" msgstr "" -#: ishtar_common/admin.py:2528 +#: ishtar_common/admin.py:2570 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2552 +#: ishtar_common/admin.py:2594 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2557 +#: ishtar_common/admin.py:2599 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2570 +#: ishtar_common/admin.py:2612 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2604 +#: ishtar_common/admin.py:2646 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2605 +#: ishtar_common/admin.py:2647 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2615 ishtar_common/models_rest.py:81 +#: ishtar_common/admin.py:2657 ishtar_common/models_rest.py:81 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2618 ishtar_common/models.py:715 -#: ishtar_common/models_common.py:809 ishtar_common/models_imports.py:851 -#: ishtar_common/models_imports.py:1950 ishtar_common/models_rest.py:111 +#: ishtar_common/admin.py:2660 ishtar_common/models.py:726 +#: ishtar_common/models_common.py:811 ishtar_common/models_imports.py:970 +#: ishtar_common/models_imports.py:2827 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8051,21 +8250,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2620 +#: ishtar_common/admin.py:2662 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2650 +#: ishtar_common/admin.py:2692 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2683 +#: ishtar_common/admin.py:2725 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2691 +#: ishtar_common/admin.py:2733 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8136,173 +8335,173 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:279 +#: ishtar_common/data_importer.py:277 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:298 +#: ishtar_common/data_importer.py:296 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:310 +#: ishtar_common/data_importer.py:308 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:320 +#: ishtar_common/data_importer.py:318 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:377 ishtar_common/data_importer.py:391 -#: ishtar_common/data_importer.py:615 +#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:613 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:404 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:473 +#: ishtar_common/data_importer.py:471 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:480 +#: ishtar_common/data_importer.py:478 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:482 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:644 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:753 +#: ishtar_common/data_importer.py:752 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:759 +#: ishtar_common/data_importer.py:758 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:761 ishtar_common/views.py:1702 +#: ishtar_common/data_importer.py:760 ishtar_common/views.py:1818 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:762 +#: ishtar_common/data_importer.py:761 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:762 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:764 +#: ishtar_common/data_importer.py:763 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:766 +#: ishtar_common/data_importer.py:765 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:770 +#: ishtar_common/data_importer.py:769 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:774 +#: ishtar_common/data_importer.py:773 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1361 ishtar_common/views.py:1780 -#: ishtar_common/views.py:1790 +#: ishtar_common/data_importer.py:1391 ishtar_common/views.py:1896 +#: ishtar_common/views.py:1906 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1655 +#: ishtar_common/data_importer.py:1681 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1660 +#: ishtar_common/data_importer.py:1686 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1742 +#: ishtar_common/data_importer.py:1770 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1869 +#: ishtar_common/data_importer.py:1901 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:1944 +#: ishtar_common/data_importer.py:1971 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:1952 +#: ishtar_common/data_importer.py:1979 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:1957 +#: ishtar_common/data_importer.py:1984 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2043 +#: ishtar_common/data_importer.py:2072 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2046 +#: ishtar_common/data_importer.py:2075 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2126 +#: ishtar_common/data_importer.py:2158 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2210 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8315,8 +8514,8 @@ msgstr "" msgid "File too large. Size should not exceed {} Mo." msgstr "" -#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1337 -#: ishtar_common/views.py:2671 +#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1514 +#: ishtar_common/views.py:2934 msgid "Confirm" msgstr "" @@ -8324,99 +8523,99 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: ishtar_common/forms.py:437 ishtar_common/forms.py:1027 +#: ishtar_common/forms.py:447 ishtar_common/forms.py:1047 msgid "You should select an item." msgstr "" -#: ishtar_common/forms.py:445 +#: ishtar_common/forms.py:455 msgid "Invalid selection." msgstr "" -#: ishtar_common/forms.py:526 +#: ishtar_common/forms.py:536 msgid "There are identical items." msgstr "" -#: ishtar_common/forms.py:938 +#: ishtar_common/forms.py:958 msgid "Created before" msgstr "" -#: ishtar_common/forms.py:941 +#: ishtar_common/forms.py:961 msgid "Created after" msgstr "" -#: ishtar_common/forms.py:944 man_app/templates/ishtar/sheet_basefind.html:74 +#: ishtar_common/forms.py:964 man_app/templates/ishtar/sheet_basefind.html:74 msgid "Last modified by" msgstr "" -#: ishtar_common/forms.py:951 +#: ishtar_common/forms.py:971 msgid "Modified before" msgstr "" -#: ishtar_common/forms.py:954 +#: ishtar_common/forms.py:974 msgid "Modified after" msgstr "" -#: ishtar_common/forms.py:956 +#: ishtar_common/forms.py:976 msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:984 ishtar_common/forms_common.py:2175 +#: ishtar_common/forms.py:1004 ishtar_common/forms_common.py:2352 msgid "Has an image?" msgstr "" -#: ishtar_common/forms.py:986 +#: ishtar_common/forms.py:1006 msgid "Has an attached file?" msgstr "" -#: ishtar_common/forms.py:989 +#: ishtar_common/forms.py:1009 msgid "Has a web address?" msgstr "" -#: ishtar_common/forms.py:1029 +#: ishtar_common/forms.py:1049 msgid "Add a new item" msgstr "" -#: ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1237 msgid " - append to existing" msgstr "" -#: ishtar_common/forms.py:1219 +#: ishtar_common/forms.py:1240 msgid " - replace" msgstr "" -#: ishtar_common/forms.py:1249 +#: ishtar_common/forms.py:1270 msgid "Set to null" msgstr "" -#: ishtar_common/forms.py:1311 +#: ishtar_common/forms.py:1332 msgid "Geo - Name" msgstr "" -#: ishtar_common/forms.py:1312 +#: ishtar_common/forms.py:1333 msgid "Geo - Data type" msgstr "" -#: ishtar_common/forms.py:1313 +#: ishtar_common/forms.py:1334 msgid "Geo - Origin" msgstr "" -#: ishtar_common/forms.py:1314 +#: ishtar_common/forms.py:1335 msgid "Geo - Provider" msgstr "" -#: ishtar_common/forms.py:1315 +#: ishtar_common/forms.py:1336 msgid "Geo - Z - higher than" msgstr "" -#: ishtar_common/forms.py:1316 +#: ishtar_common/forms.py:1337 msgid "Geo - Z - lower than" msgstr "" -#: ishtar_common/forms.py:1317 +#: ishtar_common/forms.py:1338 msgid "Geo - Comment" msgstr "" -#: ishtar_common/forms_common.py:90 +#: ishtar_common/forms_common.py:94 msgid "" "<p>Type name, department code of the town you would like to select. The " "search is insensitive to case.</p>\n" @@ -8426,67 +8625,92 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: ishtar_common/forms_common.py:148 +#: ishtar_common/forms_common.py:152 msgid "Password" msgstr "" -#: ishtar_common/forms_common.py:157 ishtar_common/forms_common.py:1220 -#: ishtar_common/forms_common.py:1235 ishtar_common/wizards.py:2003 +#: ishtar_common/forms_common.py:162 ishtar_common/forms_common.py:1398 +#: ishtar_common/forms_common.py:1417 ishtar_common/wizards.py:2003 msgid "New password" msgstr "" -#: ishtar_common/forms_common.py:164 +#: ishtar_common/forms_common.py:170 msgid "New password confirmation" msgstr "" -#: ishtar_common/forms_common.py:173 +#: ishtar_common/forms_common.py:180 msgid "Old password" msgstr "" -#: ishtar_common/forms_common.py:211 ishtar_common/forms_common.py:306 +#: ishtar_common/forms_common.py:218 msgid "Associated images (web link to a zip file)" msgstr "" -#: ishtar_common/forms_common.py:233 ishtar_common/forms_common.py:324 +#: ishtar_common/forms_common.py:240 ishtar_common/forms_common.py:370 msgid "Import (table)" msgstr "" -#: ishtar_common/forms_common.py:285 -msgid "This is not a valid CSV file. Check file format and encoding." +#: ishtar_common/forms_common.py:241 ishtar_common/forms_common.py:371 +#: ishtar_common/forms_common.py:455 ishtar_common/forms_common.py:522 +msgid "CSV options" msgstr "" #: ishtar_common/forms_common.py:297 +msgid "Bad format. Extension of the file must be {}." +msgstr "" + +#: ishtar_common/forms_common.py:299 +msgid "Bad format. Extension of the file must be: {} or {}." +msgstr "" + +#: ishtar_common/forms_common.py:320 +msgid "This is not a valid CSV file. Check file format and encoding." +msgstr "" + +#: ishtar_common/forms_common.py:332 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." msgstr "" -#: ishtar_common/forms_common.py:332 +#: ishtar_common/forms_common.py:352 +msgid "Associated documents (web link to a zip file)" +msgstr "" + +#: ishtar_common/forms_common.py:372 ishtar_common/forms_common.py:523 +msgid "Documents/Images" +msgstr "" + +#: ishtar_common/forms_common.py:384 msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:343 ishtar_common/tests.py:2591 +#: ishtar_common/forms_common.py:395 ishtar_common/tests.py:2884 msgid "\"Associated images\" field must be a valid zip file." msgstr "" -#: ishtar_common/forms_common.py:356 +#: ishtar_common/forms_common.py:417 msgid "Invalid link or no file is available for this link." msgstr "" -#: ishtar_common/forms_common.py:399 +#: ishtar_common/forms_common.py:454 msgid "Import (GIS)" msgstr "" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:484 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" -#: ishtar_common/forms_common.py:450 +#: ishtar_common/forms_common.py:521 +msgid "Import (group)" +msgstr "" + +#: ishtar_common/forms_common.py:551 ishtar_common/models_imports.py:538 msgid "Target" msgstr "" -#: ishtar_common/forms_common.py:451 ishtar_common/models.py:1832 -#: ishtar_common/models_imports.py:852 +#: ishtar_common/forms_common.py:552 ishtar_common/models.py:1842 +#: ishtar_common/models_imports.py:971 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8494,695 +8718,698 @@ msgstr "" msgid "Value" msgstr "" -#: ishtar_common/forms_common.py:452 +#: ishtar_common/forms_common.py:553 msgid "Remember" msgstr "" -#: ishtar_common/forms_common.py:477 +#: ishtar_common/forms_common.py:579 msgid "Set to NULL" msgstr "" -#: ishtar_common/forms_common.py:484 +#: ishtar_common/forms_common.py:586 msgid "this import only" msgstr "" -#: ishtar_common/forms_common.py:485 +#: ishtar_common/forms_common.py:587 msgid "me" msgstr "" -#: ishtar_common/forms_common.py:498 +#: ishtar_common/forms_common.py:600 msgid "the current group: {}" msgstr "" -#: ishtar_common/forms_common.py:504 +#: ishtar_common/forms_common.py:606 msgid "all users" msgstr "" -#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:698 -#: ishtar_common/models.py:2514 ishtar_common/models_imports.py:929 -#: ishtar_common/models_imports.py:930 +#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:876 +#: ishtar_common/models.py:2524 ishtar_common/models_imports.py:1048 +#: ishtar_common/models_imports.py:1049 msgid "Organization type" msgstr "" -#: ishtar_common/forms_common.py:587 ishtar_common/forms_common.py:2140 -#: ishtar_common/models.py:2592 +#: ishtar_common/forms_common.py:763 ishtar_common/forms_common.py:2317 +#: ishtar_common/models.py:2602 msgid "Web address" msgstr "" -#: ishtar_common/forms_common.py:589 ishtar_common/forms_common.py:701 -#: ishtar_common/models.py:2490 ishtar_common/models.py:2507 -#: ishtar_common/models.py:2594 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:879 +#: ishtar_common/models.py:2500 ishtar_common/models.py:2517 +#: ishtar_common/models.py:2604 msgid "Grammatical gender" msgstr "" -#: ishtar_common/forms_common.py:592 ishtar_common/forms_common.py:704 +#: ishtar_common/forms_common.py:768 ishtar_common/forms_common.py:882 msgid "Can be used by templates" msgstr "" -#: ishtar_common/forms_common.py:602 ishtar_common/forms_common.py:826 -#: ishtar_common/forms_common.py:955 ishtar_common/forms_common.py:1050 -#: ishtar_common/forms_common.py:1217 ishtar_common/models_common.py:3809 -#: ishtar_common/models_common.py:3977 ishtar_common/wizards.py:1968 +#: ishtar_common/forms_common.py:778 ishtar_common/forms_common.py:1004 +#: ishtar_common/forms_common.py:1133 ishtar_common/forms_common.py:1228 +#: ishtar_common/forms_common.py:1395 ishtar_common/models_common.py:3617 +#: ishtar_common/models_common.py:3785 ishtar_common/wizards.py:1968 msgid "Email" msgstr "" -#: ishtar_common/forms_common.py:655 ishtar_common/forms_common.py:671 +#: ishtar_common/forms_common.py:833 ishtar_common/forms_common.py:849 #: ishtar_common/views.py:335 msgid "Organization search" msgstr "" -#: ishtar_common/forms_common.py:688 +#: ishtar_common/forms_common.py:866 msgid "Organization - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:741 +#: ishtar_common/forms_common.py:919 msgid "Merge all items into" msgstr "" -#: ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:957 msgid "Organization to merge" msgstr "" -#: ishtar_common/forms_common.py:823 ishtar_common/forms_common.py:951 -#: ishtar_common/forms_common.py:1049 ishtar_common/models.py:2879 +#: ishtar_common/forms_common.py:1001 ishtar_common/forms_common.py:1129 +#: ishtar_common/forms_common.py:1227 ishtar_common/models.py:2889 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "" -#: ishtar_common/forms_common.py:824 ishtar_common/forms_common.py:889 -#: ishtar_common/forms_common.py:948 ishtar_common/forms_common.py:1722 -#: ishtar_common/forms_common.py:2132 ishtar_common/forms_common.py:2364 -#: ishtar_common/models.py:2866 ishtar_common/models.py:2870 -#: ishtar_common/models.py:4240 ishtar_common/models_imports.py:932 +#: ishtar_common/forms_common.py:1002 ishtar_common/forms_common.py:1067 +#: ishtar_common/forms_common.py:1126 ishtar_common/forms_common.py:1899 +#: ishtar_common/forms_common.py:2309 ishtar_common/forms_common.py:2540 +#: ishtar_common/models.py:2876 ishtar_common/models.py:2880 +#: ishtar_common/models.py:4254 ishtar_common/models_imports.py:1051 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "" -#: ishtar_common/forms_common.py:825 ishtar_common/forms_common.py:949 -#: ishtar_common/models.py:2876 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1127 +#: ishtar_common/models.py:2886 #: ishtar_common/templates/ishtar/merge_person.html:12 #: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "" -#: ishtar_common/forms_common.py:844 ishtar_common/forms_common.py:860 -#: ishtar_common/forms_common.py:1025 ishtar_common/views.py:276 +#: ishtar_common/forms_common.py:1022 ishtar_common/forms_common.py:1038 +#: ishtar_common/forms_common.py:1203 ishtar_common/views.py:276 msgid "Person search" msgstr "" -#: ishtar_common/forms_common.py:878 +#: ishtar_common/forms_common.py:1056 msgid "Person - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:900 ishtar_common/models.py:2671 +#: ishtar_common/forms_common.py:1078 ishtar_common/models.py:2681 msgid "Person types" msgstr "" -#: ishtar_common/forms_common.py:918 +#: ishtar_common/forms_common.py:1096 msgid "Person to merge" msgstr "" -#: ishtar_common/forms_common.py:940 +#: ishtar_common/forms_common.py:1118 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "" -#: ishtar_common/forms_common.py:954 ishtar_common/models.py:2889 +#: ishtar_common/forms_common.py:1132 ishtar_common/models.py:2899 #: ishtar_common/templates/ishtar/merge_person.html:9 #: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:957 ishtar_common/models_common.py:3793 +#: ishtar_common/forms_common.py:1135 ishtar_common/models_common.py:3601 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:961 ishtar_common/models_common.py:3796 -#: ishtar_common/models_common.py:3799 +#: ishtar_common/forms_common.py:1139 ishtar_common/models_common.py:3604 +#: ishtar_common/models_common.py:3607 msgid "Phone description 2" msgstr "" -#: ishtar_common/forms_common.py:963 +#: ishtar_common/forms_common.py:1141 msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:965 ishtar_common/models_common.py:3803 +#: ishtar_common/forms_common.py:1143 ishtar_common/models_common.py:3611 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:967 ishtar_common/models_common.py:3801 +#: ishtar_common/forms_common.py:1145 ishtar_common/models_common.py:3609 msgid "Phone 3" msgstr "" -#: ishtar_common/forms_common.py:972 +#: ishtar_common/forms_common.py:1150 msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:990 ishtar_common/models_common.py:3778 +#: ishtar_common/forms_common.py:1168 ishtar_common/models_common.py:3586 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:993 ishtar_common/models_common.py:3780 +#: ishtar_common/forms_common.py:1171 ishtar_common/models_common.py:3588 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:998 ishtar_common/models_common.py:3783 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3591 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1001 ishtar_common/models_common.py:3786 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3594 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1004 ishtar_common/models_common.py:3789 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:3597 msgid "Other address: country" msgstr "" -#: ishtar_common/forms_common.py:1016 +#: ishtar_common/forms_common.py:1194 msgid "Already has an account" msgstr "" -#: ishtar_common/forms_common.py:1017 ishtar_common/forms_common.py:1355 -#: ishtar_common/models.py:3197 ishtar_common/models.py:3218 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/forms_common.py:1195 ishtar_common/forms_common.py:1532 +#: ishtar_common/models.py:3207 ishtar_common/models.py:3228 +#: ishtar_common/models_imports.py:1056 msgid "Profile type" msgstr "" -#: ishtar_common/forms_common.py:1047 ishtar_common/models.py:3398 +#: ishtar_common/forms_common.py:1225 ishtar_common/models.py:3408 #: ishtar_common/wizards.py:1967 msgid "Username" msgstr "" -#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1247 ishtar_common/forms_common.py:1260 msgid "Account search" msgstr "" -#: ishtar_common/forms_common.py:1144 ishtar_common/forms_common.py:1192 -#: ishtar_common/forms_common.py:1196 ishtar_common/models.py:2670 -#: ishtar_common/models_imports.py:931 +#: ishtar_common/forms_common.py:1322 ishtar_common/forms_common.py:1370 +#: ishtar_common/forms_common.py:1374 ishtar_common/models.py:2680 +#: ishtar_common/models_imports.py:1050 msgid "Person type" msgstr "" -#: ishtar_common/forms_common.py:1211 ishtar_common/forms_common.py:1215 +#: ishtar_common/forms_common.py:1389 ishtar_common/forms_common.py:1393 #: ishtar_common/ishtar_menu.py:80 msgid "Account" msgstr "" -#: ishtar_common/forms_common.py:1227 +#: ishtar_common/forms_common.py:1407 msgid "New password (confirmation)" msgstr "" -#: ishtar_common/forms_common.py:1237 +#: ishtar_common/forms_common.py:1419 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." msgstr "" -#: ishtar_common/forms_common.py:1275 +#: ishtar_common/forms_common.py:1457 msgid "Your password and confirmation password do not match." msgstr "" -#: ishtar_common/forms_common.py:1281 +#: ishtar_common/forms_common.py:1463 msgid "You must provide a correct password." msgstr "" -#: ishtar_common/forms_common.py:1290 +#: ishtar_common/forms_common.py:1470 msgid "This username already exists." msgstr "" -#: ishtar_common/forms_common.py:1322 +#: ishtar_common/forms_common.py:1499 msgid "Choose different name for profiles." msgstr "" -#: ishtar_common/forms_common.py:1339 +#: ishtar_common/forms_common.py:1516 msgid "Send the new password by email?" msgstr "" -#: ishtar_common/forms_common.py:1352 ishtar_common/models.py:3226 -#: ishtar_common/views.py:1344 +#: ishtar_common/forms_common.py:1529 ishtar_common/models.py:3236 +#: ishtar_common/views.py:1345 msgid "Current profile" msgstr "" -#: ishtar_common/forms_common.py:1358 +#: ishtar_common/forms_common.py:1535 msgid "Pin automatically items on creation and modification" msgstr "" -#: ishtar_common/forms_common.py:1363 +#: ishtar_common/forms_common.py:1540 msgid "Duplicate this profile" msgstr "" -#: ishtar_common/forms_common.py:1366 +#: ishtar_common/forms_common.py:1543 msgid "Delete this profile" msgstr "" -#: ishtar_common/forms_common.py:1403 ishtar_common/forms_common.py:1411 +#: ishtar_common/forms_common.py:1580 ishtar_common/forms_common.py:1588 msgid "External source - {}" msgstr "" -#: ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1637 msgid "A profile with the same name exists." msgstr "" -#: ishtar_common/forms_common.py:1493 +#: ishtar_common/forms_common.py:1670 msgid " (duplicate)" msgstr "" -#: ishtar_common/forms_common.py:1522 +#: ishtar_common/forms_common.py:1699 msgid "There are identical towns." msgstr "" -#: ishtar_common/forms_common.py:1609 +#: ishtar_common/forms_common.py:1786 msgid "Only one choice can be checked." msgstr "" -#: ishtar_common/forms_common.py:1659 +#: ishtar_common/forms_common.py:1836 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: ishtar_common/forms_common.py:1684 +#: ishtar_common/forms_common.py:1861 msgid "This value already exist" msgstr "" -#: ishtar_common/forms_common.py:1700 ishtar_common/models.py:3836 -#: ishtar_common/models_imports.py:940 +#: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3850 +#: ishtar_common/models_imports.py:1059 msgid "Document tag" msgstr "" -#: ishtar_common/forms_common.py:1709 +#: ishtar_common/forms_common.py:1886 msgid "Document - General" msgstr "" -#: ishtar_common/forms_common.py:1730 ishtar_common/forms_common.py:2138 -#: ishtar_common/forms_common.py:2344 ishtar_common/models.py:4306 +#: ishtar_common/forms_common.py:1907 ishtar_common/forms_common.py:2315 +#: ishtar_common/forms_common.py:2520 ishtar_common/models.py:4320 msgid "Medium" msgstr "" -#: ishtar_common/forms_common.py:1733 ishtar_common/forms_common.py:1922 -#: ishtar_common/forms_common.py:2137 ishtar_common/forms_common.py:2343 -#: ishtar_common/models.py:4313 ishtar_common/models_imports.py:936 -#: ishtar_common/models_imports.py:938 +#: ishtar_common/forms_common.py:1910 ishtar_common/forms_common.py:2099 +#: ishtar_common/forms_common.py:2314 ishtar_common/forms_common.py:2519 +#: ishtar_common/models.py:4327 ishtar_common/models_imports.py:1055 +#: ishtar_common/models_imports.py:1057 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "" -#: ishtar_common/forms_common.py:1735 ishtar_common/forms_common.py:2139 -#: ishtar_common/forms_common.py:2345 ishtar_common/models.py:4318 +#: ishtar_common/forms_common.py:1912 ishtar_common/forms_common.py:2316 +#: ishtar_common/forms_common.py:2521 ishtar_common/models.py:4332 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" -#: ishtar_common/forms_common.py:1753 ishtar_common/forms_common.py:1924 -#: ishtar_common/forms_common.py:2571 ishtar_common/forms_common.py:2572 -#: ishtar_common/models.py:3697 ishtar_common/models.py:3963 -#: ishtar_common/models.py:4320 +#: ishtar_common/forms_common.py:1930 ishtar_common/forms_common.py:2101 +#: ishtar_common/forms_common.py:2747 ishtar_common/forms_common.py:2748 +#: ishtar_common/models.py:3711 ishtar_common/models.py:3977 +#: ishtar_common/models.py:4334 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "" -#: ishtar_common/forms_common.py:1759 ishtar_common/forms_common.py:2143 -#: ishtar_common/models.py:4262 +#: ishtar_common/forms_common.py:1936 ishtar_common/forms_common.py:2320 +#: ishtar_common/models.py:4276 msgid "Publisher" msgstr "" -#: ishtar_common/forms_common.py:1783 ishtar_common/forms_common.py:2165 -#: ishtar_common/models.py:4269 +#: ishtar_common/forms_common.py:1960 ishtar_common/forms_common.py:2342 +#: ishtar_common/models.py:4283 msgid "Year of publication" msgstr "" -#: ishtar_common/forms_common.py:1788 +#: ishtar_common/forms_common.py:1965 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "" -#: ishtar_common/forms_common.py:1791 ishtar_common/forms_common.py:2346 -#: ishtar_common/models.py:4274 +#: ishtar_common/forms_common.py:1968 ishtar_common/forms_common.py:2522 +#: ishtar_common/models.py:4288 msgid "Tags" msgstr "" -#: ishtar_common/forms_common.py:1797 ishtar_common/forms_common.py:2166 -#: ishtar_common/models.py:982 ishtar_common/models.py:4277 -#: ishtar_common/models_imports.py:941 overload_translation/models.py:11 +#: ishtar_common/forms_common.py:1974 ishtar_common/forms_common.py:2343 +#: ishtar_common/models.py:993 ishtar_common/models.py:4291 +#: ishtar_common/models_imports.py:1060 overload_translation/models.py:11 msgid "Language" msgstr "" -#: ishtar_common/forms_common.py:1800 ishtar_common/forms_common.py:2168 -#: ishtar_common/models.py:4282 +#: ishtar_common/forms_common.py:1977 ishtar_common/forms_common.py:2345 +#: ishtar_common/models.py:4296 msgid "ISSN" msgstr "" -#: ishtar_common/forms_common.py:1806 ishtar_common/forms_common.py:2167 -#: ishtar_common/models.py:4283 +#: ishtar_common/forms_common.py:1983 ishtar_common/forms_common.py:2344 +#: ishtar_common/models.py:4297 msgid "ISBN" msgstr "" -#: ishtar_common/forms_common.py:1812 ishtar_common/forms_common.py:1927 -#: ishtar_common/forms_common.py:2177 ishtar_common/models.py:4286 -#: ishtar_common/models.py:5354 +#: ishtar_common/forms_common.py:1989 ishtar_common/forms_common.py:2104 +#: ishtar_common/forms_common.py:2354 ishtar_common/models.py:4300 +#: ishtar_common/models.py:5368 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 +#: ishtar_common/templates/ishtar/import_table.html:2 #: ishtar_common/templates/ishtar/sheet_document.html:93 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:2 +#: ishtar_common/views.py:2239 msgid "Source" msgstr "" -#: ishtar_common/forms_common.py:1815 ishtar_common/forms_common.py:2183 -#: ishtar_common/models.py:4293 +#: ishtar_common/forms_common.py:1992 ishtar_common/forms_common.py:2360 +#: ishtar_common/models.py:4307 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:1820 ishtar_common/models.py:4299 +#: ishtar_common/forms_common.py:1997 ishtar_common/models.py:4313 msgid "Source - page range" msgstr "" -#: ishtar_common/forms_common.py:1824 +#: ishtar_common/forms_common.py:2001 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:1830 ishtar_common/models.py:4330 +#: ishtar_common/forms_common.py:2007 ishtar_common/models.py:4344 msgid "Numerical ressource (web address)" msgstr "" -#: ishtar_common/forms_common.py:1833 +#: ishtar_common/forms_common.py:2010 msgid "Image" msgstr "" -#: ishtar_common/forms_common.py:1841 +#: ishtar_common/forms_common.py:2018 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:1858 ishtar_common/models.py:4333 +#: ishtar_common/forms_common.py:2035 ishtar_common/models.py:4347 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:1864 ishtar_common/models.py:4339 +#: ishtar_common/forms_common.py:2041 ishtar_common/models.py:4353 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:1871 ishtar_common/models.py:4353 +#: ishtar_common/forms_common.py:2048 ishtar_common/models.py:4367 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2173 -#: ishtar_common/models.py:4355 +#: ishtar_common/forms_common.py:2050 ishtar_common/forms_common.py:2350 +#: ishtar_common/models.py:4369 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" -#: ishtar_common/forms_common.py:1920 ishtar_common/forms_common.py:2743 +#: ishtar_common/forms_common.py:2097 ishtar_common/forms_common.py:2933 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "" -#: ishtar_common/forms_common.py:1926 +#: ishtar_common/forms_common.py:2103 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "" -#: ishtar_common/forms_common.py:1929 +#: ishtar_common/forms_common.py:2106 msgid "Advanced" msgstr "" -#: ishtar_common/forms_common.py:1976 +#: ishtar_common/forms_common.py:2153 msgid "Incorrect page range." msgstr "" -#: ishtar_common/forms_common.py:2063 +#: ishtar_common/forms_common.py:2240 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." msgstr "" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2249 msgid "A document has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2115 +#: ishtar_common/forms_common.py:2292 msgid "Document - 001 - Search" msgstr "" -#: ishtar_common/forms_common.py:2128 ishtar_common/forms_common.py:2338 -#: ishtar_common/forms_common.py:2507 ishtar_common/forms_common.py:2558 -#: ishtar_common/models.py:3696 +#: ishtar_common/forms_common.py:2305 ishtar_common/forms_common.py:2514 +#: ishtar_common/forms_common.py:2683 ishtar_common/forms_common.py:2734 +#: ishtar_common/models.py:3710 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2318 msgid "Tag" msgstr "" -#: ishtar_common/forms_common.py:2169 ishtar_common/models.py:4272 +#: ishtar_common/forms_common.py:2346 ishtar_common/models.py:4286 msgid "License" msgstr "" -#: ishtar_common/forms_common.py:2172 +#: ishtar_common/forms_common.py:2349 msgid "Additional informations" msgstr "" -#: ishtar_common/forms_common.py:2174 +#: ishtar_common/forms_common.py:2351 msgid "Has a file?" msgstr "" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2362 msgid "Warehouse - Container" msgstr "" -#: ishtar_common/forms_common.py:2193 +#: ishtar_common/forms_common.py:2370 msgid "Warehouse - Reference container" msgstr "" -#: ishtar_common/forms_common.py:2210 +#: ishtar_common/forms_common.py:2387 msgid "Operation - type" msgstr "" -#: ishtar_common/forms_common.py:2223 +#: ishtar_common/forms_common.py:2399 msgid "Basket - Finds" msgstr "" -#: ishtar_common/forms_common.py:2238 +#: ishtar_common/forms_common.py:2414 msgid "Find - denomination" msgstr "" -#: ishtar_common/forms_common.py:2250 ishtar_common/forms_common.py:2262 +#: ishtar_common/forms_common.py:2426 ishtar_common/forms_common.py:2438 msgid "Receipt date before" msgstr "" -#: ishtar_common/forms_common.py:2253 ishtar_common/forms_common.py:2265 +#: ishtar_common/forms_common.py:2429 ishtar_common/forms_common.py:2441 msgid "Receipt date after" msgstr "" -#: ishtar_common/forms_common.py:2256 +#: ishtar_common/forms_common.py:2432 msgid "Creation date before" msgstr "" -#: ishtar_common/forms_common.py:2259 +#: ishtar_common/forms_common.py:2435 msgid "Creation date after" msgstr "" -#: ishtar_common/forms_common.py:2288 ishtar_common/forms_common.py:2303 +#: ishtar_common/forms_common.py:2464 ishtar_common/forms_common.py:2479 msgid "Document search" msgstr "" -#: ishtar_common/forms_common.py:2322 +#: ishtar_common/forms_common.py:2498 msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2336 ishtar_common/models_imports.py:933 -#: ishtar_common/models_imports.py:934 +#: ishtar_common/forms_common.py:2512 ishtar_common/models_imports.py:1052 +#: ishtar_common/models_imports.py:1053 msgid "Source type" msgstr "" -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2543 msgid "Edit duplicated item" msgstr "" -#: ishtar_common/forms_common.py:2441 +#: ishtar_common/forms_common.py:2617 msgid "current and reference containers" msgstr "" -#: ishtar_common/forms_common.py:2480 -#: ishtar_common/templates/ishtar/import_table.html:33 +#: ishtar_common/forms_common.py:2656 +#: ishtar_common/templates/ishtar/import_table.html:58 msgid "Action" msgstr "" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Lock" msgstr "" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Unlock" msgstr "" -#: ishtar_common/forms_common.py:2498 +#: ishtar_common/forms_common.py:2674 msgid "Would you like to delete this documentation?" msgstr "" -#: ishtar_common/forms_common.py:2518 ishtar_common/models.py:3666 -#: ishtar_common/models.py:3688 ishtar_common/models_imports.py:935 +#: ishtar_common/forms_common.py:2694 ishtar_common/models.py:3680 +#: ishtar_common/models.py:3702 ishtar_common/models_imports.py:1054 msgid "Author type" msgstr "" -#: ishtar_common/forms_common.py:2535 +#: ishtar_common/forms_common.py:2711 msgid "This author already exist." msgstr "" -#: ishtar_common/forms_common.py:2547 +#: ishtar_common/forms_common.py:2723 msgid "Author selection" msgstr "" -#: ishtar_common/forms_common.py:2565 +#: ishtar_common/forms_common.py:2741 msgid "There are identical authors." msgstr "" -#: ishtar_common/forms_common.py:2578 ishtar_common/forms_common.py:2643 -#: ishtar_common/models.py:960 +#: ishtar_common/forms_common.py:2754 ishtar_common/forms_common.py:2819 +#: ishtar_common/models.py:971 msgid "Query" msgstr "" -#: ishtar_common/forms_common.py:2582 ishtar_common/models.py:967 +#: ishtar_common/forms_common.py:2758 ishtar_common/models.py:978 msgid "Is an alert" msgstr "" -#: ishtar_common/forms_common.py:2604 +#: ishtar_common/forms_common.py:2780 msgid "A label is required for a new search query." msgstr "" -#: ishtar_common/forms_common.py:2608 +#: ishtar_common/forms_common.py:2784 msgid "Select the search query to update" msgstr "" -#: ishtar_common/forms_common.py:2615 ishtar_common/forms_common.py:2636 +#: ishtar_common/forms_common.py:2791 ishtar_common/forms_common.py:2812 msgid "Query does not exist." msgstr "" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2847 msgid "Geo item" msgstr "" -#: ishtar_common/forms_common.py:2672 +#: ishtar_common/forms_common.py:2848 msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2689 ishtar_common/models_common.py:2373 +#: ishtar_common/forms_common.py:2865 ishtar_common/models_common.py:2183 msgid "Import key" msgstr "" -#: ishtar_common/forms_common.py:2692 +#: ishtar_common/forms_common.py:2869 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2700 ishtar_common/models_common.py:2388 +#: ishtar_common/forms_common.py:2880 ishtar_common/models_common.py:2198 #: 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:2703 ishtar_common/models_common.py:2380 +#: ishtar_common/forms_common.py:2883 ishtar_common/models_common.py:2190 #: 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:2706 ishtar_common/models_common.py:2396 +#: ishtar_common/forms_common.py:2886 ishtar_common/models_common.py:2206 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" -#: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:2746 -#: ishtar_common/models_common.py:2362 +#: ishtar_common/forms_common.py:2889 ishtar_common/forms_common.py:2937 +#: ishtar_common/models_common.py:2172 msgid "Buffer" msgstr "" -#: ishtar_common/forms_common.py:2713 +#: ishtar_common/forms_common.py:2894 msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2717 ishtar_common/models_common.py:2409 -#: ishtar_common/models_common.py:4305 +#: ishtar_common/forms_common.py:2898 ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:4113 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:2721 ishtar_common/models_common.py:2412 -#: ishtar_common/models_common.py:4308 +#: ishtar_common/forms_common.py:2903 ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:4116 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:2725 ishtar_common/models_common.py:2415 -#: ishtar_common/models_common.py:4311 +#: ishtar_common/forms_common.py:2908 ishtar_common/models_common.py:2225 +#: ishtar_common/models_common.py:4119 msgid "Estimated error for Z" msgstr "" -#: ishtar_common/forms_common.py:2744 +#: ishtar_common/forms_common.py:2935 msgid "Metadata" msgstr "" -#: ishtar_common/forms_common.py:2745 ishtar_common/models.py:2375 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2232 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2281 -#: ishtar_common/models_common.py:2298 ishtar_common/models_common.py:2311 -#: ishtar_common/models_common.py:2440 ishtar_common/models_common.py:3531 +#: ishtar_common/forms_common.py:2936 ishtar_common/models.py:2385 +#: ishtar_common/models_common.py:1984 ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2074 ishtar_common/models_common.py:2091 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2121 +#: ishtar_common/models_common.py:2250 ishtar_common/models_common.py:3339 msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:3133 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:3137 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2937 +#: ishtar_common/forms_common.py:3140 msgid "A value is expected for Z." msgstr "" -#: ishtar_common/forms_common.py:2956 +#: ishtar_common/forms_common.py:3158 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2996 +#: ishtar_common/forms_common.py:3198 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2998 +#: ishtar_common/forms_common.py:3200 msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:2999 ishtar_common/models_common.py:2331 -#: ishtar_common/models_common.py:4320 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2141 +#: ishtar_common/models_common.py:4128 msgid "Point" msgstr "" -#: ishtar_common/forms_common.py:3000 +#: ishtar_common/forms_common.py:3202 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:3001 +#: ishtar_common/forms_common.py:3203 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:3002 +#: ishtar_common/forms_common.py:3204 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:3003 +#: ishtar_common/forms_common.py:3205 msgid "Multi-polygons" msgstr "" @@ -9191,12 +9418,12 @@ msgstr "" msgid "Home" msgstr "" -#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2517 -#: ishtar_common/models.py:2619 ishtar_common/models.py:2673 -#: ishtar_common/models.py:2747 ishtar_common/models.py:2921 -#: ishtar_common/models.py:3200 ishtar_common/models.py:3212 -#: ishtar_common/models.py:3249 ishtar_common/models.py:3453 -#: ishtar_common/models.py:3669 ishtar_common/models.py:3705 +#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2527 +#: ishtar_common/models.py:2629 ishtar_common/models.py:2683 +#: ishtar_common/models.py:2757 ishtar_common/models.py:2931 +#: ishtar_common/models.py:3210 ishtar_common/models.py:3222 +#: ishtar_common/models.py:3259 ishtar_common/models.py:3463 +#: ishtar_common/models.py:3683 ishtar_common/models.py:3719 msgid "Directory" msgstr "" @@ -9204,22 +9431,23 @@ msgstr "" msgid "Addition/modification" msgstr "" -#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:201 -#: ishtar_common/models_imports.py:449 ishtar_common/models_imports.py:507 -#: ishtar_common/models_imports.py:614 ishtar_common/models_imports.py:668 -#: ishtar_common/models_imports.py:688 ishtar_common/models_imports.py:717 -#: ishtar_common/models_imports.py:771 ishtar_common/models_imports.py:831 -#: ishtar_common/models_imports.py:874 ishtar_common/models_imports.py:1053 -#: ishtar_common/models_imports.py:1313 ishtar_common/models_imports.py:1314 -#: ishtar_common/models_imports.py:1971 +#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:220 +#: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:555 +#: ishtar_common/models_imports.py:623 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:787 ishtar_common/models_imports.py:807 +#: ishtar_common/models_imports.py:836 ishtar_common/models_imports.py:890 +#: ishtar_common/models_imports.py:950 ishtar_common/models_imports.py:993 +#: ishtar_common/models_imports.py:1187 ishtar_common/models_imports.py:1523 +#: ishtar_common/models_imports.py:1948 ishtar_common/models_imports.py:2820 +#: ishtar_common/models_imports.py:2848 msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1519 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1586 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:1999 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2115 msgid "Old imports" msgstr "" @@ -9227,96 +9455,96 @@ msgstr "" msgid "Documentation / Images" msgstr "" -#: ishtar_common/models.py:390 +#: ishtar_common/models.py:399 msgid "Not a valid item." msgstr "" -#: ishtar_common/models.py:405 +#: ishtar_common/models.py:414 msgid "A selected item is not a valid item." msgstr "" -#: ishtar_common/models.py:415 +#: ishtar_common/models.py:424 msgid "This item already exists." msgstr "" -#: ishtar_common/models.py:579 +#: ishtar_common/models.py:590 msgid "Generated relation image (SVG)" msgstr "" -#: ishtar_common/models.py:586 +#: ishtar_common/models.py:597 msgid "Generated relation image (PNG)" msgstr "" -#: ishtar_common/models.py:593 +#: ishtar_common/models.py:604 msgid "Generated relation image (DOT)" msgstr "" -#: ishtar_common/models.py:600 +#: ishtar_common/models.py:611 msgid "Generated above relation image (SVG)" msgstr "" -#: ishtar_common/models.py:607 +#: ishtar_common/models.py:618 msgid "Generated above relation image (DOT)" msgstr "" -#: ishtar_common/models.py:614 +#: ishtar_common/models.py:625 msgid "Generated above relation image (PNG)" msgstr "" -#: ishtar_common/models.py:621 +#: ishtar_common/models.py:632 msgid "Generated below relation image (SVG)" msgstr "" -#: ishtar_common/models.py:628 +#: ishtar_common/models.py:639 msgid "Generated below relation image (DOT)" msgstr "" -#: ishtar_common/models.py:635 +#: ishtar_common/models.py:646 msgid "Generated below relation image (PNG)" msgstr "" -#: ishtar_common/models.py:677 +#: ishtar_common/models.py:688 msgid "Custom data - Menu" msgstr "" -#: ishtar_common/models.py:678 +#: ishtar_common/models.py:689 msgid "Custom data - Menus" msgstr "" -#: ishtar_common/models.py:681 ishtar_common/models.py:745 -#: ishtar_common/models.py:1663 ishtar_common/models.py:1815 +#: ishtar_common/models.py:692 ishtar_common/models.py:756 +#: ishtar_common/models.py:1673 ishtar_common/models.py:1825 msgid "Custom data / custom forms" msgstr "" -#: ishtar_common/models.py:691 +#: ishtar_common/models.py:702 msgid "Text" msgstr "" -#: ishtar_common/models.py:692 +#: ishtar_common/models.py:703 msgid "Long text" msgstr "" -#: ishtar_common/models.py:693 ishtar_common/models_imports.py:993 +#: ishtar_common/models.py:704 ishtar_common/models_imports.py:1112 msgid "Integer" msgstr "" -#: ishtar_common/models.py:694 +#: ishtar_common/models.py:705 msgid "Boolean" msgstr "" -#: ishtar_common/models.py:695 ishtar_common/models_imports.py:994 +#: ishtar_common/models.py:706 ishtar_common/models_imports.py:1113 msgid "Float" msgstr "" -#: ishtar_common/models.py:697 +#: ishtar_common/models.py:708 msgid "Choices" msgstr "" -#: ishtar_common/models.py:698 +#: ishtar_common/models.py:709 msgid "Multi-choices" msgstr "" -#: ishtar_common/models.py:718 +#: ishtar_common/models.py:729 msgid "" "Value of the key in the JSON schema. For hierarchical key use \"__\" to " "explain it. For instance for the key 'my_subkey' with data such as " @@ -9324,222 +9552,222 @@ msgid "" "my_key__my_subkey." msgstr "" -#: ishtar_common/models.py:725 +#: ishtar_common/models.py:736 msgid "Display" msgstr "" -#: ishtar_common/models.py:730 +#: ishtar_common/models.py:741 msgid "Use in search indexes" msgstr "" -#: ishtar_common/models.py:741 +#: ishtar_common/models.py:752 msgid "Custom data - Field" msgstr "" -#: ishtar_common/models.py:742 +#: ishtar_common/models.py:753 msgid "Custom data - Fields" msgstr "" -#: ishtar_common/models.py:758 +#: ishtar_common/models.py:769 msgid "Content types of the field and of the menu do not match" msgstr "" -#: ishtar_common/models.py:763 +#: ishtar_common/models.py:774 msgid "Above" msgstr "" -#: ishtar_common/models.py:764 +#: ishtar_common/models.py:775 msgid "Below" msgstr "" -#: ishtar_common/models.py:765 +#: ishtar_common/models.py:776 msgid "Equal" msgstr "" -#: ishtar_common/models.py:766 +#: ishtar_common/models.py:777 msgid "Include" msgstr "" -#: ishtar_common/models.py:767 +#: ishtar_common/models.py:778 msgid "Is included" msgstr "" -#: ishtar_common/models.py:773 +#: ishtar_common/models.py:784 msgid "Symmetrical" msgstr "" -#: ishtar_common/models.py:774 +#: ishtar_common/models.py:785 msgid "Tiny label" msgstr "" -#: ishtar_common/models.py:777 +#: ishtar_common/models.py:788 msgid "Inverse relation" msgstr "" -#: ishtar_common/models.py:783 +#: ishtar_common/models.py:794 msgid "Logical relation" msgstr "" -#: ishtar_common/models.py:796 +#: ishtar_common/models.py:807 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: ishtar_common/models.py:970 +#: ishtar_common/models.py:981 msgid "Search query" msgstr "" -#: ishtar_common/models.py:971 +#: ishtar_common/models.py:982 msgid "Search queries" msgstr "" -#: ishtar_common/models.py:979 +#: ishtar_common/models.py:990 msgid "ISO code" msgstr "" -#: ishtar_common/models.py:983 +#: ishtar_common/models.py:994 msgid "Languages" msgstr "" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "Euro" msgstr "" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "US dollar" msgstr "" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Site" msgstr "" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Archaeological entity" msgstr "" -#: ishtar_common/models.py:993 +#: ishtar_common/models.py:1004 msgid "Site search" msgstr "" -#: ishtar_common/models.py:994 +#: ishtar_common/models.py:1005 msgid "New site" msgstr "" -#: ishtar_common/models.py:995 +#: ishtar_common/models.py:1006 msgid "Site modification" msgstr "" -#: ishtar_common/models.py:997 +#: ishtar_common/models.py:1008 msgid "Site (attached to the operation)" msgstr "" -#: ishtar_common/models.py:998 +#: ishtar_common/models.py:1009 msgid "Site name (attached to the operation)" msgstr "" -#: ishtar_common/models.py:999 +#: ishtar_common/models.py:1010 msgid "Site (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1000 +#: ishtar_common/models.py:1011 msgid "Site name (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1003 +#: ishtar_common/models.py:1014 msgid "Archaeological entity search" msgstr "" -#: ishtar_common/models.py:1004 +#: ishtar_common/models.py:1015 msgid "New archaeological entity" msgstr "" -#: ishtar_common/models.py:1005 +#: ishtar_common/models.py:1016 msgid "Archaeological entity modification" msgstr "" -#: ishtar_common/models.py:1006 +#: ishtar_common/models.py:1017 msgid "Archaeological entity deletion" msgstr "" -#: ishtar_common/models.py:1008 +#: ishtar_common/models.py:1019 msgid "Archaeological entity (attached to the operation)" msgstr "" -#: ishtar_common/models.py:1011 +#: ishtar_common/models.py:1022 msgid "Archaeological entity name (attached to the operation)" msgstr "" -#: ishtar_common/models.py:1014 +#: ishtar_common/models.py:1025 msgid "Archaeological entity (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1017 +#: ishtar_common/models.py:1028 msgid "Archaeological entity name (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1023 +#: ishtar_common/models.py:1034 msgid "name.firstname" msgstr "" -#: ishtar_common/models.py:1024 +#: ishtar_common/models.py:1035 msgid "firstname.name" msgstr "" -#: ishtar_common/models.py:1032 +#: ishtar_common/models.py:1043 msgid "Current active" msgstr "" -#: ishtar_common/models.py:1034 +#: ishtar_common/models.py:1045 msgid "Activate experimental feature" msgstr "" -#: ishtar_common/models.py:1037 +#: ishtar_common/models.py:1048 msgid "Warning name" msgstr "" -#: ishtar_common/models.py:1038 +#: ishtar_common/models.py:1049 msgid "Warning message" msgstr "" -#: ishtar_common/models.py:1039 +#: ishtar_common/models.py:1050 msgid "Footer text" msgstr "" -#: ishtar_common/models.py:1040 ishtar_common/models.py:1640 +#: ishtar_common/models.py:1051 ishtar_common/models.py:1650 msgid "You can use markdown syntax." msgstr "" -#: ishtar_common/models.py:1042 +#: ishtar_common/models.py:1053 msgid "Import - Delete image/document zip on archive" msgstr "" -#: ishtar_common/models.py:1045 +#: ishtar_common/models.py:1056 msgid "Document - Remove redundant association" msgstr "" -#: ishtar_common/models.py:1048 +#: ishtar_common/models.py:1059 msgid "" "For instance, remove operation association of a document also associated to " "a find of this operation. Only manage association of operations, context " "records and finds." msgstr "" -#: ishtar_common/models.py:1055 +#: ishtar_common/models.py:1066 msgid "Container - calculate weight only when all find has a weight" msgstr "" -#: ishtar_common/models.py:1059 +#: ishtar_common/models.py:1070 msgid "Parent relations engine" msgstr "" -#: ishtar_common/models.py:1061 +#: ishtar_common/models.py:1072 msgid "SQL views" msgstr "" -#: ishtar_common/models.py:1062 +#: ishtar_common/models.py:1073 msgid "Cache tables" msgstr "" -#: ishtar_common/models.py:1067 +#: ishtar_common/models.py:1078 msgid "" "If you experience performance problems with complex relations (for instance: " "complex statigraphic relations), set it to \"Cache tables\" in order to use " @@ -9547,600 +9775,600 @@ msgid "" "\"migrate_relations_cache_tables\" manage.py command." msgstr "" -#: ishtar_common/models.py:1075 +#: ishtar_common/models.py:1086 msgid "Alternate configuration" msgstr "" -#: ishtar_common/models.py:1078 +#: ishtar_common/models.py:1089 msgid "Choose an alternate configuration for label, index management" msgstr "" -#: ishtar_common/models.py:1082 +#: ishtar_common/models.py:1093 msgid "Files module" msgstr "" -#: ishtar_common/models.py:1084 +#: ishtar_common/models.py:1095 msgid "Archaeological site module" msgstr "" -#: ishtar_common/models.py:1087 +#: ishtar_common/models.py:1098 msgid "Archaeological site type" msgstr "" -#: ishtar_common/models.py:1092 +#: ishtar_common/models.py:1103 msgid "Context records module" msgstr "" -#: ishtar_common/models.py:1094 +#: ishtar_common/models.py:1105 msgid "Finds module" msgstr "" -#: ishtar_common/models.py:1096 +#: ishtar_common/models.py:1107 msgid "Need context records module" msgstr "" -#: ishtar_common/models.py:1099 +#: ishtar_common/models.py:1110 msgid "Find index is based on" msgstr "" -#: ishtar_common/models.py:1104 +#: ishtar_common/models.py:1115 msgid "" "To prevent irrelevant indexes, change this parameter only if there is no " "find in the database" msgstr "" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Warehouses module" msgstr "" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Need finds module" msgstr "" -#: ishtar_common/models.py:1111 +#: ishtar_common/models.py:1122 msgid "Preservation module" msgstr "" -#: ishtar_common/models.py:1112 +#: ishtar_common/models.py:1123 msgid "Mapping module" msgstr "" -#: ishtar_common/models.py:1114 +#: ishtar_common/models.py:1125 msgid "Point precision (search and sheets)" msgstr "" -#: ishtar_common/models.py:1118 +#: ishtar_common/models.py:1129 msgid "" "Number of digit to round from the decimal point for coordinates in WGS84 " "(latitude, longitude). Empty value means no round." msgstr "" -#: ishtar_common/models.py:1123 +#: ishtar_common/models.py:1134 msgid "Locate warehouse and containers" msgstr "" -#: ishtar_common/models.py:1126 +#: ishtar_common/models.py:1137 msgid "" "Mapping module must be activated. With many containers and background task " "not activated, activating this option may consume many resources." msgstr "" -#: ishtar_common/models.py:1132 +#: ishtar_common/models.py:1143 msgid "Use town to locate when coordinates are missing" msgstr "" -#: ishtar_common/models.py:1134 +#: ishtar_common/models.py:1145 msgid "Generate relation graph" msgstr "" -#: ishtar_common/models.py:1136 +#: ishtar_common/models.py:1147 msgid "Preventive operator module" msgstr "" -#: ishtar_common/models.py:1138 +#: ishtar_common/models.py:1149 msgid "Underwater module" msgstr "" -#: ishtar_common/models.py:1140 +#: ishtar_common/models.py:1151 msgid "Parcel are mandatory for context records" msgstr "" -#: ishtar_common/models.py:1143 +#: ishtar_common/models.py:1154 msgid "Home page" msgstr "" -#: ishtar_common/models.py:1147 +#: ishtar_common/models.py:1158 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: ishtar_common/models.py:1153 +#: ishtar_common/models.py:1164 msgid "Main operation code prefix" msgstr "" -#: ishtar_common/models.py:1160 +#: ishtar_common/models.py:1171 msgid "Default operation code prefix" msgstr "" -#: ishtar_common/models.py:1167 +#: ishtar_common/models.py:1178 msgid "Operation region code" msgstr "" -#: ishtar_common/models.py:1170 +#: ishtar_common/models.py:1181 msgid "Operation complete identifier" msgstr "" -#: ishtar_common/models.py:1173 +#: ishtar_common/models.py:1185 msgid "Formula to manage operation complete identifier." msgstr "" -#: ishtar_common/models.py:1176 +#: ishtar_common/models.py:1188 msgid "Operation custom index key" msgstr "" -#: ishtar_common/models.py:1180 +#: ishtar_common/models.py:1192 msgid "" "Keys to be used to manage operation custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1185 +#: ishtar_common/models.py:1197 msgid "Operation cached label" msgstr "" -#: ishtar_common/models.py:1189 ishtar_common/models.py:1212 -#: ishtar_common/models.py:1245 ishtar_common/models.py:1264 -#: ishtar_common/models.py:1297 ishtar_common/models.py:1330 -#: ishtar_common/models.py:1363 ishtar_common/models.py:1396 -#: ishtar_common/models.py:1429 ishtar_common/models.py:1462 +#: ishtar_common/models.py:1201 ishtar_common/models.py:1224 +#: ishtar_common/models.py:1257 ishtar_common/models.py:1276 +#: ishtar_common/models.py:1308 ishtar_common/models.py:1341 +#: ishtar_common/models.py:1373 ishtar_common/models.py:1406 +#: ishtar_common/models.py:1439 ishtar_common/models.py:1472 msgid "Formula to manage cached label. If not set a default formula is used." msgstr "" -#: ishtar_common/models.py:1193 +#: ishtar_common/models.py:1205 msgid "Archaeological site complete identifier" msgstr "" -#: ishtar_common/models.py:1196 +#: ishtar_common/models.py:1208 msgid "Formula to manage archaeological site complete identifier." msgstr "" -#: ishtar_common/models.py:1199 +#: ishtar_common/models.py:1211 msgid "Archaeological site custom index key" msgstr "" -#: ishtar_common/models.py:1203 +#: ishtar_common/models.py:1215 msgid "" "Keys to be used to manage archaeological site custom index. Separate keys " "with a semicolon." msgstr "" -#: ishtar_common/models.py:1208 +#: ishtar_common/models.py:1220 msgid "Site cached label" msgstr "" -#: ishtar_common/models.py:1216 +#: ishtar_common/models.py:1228 msgid "File external id" msgstr "" -#: ishtar_common/models.py:1219 +#: ishtar_common/models.py:1231 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1226 +#: ishtar_common/models.py:1238 msgid "Archaeological file complete identifier" msgstr "" -#: ishtar_common/models.py:1229 +#: ishtar_common/models.py:1241 msgid "Formula to manage archaeological file complete identifier." msgstr "" -#: ishtar_common/models.py:1232 +#: ishtar_common/models.py:1244 msgid "Archaeological file custom index key" msgstr "" -#: ishtar_common/models.py:1236 +#: ishtar_common/models.py:1248 msgid "" "Keys to be used to manage archaeological file custom index. Separate keys " "with a semicolon." msgstr "" -#: ishtar_common/models.py:1241 +#: ishtar_common/models.py:1253 msgid "File cached label" msgstr "" -#: ishtar_common/models.py:1249 +#: ishtar_common/models.py:1261 msgid "Parcel external id" msgstr "" -#: ishtar_common/models.py:1253 +#: ishtar_common/models.py:1265 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1260 +#: ishtar_common/models.py:1272 msgid "Parcel cached label" msgstr "" -#: ishtar_common/models.py:1268 +#: ishtar_common/models.py:1280 msgid "Context record external id" msgstr "" -#: ishtar_common/models.py:1271 +#: ishtar_common/models.py:1283 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1278 +#: ishtar_common/models.py:1290 msgid "Context record complete identifier" msgstr "" -#: ishtar_common/models.py:1281 +#: ishtar_common/models.py:1293 msgid "Formula to manage context record complete identifier." msgstr "" -#: ishtar_common/models.py:1284 +#: ishtar_common/models.py:1296 msgid "Context record custom index key" msgstr "" -#: ishtar_common/models.py:1288 +#: ishtar_common/models.py:1300 msgid "" "Keys to be used to manage context record custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1293 +#: ishtar_common/models.py:1305 msgid "Context record cached label" msgstr "" -#: ishtar_common/models.py:1301 +#: ishtar_common/models.py:1312 msgid "Base find external id" msgstr "" -#: ishtar_common/models.py:1304 +#: ishtar_common/models.py:1315 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1311 +#: ishtar_common/models.py:1322 msgid "Base find complete identifier" msgstr "" -#: ishtar_common/models.py:1314 +#: ishtar_common/models.py:1325 msgid "Formula to manage base find complete identifier." msgstr "" -#: ishtar_common/models.py:1317 +#: ishtar_common/models.py:1328 msgid "Base find custom index key" msgstr "" -#: ishtar_common/models.py:1321 +#: ishtar_common/models.py:1332 msgid "" "Keys to be used to manage base find custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1326 +#: ishtar_common/models.py:1337 msgid "Base find cached label" msgstr "" -#: ishtar_common/models.py:1334 +#: ishtar_common/models.py:1345 msgid "Find external id" msgstr "" -#: ishtar_common/models.py:1337 +#: ishtar_common/models.py:1348 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1344 +#: ishtar_common/models.py:1355 msgid "Find complete identifier" msgstr "" -#: ishtar_common/models.py:1347 +#: ishtar_common/models.py:1358 msgid "Formula to manage find complete identifier." msgstr "" -#: ishtar_common/models.py:1350 +#: ishtar_common/models.py:1361 msgid "Find custom index key" msgstr "" -#: ishtar_common/models.py:1354 +#: ishtar_common/models.py:1365 msgid "" "Keys to be used to manage find custom index. Separate keys with a semicolon." msgstr "" -#: ishtar_common/models.py:1359 +#: ishtar_common/models.py:1370 msgid "Find cached label" msgstr "" -#: ishtar_common/models.py:1367 +#: ishtar_common/models.py:1377 msgid "Container external id" msgstr "" -#: ishtar_common/models.py:1370 +#: ishtar_common/models.py:1380 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1377 +#: ishtar_common/models.py:1387 msgid "Container complete identifier" msgstr "" -#: ishtar_common/models.py:1380 +#: ishtar_common/models.py:1390 msgid "Formula to manage container complete identifier." msgstr "" -#: ishtar_common/models.py:1383 +#: ishtar_common/models.py:1393 msgid "Container custom index key" msgstr "" -#: ishtar_common/models.py:1387 +#: ishtar_common/models.py:1397 msgid "" "Keys to be used to manage container custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1392 +#: ishtar_common/models.py:1402 msgid "Container cached label" msgstr "" -#: ishtar_common/models.py:1400 +#: ishtar_common/models.py:1410 msgid "Warehouse external id" msgstr "" -#: ishtar_common/models.py:1403 +#: ishtar_common/models.py:1413 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1410 +#: ishtar_common/models.py:1420 msgid "Warehouse complete identifier" msgstr "" -#: ishtar_common/models.py:1413 +#: ishtar_common/models.py:1423 msgid "Formula to manage warehouse complete identifier." msgstr "" -#: ishtar_common/models.py:1416 +#: ishtar_common/models.py:1426 msgid "Warehouse custom index key" msgstr "" -#: ishtar_common/models.py:1420 +#: ishtar_common/models.py:1430 msgid "" "Keys to be used to manage warehouse custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1425 +#: ishtar_common/models.py:1435 msgid "Warehouse cached label" msgstr "" -#: ishtar_common/models.py:1433 +#: ishtar_common/models.py:1443 msgid "Document external id" msgstr "" -#: ishtar_common/models.py:1436 +#: ishtar_common/models.py:1446 msgid "" "Formula to manage document external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1443 +#: ishtar_common/models.py:1453 msgid "Document complete identifier" msgstr "" -#: ishtar_common/models.py:1446 +#: ishtar_common/models.py:1456 msgid "Formula to manage document complete identifier." msgstr "" -#: ishtar_common/models.py:1449 +#: ishtar_common/models.py:1459 msgid "Document custom index key" msgstr "" -#: ishtar_common/models.py:1453 +#: ishtar_common/models.py:1463 msgid "" "Keys to be used to manage document custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1458 +#: ishtar_common/models.py:1468 msgid "Document cached label" msgstr "" -#: ishtar_common/models.py:1466 +#: ishtar_common/models.py:1476 msgid "Raw name for person" msgstr "" -#: ishtar_common/models.py:1469 +#: ishtar_common/models.py:1479 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1475 +#: ishtar_common/models.py:1485 msgid "Use auto index for finds" msgstr "" -#: ishtar_common/models.py:1477 +#: ishtar_common/models.py:1487 msgid "Currency" msgstr "" -#: ishtar_common/models.py:1480 +#: ishtar_common/models.py:1490 msgid "Naming style for accounts" msgstr "" -#: ishtar_common/models.py:1488 +#: ishtar_common/models.py:1498 msgid "Maps - default zoom" msgstr "" -#: ishtar_common/models.py:1491 +#: ishtar_common/models.py:1501 msgid "Spatial Reference System for display" msgstr "" -#: ishtar_common/models.py:1495 +#: ishtar_common/models.py:1505 msgid "Spatial Reference System used for display when no SRS is defined" msgstr "" -#: ishtar_common/models.py:1502 +#: ishtar_common/models.py:1512 msgid "Spatial Reference System in database" msgstr "" -#: ishtar_common/models.py:1506 +#: ishtar_common/models.py:1516 msgid "" "Set it to the most used spatial reference system. Warning: after change " "launch the migrate_srid script." msgstr "" -#: ishtar_common/models.py:1514 +#: ishtar_common/models.py:1524 msgid "Default language for documentation" msgstr "" -#: ishtar_common/models.py:1518 +#: ishtar_common/models.py:1528 msgid "" "If set, by default the selected language will be set for localized documents." msgstr "" -#: ishtar_common/models.py:1526 +#: ishtar_common/models.py:1536 msgid "Ishtar site profile" msgstr "" -#: ishtar_common/models.py:1527 +#: ishtar_common/models.py:1537 msgid "Ishtar site profiles" msgstr "" -#: ishtar_common/models.py:1529 ishtar_common/models.py:1839 -#: ishtar_common/models.py:2062 ishtar_common/models.py:5109 -#: ishtar_common/models.py:5139 ishtar_common/models_imports.py:123 +#: ishtar_common/models.py:1539 ishtar_common/models.py:1849 +#: ishtar_common/models.py:2072 ishtar_common/models.py:5123 +#: ishtar_common/models.py:5153 ishtar_common/models_imports.py:132 msgid "General settings" msgstr "" -#: ishtar_common/models.py:1632 +#: ishtar_common/models.py:1642 msgid "Enable this form" msgstr "" -#: ishtar_common/models.py:1635 +#: ishtar_common/models.py:1645 msgid "" "Disable with caution: disabling a form with mandatory fields may lead to " "database errors." msgstr "" -#: ishtar_common/models.py:1639 +#: ishtar_common/models.py:1649 msgid "Header text" msgstr "" -#: ishtar_common/models.py:1642 +#: ishtar_common/models.py:1652 msgid "Apply to all" msgstr "" -#: ishtar_common/models.py:1645 +#: ishtar_common/models.py:1655 msgid "" "Apply this form to all users. If set to True, selecting user and user type " "is useless." msgstr "" -#: ishtar_common/models.py:1651 +#: ishtar_common/models.py:1661 msgid "Deprecated - use profile types" msgstr "" -#: ishtar_common/models.py:1659 +#: ishtar_common/models.py:1669 msgid "Custom form" msgstr "" -#: ishtar_common/models.py:1660 +#: ishtar_common/models.py:1670 msgid "Custom forms" msgstr "" -#: ishtar_common/models.py:1675 ishtar_common/models_imports.py:170 -#: ishtar_common/models_rest.py:116 +#: ishtar_common/models.py:1685 ishtar_common/models_imports.py:178 +#: ishtar_common/models_imports.py:437 ishtar_common/models_rest.py:116 msgid "Users" msgstr "" -#: ishtar_common/models.py:1681 +#: ishtar_common/models.py:1691 msgid "User types" msgstr "" -#: ishtar_common/models.py:1773 +#: ishtar_common/models.py:1783 msgid "Excluded field" msgstr "" -#: ishtar_common/models.py:1774 +#: ishtar_common/models.py:1784 msgid "Excluded fields" msgstr "" -#: ishtar_common/models.py:1808 +#: ishtar_common/models.py:1818 #: ishtar_common/templates/blocks/form_flex_snippet.html:18 #: ishtar_common/templates/blocks/table_form_snippet.html:9 msgid "Help" msgstr "" -#: ishtar_common/models.py:1812 +#: ishtar_common/models.py:1822 msgid "Custom forms - Json data field" msgstr "" -#: ishtar_common/models.py:1813 +#: ishtar_common/models.py:1823 msgid "Custom forms - Json data fields" msgstr "" -#: ishtar_common/models.py:1828 +#: ishtar_common/models.py:1838 msgid "Variable name" msgstr "" -#: ishtar_common/models.py:1830 +#: ishtar_common/models.py:1840 msgid "Description of the variable" msgstr "" -#: ishtar_common/models.py:1836 +#: ishtar_common/models.py:1846 msgid "Global variable" msgstr "" -#: ishtar_common/models.py:1837 +#: ishtar_common/models.py:1847 msgid "Global variables" msgstr "" -#: ishtar_common/models.py:1868 +#: ishtar_common/models.py:1878 msgid "Model name" msgstr "" -#: ishtar_common/models.py:1869 +#: ishtar_common/models.py:1879 msgid "Associated primary key" msgstr "" -#: ishtar_common/models.py:1875 +#: ishtar_common/models.py:1885 msgid "Cache for stats" msgstr "" -#: ishtar_common/models.py:1876 +#: ishtar_common/models.py:1886 msgid "Caches for stats" msgstr "" -#: ishtar_common/models.py:2028 +#: ishtar_common/models.py:2038 msgid "Base template for labels" msgstr "" -#: ishtar_common/models.py:2035 +#: ishtar_common/models.py:2045 msgid "Labels: targets for labels in the LibreOffice file" msgstr "" -#: ishtar_common/models.py:2039 +#: ishtar_common/models.py:2049 msgid "" "Each target is separated by a semi-colon. The first target is the name of " "the object including the data in base template. Following targets will be " @@ -10148,1318 +10376,1400 @@ msgid "" "Cadre3;Cadre4;Cadre5;Cadre6\" for a sheet with 6 labels." msgstr "" -#: ishtar_common/models.py:2048 +#: ishtar_common/models.py:2058 msgid "Used for labels" msgstr "" -#: ishtar_common/models.py:2050 +#: ishtar_common/models.py:2060 msgid "Number of label per page" msgstr "" -#: ishtar_common/models.py:2053 +#: ishtar_common/models.py:2063 msgid "Only relevant for label template" msgstr "" -#: ishtar_common/models.py:2059 +#: ishtar_common/models.py:2069 msgid "Document template" msgstr "" -#: ishtar_common/models.py:2060 +#: ishtar_common/models.py:2070 msgid "Document templates" msgstr "" -#: ishtar_common/models.py:2073 +#: ishtar_common/models.py:2083 msgid "For label template, you must provide number of label per page." msgstr "" -#: ishtar_common/models.py:2355 +#: ishtar_common/models.py:2365 msgid "Only four level of parent are managed." msgstr "" -#: ishtar_common/models.py:2412 +#: ishtar_common/models.py:2422 msgid "Communal area boundaries" msgstr "" -#: ishtar_common/models.py:2463 +#: ishtar_common/models.py:2473 msgid "Male" msgstr "" -#: ishtar_common/models.py:2464 +#: ishtar_common/models.py:2474 msgid "Female" msgstr "" -#: ishtar_common/models.py:2465 +#: ishtar_common/models.py:2475 msgid "Neutral" msgstr "" -#: ishtar_common/models.py:2515 +#: ishtar_common/models.py:2525 msgid "Organization types" msgstr "" -#: ishtar_common/models.py:2525 +#: ishtar_common/models.py:2535 msgid "Error: planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2533 ishtar_common/models.py:2709 +#: ishtar_common/models.py:2543 ishtar_common/models.py:2719 msgid "Error: general_contractor type is missing" msgstr "" -#: ishtar_common/models.py:2571 +#: ishtar_common/models.py:2581 msgctxt "key for text search" msgid "precise-town" msgstr "" -#: ishtar_common/models.py:2609 +#: ishtar_common/models.py:2619 msgid "Organizations" msgstr "" -#: ishtar_common/models.py:2638 +#: ishtar_common/models.py:2648 msgid "unknown organization" msgstr "" -#: ishtar_common/models.py:2687 +#: ishtar_common/models.py:2697 msgid "/" msgstr "" -#: ishtar_common/models.py:2693 +#: ishtar_common/models.py:2703 msgid "Error: sra_agent and head_scientist types are missing" msgstr "" -#: ishtar_common/models.py:2701 +#: ishtar_common/models.py:2711 msgid "Error: sra_agent type is missing" msgstr "" -#: ishtar_common/models.py:2717 +#: ishtar_common/models.py:2727 msgid "Error: responsible_planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2729 +#: ishtar_common/models.py:2739 msgid "Error: publisher type is missing" msgstr "" -#: ishtar_common/models.py:2737 +#: ishtar_common/models.py:2747 msgid "Error: operator type is missing" msgstr "" -#: ishtar_common/models.py:2741 ishtar_common/models.py:2755 +#: ishtar_common/models.py:2751 ishtar_common/models.py:2765 msgid "Long title" msgstr "" -#: ishtar_common/models.py:2744 ishtar_common/models_imports.py:987 +#: ishtar_common/models.py:2754 ishtar_common/models_imports.py:1106 msgid "Title type" msgstr "" -#: ishtar_common/models.py:2745 +#: ishtar_common/models.py:2755 msgid "Title types" msgstr "" -#: ishtar_common/models.py:2772 +#: ishtar_common/models.py:2782 msgid "Mr" msgstr "" -#: ishtar_common/models.py:2773 +#: ishtar_common/models.py:2783 msgid "Miss" msgstr "" -#: ishtar_common/models.py:2774 +#: ishtar_common/models.py:2784 msgid "Mr and Mrs" msgstr "" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2785 msgid "Mrs" msgstr "" -#: ishtar_common/models.py:2776 +#: ishtar_common/models.py:2786 msgid "Doctor" msgstr "" -#: ishtar_common/models.py:2824 ishtar_common/models.py:3411 +#: ishtar_common/models.py:2834 ishtar_common/models.py:3421 msgctxt "key for text search" msgid "surname" msgstr "" -#: ishtar_common/models.py:2827 ishtar_common/models.py:3415 +#: ishtar_common/models.py:2837 ishtar_common/models.py:3425 msgctxt "key for text search" msgid "email" msgstr "" -#: ishtar_common/models.py:2830 ishtar_common/models.py:3999 +#: ishtar_common/models.py:2840 ishtar_common/models.py:4013 msgctxt "key for text search" msgid "title" msgstr "" -#: ishtar_common/models.py:2833 +#: ishtar_common/models.py:2843 msgctxt "key for text search" msgid "salutation" msgstr "" -#: ishtar_common/models.py:2840 ishtar_common/models.py:3423 +#: ishtar_common/models.py:2850 ishtar_common/models.py:3433 msgctxt "key for text search" msgid "organization" msgstr "" -#: ishtar_common/models.py:2844 +#: ishtar_common/models.py:2854 msgctxt "key for text search" msgid "has-account" msgstr "" -#: ishtar_common/models.py:2848 +#: ishtar_common/models.py:2858 msgctxt "key for text search" msgid "profile-type" msgstr "" -#: ishtar_common/models.py:2884 +#: ishtar_common/models.py:2894 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." msgstr "" -#: ishtar_common/models.py:2891 +#: ishtar_common/models.py:2901 msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2894 ishtar_common/models.py:3014 +#: ishtar_common/models.py:2904 ishtar_common/models.py:3024 msgid "Types" msgstr "" -#: ishtar_common/models.py:2899 +#: ishtar_common/models.py:2909 msgid "Is attached to" msgstr "" -#: ishtar_common/models.py:2910 +#: ishtar_common/models.py:2920 msgid "Persons" msgstr "" -#: ishtar_common/models.py:3171 +#: ishtar_common/models.py:3181 msgid "Manage account" msgstr "" -#: ishtar_common/models.py:3194 +#: ishtar_common/models.py:3204 msgid "Groups" msgstr "" -#: ishtar_common/models.py:3198 +#: ishtar_common/models.py:3208 msgid "Profile types" msgstr "" -#: ishtar_common/models.py:3210 +#: ishtar_common/models.py:3220 msgid "Profile type summary" msgstr "" -#: ishtar_common/models.py:3211 +#: ishtar_common/models.py:3221 msgid "Profile types summary" msgstr "" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3237 msgid "Show field number" msgstr "" -#: ishtar_common/models.py:3228 +#: ishtar_common/models.py:3238 msgid "Automatically pin" msgstr "" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3239 msgid "Display pin menu" msgstr "" -#: ishtar_common/models.py:3231 +#: ishtar_common/models.py:3241 msgid "Use background tasks" msgstr "" -#: ishtar_common/models.py:3232 +#: ishtar_common/models.py:3242 msgid "" "If set to true, each import, export, document generation is set as a " "background task." msgstr "" -#: ishtar_common/models.py:3236 +#: ishtar_common/models.py:3246 msgid "Send email when the task is finished" msgstr "" -#: ishtar_common/models.py:3246 +#: ishtar_common/models.py:3256 msgid "User profile" msgstr "" -#: ishtar_common/models.py:3247 +#: ishtar_common/models.py:3257 msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3334 ishtar_common/models.py:5116 +#: ishtar_common/models.py:3344 ishtar_common/models.py:5130 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3335 ishtar_common/models.py:5117 +#: ishtar_common/models.py:3345 ishtar_common/models.py:5131 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3336 ishtar_common/models.py:5119 -#: ishtar_common/models_imports.py:1131 +#: ishtar_common/models.py:3346 ishtar_common/models.py:5133 +#: ishtar_common/models_imports.py:1285 ishtar_common/models_imports.py:1299 msgid "Finished" msgstr "" -#: ishtar_common/models.py:3342 +#: ishtar_common/models.py:3352 msgid "Generate label" msgstr "" -#: ishtar_common/models.py:3354 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/models.py:3364 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:12 msgid "View" msgstr "" -#: ishtar_common/models.py:3356 +#: ishtar_common/models.py:3366 msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3364 ishtar_common/models.py:5133 -#: ishtar_common/models.py:5292 +#: ishtar_common/models.py:3374 ishtar_common/models.py:5147 +#: ishtar_common/models.py:5306 +#: ishtar_common/templates/ishtar/import_table.html:4 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:4 +#: ishtar_common/views.py:2241 msgid "Result" msgstr "" -#: ishtar_common/models.py:3367 +#: ishtar_common/models.py:3377 msgid "Background task" msgstr "" -#: ishtar_common/models.py:3368 +#: ishtar_common/models.py:3378 msgid "Background tasks" msgstr "" -#: ishtar_common/models.py:3404 +#: ishtar_common/models.py:3414 msgctxt "key for text search" msgid "username" msgstr "" -#: ishtar_common/models.py:3439 +#: ishtar_common/models.py:3449 msgid "Password last update" msgstr "" -#: ishtar_common/models.py:3442 +#: ishtar_common/models.py:3452 msgid "Advanced shortcut menu" msgstr "" -#: ishtar_common/models.py:3445 +#: ishtar_common/models.py:3455 msgid "Latest news version" msgstr "" -#: ishtar_common/models.py:3447 +#: ishtar_common/models.py:3457 msgid "Display news" msgstr "" -#: ishtar_common/models.py:3450 +#: ishtar_common/models.py:3460 msgid "Ishtar user" msgstr "" -#: ishtar_common/models.py:3451 +#: ishtar_common/models.py:3461 msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:3549 +#: ishtar_common/models.py:3563 msgid "Public" msgstr "" -#: ishtar_common/models.py:3667 +#: ishtar_common/models.py:3681 msgid "Author types" msgstr "" -#: ishtar_common/models.py:3752 +#: ishtar_common/models.py:3766 msgid "COInS export - type" msgstr "" -#: ishtar_common/models.py:3755 +#: ishtar_common/models.py:3769 msgid "COInS export - genre" msgstr "" -#: ishtar_common/models.py:3758 +#: ishtar_common/models.py:3772 msgid "Is localized" msgstr "" -#: ishtar_common/models.py:3760 +#: ishtar_common/models.py:3774 msgid "Setting a language for this type of document is relevant" msgstr "" -#: ishtar_common/models.py:3765 +#: ishtar_common/models.py:3779 msgid "Document type" msgstr "" -#: ishtar_common/models.py:3766 +#: ishtar_common/models.py:3780 msgid "Document types" msgstr "" -#: ishtar_common/models.py:3780 ishtar_common/models.py:3808 +#: ishtar_common/models.py:3794 ishtar_common/models.py:3822 msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3784 ishtar_common/models_imports.py:942 -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models.py:3798 ishtar_common/models_imports.py:1061 +#: ishtar_common/models_imports.py:1105 msgid "Support type" msgstr "" -#: ishtar_common/models.py:3785 +#: ishtar_common/models.py:3799 msgid "Support types" msgstr "" -#: ishtar_common/models.py:3795 +#: ishtar_common/models.py:3809 msgid "Iframe template" msgstr "" -#: ishtar_common/models.py:3799 +#: ishtar_common/models.py:3813 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." msgstr "" -#: ishtar_common/models.py:3812 +#: ishtar_common/models.py:3826 msgid "Format type" msgstr "" -#: ishtar_common/models.py:3813 +#: ishtar_common/models.py:3827 msgid "Format types" msgstr "" -#: ishtar_common/models.py:3823 ishtar_common/models_rest.py:109 +#: ishtar_common/models.py:3837 ishtar_common/models_rest.py:109 #: ishtar_common/templates/ishtar/merge_organization.html:11 #: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "" -#: ishtar_common/models.py:3826 ishtar_common/models_imports.py:939 +#: ishtar_common/models.py:3840 ishtar_common/models_imports.py:1058 msgid "License type" msgstr "" -#: ishtar_common/models.py:3827 +#: ishtar_common/models.py:3841 msgid "License types" msgstr "" -#: ishtar_common/models.py:3837 +#: ishtar_common/models.py:3851 msgid "Document tags" msgstr "" -#: ishtar_common/models.py:3964 +#: ishtar_common/models.py:3978 msgid "Identifier" msgstr "" -#: ishtar_common/models.py:3987 +#: ishtar_common/models.py:4001 msgctxt "key for text search" msgid "author" msgstr "" -#: ishtar_common/models.py:3991 +#: ishtar_common/models.py:4005 msgctxt "key for text search" msgid "publisher" msgstr "" -#: ishtar_common/models.py:3995 +#: ishtar_common/models.py:4009 msgctxt "key for text search" msgid "publishing-year" msgstr "" -#: ishtar_common/models.py:4010 +#: ishtar_common/models.py:4024 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: ishtar_common/models.py:4018 +#: ishtar_common/models.py:4032 msgctxt "key for text search" msgid "tag" msgstr "" -#: ishtar_common/models.py:4021 +#: ishtar_common/models.py:4035 msgctxt "key for text search" msgid "format" msgstr "" -#: ishtar_common/models.py:4025 +#: ishtar_common/models.py:4039 msgctxt "key for text search" msgid "medium" msgstr "" -#: ishtar_common/models.py:4029 +#: ishtar_common/models.py:4043 msgctxt "key for text search" msgid "language" msgstr "" -#: ishtar_common/models.py:4033 +#: ishtar_common/models.py:4047 msgctxt "key for text search" msgid "license" msgstr "" -#: ishtar_common/models.py:4037 +#: ishtar_common/models.py:4051 msgctxt "key for text search" msgid "scale" msgstr "" -#: ishtar_common/models.py:4040 +#: ishtar_common/models.py:4054 msgctxt "key for text search" msgid "url" msgstr "" -#: ishtar_common/models.py:4044 +#: ishtar_common/models.py:4058 msgctxt "key for text search" msgid "isbn" msgstr "" -#: ishtar_common/models.py:4047 +#: ishtar_common/models.py:4061 msgctxt "key for text search" msgid "issn" msgstr "" -#: ishtar_common/models.py:4050 +#: ishtar_common/models.py:4064 msgctxt "key for text search" msgid "source" msgstr "" -#: ishtar_common/models.py:4054 +#: ishtar_common/models.py:4068 msgctxt "key for text search" msgid "source-free-input" msgstr "" -#: ishtar_common/models.py:4058 +#: ishtar_common/models.py:4072 msgctxt "key for text search" msgid "warehouse-container" msgstr "" -#: ishtar_common/models.py:4062 +#: ishtar_common/models.py:4076 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "" -#: ishtar_common/models.py:4069 +#: ishtar_common/models.py:4083 msgctxt "key for text search" msgid "additional-information" msgstr "" -#: ishtar_common/models.py:4073 +#: ishtar_common/models.py:4087 msgctxt "key for text search" msgid "has-duplicate" msgstr "" -#: ishtar_common/models.py:4092 +#: ishtar_common/models.py:4106 msgctxt "key for text search" msgid "basket-finds" msgstr "" -#: ishtar_common/models.py:4096 ishtar_common/models.py:4197 +#: ishtar_common/models.py:4110 ishtar_common/models.py:4211 msgctxt "key for text search" msgid "find" msgstr "" -#: ishtar_common/models.py:4116 ishtar_common/models.py:4200 +#: ishtar_common/models.py:4130 ishtar_common/models.py:4214 msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4128 ishtar_common/models_common.py:1967 +#: ishtar_common/models.py:4142 ishtar_common/models_common.py:1777 msgctxt "key for text search" msgid "has-image" msgstr "" -#: ishtar_common/models.py:4131 +#: ishtar_common/models.py:4145 msgctxt "key for text search" msgid "has-file" msgstr "" -#: ishtar_common/models.py:4135 +#: ishtar_common/models.py:4149 msgctxt "key for text search" msgid "receipt-date-before" msgstr "" -#: ishtar_common/models.py:4139 +#: ishtar_common/models.py:4153 msgctxt "key for text search" msgid "receipt-date-after" msgstr "" -#: ishtar_common/models.py:4144 +#: ishtar_common/models.py:4158 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "" -#: ishtar_common/models.py:4149 +#: ishtar_common/models.py:4163 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "" -#: ishtar_common/models.py:4153 +#: ishtar_common/models.py:4167 msgctxt "key for text search" msgid "creation-date-before" msgstr "" -#: ishtar_common/models.py:4157 +#: ishtar_common/models.py:4171 msgctxt "key for text search" msgid "creation-date-after" msgstr "" -#: ishtar_common/models.py:4204 +#: ishtar_common/models.py:4218 msgctxt "key for text search" msgid "treatment" msgstr "" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4222 msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4324 +#: ishtar_common/models.py:4338 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4341 +#: ishtar_common/models.py:4355 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4348 +#: ishtar_common/models.py:4362 msgid "Container reference ID" msgstr "" -#: ishtar_common/models.py:4356 +#: ishtar_common/models.py:4370 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4358 +#: ishtar_common/models.py:4372 msgid "Related" msgstr "" -#: ishtar_common/models.py:4367 +#: ishtar_common/models.py:4381 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4371 +#: ishtar_common/models.py:4385 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4372 +#: ishtar_common/models.py:4386 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4373 +#: ishtar_common/models.py:4387 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4374 +#: ishtar_common/models.py:4388 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4594 +#: ishtar_common/models.py:4608 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4596 +#: ishtar_common/models.py:4610 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:5011 +#: ishtar_common/models.py:5025 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:5015 +#: ishtar_common/models.py:5029 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:5065 +#: ishtar_common/models.py:5079 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:5069 +#: ishtar_common/models.py:5083 msgid "Research" msgstr "" -#: ishtar_common/models.py:5102 +#: ishtar_common/models.py:5116 msgid "Filename" msgstr "" -#: ishtar_common/models.py:5106 +#: ishtar_common/models.py:5120 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:5107 +#: ishtar_common/models.py:5121 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:5118 ishtar_common/models_imports.py:1130 +#: ishtar_common/models.py:5132 ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1298 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:5136 +#: ishtar_common/models.py:5150 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:5137 +#: ishtar_common/models.py:5151 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:5157 +#: ishtar_common/models.py:5171 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5169 +#: ishtar_common/models.py:5183 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5182 +#: ishtar_common/models.py:5196 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5200 +#: ishtar_common/models.py:5214 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5242 ishtar_common/models_imports.py:1121 +#: ishtar_common/models.py:5256 ishtar_common/models_imports.py:1275 +#: ishtar_common/models_imports.py:1292 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "" -#: ishtar_common/models.py:5247 +#: ishtar_common/models.py:5261 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5250 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5264 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5253 +#: ishtar_common/models.py:5267 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5256 +#: ishtar_common/models.py:5270 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5259 +#: ishtar_common/models.py:5273 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5267 +#: ishtar_common/models.py:5281 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5272 +#: ishtar_common/models.py:5286 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5276 +#: ishtar_common/models.py:5290 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5281 +#: ishtar_common/models.py:5295 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5282 +#: ishtar_common/models.py:5296 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5283 +#: ishtar_common/models.py:5297 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5284 +#: ishtar_common/models.py:5298 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5285 +#: ishtar_common/models.py:5299 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5286 +#: ishtar_common/models.py:5300 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5287 +#: ishtar_common/models.py:5301 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5294 +#: ishtar_common/models.py:5308 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5297 +#: ishtar_common/models.py:5311 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5298 +#: ishtar_common/models.py:5312 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5300 ishtar_common/models.py:5360 -#: ishtar_common/templates/ishtar/import_table.html:51 +#: ishtar_common/models.py:5314 ishtar_common/models.py:5374 +#: ishtar_common/templates/ishtar/import_table.html:107 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "" -#: ishtar_common/models.py:5310 +#: ishtar_common/models.py:5324 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5322 +#: ishtar_common/models.py:5336 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5334 +#: ishtar_common/models.py:5348 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5338 +#: ishtar_common/models.py:5352 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5347 +#: ishtar_common/models.py:5361 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5349 +#: ishtar_common/models.py:5363 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5352 +#: ishtar_common/models.py:5366 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5357 +#: ishtar_common/models.py:5371 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5358 +#: ishtar_common/models.py:5372 msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1440 +#: ishtar_common/models_common.py:1085 +msgid "Timestamp geo" +msgstr "" + +#: ishtar_common/models_common.py:1086 +msgid "Timestamp label" +msgstr "" + +#: ishtar_common/models_common.py:1470 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1448 +#: ishtar_common/models_common.py:1478 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1455 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:1485 ishtar_common/models_common.py:2176 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1457 +#: ishtar_common/models_common.py:1487 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1463 +#: ishtar_common/models_common.py:1493 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1483 +#: ishtar_common/models_common.py:1513 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1487 +#: ishtar_common/models_common.py:1517 msgctxt "key for text search" msgid "created-before" msgstr "" -#: ishtar_common/models_common.py:1491 +#: ishtar_common/models_common.py:1521 msgctxt "key for text search" msgid "created-after" msgstr "" -#: ishtar_common/models_common.py:1494 +#: ishtar_common/models_common.py:1524 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1498 +#: ishtar_common/models_common.py:1528 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1501 +#: ishtar_common/models_common.py:1531 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1971 +#: ishtar_common/models_common.py:1781 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1975 +#: ishtar_common/models_common.py:1785 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:2055 +#: ishtar_common/models_common.py:1865 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:2057 +#: ishtar_common/models_common.py:1867 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2220 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2051 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2221 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2051 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:2032 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2223 +#: ishtar_common/models_common.py:2033 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:2036 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2227 +#: ishtar_common/models_common.py:2037 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2258 +#: ishtar_common/models_common.py:2068 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2259 +#: ishtar_common/models_common.py:2069 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2275 +#: ishtar_common/models_common.py:2085 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2086 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2102 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2103 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2305 +#: ishtar_common/models_common.py:2115 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2306 +#: ishtar_common/models_common.py:2116 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2332 +#: ishtar_common/models_common.py:2142 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2333 +#: ishtar_common/models_common.py:2143 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2334 +#: ishtar_common/models_common.py:2144 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2374 +#: ishtar_common/models_common.py:2184 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2381 +#: ishtar_common/models_common.py:2191 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2389 +#: ishtar_common/models_common.py:2199 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2397 +#: ishtar_common/models_common.py:2207 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:4301 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:4109 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:2401 -#: ishtar_common/models_common.py:2402 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:2212 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2401 ishtar_common/models_common.py:4302 +#: ishtar_common/models_common.py:2211 ishtar_common/models_common.py:4110 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2402 ishtar_common/models_common.py:4303 +#: ishtar_common/models_common.py:2212 ishtar_common/models_common.py:4111 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2405 +#: ishtar_common/models_common.py:2215 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2406 +#: ishtar_common/models_common.py:2216 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2407 +#: ishtar_common/models_common.py:2217 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2419 ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:4123 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2424 ishtar_common/models_common.py:4321 +#: ishtar_common/models_common.py:2234 ishtar_common/models_common.py:4129 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2425 +#: ishtar_common/models_common.py:2235 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:2236 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2427 +#: ishtar_common/models_common.py:2237 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2428 +#: ishtar_common/models_common.py:2238 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2431 ishtar_common/models_common.py:2432 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:2242 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2560 +#: ishtar_common/models_common.py:2370 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:3022 +#: ishtar_common/models_common.py:2832 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:3026 +#: ishtar_common/models_common.py:2836 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:2840 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:3033 +#: ishtar_common/models_common.py:2843 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:3036 +#: ishtar_common/models_common.py:2846 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:3039 +#: ishtar_common/models_common.py:2849 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:3042 +#: ishtar_common/models_common.py:2852 msgctxt "key for text search" msgid "z-higher" msgstr "" -#: ishtar_common/models_common.py:3046 +#: ishtar_common/models_common.py:2856 msgctxt "key for text search" msgid "z-lower" msgstr "" -#: ishtar_common/models_common.py:3050 +#: ishtar_common/models_common.py:2860 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:3072 +#: ishtar_common/models_common.py:2882 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:3074 +#: ishtar_common/models_common.py:2884 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3273 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3467 +#: ishtar_common/models_common.py:3275 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3487 +#: ishtar_common/models_common.py:3295 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3489 +#: ishtar_common/models_common.py:3297 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3499 +#: ishtar_common/models_common.py:3307 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3503 +#: ishtar_common/models_common.py:3311 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3507 +#: ishtar_common/models_common.py:3315 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3773 +#: ishtar_common/models_common.py:3581 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3805 +#: ishtar_common/models_common.py:3613 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3811 +#: ishtar_common/models_common.py:3619 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3844 +#: ishtar_common/models_common.py:3652 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3881 +#: ishtar_common/models_common.py:3689 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3962 +#: ishtar_common/models_common.py:3770 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3972 +#: ishtar_common/models_common.py:3780 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3990 +#: ishtar_common/models_common.py:3798 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4323 +#: ishtar_common/models_common.py:4131 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4326 +#: ishtar_common/models_common.py:4134 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4328 +#: ishtar_common/models_common.py:4136 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4330 +#: ishtar_common/models_common.py:4138 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4337 +#: ishtar_common/models_common.py:4145 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_imports.py:116 +#: ishtar_common/models_imports.py:125 msgid "Class name" msgstr "" -#: ishtar_common/models_imports.py:120 +#: ishtar_common/models_imports.py:129 msgid "Data model" msgstr "" -#: ishtar_common/models_imports.py:121 +#: ishtar_common/models_imports.py:130 msgid "Data models" msgstr "" -#: ishtar_common/models_imports.py:138 +#: ishtar_common/models_imports.py:142 #: ishtar_common/templates/blocks/DataTables-stats.html:32 #: ishtar_common/templates/blocks/DataTables-tabs.html:8 msgid "Table" msgstr "" -#: ishtar_common/models_imports.py:139 +#: ishtar_common/models_imports.py:143 msgid "GIS" msgstr "" -#: ishtar_common/models_imports.py:159 +#: ishtar_common/models_imports.py:163 +msgid "Tab number" +msgstr "" + +#: ishtar_common/models_imports.py:164 +msgid "" +"When using an Excel or Calc file choose the tab number. Keep it to 1 by " +"default." +msgstr "" + +#: ishtar_common/models_imports.py:167 msgid "Layer name" msgstr "" -#: ishtar_common/models_imports.py:163 +#: ishtar_common/models_imports.py:171 msgid "For GIS file with multiple layers" msgstr "" -#: ishtar_common/models_imports.py:166 +#: ishtar_common/models_imports.py:174 msgid "Set as main geometry" msgstr "" -#: ishtar_common/models_imports.py:168 +#: ishtar_common/models_imports.py:176 msgid "Only relevant for GIS files" msgstr "" -#: ishtar_common/models_imports.py:173 +#: ishtar_common/models_imports.py:181 msgid "Associated model" msgstr "" -#: ishtar_common/models_imports.py:181 +#: ishtar_common/models_imports.py:189 msgid "Models that can accept new items" msgstr "" -#: ishtar_common/models_imports.py:183 +#: ishtar_common/models_imports.py:191 msgid "Leave blank for no restrictions" msgstr "" -#: ishtar_common/models_imports.py:186 +#: ishtar_common/models_imports.py:194 msgid "Can be exported" msgstr "" -#: ishtar_common/models_imports.py:188 +#: ishtar_common/models_imports.py:195 +msgid "Can be import" +msgstr "" + +#: ishtar_common/models_imports.py:196 +msgid "Archive required" +msgstr "" + +#: ishtar_common/models_imports.py:198 msgid "Unicity keys (separator \";\")" msgstr "" -#: ishtar_common/models_imports.py:189 +#: ishtar_common/models_imports.py:199 msgid "" "Mandatory for update importer. Set to key that identify items without " "ambiguity. Warning: __ is not supported, only use level 1 key." msgstr "" -#: ishtar_common/models_imports.py:198 +#: ishtar_common/models_imports.py:205 +msgid "Pre-import form message" +msgstr "" + +#: ishtar_common/models_imports.py:208 +msgid "Error messages to ignore" +msgstr "" + +#: ishtar_common/models_imports.py:209 +msgid "" +"If an error is encountered with the following character strings, the error " +"is not reported in the error file. Each message is separated with a line " +"break." +msgstr "" + +#: ishtar_common/models_imports.py:217 msgid "Importer - Type" msgstr "" -#: ishtar_common/models_imports.py:199 +#: ishtar_common/models_imports.py:218 msgid "Importer - Types" msgstr "" -#: ishtar_common/models_imports.py:223 ishtar_common/models_rest.py:277 +#: ishtar_common/models_imports.py:250 ishtar_common/models_rest.py:277 msgid "List types" msgstr "" -#: ishtar_common/models_imports.py:402 ishtar_common/models_imports.py:419 +#: ishtar_common/models_imports.py:440 +msgid "Importer - Group" +msgstr "" + +#: ishtar_common/models_imports.py:441 +msgid "Importer - Groups" +msgstr "" + +#: ishtar_common/models_imports.py:475 +msgid "Importer - Group <-> Importer" +msgstr "" + +#: ishtar_common/models_imports.py:496 ishtar_common/models_imports.py:513 msgid "" "Importer configuration error: \"{}\" is not available for \"{}\". Check your " "default and column configuration" msgstr "" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:539 +msgid "" +"The target of the default values. Can be set to empty with \"-\". Use the " +"\"__\" notation to pass between models." +msgstr "" + +#: ishtar_common/models_imports.py:543 +msgid "Required fields" +msgstr "" + +#: ishtar_common/models_imports.py:545 +msgid "" +"Theses defaults values only apply if the designated fields are not empty. " +"Use the \"__\" notation to pass between models.Leave empty to always apply." +msgstr "" + +#: ishtar_common/models_imports.py:552 msgid "Importer - Default" msgstr "" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:553 msgid "Importer - Defaults" msgstr "" -#: ishtar_common/models_imports.py:504 +#: ishtar_common/models_imports.py:620 msgid "Importer - Default value" msgstr "" -#: ishtar_common/models_imports.py:505 +#: ishtar_common/models_imports.py:621 msgid "Importer - Default values" msgstr "" -#: ishtar_common/models_imports.py:580 +#: ishtar_common/models_imports.py:697 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "" -#: ishtar_common/models_imports.py:596 +#: ishtar_common/models_imports.py:698 +msgid "" +"Column number in the table. Put 0 or negative number for pre-importer field." +msgstr "" + +#: ishtar_common/models_imports.py:715 msgid "Required" msgstr "" -#: ishtar_common/models_imports.py:598 +#: ishtar_common/models_imports.py:717 msgid "Export field name" msgstr "" -#: ishtar_common/models_imports.py:603 +#: ishtar_common/models_imports.py:722 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: ishtar_common/models_imports.py:610 +#: ishtar_common/models_imports.py:729 msgid "Importer - Column" msgstr "" -#: ishtar_common/models_imports.py:611 +#: ishtar_common/models_imports.py:730 msgid "Importer - Columns" msgstr "" -#: ishtar_common/models_imports.py:654 +#: ishtar_common/models_imports.py:773 msgid "Field name" msgstr "" -#: ishtar_common/models_imports.py:656 ishtar_common/models_imports.py:759 +#: ishtar_common/models_imports.py:775 ishtar_common/models_imports.py:878 msgid "Force creation of new items" msgstr "" -#: ishtar_common/models_imports.py:657 ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:776 ishtar_common/models_imports.py:879 msgid "Concatenate with existing" msgstr "" -#: ishtar_common/models_imports.py:659 ishtar_common/models_imports.py:762 +#: ishtar_common/models_imports.py:778 ishtar_common/models_imports.py:881 msgid "Concatenate character" msgstr "" -#: ishtar_common/models_imports.py:664 +#: ishtar_common/models_imports.py:783 msgid "Importer - Duplicate field" msgstr "" -#: ishtar_common/models_imports.py:665 +#: ishtar_common/models_imports.py:784 msgid "Importer - Duplicate fields" msgstr "" -#: ishtar_common/models_imports.py:682 +#: ishtar_common/models_imports.py:801 msgid "Regular expression" msgstr "" -#: ishtar_common/models_imports.py:686 +#: ishtar_common/models_imports.py:805 msgid "Importer - Regular expression" msgstr "" -#: ishtar_common/models_imports.py:687 +#: ishtar_common/models_imports.py:806 msgid "Importer - Regular expressions" msgstr "" -#: ishtar_common/models_imports.py:702 +#: ishtar_common/models_imports.py:821 msgid "Format string" msgstr "" -#: ishtar_common/models_imports.py:705 +#: ishtar_common/models_imports.py:824 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " @@ -11467,394 +11777,448 @@ msgid "" "a string." msgstr "" -#: ishtar_common/models_imports.py:715 +#: ishtar_common/models_imports.py:834 msgid "Importer - Value format" msgstr "" -#: ishtar_common/models_imports.py:716 +#: ishtar_common/models_imports.py:835 msgid "Importer - Value formats" msgstr "" -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:848 msgid "The string provided generate an error. Fix it." msgstr "" -#: ishtar_common/models_imports.py:768 +#: ishtar_common/models_imports.py:887 msgid "Importer - Target" msgstr "" -#: ishtar_common/models_imports.py:769 +#: ishtar_common/models_imports.py:888 msgid "Importer - Targets" msgstr "" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:607 -#: ishtar_common/views_item.py:1425 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:639 +#: ishtar_common/views_item.py:1471 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:1427 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:1473 msgid "False" msgstr "" -#: ishtar_common/models_imports.py:822 +#: ishtar_common/models_imports.py:941 msgid "All users can use it" msgstr "" -#: ishtar_common/models_imports.py:824 +#: ishtar_common/models_imports.py:943 msgid "All users can modify it" msgstr "" -#: ishtar_common/models_imports.py:829 +#: ishtar_common/models_imports.py:948 msgid "Importer - Target key group" msgstr "" -#: ishtar_common/models_imports.py:830 +#: ishtar_common/models_imports.py:949 msgid "Importer - Target key groups" msgstr "" -#: ishtar_common/models_imports.py:853 +#: ishtar_common/models_imports.py:972 msgid "Is set" msgstr "" -#: ishtar_common/models_imports.py:871 +#: ishtar_common/models_imports.py:990 msgid "Importer - Target key" msgstr "" -#: ishtar_common/models_imports.py:872 +#: ishtar_common/models_imports.py:991 msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:1065 msgid "Period" msgstr "" -#: ishtar_common/models_imports.py:947 +#: ishtar_common/models_imports.py:1066 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:952 +#: ishtar_common/models_imports.py:1071 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:1076 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:958 +#: ishtar_common/models_imports.py:1077 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:1080 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:969 +#: ishtar_common/models_imports.py:1088 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:979 +#: ishtar_common/models_imports.py:1098 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:1102 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:1104 msgid "Spatial reference system" msgstr "" -#: ishtar_common/models_imports.py:995 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:1114 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:999 +#: ishtar_common/models_imports.py:1118 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:1000 +#: ishtar_common/models_imports.py:1119 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1120 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:1002 +#: ishtar_common/models_imports.py:1121 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:1003 +#: ishtar_common/models_imports.py:1122 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:1004 +#: ishtar_common/models_imports.py:1123 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:1023 +#: ishtar_common/models_imports.py:1142 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1143 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:1025 +#: ishtar_common/models_imports.py:1144 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:1042 +#: ishtar_common/models_imports.py:1174 +msgid "Formater type" +msgstr "" + +#: ishtar_common/models_imports.py:1176 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:1044 +#: ishtar_common/models_imports.py:1178 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:1049 +#: ishtar_common/models_imports.py:1183 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:1050 +#: ishtar_common/models_imports.py:1184 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:1122 +#: ishtar_common/models_imports.py:1276 ishtar_common/models_imports.py:1293 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:1123 +#: ishtar_common/models_imports.py:1277 ishtar_common/models_imports.py:1294 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:1124 +#: ishtar_common/models_imports.py:1278 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1279 ishtar_common/models_imports.py:1295 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1280 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:1127 +#: ishtar_common/models_imports.py:1281 ishtar_common/models_imports.py:1296 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:1128 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1297 msgid "Post-processing in progress" msgstr "" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1283 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1286 ishtar_common/models_imports.py:1300 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:1201 -msgid "Importer type" -msgstr "" - -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1370 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:1211 -msgid "Associated images (zip file)" +#: ishtar_common/models_imports.py:1378 +msgid "Associated documents (zip file)" msgstr "" -#: ishtar_common/models_imports.py:1224 -msgid "If a group is selected, target key saved in this group will be used." +#: ishtar_common/models_imports.py:1386 +msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:1228 +#: ishtar_common/models_imports.py:1394 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:1229 +#: ishtar_common/models_imports.py:1395 msgid "Only required for CSV file" msgstr "" -#: ishtar_common/models_imports.py:1232 +#: ishtar_common/models_imports.py:1398 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:1237 +#: ishtar_common/models_imports.py:1403 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1408 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:1244 +#: ishtar_common/models_imports.py:1410 msgid "" "Number of header lines in your file (can be 0 and should be 0 for geopackage " "or Shapefile)." msgstr "" -#: ishtar_common/models_imports.py:1247 +#: ishtar_common/models_imports.py:1508 +msgid "Importer group type" +msgstr "" + +#: ishtar_common/models_imports.py:1509 +msgid "Current import" +msgstr "" + +#: ishtar_common/models_imports.py:1515 +msgid "Import - Group" +msgstr "" + +#: ishtar_common/models_imports.py:1516 +msgid "Import - Groups" +msgstr "" + +#: ishtar_common/models_imports.py:1593 ishtar_common/models_imports.py:2245 +msgid "Analyse" +msgstr "" + +#: ishtar_common/models_imports.py:1595 ishtar_common/models_imports.py:1599 +#: ishtar_common/models_imports.py:2247 ishtar_common/models_imports.py:2257 +msgid "Re-analyse" +msgstr "" + +#: ishtar_common/models_imports.py:1600 ishtar_common/models_imports.py:2258 +msgid "Re-import" +msgstr "" + +#: ishtar_common/models_imports.py:1601 ishtar_common/models_imports.py:2265 +msgid "Archive" +msgstr "" + +#: ishtar_common/models_imports.py:1604 ishtar_common/models_imports.py:2268 +msgid "Unarchive" +msgstr "" + +#: ishtar_common/models_imports.py:1606 ishtar_common/models_imports.py:2272 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 +#: ishtar_common/templates/ishtar/form_delete.html:11 +#: ishtar_common/views.py:2782 ishtar_common/widgets.py:453 +#: ishtar_common/widgets.py:489 +msgid "Delete" +msgstr "" + +#: ishtar_common/models_imports.py:1864 +msgid "Importer type" +msgstr "" + +#: ishtar_common/models_imports.py:1872 +msgid "If a group is selected, target key saved in this group will be used." +msgstr "" + +#: ishtar_common/models_imports.py:1876 +msgid "Imported values" +msgstr "" + +#: ishtar_common/models_imports.py:1884 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1892 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1263 +#: ishtar_common/models_imports.py:1900 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1271 -msgid "Archive file" -msgstr "" - -#: ishtar_common/models_imports.py:1282 +#: ishtar_common/models_imports.py:1911 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1913 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1293 +#: ishtar_common/models_imports.py:1916 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1295 +#: ishtar_common/models_imports.py:1918 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1296 +#: ishtar_common/models_imports.py:1919 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1298 +#: ishtar_common/models_imports.py:1921 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1303 +#: ishtar_common/models_imports.py:1926 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1305 +#: ishtar_common/models_imports.py:1928 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1312 -msgid "Import" +#: ishtar_common/models_imports.py:1934 +#: ishtar_common/templates/ishtar/import_table.html:76 +msgid "Group" msgstr "" -#: ishtar_common/models_imports.py:1355 ishtar_common/models_imports.py:1499 -msgid "Error in the CSV file." +#: ishtar_common/models_imports.py:1937 +msgid "Next import" msgstr "" -#: ishtar_common/models_imports.py:1424 -msgid "Analyse" +#: ishtar_common/models_imports.py:1940 +msgid "Import - Import" msgstr "" -#: ishtar_common/models_imports.py:1426 ishtar_common/models_imports.py:1435 -msgid "Re-analyse" +#: ishtar_common/models_imports.py:1941 +msgid "Import - Imports" +msgstr "" + +#: ishtar_common/models_imports.py:2174 ishtar_common/models_imports.py:2322 +msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1430 +#: ishtar_common/models_imports.py:2252 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1431 ishtar_common/models_imports.py:1440 +#: ishtar_common/models_imports.py:2253 ishtar_common/models_imports.py:2262 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1433 ishtar_common/models_imports.py:1442 +#: ishtar_common/models_imports.py:2255 ishtar_common/models_imports.py:2264 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1436 -msgid "Re-import" -msgstr "" - -#: ishtar_common/models_imports.py:1439 +#: ishtar_common/models_imports.py:2261 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1443 -msgid "Archive" -msgstr "" - -#: ishtar_common/models_imports.py:1446 -msgid "Unarchive" -msgstr "" - -#: ishtar_common/models_imports.py:1448 +#: ishtar_common/models_imports.py:2270 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "" -#: ishtar_common/models_imports.py:1449 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 -#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 -#: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2519 ishtar_common/widgets.py:453 -#: ishtar_common/widgets.py:489 -msgid "Delete" -msgstr "" - -#: ishtar_common/models_imports.py:1543 ishtar_common/models_imports.py:1546 -#: ishtar_common/models_imports.py:1608 +#: ishtar_common/models_imports.py:2366 ishtar_common/models_imports.py:2369 +#: ishtar_common/models_imports.py:2431 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:1556 +#: ishtar_common/models_imports.py:2379 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:2401 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1605 +#: ishtar_common/models_imports.py:2428 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1644 +#: ishtar_common/models_imports.py:2469 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1712 +#: ishtar_common/models_imports.py:2537 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1743 +#: ishtar_common/models_imports.py:2568 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1779 +#: ishtar_common/models_imports.py:2604 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1787 +#: ishtar_common/models_imports.py:2612 msgid "Import {} finished with no errors" msgstr "" -#: ishtar_common/models_imports.py:1958 +#: ishtar_common/models_imports.py:2778 +msgid "Ignored" +msgstr "" + +#: ishtar_common/models_imports.py:2781 ishtar_common/models_imports.py:2782 +msgid "Import - Ignored error" +msgstr "" + +#: ishtar_common/models_imports.py:2817 +msgid "Import - Pre-import value" +msgstr "" + +#: ishtar_common/models_imports.py:2818 +msgid "Import - Pre-import values" +msgstr "" + +#: ishtar_common/models_imports.py:2835 msgid "Specific key to an import" msgstr "" -#: ishtar_common/models_imports.py:1969 -msgid "Importer - Item key" +#: ishtar_common/models_imports.py:2846 +msgid "Import - Item key" msgstr "" -#: ishtar_common/models_imports.py:1970 -msgid "Imports - Item keys" +#: ishtar_common/models_imports.py:2847 +msgid "Import - Item keys" msgstr "" #: ishtar_common/models_rest.py:49 ishtar_common/models_rest.py:63 @@ -12066,15 +12430,15 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1757 -#: ishtar_common/views.py:1761 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1873 +#: ishtar_common/views.py:1877 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1764 -#: ishtar_common/views.py:1766 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1880 +#: ishtar_common/views.py:1882 msgid "Next" msgstr "" @@ -12234,7 +12598,6 @@ msgstr "" #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 -#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "" @@ -12349,8 +12712,8 @@ msgstr "" msgid ", " msgstr "" -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2346 -#: ishtar_common/utils.py:2354 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2636 +#: ishtar_common/utils.py:2644 msgid "." msgstr "" @@ -12428,6 +12791,10 @@ msgid "" "a free software under AGPL v3 license." msgstr "" +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:15 +msgid "Download" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:5 msgctxt "Sheet" msgid "Creation" @@ -12438,6 +12805,14 @@ msgctxt "Sheet" msgid "Modification" msgstr "" +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:23 +msgid "Imports (creation)" +msgstr "" + +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:32 +msgid "Imports (update)" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "" @@ -12474,6 +12849,10 @@ msgstr "" msgid "Generate image" msgstr "" +#: ishtar_common/templates/ishtar/blocks/view_import_csv.html:19 +msgid "Ignore" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:78 msgid "Support" msgstr "" @@ -12540,7 +12919,7 @@ msgid "Link" msgstr "" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1238 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1239 msgid "Changelog" msgstr "" @@ -12555,7 +12934,7 @@ msgstr "" #: ishtar_common/templates/ishtar/forms/search_query.html:77 #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 -#: ishtar_common/templates/ishtar/import_list.html:38 +#: ishtar_common/templates/ishtar/import_list.html:41 #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 @@ -12606,7 +12985,7 @@ 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 +#: ishtar_common/templates/ishtar/import_delete.html:28 msgid "Are you sure to want to delete this import?" msgstr "" @@ -12734,6 +13113,10 @@ msgstr "" msgid "import (GIS)" msgstr "" +#: ishtar_common/templates/ishtar/import_list.html:27 +msgid "import (group)" +msgstr "" + #: ishtar_common/templates/ishtar/import_step_by_step.html:14 msgid "Add/modified" msgstr "" @@ -12755,7 +13138,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1600 +#: ishtar_common/views.py:1716 msgid "Import step by step" msgstr "" @@ -12768,7 +13151,9 @@ msgid "Column" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 -#: ishtar_common/templates/ishtar/import_table.html:35 +#: ishtar_common/templates/ishtar/import_table.html:5 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:5 +#: ishtar_common/views.py:2240 msgid "Error" msgstr "" @@ -12830,7 +13215,6 @@ msgid "Objects matched with no changes" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:263 -#: ishtar_common/templates/ishtar/import_table.html:49 msgid "Source file" msgstr "" @@ -12852,45 +13236,46 @@ msgid "" "modification before import." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:23 -msgid "No pending imports." +#: ishtar_common/templates/ishtar/import_table.html:3 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:3 +msgid "Media" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:29 -msgctxt "file" -msgid "File" +#: ishtar_common/templates/ishtar/import_table.html:6 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:6 +#: ishtar_common/views.py:2242 +msgid "Match" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:30 -msgid "Media" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgid "No pending imports." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:32 +#: ishtar_common/templates/ishtar/import_table.html:57 msgid "Status" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:34 -msgid "Unmatched items" +#: ishtar_common/templates/ishtar/import_table.html:59 +msgctxt "file" +msgid "Files" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:36 -msgid "Control" +#: ishtar_common/templates/ishtar/import_table.html:60 +msgid "Pré-import form / matching" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:37 -#: ishtar_common/templates/ishtar/import_table.html:77 -msgid "Match" +#: ishtar_common/templates/ishtar/import_table.html:61 +msgid "Diagnostic files" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:56 -msgid "Media file" +#: ishtar_common/templates/ishtar/import_table.html:119 +#: ishtar_common/templates/ishtar/import_table.html:192 +msgid "Pre-import values" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:81 -#: ishtar_common/templates/ishtar/import_table.html:84 -#: ishtar_common/templates/ishtar/import_table.html:87 -msgctxt "not a directory" -msgid "File" +#: ishtar_common/templates/ishtar/import_table.html:126 +#: ishtar_common/templates/ishtar/import_table.html:199 +msgid "Make match" msgstr "" #: ishtar_common/templates/ishtar/manage_basket.html:9 @@ -12960,6 +13345,26 @@ msgstr "" msgid "Other" msgstr "" +#: ishtar_common/templates/ishtar/sheet_import.html:4 +msgid "Import" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:32 +msgid "Updated" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:98 +msgid "Associated imports" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:106 +msgid "Pre-import values " +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_importgroup.html:4 +msgid "Import group" +msgstr "" + #: ishtar_common/templates/ishtar/sheet_organization.html:21 msgid "Person in the organization" msgstr "" @@ -13504,47 +13909,47 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:200 ishtar_common/views.py:125 +#: ishtar_common/utils.py:207 ishtar_common/views.py:125 msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:692 +#: ishtar_common/utils.py:968 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:770 +#: ishtar_common/utils.py:1046 msgid "Information" msgstr "" -#: ishtar_common/utils.py:771 +#: ishtar_common/utils.py:1047 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1637 +#: ishtar_common/utils.py:1927 msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/utils.py:2323 +#: ishtar_common/utils.py:2613 msgid "uppercase letter" msgstr "" -#: ishtar_common/utils.py:2324 +#: ishtar_common/utils.py:2614 msgid "lowercase letter" msgstr "" -#: ishtar_common/utils.py:2325 +#: ishtar_common/utils.py:2615 msgid "number" msgstr "" -#: ishtar_common/utils.py:2326 +#: ishtar_common/utils.py:2616 msgid "punctuation sign" msgstr "" -#: ishtar_common/utils.py:2345 +#: ishtar_common/utils.py:2635 msgid "This password must contain one of this character: " msgstr "" -#: ishtar_common/utils.py:2351 +#: ishtar_common/utils.py:2641 msgid "Your password must contain each of these characters: " msgstr "" @@ -13592,128 +13997,136 @@ msgstr "" msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:1104 ishtar_common/views_item.py:177 +#: ishtar_common/views.py:1105 ishtar_common/views_item.py:177 #: ishtar_common/views_item.py:218 ishtar_common/views_item.py:235 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1471 +#: ishtar_common/views.py:1490 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1491 -msgid "Edit import" +#: ishtar_common/views.py:1515 +msgid "Import: edit (table)" msgstr "" -#: ishtar_common/views.py:1513 +#: ishtar_common/views.py:1522 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1949 +#: ishtar_common/views.py:1529 +msgid "Import: create (group)" +msgstr "" + +#: ishtar_common/views.py:1535 +msgid "Import: pre-form" +msgstr "" + +#: ishtar_common/views.py:2065 msgid "Col. " msgstr "" -#: ishtar_common/views.py:1956 ishtar_common/views.py:1971 +#: ishtar_common/views.py:2072 ishtar_common/views.py:2087 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:2013 +#: ishtar_common/views.py:2173 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:2049 +#: ishtar_common/views.py:2211 ishtar_common/views.py:2222 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2087 +#: ishtar_common/views.py:2350 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2111 +#: ishtar_common/views.py:2374 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2119 +#: ishtar_common/views.py:2382 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2129 +#: ishtar_common/views.py:2392 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2169 ishtar_common/views.py:2184 +#: ishtar_common/views.py:2432 ishtar_common/views.py:2447 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2198 +#: ishtar_common/views.py:2461 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2211 +#: ishtar_common/views.py:2474 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2231 +#: ishtar_common/views.py:2494 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2299 +#: ishtar_common/views.py:2562 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2327 +#: ishtar_common/views.py:2590 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2352 +#: ishtar_common/views.py:2615 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2389 +#: ishtar_common/views.py:2652 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2495 +#: ishtar_common/views.py:2758 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2518 +#: ishtar_common/views.py:2781 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2561 +#: ishtar_common/views.py:2824 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2562 +#: ishtar_common/views.py:2825 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2567 +#: ishtar_common/views.py:2830 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2568 +#: ishtar_common/views.py:2831 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:2687 +#: ishtar_common/views.py:2950 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2803 ishtar_common/views.py:2898 +#: ishtar_common/views.py:3066 ishtar_common/views.py:3161 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2935 ishtar_common/views.py:2986 +#: ishtar_common/views.py:3198 ishtar_common/views.py:3249 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:2946 +#: ishtar_common/views.py:3209 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2999 +#: ishtar_common/views.py:3262 msgid "Delete geographic item" msgstr "" @@ -13727,7 +14140,7 @@ msgstr "" msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:923 +#: ishtar_common/views_item.py:955 msgctxt "key for text search" msgid "today" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index bd53a62b9..c1550e184 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: 2023-09-27 14:17+0200\n" +"POT-Creation-Date: 2023-11-18 17:48+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,28 +21,29 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:718 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1181 -#: archaeological_finds/models_finds.py:2464 +#: archaeological_finds/models_finds.py:1036 +#: archaeological_finds/models_finds.py:2319 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1238 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1557 -#: archaeological_operations/models.py:2429 -#: archaeological_operations/models.py:2447 -#: archaeological_operations/models.py:2563 -#: archaeological_operations/models.py:2762 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:2435 +#: archaeological_operations/models.py:2453 +#: archaeological_operations/models.py:2569 +#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:3057 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2202 -#: ishtar_common/models.py:5234 ishtar_common/views.py:499 +#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2379 +#: ishtar_common/models.py:5248 ishtar_common/views.py:499 +#: na_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -88,17 +89,17 @@ msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 -#: archaeological_finds/forms.py:1260 archaeological_finds/forms.py:1966 +#: archaeological_finds/forms.py:1261 archaeological_finds/forms.py:1967 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1424 +#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1429 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:641 ishtar_common/forms_common.py:819 -#: ishtar_common/forms_common.py:1044 ishtar_common/forms_common.py:2119 +#: ishtar_common/forms_common.py:819 ishtar_common/forms_common.py:997 +#: ishtar_common/forms_common.py:1222 ishtar_common/forms_common.py:2296 msgid "Full text search" msgstr "Recherche en texte intégral" @@ -106,14 +107,14 @@ msgstr "Recherche en texte intégral" #: archaeological_context_records/forms.py:301 #: archaeological_context_records/forms.py:554 #: archaeological_context_records/forms.py:608 -#: archaeological_context_records/models.py:750 -#: archaeological_context_records/models.py:1457 +#: archaeological_context_records/models.py:730 +#: archaeological_context_records/models.py:1347 #: archaeological_warehouse/forms.py:454 msgid "ID" msgstr "Identifiant" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1739 +#: archaeological_operations/forms.py:1744 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" @@ -122,7 +123,7 @@ msgid "Operation - name" msgstr "Opération - nom" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2213 +#: ishtar_common/forms_common.py:2389 msgid "Operation - year" msgstr "Opération - année" @@ -132,14 +133,14 @@ msgstr "Numéro de l'opération (index par année)" #: archaeological_context_records/forms.py:157 #: archaeological_context_records/forms.py:715 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/models.py:724 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5235 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5249 msgid "Archaeological site" msgstr "Entité archéologique" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1348 +#: archaeological_finds/forms.py:1349 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" @@ -150,23 +151,24 @@ msgstr "Type d'unité" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:511 -#: archaeological_context_records/models.py:536 -#: archaeological_context_records/models.py:825 +#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:805 msgid "Activity" msgstr "Activité" #: archaeological_context_records/forms.py:169 #: archaeological_context_records/forms.py:513 -#: archaeological_context_records/models.py:535 -#: archaeological_context_records/models.py:818 +#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:798 #: archaeological_finds/forms.py:273 archaeological_finds/forms.py:541 #: archaeological_finds/forms.py:717 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: ishtar_common/forms_common.py:1921 +#: ishtar_common/forms_common.py:2098 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 #: man_app/templates/ishtar/sheet_find.html:151 +#: na_app/templates/ishtar/sheet_find.html:159 msgid "Identification" msgstr "Identification" @@ -174,18 +176,18 @@ msgstr "Identification" #: archaeological_context_records/forms.py:292 #: archaeological_context_records/forms.py:556 #: archaeological_context_records/forms.py:609 -#: archaeological_context_records/models.py:522 -#: archaeological_context_records/models.py:523 -#: archaeological_context_records/models.py:722 -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 +#: archaeological_context_records/models.py:702 +#: archaeological_context_records/models.py:1349 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:127 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 -#: archaeological_finds/models_finds.py:1139 +#: archaeological_finds/models_finds.py:994 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1064 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:3075 -#: archaeological_operations/models.py:3350 +#: archaeological_operations/forms.py:1066 +#: archaeological_operations/forms.py:1443 +#: archaeological_operations/models.py:3081 +#: archaeological_operations/models.py:3375 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" @@ -202,8 +204,8 @@ msgstr "Rechercher parmi les relations" #: archaeological_context_records/forms.py:175 #: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:537 -#: archaeological_context_records/models.py:830 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:810 msgid "Excavation techniques" msgstr "Méthodes de fouille" @@ -217,17 +219,20 @@ msgstr "Rechercher une Unité d'Enregistrement" #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:58 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:707 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:683 +#: archaeological_operations/forms.py:709 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1498 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 #: ishtar_common/templates/ishtar/sheet_area.html:30 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "Général" @@ -239,17 +244,17 @@ msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_context_records/forms.py:546 #: archaeological_context_records/forms.py:610 #: archaeological_context_records/forms.py:708 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:730 -#: archaeological_finds/models_finds.py:1136 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:710 +#: archaeological_finds/models_finds.py:991 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1036 -#: archaeological_operations/models.py:3056 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:3062 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:294 -#: ishtar_common/forms_common.py:88 ishtar_common/forms_common.py:110 -#: ishtar_common/models_common.py:3526 ishtar_common/models_common.py:4299 +#: ishtar_common/forms_common.py:92 ishtar_common/forms_common.py:114 +#: ishtar_common/models_common.py:3334 ishtar_common/models_common.py:4107 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" @@ -263,87 +268,89 @@ msgstr "Seuls les éléments associés à l'opération peuvent être sélectionn #: archaeological_context_records/forms.py:303 #: archaeological_context_records/forms.py:557 #: archaeological_context_records/forms.py:612 -#: archaeological_context_records/models.py:524 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:775 -#: archaeological_context_records/models.py:1458 +#: archaeological_context_records/models.py:504 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:1348 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:751 -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:731 +#: archaeological_context_records/models.py:1350 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_finds/forms.py:291 archaeological_finds/forms.py:293 #: archaeological_finds/forms.py:548 archaeological_finds/forms.py:550 #: archaeological_finds/forms.py:718 archaeological_finds/forms.py:764 -#: archaeological_finds/forms.py:1362 +#: archaeological_finds/forms.py:1363 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:426 -#: archaeological_finds/models_finds.py:1850 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/models_treatments.py:260 #: archaeological_finds/templates/ishtar/sheet_find.html:169 -#: ishtar_common/forms_common.py:1868 ishtar_common/forms_common.py:2136 -#: ishtar_common/models.py:1036 ishtar_common/models.py:4342 -#: ishtar_common/models_imports.py:153 ishtar_common/models_imports.py:581 -#: ishtar_common/models_imports.py:681 ishtar_common/models_imports.py:700 +#: ishtar_common/forms_common.py:2045 ishtar_common/forms_common.py:2313 +#: ishtar_common/models.py:1047 ishtar_common/models.py:4356 +#: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:434 +#: ishtar_common/models_imports.py:700 ishtar_common/models_imports.py:800 +#: ishtar_common/models_imports.py:819 #: man_app/templates/ishtar/sheet_find.html:170 +#: na_app/templates/ishtar/sheet_find.html:181 msgid "Description" msgstr "Description" #: archaeological_context_records/forms.py:307 -#: archaeological_context_records/models.py:781 +#: archaeological_context_records/models.py:761 msgid "Filling" msgstr "Remplissage" #: archaeological_context_records/forms.py:309 -#: archaeological_context_records/models.py:752 +#: archaeological_context_records/models.py:732 msgid "General comment" msgstr "Commentaire général" #: archaeological_context_records/forms.py:320 #: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:639 archaeological_operations/forms.py:736 +#: archaeological_files/models.py:639 archaeological_operations/forms.py:738 msgid "Total surface (m2)" msgstr "Surface totale (m2)" #: archaeological_context_records/forms.py:326 -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:735 msgid "Length (m)" msgstr "Taille (m)" #: archaeological_context_records/forms.py:327 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/models.py:736 msgid "Width (m)" msgstr "Largeur (m)" #: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/models.py:737 msgid "Thickness (m)" msgstr "Épaisseur (m)" #: archaeological_context_records/forms.py:329 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/models.py:738 msgid "Diameter (m)" msgstr "Diamètre (m)" #: archaeological_context_records/forms.py:330 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/models.py:739 msgid "Depth (m)" msgstr "Profondeur (m)" #: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/models.py:741 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition (m)" #: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:753 +#: archaeological_context_records/models.py:733 msgid "Opening date" msgstr "Date d'ouverture" #: archaeological_context_records/forms.py:338 -#: archaeological_context_records/models.py:754 +#: archaeological_context_records/models.py:734 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_files/models.py:602 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -354,22 +361,24 @@ msgstr "Date d'ouverture" #: archaeological_finds/models_treatments.py:1142 #: archaeological_operations/models.py:1325 #: archaeological_operations/templates/ishtar/sheet_operation.html:204 -#: ishtar_common/forms.py:1005 ishtar_common/forms.py:1006 +#: ishtar_common/forms.py:1025 ishtar_common/forms.py:1026 +#: na_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "Date de clôture" #: archaeological_context_records/forms.py:341 -#: ishtar_common/forms_common.py:1708 +#: ishtar_common/forms_common.py:1885 msgid "Documentation" msgstr "Documentation" #: archaeological_context_records/forms.py:347 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:745 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:224 #: archaeological_finds/models_treatments.py:760 #: archaeological_warehouse/forms.py:737 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "Localisation" @@ -384,23 +393,27 @@ msgstr "Vous devez choisir une commune ou une parcelle." #: archaeological_context_records/forms.py:441 #: archaeological_context_records/forms.py:463 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1154 archaeological_finds/forms.py:1175 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/forms.py:1155 archaeological_finds/forms.py:1176 +#: archaeological_finds/models_finds.py:1748 #: archaeological_finds/templates/ishtar/sheet_find.html:213 #: man_app/templates/ishtar/sheet_find.html:214 +#: na_app/templates/ishtar/sheet_find.html:225 msgid "Dating" msgstr "Datation" #: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:534 -#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1161 -#: archaeological_finds/models_finds.py:1189 +#: archaeological_context_records/models.py:514 +#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1162 +#: archaeological_finds/models_finds.py:1044 #: archaeological_finds/templates/ishtar/sheet_find.html:221 -#: archaeological_operations/forms.py:827 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 +#: archaeological_operations/forms.py:829 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: man_app/templates/ishtar/sheet_find.html:222 +#: na_app/templates/ishtar/sheet_find.html:233 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:561 msgid "Chronological period" msgstr "Période chronologique" @@ -409,32 +422,36 @@ msgstr "Période chronologique" #: archaeological_files/forms.py:786 archaeological_files/models.py:75 #: archaeological_files/models.py:708 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1164 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3422 +#: archaeological_finds/models_finds.py:3157 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:758 #: archaeological_finds/templates/ishtar/sheet_find.html:222 #: 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_operations/forms.py:782 +#: archaeological_operations/forms.py:784 #: archaeological_operations/models.py:104 #: archaeological_operations/models.py:1326 -#: archaeological_operations/models.py:3354 +#: archaeological_operations/models.py:3379 #: man_app/templates/ishtar/sheet_find.html:223 -#: man_app/templates/ishtar/sheet_find.html:403 -#: man_app/templates/ishtar/sheet_find.html:441 -#: man_app/templates/ishtar/sheet_find.html:479 +#: man_app/templates/ishtar/sheet_find.html:391 +#: man_app/templates/ishtar/sheet_find.html:429 +#: man_app/templates/ishtar/sheet_find.html:467 +#: na_app/templates/ishtar/sheet_find.html:234 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:440 +#: na_app/templates/ishtar/sheet_find.html:478 msgid "Start date" msgstr "Date de début" #: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 -#: archaeological_files/models.py:709 archaeological_finds/forms.py:1164 -#: archaeological_finds/models_finds.py:3423 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:1165 +#: archaeological_finds/models_finds.py:3158 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:223 #: archaeological_finds/templates/ishtar/sheet_find.html:391 @@ -442,38 +459,46 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3355 -#: ishtar_common/models_imports.py:1290 +#: archaeological_operations/models.py:3380 +#: ishtar_common/models_imports.py:1416 #: man_app/templates/ishtar/sheet_find.html:224 -#: man_app/templates/ishtar/sheet_find.html:404 -#: man_app/templates/ishtar/sheet_find.html:442 -#: man_app/templates/ishtar/sheet_find.html:480 -#: man_app/templates/ishtar/sheet_find.html:518 +#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:506 +#: na_app/templates/ishtar/sheet_find.html:235 +#: na_app/templates/ishtar/sheet_find.html:403 +#: na_app/templates/ishtar/sheet_find.html:441 +#: na_app/templates/ishtar/sheet_find.html:479 +#: na_app/templates/ishtar/sheet_find.html:517 msgid "End date" msgstr "Date de fin" #: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1165 +#: archaeological_finds/forms.py:1166 #: archaeological_finds/templates/ishtar/sheet_find.html:225 #: man_app/templates/ishtar/sheet_find.html:226 +#: na_app/templates/ishtar/sheet_find.html:237 msgid "Quality" msgstr "Qualité" #: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1162 +#: archaeological_finds/forms.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:224 #: man_app/templates/ishtar/sheet_find.html:225 +#: na_app/templates/ishtar/sheet_find.html:236 msgid "Dating type" msgstr "Type de datation" #: archaeological_context_records/forms.py:453 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1167 #: archaeological_finds/templates/ishtar/sheet_find.html:226 #: man_app/templates/ishtar/sheet_find.html:227 +#: na_app/templates/ishtar/sheet_find.html:238 msgid "Precise on dating" msgstr "Précision sur la datation" @@ -484,15 +509,15 @@ msgstr "Unité d'enregistrement - 030 - Datation" #: archaeological_context_records/forms.py:476 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1588 +#: archaeological_context_records/models.py:1478 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:716 archaeological_finds/forms.py:734 -#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1132 -#: archaeological_finds/models_finds.py:2456 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:987 +#: archaeological_finds/models_finds.py:2311 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2215 ishtar_common/models.py:5236 +#: ishtar_common/forms_common.py:2391 ishtar_common/models.py:5250 #: ishtar_common/views.py:503 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -501,7 +526,9 @@ msgstr "Unité d'Enregistrement" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:82 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 -#: archaeological_operations/templates/ishtar/sheet_operation.html:374 +#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:382 msgid "Relations" msgstr "Relations" @@ -511,7 +538,7 @@ msgstr "Unité d'enregistrement - 050 - Relations" #: archaeological_context_records/forms.py:500 #: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/models.py:762 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:48 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" @@ -522,22 +549,22 @@ msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" #: archaeological_context_records/forms.py:515 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/models.py:764 msgid "TAQ" msgstr "TAQ" #: archaeological_context_records/forms.py:516 -#: archaeological_context_records/models.py:793 +#: archaeological_context_records/models.py:773 msgid "Estimated TAQ" msgstr "TAQ estimé" #: archaeological_context_records/forms.py:517 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/models.py:779 msgid "TPQ" msgstr "TPQ" #: archaeological_context_records/forms.py:518 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/models.py:788 msgid "Estimated TPQ" msgstr "TPQ estimé" @@ -546,8 +573,8 @@ msgid "Comments on dating" msgstr "Commentaire relatif à la datation" #: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:616 -#: archaeological_operations/forms.py:629 +#: archaeological_operations/forms.py:618 +#: archaeological_operations/forms.py:631 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "Rechercher une opération" @@ -562,9 +589,9 @@ msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" #: archaeological_context_records/forms.py:644 -#: archaeological_finds/forms.py:970 archaeological_finds/forms.py:995 -#: archaeological_operations/forms.py:1809 ishtar_common/forms_common.py:2382 -#: ishtar_common/models.py:3284 ishtar_common/models.py:3654 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:996 +#: archaeological_operations/forms.py:1814 ishtar_common/forms_common.py:2558 +#: ishtar_common/models.py:3294 ishtar_common/models.py:3668 msgid " - duplicate" msgstr " - copie" @@ -573,9 +600,9 @@ msgid "Context record - Quick action - Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" #: archaeological_context_records/forms.py:694 -#: archaeological_context_records/models.py:1351 -#: archaeological_context_records/models.py:1390 -#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1239 +#: archaeological_context_records/models.py:1278 +#: archaeological_context_records/models.py:1346 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "Type de relation" @@ -638,7 +665,6 @@ msgstr "Recherche" #: archaeological_warehouse/ishtar_menu.py:46 #: archaeological_warehouse/ishtar_menu.py:80 ishtar_common/ishtar_menu.py:48 #: ishtar_common/ishtar_menu.py:115 ishtar_common/ishtar_menu.py:192 -#: ishtar_common/templates/ishtar/import_table.html:31 msgid "Creation" msgstr "Ajout" @@ -694,8 +720,8 @@ msgid "Dating quality types" msgstr "Types de qualité de datation" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:937 -#: archaeological_finds/tests.py:1341 archaeological_finds/tests.py:1541 +#: archaeological_context_records/tests.py:935 +#: archaeological_finds/tests.py:1386 archaeological_finds/tests.py:1586 msgctxt "key for text search" msgid "datings-period" msgstr "datation-periode" @@ -742,13 +768,14 @@ msgstr "Datations" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2073 -#: archaeological_finds/models_finds.py:3388 -#: archaeological_finds/models_finds.py:3410 +#: archaeological_finds/models_finds.py:1928 +#: archaeological_finds/models_finds.py:3123 +#: archaeological_finds/models_finds.py:3145 #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2231 ishtar_common/models.py:5237 +#: ishtar_common/forms_common.py:2407 ishtar_common/models.py:5251 #: ishtar_common/views.py:507 man_app/templates/ishtar/sheet_find.html:5 +#: na_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "Mobilier" @@ -763,21 +790,22 @@ msgstr "Mobilier" #: archaeological_finds/models_finds.py:255 #: archaeological_finds/models_finds.py:299 #: archaeological_finds/models_finds.py:370 -#: archaeological_finds/models_finds.py:1845 +#: archaeological_finds/models_finds.py:1700 #: archaeological_finds/models_treatments.py:66 #: archaeological_finds/models_treatments.py:752 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3381 +#: archaeological_operations/models.py:3406 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:734 -#: archaeological_warehouse/models.py:766 ishtar_common/models.py:673 -#: ishtar_common/models.py:729 ishtar_common/models.py:772 -#: ishtar_common/models.py:1807 ishtar_common/models.py:3663 -#: ishtar_common/models.py:5009 ishtar_common/models_common.py:2219 -#: ishtar_common/models_common.py:2255 ishtar_common/models_common.py:2272 -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:2302 +#: archaeological_warehouse/models.py:766 ishtar_common/models.py:684 +#: ishtar_common/models.py:740 ishtar_common/models.py:783 +#: ishtar_common/models.py:1817 ishtar_common/models.py:3677 +#: ishtar_common/models.py:5023 ishtar_common/models_common.py:2029 +#: ishtar_common/models_common.py:2065 ishtar_common/models_common.py:2082 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2112 +#: ishtar_common/models_imports.py:469 msgid "Order" msgstr "Ordre" @@ -818,7 +846,7 @@ msgid "Excavation technique types" msgstr "Types de méthode de fouille" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:955 +#: ishtar_common/models_imports.py:1074 msgid "Documentation type" msgstr "Type de documentation" @@ -826,15 +854,15 @@ msgstr "Type de documentation" msgid "Documentation types" msgstr "Types de documentation" -#: archaeological_context_records/models.py:511 -#: archaeological_context_records/models.py:512 -#: archaeological_context_records/models.py:1461 -#: archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1152 +#: archaeological_context_records/models.py:491 +#: archaeological_context_records/models.py:492 +#: archaeological_context_records/models.py:1351 +#: archaeological_finds/models_finds.py:1006 +#: archaeological_finds/models_finds.py:1007 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1124 -#: archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1126 +#: archaeological_operations/forms.py:1223 +#: archaeological_operations/forms.py:1341 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:495 @@ -845,169 +873,170 @@ msgstr "Types de documentation" msgid "Periods" msgstr "Périodes" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:493 msgid "Datings (period)" msgstr "Datations (période)" -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:494 +#: archaeological_context_records/models.py:495 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:496 msgid "Operation (Patriarche code)" msgstr "Opération (code Patriarche)" -#: archaeological_context_records/models.py:517 -#: archaeological_finds/models_finds.py:1137 +#: archaeological_context_records/models.py:497 +#: archaeological_finds/models_finds.py:992 msgid "Operation (name)" msgstr "Opération (nom)" -#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:498 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant)" -#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:501 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: archaeological_context_records/models.py:538 -#: archaeological_finds/models_finds.py:1201 +#: archaeological_context_records/models.py:518 +#: archaeological_finds/models_finds.py:1056 #: archaeological_operations/models.py:317 #: archaeological_operations/models.py:994 msgid "Associated document type" msgstr "Type de document associé" -#: archaeological_context_records/models.py:539 -#: archaeological_finds/models_finds.py:1202 +#: archaeological_context_records/models.py:519 +#: archaeological_finds/models_finds.py:1057 #: archaeological_operations/models.py:318 #: archaeological_operations/models.py:995 msgid "Modification (year)" msgstr "Modification (année)" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:558 msgctxt "key for text search" msgid "id" msgstr "id" -#: archaeological_context_records/models.py:581 -#: archaeological_context_records/tests.py:763 -#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1285 +#: archaeological_context_records/models.py:561 +#: archaeological_context_records/tests.py:761 +#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1140 #: archaeological_operations/models.py:379 #: archaeological_operations/models.py:1138 -#: archaeological_operations/tests.py:3052 -#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4120 +#: archaeological_operations/tests.py:3097 +#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4134 msgctxt "key for text search" msgid "town" msgstr "commune" -#: archaeological_context_records/models.py:584 ishtar_common/models.py:4084 +#: archaeological_context_records/models.py:564 ishtar_common/models.py:4098 msgctxt "key for text search" msgid "operation-year" msgstr "operation-annee" -#: archaeological_context_records/models.py:587 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1390 +#: archaeological_context_records/models.py:567 +#: archaeological_finds/models_finds.py:1505 archaeological_finds/tests.py:1435 msgctxt "key for text search" msgid "operation-name" msgstr "operation-nom" -#: archaeological_context_records/models.py:591 +#: archaeological_context_records/models.py:571 #: archaeological_operations/models.py:1134 -#: archaeological_operations/models.py:2593 -#: archaeological_operations/tests.py:4540 +#: archaeological_operations/models.py:2599 +#: archaeological_operations/tests.py:4604 msgctxt "key for text search" msgid "patriarche" msgstr "patriarche" -#: archaeological_context_records/models.py:595 -#: archaeological_finds/models_finds.py:1293 +#: archaeological_context_records/models.py:575 +#: archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "operation-code" msgstr "operation-code" -#: archaeological_context_records/models.py:599 -#: archaeological_context_records/models.py:664 -#: archaeological_finds/models_finds.py:1394 -#: archaeological_finds/models_finds.py:1766 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:644 +#: archaeological_finds/models_finds.py:1249 +#: archaeological_finds/models_finds.py:1621 #: archaeological_operations/models.py:414 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4076 -#: ishtar_common/models.py:4189 +#: archaeological_operations/models.py:440 ishtar_common/models.py:4090 +#: ishtar_common/models.py:4203 msgctxt "key for text search" msgid "operation" msgstr "operation" -#: archaeological_context_records/models.py:603 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1309 +#: archaeological_context_records/models.py:583 +#: archaeological_context_records/models.py:647 +#: archaeological_finds/models_finds.py:1164 #: archaeological_operations/models.py:1222 #: archaeological_operations/models.py:1287 -#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4112 -#: ishtar_common/models.py:4198 +#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4126 +#: ishtar_common/models.py:4212 msgctxt "key for text search" msgid "site" msgstr "site" -#: archaeological_context_records/models.py:607 -#: archaeological_context_records/tests.py:830 -#: archaeological_finds/models_finds.py:1332 +#: archaeological_context_records/models.py:587 +#: archaeological_context_records/tests.py:828 +#: archaeological_finds/models_finds.py:1187 msgctxt "key for text search" msgid "operation-relation-type" msgstr "operation-type-relation" -#: archaeological_context_records/models.py:611 +#: archaeological_context_records/models.py:591 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1180 -#: archaeological_operations/tests.py:3030 -#: archaeological_operations/tests.py:3068 -#: archaeological_operations/tests.py:3228 +#: archaeological_operations/tests.py:3075 +#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3252 +#: archaeological_operations/tests.py:3292 msgctxt "key for text search" msgid "period" msgstr "periode" -#: archaeological_context_records/models.py:615 -#: archaeological_context_records/tests.py:889 +#: archaeological_context_records/models.py:595 +#: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "type-unite" -#: archaeological_context_records/models.py:618 +#: archaeological_context_records/models.py:598 msgctxt "key for text search" msgid "activity" msgstr "activite" -#: archaeological_context_records/models.py:621 +#: archaeological_context_records/models.py:601 msgctxt "key for text search" msgid "identification" msgstr "identification" -#: archaeological_context_records/models.py:625 +#: archaeological_context_records/models.py:605 #: archaeological_files/models.py:477 archaeological_operations/models.py:1144 -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2617 msgctxt "key for text search" msgid "parcel" msgstr "parcelle" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:609 #: archaeological_operations/models.py:1241 msgctxt "key for text search" msgid "has-finds" msgstr "mobilier-rattache" -#: archaeological_context_records/models.py:632 -#: archaeological_context_records/tests.py:795 +#: archaeological_context_records/models.py:612 +#: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "ue-type-relation" -#: archaeological_context_records/models.py:636 +#: archaeological_context_records/models.py:616 msgctxt "key for text search" msgid "excavation-technique" msgstr "methode-de-fouille" -#: archaeological_context_records/models.py:682 -#: archaeological_finds/models_finds.py:1725 +#: archaeological_context_records/models.py:662 +#: archaeological_finds/models_finds.py:1580 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1270 #: archaeological_warehouse/models.py:342 @@ -1015,72 +1044,72 @@ msgstr "methode-de-fouille" msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" -#: archaeological_context_records/models.py:689 -#: archaeological_finds/models_finds.py:1718 +#: archaeological_context_records/models.py:669 +#: archaeological_finds/models_finds.py:1573 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1263 #: archaeological_warehouse/models.py:334 -#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2578 -#: ishtar_common/models.py:2855 ishtar_common/models.py:4215 +#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2588 +#: ishtar_common/models.py:2865 ishtar_common/models.py:4229 msgid "Bulk update" msgstr "Modification par lot" -#: archaeological_context_records/models.py:699 -#: archaeological_context_records/models.py:1147 +#: archaeological_context_records/models.py:679 +#: archaeological_context_records/models.py:1039 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:915 -#: archaeological_finds/models_finds.py:1735 -#: archaeological_finds/models_finds.py:2362 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:770 +#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:2217 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 #: archaeological_finds/views.py:1316 archaeological_operations/models.py:484 #: archaeological_operations/models.py:661 #: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:1917 +#: archaeological_operations/models.py:1923 #: archaeological_operations/views.py:886 #: archaeological_operations/views.py:901 #: archaeological_operations/views.py:908 #: archaeological_operations/views.py:925 ishtar_common/admin.py:1589 -#: ishtar_common/admin.py:1709 ishtar_common/models.py:4224 -#: ishtar_common/models.py:4571 ishtar_common/views.py:2722 -#: ishtar_common/views.py:2740 +#: ishtar_common/admin.py:1732 ishtar_common/models.py:4238 +#: ishtar_common/models.py:4585 ishtar_common/views.py:2985 +#: ishtar_common/views.py:3003 msgid "Duplicate" msgstr "Dupliquer" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:696 #: archaeological_files/models.py:540 archaeological_finds/models_finds.py:421 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1694 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:1110 -#: archaeological_operations/models.py:3064 +#: archaeological_operations/models.py:3070 #: archaeological_warehouse/models.py:396 -#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4250 +#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4264 msgid "External ID" msgstr "Identifiant" -#: archaeological_context_records/models.py:718 +#: archaeological_context_records/models.py:698 #: archaeological_files/models.py:543 archaeological_finds/models_finds.py:423 -#: archaeological_finds/models_finds.py:1841 -#: archaeological_operations/models.py:3067 +#: archaeological_finds/models_finds.py:1696 +#: archaeological_operations/models.py:3073 #: archaeological_warehouse/models.py:398 #: archaeological_warehouse/models.py:1175 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" -#: archaeological_context_records/models.py:763 -#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3485 +#: archaeological_context_records/models.py:743 +#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3293 msgid "Surface (m2)" msgstr "Surface (m2)" -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/models.py:748 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:772 +#: archaeological_context_records/models.py:752 msgid "Comment on datings" msgstr "Commentaire relatif aux datations" -#: archaeological_context_records/models.py:788 +#: archaeological_context_records/models.py:768 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1088,11 +1117,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date" -#: archaeological_context_records/models.py:796 +#: archaeological_context_records/models.py:776 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:783 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1100,20 +1129,20 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date" -#: archaeological_context_records/models.py:811 +#: archaeological_context_records/models.py:791 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: archaeological_context_records/models.py:839 +#: archaeological_context_records/models.py:819 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:91 -#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:2034 +#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:1889 #: archaeological_finds/models_treatments.py:277 #: archaeological_finds/models_treatments.py:1160 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:534 #: archaeological_operations/models.py:1453 -#: archaeological_operations/models.py:2811 +#: archaeological_operations/models.py:2817 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:96 #: archaeological_warehouse/models.py:385 @@ -1121,136 +1150,141 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:193 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:984 ishtar_common/models.py:2360 -#: ishtar_common/models.py:3768 ishtar_common/models.py:3786 -#: ishtar_common/models.py:3815 ishtar_common/models.py:3829 -#: ishtar_common/models.py:3839 ishtar_common/models.py:4368 -#: ishtar_common/models.py:4379 ishtar_common/models_common.py:3513 +#: ishtar_common/models.py:995 ishtar_common/models.py:2370 +#: ishtar_common/models.py:3782 ishtar_common/models.py:3800 +#: ishtar_common/models.py:3829 ishtar_common/models.py:3843 +#: ishtar_common/models.py:3853 ishtar_common/models.py:4382 +#: ishtar_common/models.py:4393 ishtar_common/models_common.py:3321 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_find.html:67 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_find.html:65 +#: na_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "Documents" -#: archaeological_context_records/models.py:846 -#: archaeological_finds/models_finds.py:2040 +#: archaeological_context_records/models.py:826 +#: archaeological_finds/models_finds.py:1895 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1167 #: archaeological_operations/models.py:540 #: archaeological_operations/models.py:1459 -#: archaeological_operations/models.py:2818 +#: archaeological_operations/models.py:2824 #: archaeological_warehouse/models.py:392 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2366 -#: ishtar_common/models_common.py:3519 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2376 +#: ishtar_common/models_common.py:3327 msgid "Main image" msgstr "Image principale" -#: archaeological_context_records/models.py:851 -#: archaeological_finds/models_finds.py:2052 +#: archaeological_context_records/models.py:831 +#: archaeological_finds/models_finds.py:1907 #: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1542 +#: archaeological_operations/models.py:1548 msgid "Cached periods label" msgstr "Nom en cache des périodes" -#: archaeological_context_records/models.py:854 -#: archaeological_context_records/models.py:860 -#: archaeological_finds/models_finds.py:2055 -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2067 +#: archaeological_context_records/models.py:834 +#: archaeological_context_records/models.py:840 +#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1922 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:554 #: archaeological_operations/models.py:560 #: archaeological_operations/models.py:1539 #: archaeological_operations/models.py:1545 #: archaeological_operations/models.py:1551 -#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4475 +#: archaeological_operations/models.py:1557 +#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4283 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:837 msgid "Cached related context records" msgstr "Nom en cache des unités d'enregistrements liées" -#: archaeological_context_records/models.py:864 -#: archaeological_context_records/models.py:865 +#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:845 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:434 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/models.py:866 msgctxt "short" msgid "Context record" msgstr "UE" -#: archaeological_context_records/models.py:921 -#: archaeological_finds/models_finds.py:2234 +#: archaeological_context_records/models.py:901 +#: archaeological_finds/models_finds.py:2089 msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" -#: archaeological_context_records/models.py:1135 +#: archaeological_context_records/models.py:1027 msgid "Add find" msgstr "Ajout mobilier" -#: archaeological_context_records/models.py:1137 +#: archaeological_context_records/models.py:1029 msgid "find" msgstr "mobilier" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1240 msgid "Relation types" msgstr "Types de relation" -#: archaeological_context_records/models.py:1385 +#: archaeological_context_records/models.py:1273 msgid "ID (left)" msgstr "Identifiant (gauche)" -#: archaeological_context_records/models.py:1386 +#: archaeological_context_records/models.py:1274 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: archaeological_context_records/models.py:1387 +#: archaeological_context_records/models.py:1275 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: archaeological_context_records/models.py:1388 +#: archaeological_context_records/models.py:1276 msgid "Description (left)" msgstr "Description (gauche)" -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1277 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1279 msgid "ID (right)" msgstr "Identifiant (droit)" -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1280 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1281 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1282 msgid "Description (right)" msgstr "Description (droite)" -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:1283 msgid "Periods (right)" msgstr "Périodes (droite)" -#: archaeological_context_records/models.py:1402 +#: archaeological_context_records/models.py:1292 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1403 +#: archaeological_context_records/models.py:1293 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1594 +#: archaeological_context_records/models.py:1484 msgid "Context record parent" msgstr "Unité d'Enregistrement parente" @@ -1289,6 +1323,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:40 #: archaeological_finds/templates/ishtar/sheet_find.html:48 #: man_app/templates/ishtar/sheet_find.html:50 +#: na_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "Identification / Description" @@ -1303,7 +1338,7 @@ msgstr "Opération / Site" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:73 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:264 -#: archaeological_finds/forms.py:1763 archaeological_finds/models_finds.py:93 +#: archaeological_finds/forms.py:1764 archaeological_finds/models_finds.py:93 #: archaeological_finds/models_finds.py:107 #: archaeological_finds/models_finds.py:124 #: archaeological_finds/models_finds.py:235 @@ -1318,19 +1353,24 @@ msgstr "Opération / Site" #: archaeological_finds/models_finds.py:362 #: archaeological_finds/models_finds.py:376 #: archaeological_finds/models_finds.py:503 -#: archaeological_finds/models_finds.py:928 -#: archaeological_finds/models_finds.py:2074 -#: archaeological_finds/models_finds.py:2085 -#: archaeological_finds/models_finds.py:3431 +#: archaeological_finds/models_finds.py:783 +#: archaeological_finds/models_finds.py:1929 +#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/models_finds.py:3166 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 -#: archaeological_operations/templates/ishtar/sheet_operation.html:433 -#: archaeological_operations/templates/ishtar/sheet_operation.html:525 +#: archaeological_operations/templates/ishtar/sheet_operation.html:463 +#: archaeological_operations/templates/ishtar/sheet_operation.html:555 #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_container.html:235 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: na_app/templates/ishtar/sheet_container.html:195 +#: na_app/templates/ishtar/sheet_container.html:242 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:441 +#: na_app/templates/ishtar/sheet_operation.html:533 msgid "Finds" msgstr "Mobilier" @@ -1344,7 +1384,11 @@ msgstr "Mobilier" #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 #: man_app/templates/ishtar/sheet_find.html:76 -#: man_app/templates/ishtar/sheet_find.html:600 +#: man_app/templates/ishtar/sheet_find.html:546 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:74 +#: na_app/templates/ishtar/sheet_find.html:557 +#: na_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "Données géographiques" @@ -1352,6 +1396,8 @@ msgstr "Données géographiques" #: archaeological_finds/templates/ishtar/sheet_find.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: man_app/templates/ishtar/sheet_find.html:85 +#: na_app/templates/ishtar/sheet_find.html:83 +#: na_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "Champs personnalisés" @@ -1362,8 +1408,11 @@ msgstr "Champs personnalisés" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4478 +#: ishtar_common/models_common.py:4286 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_operation.html:138 msgid "Complete identifier" msgstr "Identifiant complet" @@ -1373,6 +1422,7 @@ msgstr "Identifiant complet" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:212 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:212 msgid "Surface" msgstr "Surface" @@ -1380,12 +1430,14 @@ msgstr "Surface" #: archaeological_files/forms.py:286 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 -#: archaeological_operations/templates/ishtar/sheet_operation.html:292 +#: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:55 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:300 msgid "Geographic localisation" msgstr "Localisation géographique" @@ -1394,10 +1446,12 @@ msgstr "Localisation géographique" #: archaeological_finds/forms.py:719 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: archaeological_operations/templates/ishtar/sheet_operation.html:313 +#: archaeological_operations/templates/ishtar/sheet_operation.html:343 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: man_app/templates/ishtar/sheet_basefind.html:65 -#: man_app/templates/ishtar/sheet_find.html:270 +#: man_app/templates/ishtar/sheet_find.html:258 +#: na_app/templates/ishtar/sheet_find.html:269 +#: na_app/templates/ishtar/sheet_operation.html:321 msgid "Sheet" msgstr "Fiche" @@ -1406,7 +1460,8 @@ msgid "Operation summary" msgstr "Résumé de l'opération" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:215 -#: archaeological_operations/templates/ishtar/sheet_operation.html:277 +#: archaeological_operations/templates/ishtar/sheet_operation.html:293 +#: na_app/templates/ishtar/sheet_operation.html:285 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" @@ -1423,30 +1478,37 @@ msgstr "Référence numérique" #: archaeological_finds/templates/ishtar/sheet_find.html:424 #: archaeological_finds/templates/ishtar/sheet_find.html:462 #: archaeological_operations/templates/ishtar/sheet_operation.html:175 -#: ishtar_common/models.py:3359 ishtar_common/models.py:5128 -#: ishtar_common/models.py:5265 ishtar_common/models.py:5344 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2163 -#: ishtar_common/models_imports.py:1279 -#: man_app/templates/ishtar/sheet_find.html:399 -#: man_app/templates/ishtar/sheet_find.html:437 -#: man_app/templates/ishtar/sheet_find.html:475 +#: ishtar_common/models.py:3369 ishtar_common/models.py:5142 +#: ishtar_common/models.py:5279 ishtar_common/models.py:5358 +#: ishtar_common/models_common.py:1958 ishtar_common/models_common.py:1973 +#: ishtar_common/models_imports.py:1511 ishtar_common/models_imports.py:1908 +#: man_app/templates/ishtar/sheet_find.html:387 +#: man_app/templates/ishtar/sheet_find.html:425 +#: man_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:398 +#: na_app/templates/ishtar/sheet_find.html:436 +#: na_app/templates/ishtar/sheet_find.html:474 +#: na_app/templates/ishtar/sheet_operation.html:175 msgid "State" msgstr "État" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:180 +#: na_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "Dossier actif" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: na_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "Opération close" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:206 +#: na_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "par" @@ -1459,12 +1521,14 @@ msgid "No associated finds." msgstr "Pas de mobilier associé." #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:273 -#: archaeological_operations/templates/ishtar/sheet_operation.html:438 +#: archaeological_operations/templates/ishtar/sheet_operation.html:468 +#: na_app/templates/ishtar/sheet_operation.html:446 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:286 -#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: archaeological_operations/templates/ishtar/sheet_operation.html:434 +#: na_app/templates/ishtar/sheet_operation.html:412 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" @@ -1497,7 +1561,7 @@ msgid "Context record deletion" msgstr "Supprimer une Unité d'Enregistrement" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1906 +#: archaeological_operations/models.py:1912 msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" @@ -1534,7 +1598,7 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:387 archaeological_files/models.py:532 #: archaeological_files/templates/ishtar/sheet_file.html:217 -#: archaeological_finds/forms.py:1275 +#: archaeological_finds/forms.py:1276 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1542,20 +1606,20 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_finds/forms_treatments.py:644 #: archaeological_finds/forms_treatments.py:726 #: archaeological_finds/forms_treatments.py:840 -#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1038 #: archaeological_finds/models_treatments.py:202 #: archaeological_finds/models_treatments.py:1104 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:727 -#: archaeological_operations/forms.py:1428 -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/forms.py:1746 #: archaeological_operations/models.py:986 #: archaeological_operations/models.py:1363 -#: archaeological_operations/models.py:2561 -#: archaeological_operations/models.py:2790 -#: archaeological_operations/models.py:3054 +#: archaeological_operations/models.py:2567 +#: archaeological_operations/models.py:2796 +#: archaeological_operations/models.py:3060 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1117 msgid "Year" msgstr "Année" @@ -1567,22 +1631,22 @@ msgid "Numeric reference" msgstr "Identifiant numérique" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1121 -#: archaeological_operations/forms.py:1218 -#: archaeological_operations/forms.py:1333 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1507 +#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1123 +#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/forms.py:1512 #: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2799 msgid "Other reference" msgstr "Autre référence" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 #: archaeological_files/forms.py:1167 archaeological_files/models.py:1357 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/models.py:2433 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3493 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/models.py:2439 ishtar_common/models_common.py:1981 +#: ishtar_common/models_common.py:3301 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" @@ -1620,30 +1684,30 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_files/forms.py:105 archaeological_files/forms.py:616 #: archaeological_files/forms.py:664 archaeological_files/models.py:648 #: archaeological_finds/forms.py:336 archaeological_finds/forms.py:586 -#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2017 +#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1414 archaeological_finds/forms.py:2018 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:427 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1827 #: archaeological_finds/models_treatments.py:259 #: archaeological_finds/models_treatments.py:1156 #: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:741 -#: archaeological_operations/forms.py:1226 -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1444 -#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1352 +#: archaeological_operations/forms.py:1449 +#: archaeological_operations/forms.py:1511 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1448 -#: archaeological_operations/models.py:2807 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:375 -#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:1866 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2715 -#: ishtar_common/models.py:2893 ishtar_common/models.py:3547 -#: ishtar_common/models.py:4351 ishtar_common/models_common.py:183 -#: ishtar_common/models_common.py:2399 ishtar_common/models_imports.py:764 +#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:2043 +#: ishtar_common/forms_common.py:2348 ishtar_common/forms_common.py:2896 +#: ishtar_common/models.py:2903 ishtar_common/models.py:3561 +#: ishtar_common/models.py:4365 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2209 ishtar_common/models_imports.py:883 #: 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 @@ -1669,7 +1733,7 @@ msgstr "Organisation de l'aménageur" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1446 ishtar_common/forms.py:931 +#: archaeological_operations/forms.py:1451 ishtar_common/forms.py:951 msgid "Created by" msgstr "Créée par" @@ -1677,7 +1741,7 @@ msgstr "Créée par" #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1457 msgid "Modified by" msgstr "Modifiée par" @@ -1691,9 +1755,9 @@ msgstr "Dossier archéologique - 010 - Général" #: archaeological_files/forms.py:218 archaeological_files/models.py:615 #: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:1861 -#: ishtar_common/forms_common.py:2341 ishtar_common/models.py:4336 -#: ishtar_common/models_imports.py:1287 +#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:2038 +#: ishtar_common/forms_common.py:2517 ishtar_common/models.py:4350 +#: ishtar_common/models_imports.py:1413 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "Date de création" @@ -1703,7 +1767,8 @@ msgstr "Date de création" #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1146 #: archaeological_finds/templates/ishtar/sheet_find.html:504 -#: man_app/templates/ishtar/sheet_find.html:517 +#: man_app/templates/ishtar/sheet_find.html:505 +#: na_app/templates/ishtar/sheet_find.html:516 msgid "Reception date" msgstr "Date de réception" @@ -1733,28 +1798,29 @@ msgstr "Nom de l'aménagement" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 #: archaeological_files/models.py:454 archaeological_files/models.py:612 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/forms.py:1034 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1055 -#: archaeological_operations/forms.py:1383 +#: archaeological_operations/forms.py:723 +#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1057 +#: archaeological_operations/forms.py:1388 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1071 #: archaeological_operations/models.py:1073 #: archaeological_operations/models.py:1384 -#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:2808 #: archaeological_operations/templates/ishtar/sheet_operation.html:146 -#: ishtar_common/forms_common.py:1513 ishtar_common/forms_common.py:1526 -#: ishtar_common/forms_common.py:1527 ishtar_common/models.py:2347 -#: ishtar_common/models_common.py:3527 +#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:1703 +#: ishtar_common/forms_common.py:1704 ishtar_common/models.py:2357 +#: ishtar_common/models_common.py:3335 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: na_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "Communes" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:651 -#: archaeological_operations/models.py:2796 ishtar_common/models_common.py:2172 +#: archaeological_operations/models.py:2802 ishtar_common/models_common.py:1982 msgid "Departments" msgstr "Départements" @@ -1776,8 +1842,8 @@ msgid "Number/street" msgstr "N° / voie" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:598 -#: ishtar_common/forms_common.py:985 ishtar_common/models_common.py:3769 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:774 +#: ishtar_common/forms_common.py:1163 ishtar_common/models_common.py:3577 msgid "Postal code" msgstr "Code postal" @@ -1793,8 +1859,8 @@ msgstr "Surface totale aménagée (m2)" #: archaeological_files/forms.py:326 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:981 -#: ishtar_common/models_common.py:3764 ishtar_common/models_common.py:3950 +#: ishtar_common/forms_common.py:770 ishtar_common/forms_common.py:1159 +#: ishtar_common/models_common.py:3572 ishtar_common/models_common.py:3758 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -1863,7 +1929,7 @@ msgstr "Dossier archéologique - 045 - Recherche - Général" #: archaeological_files/forms.py:596 archaeological_files/models.py:675 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2747 +#: archaeological_operations/models.py:2753 msgid "Scientist in charge" msgstr "Responsable d'opération" @@ -1915,7 +1981,7 @@ msgstr "Dossier préventif" msgid "Preventive file - 020 - Edition form" msgstr "Dossier préventif - 020 - Formulaire d'édition" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:1925 +#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2102 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "Dates" @@ -2022,10 +2088,11 @@ msgstr "Équipement / service" #: archaeological_finds/models_treatments.py:203 #: archaeological_finds/models_treatments.py:1105 #: archaeological_finds/templates/ishtar/sheet_find.html:358 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1562 -#: archaeological_operations/models.py:2732 ishtar_common/admin.py:573 -#: ishtar_common/models.py:4249 man_app/templates/ishtar/sheet_find.html:371 +#: archaeological_operations/forms.py:1434 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/models.py:2738 ishtar_common/admin.py:573 +#: ishtar_common/models.py:4263 man_app/templates/ishtar/sheet_find.html:359 +#: na_app/templates/ishtar/sheet_find.html:370 msgid "Index" msgstr "Index" @@ -2035,10 +2102,11 @@ msgstr "Index" #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2463 -#: archaeological_operations/models.py:2722 ishtar_common/models_imports.py:950 +#: archaeological_operations/forms.py:1440 +#: archaeological_operations/forms.py:1501 +#: archaeological_operations/models.py:2469 +#: archaeological_operations/models.py:2728 +#: ishtar_common/models_imports.py:1069 msgid "Act type" msgstr "Type d'acte" @@ -2049,17 +2117,17 @@ msgstr "Objet (recherche en texte intégral)" #: archaeological_files/forms.py:1162 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1436 -#: archaeological_operations/forms.py:1632 +#: archaeological_operations/forms.py:1441 +#: archaeological_operations/forms.py:1637 msgid "Indexed?" msgstr "Indexé ?" #: archaeological_files/forms.py:1169 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1442 -#: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1508 +#: archaeological_operations/models.py:2797 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" @@ -2103,12 +2171,12 @@ msgstr "Dossier archéologique - Acte administratif - Général" #: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:751 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:220 archaeological_files/wizards.py:232 -#: archaeological_operations/forms.py:673 -#: archaeological_operations/forms.py:933 -#: archaeological_operations/models.py:1926 -#: archaeological_operations/models.py:2446 -#: archaeological_operations/models.py:2562 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/forms.py:675 +#: archaeological_operations/forms.py:935 +#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2776 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:498 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2121,9 +2189,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:3413 +#: archaeological_finds/models_finds.py:3148 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2827 +#: archaeological_operations/models.py:2833 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -2134,7 +2202,8 @@ msgstr "Acte administratif" #: archaeological_files/models.py:353 archaeological_files/models.py:1403 #: archaeological_files/models.py:1420 archaeological_files/models.py:1445 #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: ishtar_common/models.py:5067 +#: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: ishtar_common/models.py:5081 msgid "Preventive" msgstr "Préventif" @@ -2200,6 +2269,7 @@ msgstr "Types d'équipement/de service" #: archaeological_files/models.py:187 #: archaeological_operations/templates/ishtar/sheet_operation.html:229 +#: na_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "jours" @@ -2220,12 +2290,12 @@ msgid "Equipment/Service" msgstr "Équipement/Service" #: archaeological_files/models.py:212 archaeological_warehouse/forms.py:207 -#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:174 -#: ishtar_common/models_common.py:205 +#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:176 +#: ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "Identifiant textuel" -#: archaeological_files/models.py:216 ishtar_common/models_common.py:178 +#: archaeological_files/models.py:216 ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2246,7 +2316,7 @@ msgstr "Tarif forfaitaire" msgid "Unitary cost" msgstr "Coût unitaire" -#: archaeological_files/models.py:227 ishtar_common/models_imports.py:951 +#: archaeological_files/models.py:227 ishtar_common/models_imports.py:1070 msgid "Unit" msgstr "Unité" @@ -2258,16 +2328,16 @@ msgstr "Spécificité" msgid "Default quantity by day" msgstr "Quantité par défaut par jour" -#: archaeological_files/models.py:235 ishtar_common/models.py:1630 -#: ishtar_common/models.py:2047 ishtar_common/models.py:3558 -#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:193 -#: ishtar_common/models_imports.py:826 +#: archaeological_files/models.py:235 ishtar_common/models.py:1640 +#: ishtar_common/models.py:2057 ishtar_common/models.py:3572 +#: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:203 +#: ishtar_common/models_imports.py:436 ishtar_common/models_imports.py:945 msgid "Available" msgstr "Disponible" #: archaeological_files/models.py:241 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1135 ishtar_common/models.py:2354 -#: ishtar_common/models_common.py:716 +#: ishtar_common/admin.py:1135 ishtar_common/models.py:2364 +#: ishtar_common/models_common.py:718 msgid "Parent" msgstr "Parent" @@ -2327,30 +2397,36 @@ 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:389 archaeological_finds/models_finds.py:1184 +#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1039 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:987 ishtar_common/admin.py:1318 -#: ishtar_common/forms_common.py:2248 ishtar_common/models.py:2372 +#: ishtar_common/forms_common.py:2424 ishtar_common/models.py:2382 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "Zone" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1187 +#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1042 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:988 msgid "Extended area" msgstr "Zone étendue" -#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1208 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 -#: ishtar_common/models.py:1931 ishtar_common/models_common.py:749 -#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2160 +#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1063 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 +#: ishtar_common/models.py:1941 ishtar_common/models_common.py:751 +#: ishtar_common/models_common.py:1954 ishtar_common/models_common.py:1970 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: na_app/templates/ishtar/sheet_operation.html:551 +#: na_app/templates/ishtar/sheet_operation.html:561 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Number" msgstr "Nombre" @@ -2362,13 +2438,13 @@ msgstr "Surface totale (km2)" msgid "Total developed surface (km2)" msgstr "Surface totale aménagée (km²)" -#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1289 +#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:157 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1125 -#: archaeological_operations/models.py:2586 -#: archaeological_operations/tests.py:3036 -#: archaeological_operations/tests.py:3128 +#: archaeological_operations/models.py:2592 +#: archaeological_operations/tests.py:3081 +#: archaeological_operations/tests.py:3173 msgctxt "key for text search" msgid "year" msgstr "annee" @@ -2376,7 +2452,7 @@ msgstr "annee" #: archaeological_files/models.py:467 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:363 -#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4006 +#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4020 msgctxt "key for text search" msgid "reference" msgstr "reference" @@ -2397,9 +2473,9 @@ msgstr "departement" #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:366 #: archaeological_operations/models.py:1152 -#: archaeological_operations/tests.py:3172 -#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2564 -#: ishtar_common/models.py:2821 ishtar_common/models.py:3408 +#: archaeological_operations/tests.py:3217 +#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2574 +#: ishtar_common/models.py:2831 ishtar_common/models.py:3418 msgctxt "key for text search" msgid "name" msgstr "nom" @@ -2408,12 +2484,12 @@ msgstr "nom" #: archaeological_finds/models_treatments.py:160 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1158 -#: archaeological_operations/models.py:2597 -#: archaeological_operations/tests.py:3185 +#: archaeological_operations/models.py:2603 +#: archaeological_operations/tests.py:3230 #: archaeological_warehouse/models.py:320 -#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2567 -#: ishtar_common/models.py:2836 ishtar_common/models.py:3419 -#: ishtar_common/models.py:4002 +#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2577 +#: ishtar_common/models.py:2846 ishtar_common/models.py:3429 +#: ishtar_common/models.py:4016 msgctxt "key for text search" msgid "type" msgstr "type" @@ -2438,35 +2514,35 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1487 +#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1342 #: archaeological_operations/models.py:385 #: archaeological_operations/models.py:1200 -#: archaeological_operations/models.py:2707 -#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4066 +#: archaeological_operations/models.py:2713 +#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4080 msgctxt "key for text search" msgid "comment" msgstr "commentaire" -#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1493 #: archaeological_finds/models_treatments.py:1065 -#: archaeological_finds/tests.py:1435 +#: archaeological_finds/tests.py:1480 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:513 archaeological_operations/models.py:2642 +#: archaeological_files/models.py:513 archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2646 +#: archaeological_files/models.py:517 archaeological_operations/models.py:2652 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" #: archaeological_files/models.py:537 #: archaeological_finds/models_treatments.py:1107 -#: ishtar_common/forms_common.py:1853 ishtar_common/forms_common.py:2135 +#: ishtar_common/forms_common.py:2030 ishtar_common/forms_common.py:2312 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" @@ -2477,34 +2553,34 @@ msgstr "Référence interne" #: archaeological_finds/models_treatments.py:1112 #: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1120 -#: archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1797 +#: archaeological_operations/forms.py:1122 +#: archaeological_operations/forms.py:1220 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1802 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 -#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:644 ishtar_common/forms_common.py:822 -#: ishtar_common/forms_common.py:953 ishtar_common/forms_common.py:1048 -#: ishtar_common/forms_common.py:1300 ishtar_common/forms_common.py:1353 -#: ishtar_common/forms_common.py:2685 ishtar_common/models.py:672 -#: ishtar_common/models.py:712 ishtar_common/models.py:1030 -#: ishtar_common/models.py:1628 ishtar_common/models.py:2017 -#: ishtar_common/models.py:2588 ishtar_common/models.py:2888 -#: ishtar_common/models.py:3216 ishtar_common/models.py:3353 -#: ishtar_common/models.py:5103 ishtar_common/models_common.py:2367 -#: ishtar_common/models_common.py:3484 ishtar_common/models_common.py:3545 -#: ishtar_common/models_imports.py:115 ishtar_common/models_imports.py:150 -#: ishtar_common/models_imports.py:680 ishtar_common/models_imports.py:698 -#: ishtar_common/models_imports.py:821 ishtar_common/models_imports.py:1199 -#: ishtar_common/models_rest.py:110 +#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:822 ishtar_common/forms_common.py:1000 +#: ishtar_common/forms_common.py:1131 ishtar_common/forms_common.py:1226 +#: ishtar_common/forms_common.py:1480 ishtar_common/forms_common.py:1530 +#: ishtar_common/forms_common.py:2861 ishtar_common/models.py:683 +#: ishtar_common/models.py:723 ishtar_common/models.py:1041 +#: ishtar_common/models.py:1638 ishtar_common/models.py:2027 +#: ishtar_common/models.py:2598 ishtar_common/models.py:2898 +#: ishtar_common/models.py:3226 ishtar_common/models.py:3363 +#: ishtar_common/models.py:5117 ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:3292 ishtar_common/models_common.py:3353 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:154 +#: ishtar_common/models_imports.py:431 ishtar_common/models_imports.py:799 +#: ishtar_common/models_imports.py:817 ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:1368 ishtar_common/models_rest.py:110 #: 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 +#: ishtar_common/templates/ishtar/import_table.html:55 #: ishtar_common/templates/ishtar/merge_organization.html:9 #: ishtar_common/templates/ishtar/merge_organization.html:20 #: ishtar_common/templates/ishtar/merge_person.html:10 @@ -2513,7 +2589,9 @@ msgstr "Référence interne" #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 #: ishtar_common/templates/ishtar/sheet_town.html:63 -#: man_app/templates/ishtar/sheet_find.html:513 +#: man_app/templates/ishtar/sheet_find.html:501 +#: na_app/templates/ishtar/sheet_find.html:512 +#: na_app/templates/ishtar/sheet_operation.html:153 msgid "Name" msgstr "Nom" @@ -2521,7 +2599,8 @@ msgstr "Nom" #: archaeological_finds/models_treatments.py:1121 #: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:363 -#: man_app/templates/ishtar/sheet_find.html:514 +#: man_app/templates/ishtar/sheet_find.html:502 +#: na_app/templates/ishtar/sheet_find.html:513 msgid "Person in charge" msgstr "Personne responsable" @@ -2562,10 +2641,10 @@ msgstr "Adresse des terrains - code postal" #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:250 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:372 -#: ishtar_common/forms_common.py:577 ishtar_common/forms_common.py:829 -#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:1053 -#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2608 -#: ishtar_common/models.py:2816 ishtar_common/models.py:3397 +#: ishtar_common/forms_common.py:753 ishtar_common/forms_common.py:1007 +#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1231 +#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2618 +#: ishtar_common/models.py:2826 ishtar_common/models.py:3407 #: ishtar_common/templates/ishtar/merge_person.html:11 #: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 @@ -2609,11 +2688,11 @@ msgstr "Intercommunal" msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1251 archaeological_operations/models.py:1884 +#: archaeological_files/models.py:1251 archaeological_operations/models.py:1890 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1253 archaeological_operations/models.py:1886 +#: archaeological_files/models.py:1253 archaeological_operations/models.py:1892 msgid "parcels" msgstr "parcelles" @@ -2647,7 +2726,7 @@ msgid "operation" msgstr "opération" #: archaeological_files/models.py:1354 archaeological_operations/models.py:1368 -#: archaeological_operations/models.py:3041 +#: archaeological_operations/models.py:3047 msgid "File" msgstr "Dossier" @@ -2737,7 +2816,8 @@ msgid "Developed surface" msgstr "Surface aménagée" #: archaeological_files/templates/ishtar/sheet_file.html:181 -#: archaeological_operations/templates/ishtar/sheet_operation.html:345 +#: archaeological_operations/templates/ishtar/sheet_operation.html:375 +#: na_app/templates/ishtar/sheet_operation.html:353 msgid "Associated parcels" msgstr "Parcelles associées" @@ -2745,9 +2825,11 @@ msgstr "Parcelles associées" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2828 -#: archaeological_operations/templates/ishtar/sheet_operation.html:350 -#: archaeological_operations/templates/ishtar/sheet_operation.html:487 +#: archaeological_operations/models.py:2834 +#: archaeological_operations/templates/ishtar/sheet_operation.html:380 +#: archaeological_operations/templates/ishtar/sheet_operation.html:517 +#: na_app/templates/ishtar/sheet_operation.html:358 +#: na_app/templates/ishtar/sheet_operation.html:495 msgid "Administrative acts" msgstr "Actes administratifs" @@ -2758,12 +2840,12 @@ 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:2560 -#: archaeological_operations/models.py:2863 +#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2869 #: 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/models.py:733 ishtar_common/models.py:4251 +#: archaeological_warehouse/models.py:733 ishtar_common/models.py:4265 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "Réf." @@ -2778,34 +2860,40 @@ msgstr "Réf." #: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 #: archaeological_warehouse/models.py:293 -#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:645 -#: ishtar_common/forms_common.py:827 ishtar_common/forms_common.py:1051 -#: ishtar_common/forms_common.py:1298 ishtar_common/forms_common.py:1727 -#: ishtar_common/forms_common.py:2133 ishtar_common/forms_common.py:2366 -#: ishtar_common/forms_common.py:3007 ishtar_common/models.py:727 -#: ishtar_common/models.py:2590 ishtar_common/models.py:3965 -#: ishtar_common/models.py:4255 ishtar_common/models_imports.py:156 -#: ishtar_common/models_imports.py:997 +#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:823 +#: ishtar_common/forms_common.py:1005 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1478 ishtar_common/forms_common.py:1904 +#: ishtar_common/forms_common.py:2310 ishtar_common/forms_common.py:2542 +#: ishtar_common/forms_common.py:3209 ishtar_common/models.py:738 +#: ishtar_common/models.py:2600 ishtar_common/models.py:3979 +#: ishtar_common/models.py:4269 ishtar_common/models_imports.py:160 +#: ishtar_common/models_imports.py:1116 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 -#: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/import_table.html:56 #: ishtar_common/templates/ishtar/merge_organization.html:10 #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: man_app/templates/ishtar/sheet_find.html:398 -#: man_app/templates/ishtar/sheet_find.html:436 -#: man_app/templates/ishtar/sheet_find.html:474 -#: man_app/templates/ishtar/sheet_find.html:512 +#: man_app/templates/ishtar/sheet_find.html:386 +#: man_app/templates/ishtar/sheet_find.html:424 +#: man_app/templates/ishtar/sheet_find.html:462 +#: man_app/templates/ishtar/sheet_find.html:500 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:435 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:511 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Type" msgstr "Type" #: archaeological_files/templates/ishtar/sheet_file.html:195 -#: archaeological_operations/forms.py:783 +#: archaeological_operations/forms.py:785 #: archaeological_operations/models.py:1328 msgid "Excavation end date" msgstr "Date de fin de chantier" @@ -2820,8 +2908,8 @@ 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:696 -#: ishtar_common/models_imports.py:996 +#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:707 +#: ishtar_common/models_imports.py:1115 msgid "Date" msgstr "Date" @@ -2854,6 +2942,7 @@ msgstr "Effectif" #: archaeological_files/templates/ishtar/sheet_file.html:393 #: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/sheet_operation.html:220 +#: na_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "Coût" @@ -2864,7 +2953,9 @@ msgstr "Coût" #: archaeological_warehouse/templates/ishtar/sheet_container.html:269 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 -#: ishtar_common/models.py:1924 ishtar_common/models.py:1956 +#: ishtar_common/models.py:1934 ishtar_common/models.py:1966 +#: na_app/templates/ishtar/sheet_container.html:252 +#: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "Total" @@ -2969,185 +3060,187 @@ msgid "Simple find - 020 - General" msgstr "Mobilier simple - 020 - Général" #: archaeological_finds/forms.py:276 archaeological_finds/forms.py:544 -#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:956 -#: archaeological_finds/forms.py:1263 archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:957 +#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1904 #: archaeological_finds/models_finds.py:420 -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1701 msgid "Free ID" msgstr "Identifiant libre" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:546 -#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:958 -#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1970 -#: archaeological_finds/models_finds.py:1847 +#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:959 +#: archaeological_finds/forms.py:1265 archaeological_finds/forms.py:1971 +#: archaeological_finds/models_finds.py:1702 msgid "Denomination" msgstr "Dénomination" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:1265 archaeological_finds/models_finds.py:1974 +#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:1829 msgid "Previous ID" msgstr "Identifiant précédent" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:752 -#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1848 +#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1703 msgid "Museum inventory number" msgstr "Numéro d'inventaire musée" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1849 +#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1704 msgid "Laboratory ID" msgstr "Numéro de laboratoire" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:754 -#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:1844 +#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1699 msgid "Seal number" msgstr "Numéro de scellé" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:755 -#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1971 +#: archaeological_finds/forms.py:1271 archaeological_finds/models_finds.py:1826 msgid "Mark" msgstr "Marquage" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:2031 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1886 msgid "Public description" msgstr "Description publique" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:553 -#: archaeological_finds/forms.py:1376 archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:1377 archaeological_finds/models_finds.py:1769 msgid "Is complete?" msgstr "Est complet ?" #: archaeological_finds/forms.py:300 archaeological_finds/forms.py:556 #: archaeological_finds/forms.py:767 archaeological_finds/models_finds.py:91 -#: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1008 +#: archaeological_finds/models_finds.py:1009 +#: archaeological_finds/models_finds.py:1712 msgid "Material types" msgstr "Types de matériau" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:559 -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1861 -#: ishtar_common/models_imports.py:975 +#: archaeological_finds/forms.py:1386 archaeological_finds/models_finds.py:1716 +#: ishtar_common/models_imports.py:1094 msgid "Material type quality" msgstr "Qualité du type de matériaux" -#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1387 -#: archaeological_finds/models_finds.py:1868 +#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1388 +#: archaeological_finds/models_finds.py:1723 msgid "Comment on the material" msgstr "Commentaire relatif au matériau" #: archaeological_finds/forms.py:309 archaeological_finds/forms.py:562 #: archaeological_finds/forms.py:770 archaeological_finds/models_finds.py:271 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1010 +#: archaeological_finds/models_finds.py:1011 +#: archaeological_finds/models_finds.py:1771 msgid "Object types" msgstr "Types d'objet" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:566 -#: archaeological_finds/forms.py:1394 archaeological_finds/models_finds.py:1920 +#: archaeological_finds/forms.py:1395 archaeological_finds/models_finds.py:1775 msgid "Object type quality" msgstr "Qualité du type d'objet" #: archaeological_finds/forms.py:316 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1396 archaeological_finds/models_finds.py:286 +#: archaeological_finds/forms.py:1397 archaeological_finds/models_finds.py:286 msgid "Functional areas" msgstr "Domaines fonctionnels" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:568 -#: archaeological_finds/forms.py:1403 archaeological_finds/forms.py:1909 -#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/forms.py:1404 archaeological_finds/forms.py:1910 +#: archaeological_finds/models_finds.py:1730 msgid "Number of remains" msgstr "Nombre de restes (NR)" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:570 -#: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1951 +#: archaeological_finds/forms.py:1406 archaeological_finds/models_finds.py:1806 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:574 -#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1851 +#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1706 msgid "Decoration" msgstr "Décor" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:577 -#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1852 +#: archaeological_finds/forms.py:1411 archaeological_finds/models_finds.py:1707 msgid "Inscription" msgstr "Inscription" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:580 -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1408 -#: archaeological_finds/models_finds.py:1854 +#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1409 +#: archaeological_finds/models_finds.py:1709 msgid "Manufacturing place" msgstr "Lieu de fabrication" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:583 -#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1412 -#: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:1946 +#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1413 +#: archaeological_finds/models_finds.py:1051 +#: archaeological_finds/models_finds.py:1801 msgid "Communicability" msgstr "Communicabilité" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1416 -#: archaeological_finds/models_finds.py:1896 -#: archaeological_operations/forms.py:1223 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1417 +#: archaeological_finds/models_finds.py:1751 +#: archaeological_operations/forms.py:1226 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "Attribution culturelle" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:589 -#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1418 -#: archaeological_finds/models_finds.py:1973 +#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1419 +#: archaeological_finds/models_finds.py:1828 msgid "Comment on dating" msgstr "Commentaire relatif aux datations" #: archaeological_finds/forms.py:345 archaeological_finds/forms.py:592 -#: archaeological_finds/forms.py:1217 +#: archaeological_finds/forms.py:1218 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: man_app/templates/ishtar/sheet_find.html:194 +#: na_app/templates/ishtar/sheet_find.html:205 msgid "Dimensions" msgstr "Dimensions" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:593 -#: archaeological_finds/models_finds.py:1953 +#: archaeological_finds/models_finds.py:1808 msgid "Length (cm)" msgstr "Longueur (cm)" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:594 -#: archaeological_finds/models_finds.py:1954 +#: archaeological_finds/models_finds.py:1809 msgid "Width (cm)" msgstr "Largeur (cm)" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:595 -#: archaeological_finds/models_finds.py:1955 +#: archaeological_finds/models_finds.py:1810 msgid "Height (cm)" msgstr "Hauteur (cm)" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:598 -#: archaeological_finds/models_finds.py:1958 +#: archaeological_finds/models_finds.py:1813 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:596 -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1811 msgid "Diameter (cm)" msgstr "Diamètre (cm)" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:597 -#: archaeological_finds/models_finds.py:1957 +#: archaeological_finds/models_finds.py:1812 msgid "Circumference (cm)" msgstr "Circonférence (cm)" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:599 -#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1870 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:1725 #: archaeological_warehouse/models.py:731 msgid "Volume (l)" msgstr "Volume (l)" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:600 -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1909 #: archaeological_finds/templates/ishtar/sheet_find.html:202 #: man_app/templates/ishtar/sheet_find.html:203 +#: na_app/templates/ishtar/sheet_find.html:214 msgid "Weight (g)" msgstr "Poids (g)" @@ -3164,19 +3257,19 @@ msgid "Clutter height (cm)" msgstr "Encombrement hauteur (cm)" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:611 -#: archaeological_finds/forms.py:1489 archaeological_finds/models_finds.py:1969 +#: archaeological_finds/forms.py:1490 archaeological_finds/models_finds.py:1824 msgid "Dimensions comment" msgstr "Commentaire relatif aux dimensions" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:615 -#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1494 -#: archaeological_finds/models_finds.py:1197 -#: archaeological_finds/models_finds.py:1978 +#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1495 +#: archaeological_finds/models_finds.py:1052 +#: archaeological_finds/models_finds.py:1833 msgid "Check" msgstr "Vérification" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:617 -#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1838 msgid "Check date" msgstr "Date de vérification" @@ -3191,7 +3284,7 @@ msgid "Find - 020 - General" msgstr "Mobilier - 020 - Général" #: archaeological_finds/forms.py:497 archaeological_finds/forms.py:750 -#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:425 +#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:425 msgid "Excavation ID" msgstr "Identifiant fouille" @@ -3207,7 +3300,7 @@ msgstr "Date de découverte (exacte ou début)" msgid "Discovery date (end)" msgstr "Date de découverte (fin)" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1375 +#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1376 #: archaeological_finds/models_finds.py:445 msgid "Batch/object" msgstr "Lot/objet" @@ -3216,12 +3309,12 @@ msgstr "Lot/objet" msgid "Topography" msgstr "Topographie" -#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1492 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1493 #: archaeological_finds/models_finds.py:453 msgid "Point of topographic reference" msgstr "Point topographique" -#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1900 +#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1901 msgid "Resulting find" msgstr "Mobilier résultant" @@ -3229,7 +3322,7 @@ msgstr "Mobilier résultant" msgid "Treatment n-1 - 030 - Resulting find" msgstr "Traitement n-1 - 030 - Mobilier résultant" -#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1915 +#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1916 msgid "Resulting finds" msgstr "Mobiliers résultants" @@ -3261,12 +3354,12 @@ msgstr "Numérotation commençant depuis" 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:672 archaeological_finds/forms.py:936 -#: archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:937 +#: archaeological_finds/forms.py:1004 msgid "A basket with this label already exists." msgstr "Un panier avec ce libellé existe déjà." -#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1012 +#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1013 msgid "Find - Quick action - Modify" msgstr "Mobilier - Action rapide - Modification" @@ -3274,56 +3367,57 @@ msgstr "Mobilier - Action rapide - Modification" msgid "Datation" msgstr "Datation" -#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1065 -#: archaeological_finds/forms.py:1245 +#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1246 #: archaeological_finds/templates/ishtar/sheet_find.html:279 -#: man_app/templates/ishtar/sheet_find.html:292 +#: man_app/templates/ishtar/sheet_find.html:280 +#: na_app/templates/ishtar/sheet_find.html:291 msgid "Preservation" msgstr "Conservation" -#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1503 archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1101 +#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1053 +#: archaeological_finds/models_finds.py:1868 #: archaeological_warehouse/forms.py:586 msgid "Alteration" msgstr "Altération" -#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1106 -#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1199 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1107 +#: archaeological_finds/forms.py:1505 archaeological_finds/models_finds.py:1054 +#: archaeological_finds/models_finds.py:1872 #: archaeological_warehouse/forms.py:587 msgid "Alteration cause" msgstr "Cause d'altération" -#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1097 -#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1193 -#: archaeological_finds/models_finds.py:1998 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:959 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1502 archaeological_finds/models_finds.py:1048 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1078 msgid "Conservatory state" msgstr "État de conservation" -#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1118 -#: archaeological_finds/forms.py:1508 archaeological_finds/models_finds.py:1200 -#: archaeological_finds/models_finds.py:2023 +#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1119 +#: archaeological_finds/forms.py:1509 archaeological_finds/models_finds.py:1055 +#: archaeological_finds/models_finds.py:1878 #: archaeological_warehouse/forms.py:591 msgid "Treatment emergency" msgstr "Urgence du traitement" -#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1091 -#: archaeological_finds/forms.py:1500 archaeological_finds/models_finds.py:1195 -#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1092 +#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1050 +#: archaeological_finds/models_finds.py:1795 #: archaeological_warehouse/forms.py:584 msgid "Remarkability" msgstr "Remarquabilité" -#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1123 -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1124 +#: archaeological_finds/models_finds.py:1884 msgid "Appraisal date" msgstr "Date d'évaluation" -#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1121 -#: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2028 +#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1122 +#: archaeological_finds/models_finds.py:1066 +#: archaeological_finds/models_finds.py:1883 msgid "Insurance value" msgstr "Valeur d'assurance" @@ -3331,406 +3425,410 @@ msgstr "Valeur d'assurance" msgid "Comment on conservatory" msgstr "Commentaire de conservation" -#: archaeological_finds/forms.py:879 +#: archaeological_finds/forms.py:880 msgid "Find - Quick action - Modify single" msgstr "Mobilier - Action rapide - Modification simple" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 msgid "Create" msgstr "Créer" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "Mettre à jour" -#: archaeological_finds/forms.py:899 archaeological_finds/forms.py:1355 -#: archaeological_finds/forms.py:2119 archaeological_finds/forms.py:2124 -#: archaeological_finds/forms.py:2141 archaeological_finds/forms.py:2146 +#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1356 +#: archaeological_finds/forms.py:2120 archaeological_finds/forms.py:2125 +#: archaeological_finds/forms.py:2142 archaeological_finds/forms.py:2147 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:922 -#: archaeological_finds/models_finds.py:1742 +#: archaeological_finds/models_finds.py:777 +#: archaeological_finds/models_finds.py:1597 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "Panier" -#: archaeological_finds/forms.py:922 +#: archaeological_finds/forms.py:923 msgid "On update, you have to select a basket." msgstr "Pour la mise à jour, sélectionnez un panier." -#: archaeological_finds/forms.py:929 +#: archaeological_finds/forms.py:930 msgid "You cannot update the selected basket." msgstr "Vous ne pouvez pas mettre à jour le panier sélectionné." -#: archaeological_finds/forms.py:933 archaeological_finds/forms.py:1000 +#: archaeological_finds/forms.py:934 archaeological_finds/forms.py:1001 msgid "A label is required." msgstr "Un libellé est obligatoire." -#: archaeological_finds/forms.py:1022 archaeological_finds/forms.py:2015 -#: ishtar_common/models.py:1031 ishtar_common/models.py:2018 -#: ishtar_common/models.py:3548 ishtar_common/models_imports.py:151 -#: ishtar_common/models_imports.py:699 +#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: ishtar_common/models.py:1042 ishtar_common/models.py:2028 +#: ishtar_common/models.py:3562 ishtar_common/models_imports.py:155 +#: ishtar_common/models_imports.py:432 ishtar_common/models_imports.py:818 msgid "Slug" msgstr "Identifiant textuel" -#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: archaeological_finds/forms.py:1024 archaeological_finds/forms.py:2017 msgid "Is public" msgstr "Est public" -#: archaeological_finds/forms.py:1028 archaeological_finds/forms.py:2021 -#: archaeological_finds/forms.py:2063 ishtar_common/models.py:3561 +#: archaeological_finds/forms.py:1029 archaeological_finds/forms.py:2022 +#: archaeological_finds/forms.py:2064 ishtar_common/models.py:3575 msgid "Shared (read) with" msgstr "Partagé (lecture) avec" -#: archaeological_finds/forms.py:1035 archaeological_finds/forms.py:2028 -#: archaeological_finds/forms.py:2070 ishtar_common/models.py:3567 +#: archaeological_finds/forms.py:1036 archaeological_finds/forms.py:2029 +#: archaeological_finds/forms.py:2071 ishtar_common/models.py:3581 msgid "Shared (read/edit) with" msgstr "Partagé (lecture/édition) avec" -#: archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1067 msgid "Find - 030 - Preservation" msgstr "Mobilier - 030 - Conservation" -#: archaeological_finds/forms.py:1085 archaeological_finds/forms.py:1499 -#: archaeological_finds/models_finds.py:1194 -#: archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1500 +#: archaeological_finds/models_finds.py:1049 +#: archaeological_finds/models_finds.py:1789 #: archaeological_warehouse/forms.py:583 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: archaeological_finds/forms.py:1112 archaeological_finds/forms.py:1506 -#: archaeological_finds/models_finds.py:1192 -#: archaeological_finds/models_finds.py:2008 +#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1507 +#: archaeological_finds/models_finds.py:1047 +#: archaeological_finds/models_finds.py:1863 msgid "Recommended treatments" msgstr "Traitements recommandés" -#: archaeological_finds/forms.py:1120 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:1984 +#: archaeological_finds/forms.py:1121 archaeological_finds/models_finds.py:1065 +#: archaeological_finds/models_finds.py:1839 msgid "Estimated value" msgstr "Valeur estimée" -#: archaeological_finds/forms.py:1126 archaeological_finds/forms.py:1502 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1503 +#: archaeological_finds/models_finds.py:1859 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: archaeological_finds/forms.py:1176 +#: archaeological_finds/forms.py:1177 msgid "Find - 040 - Dating" msgstr "Mobilier - 040 - Datation" -#: archaeological_finds/forms.py:1182 +#: archaeological_finds/forms.py:1183 msgid "Find - 001 - Search" msgstr "Mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:1186 +#: archaeological_finds/forms.py:1187 msgid "Find origin" msgstr "Origine du mobilier" -#: archaeological_finds/forms.py:1208 +#: archaeological_finds/forms.py:1209 #: archaeological_finds/templates/ishtar/sheet_basefind.html:26 #: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "Date de découverte" -#: archaeological_finds/forms.py:1272 archaeological_finds/models_finds.py:1133 +#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:988 msgid "Base find - Short ID" msgstr "Mobilier d'origine - ID court" -#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:1134 +#: archaeological_finds/forms.py:1274 archaeological_finds/models_finds.py:989 msgid "Base find - Complete ID" msgstr "Mobilier d'origine - ID complet" -#: archaeological_finds/forms.py:1277 +#: archaeological_finds/forms.py:1278 msgid "Operation - number (index by year)" msgstr "Opération - Numéro (index par année)" -#: archaeological_finds/forms.py:1280 +#: archaeological_finds/forms.py:1281 msgid "Operation - Code (PATRIARCHE)" msgstr "Opération - Code (PATRIARCHE)" -#: archaeological_finds/forms.py:1283 +#: archaeological_finds/forms.py:1284 msgid "Operation - Type" msgstr "Opération - Type" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1287 msgid "Operation - Address / Locality" msgstr "Opération - Adresse / Lieu-dit" -#: archaeological_finds/forms.py:1289 +#: archaeological_finds/forms.py:1290 msgid "Operation - In charge" msgstr "Opération - Responsable" -#: archaeological_finds/forms.py:1300 +#: archaeological_finds/forms.py:1301 msgid "Operation - Scientist in charge" msgstr "Opération - Responsable d'opération" -#: archaeological_finds/forms.py:1303 +#: archaeological_finds/forms.py:1304 msgid "Operation - Operator" msgstr "Opération - Opérateur" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1308 msgid "Operation - Name" msgstr "Opération - Nom" -#: archaeological_finds/forms.py:1310 +#: archaeological_finds/forms.py:1311 msgid "Operation - Remains" msgstr "Opération - Vestiges" -#: archaeological_finds/forms.py:1313 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1225 ishtar_common/forms_common.py:1299 -#: ishtar_common/models.py:2373 ishtar_common/models.py:3221 +#: archaeological_finds/forms.py:1314 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1228 ishtar_common/forms_common.py:1479 +#: ishtar_common/models.py:2383 ishtar_common/models.py:3231 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "Zones" -#: archaeological_finds/forms.py:1316 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1317 archaeological_warehouse/forms.py:530 msgid "Archaeological site (attached to the operation)" msgstr "Site archéologique (rattaché à l'opération)" -#: archaeological_finds/forms.py:1324 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1325 archaeological_warehouse/forms.py:538 msgid "Archaeological site name (attached to the operation)" msgstr "Site archéologique nom (rattaché à l'opération)" -#: archaeological_finds/forms.py:1327 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1328 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the context record)" msgstr "Site archéologique (rattaché à l'UE)" -#: archaeological_finds/forms.py:1335 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1336 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the context record)" msgstr "Site archéologique nom (rattaché à l'UE)" -#: archaeological_finds/forms.py:1338 +#: archaeological_finds/forms.py:1339 msgid "Archaeological site - Remains" msgstr "Site archéologique - Vestiges" -#: archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1352 msgid "Search within related context records" msgstr "Recherche parmi les Unités d'Enregistrement associées" -#: archaeological_finds/forms.py:1364 +#: archaeological_finds/forms.py:1365 msgid "Discovery date (exact or beginning) after" msgstr "Date de découverte (exacte ou début) après" -#: archaeological_finds/forms.py:1367 +#: archaeological_finds/forms.py:1368 msgid "Discovery date (exact or beginning) before" msgstr "Date de découverte (exacte ou début) avant" -#: archaeological_finds/forms.py:1370 +#: archaeological_finds/forms.py:1371 msgid "Discovery date (end) after" msgstr "Date de découverte (fin) après" -#: archaeological_finds/forms.py:1373 +#: archaeological_finds/forms.py:1374 msgid "Discovery date (end) before" msgstr "Date de découverte (fin) avant" -#: archaeological_finds/forms.py:1378 archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1379 archaeological_finds/forms.py:1907 #: archaeological_finds/models_finds.py:90 -#: archaeological_finds/models_finds.py:1190 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 +#: archaeological_finds/models_finds.py:1045 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 #: archaeological_warehouse/forms.py:572 +#: na_app/templates/ishtar/sheet_operation.html:541 msgid "Material type" msgstr "Type de matériau" -#: archaeological_finds/forms.py:1389 archaeological_finds/models_finds.py:270 -#: archaeological_finds/models_finds.py:1191 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:968 +#: archaeological_finds/forms.py:1390 archaeological_finds/models_finds.py:270 +#: archaeological_finds/models_finds.py:1046 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:1087 +#: na_app/templates/ishtar/sheet_operation.html:551 msgid "Object type" msgstr "Type d'objet" -#: archaeological_finds/forms.py:1421 +#: archaeological_finds/forms.py:1422 msgid "Length - higher than (cm)" msgstr "Longueur - plus grand que (cm)" -#: archaeological_finds/forms.py:1424 +#: archaeological_finds/forms.py:1425 msgid "Length - lower than (cm)" msgstr "Longueur - plus petit que (cm)" -#: archaeological_finds/forms.py:1427 +#: archaeological_finds/forms.py:1428 msgid "Width - lower than (cm)" msgstr "Largeur - plus petit que (cm)" -#: archaeological_finds/forms.py:1430 +#: archaeological_finds/forms.py:1431 msgid "Width - higher than (cm)" msgstr "Largeur - plus grand que (cm)" -#: archaeological_finds/forms.py:1433 +#: archaeological_finds/forms.py:1434 msgid "Height - lower than (cm)" msgstr "Hauteur - plus petit que (cm)" -#: archaeological_finds/forms.py:1436 +#: archaeological_finds/forms.py:1437 msgid "Height - higher than (cm)" msgstr "Hauteur - plus grand que (cm)" -#: archaeological_finds/forms.py:1439 +#: archaeological_finds/forms.py:1440 msgid "Thickness - lower than (cm)" msgstr "Épaisseur - plus petit que (cm)" -#: archaeological_finds/forms.py:1442 +#: archaeological_finds/forms.py:1443 msgid "Thickness - higher than (cm)" msgstr "Épaisseur - plus grand que (cm)" -#: archaeological_finds/forms.py:1445 +#: archaeological_finds/forms.py:1446 msgid "Diameter - lower than (cm)" msgstr "Diamètre - plus petit que (cm)" -#: archaeological_finds/forms.py:1448 +#: archaeological_finds/forms.py:1449 msgid "Diameter - higher than (cm)" msgstr "Diamètre - plus grand que (cm)" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1452 msgid "Circumference - lower than (cm)" msgstr "Circonférence - plus petit que (cm)" -#: archaeological_finds/forms.py:1454 +#: archaeological_finds/forms.py:1455 msgid "Circumference - higher than (cm)" msgstr "Circonférence - plus grand que (cm)" -#: archaeological_finds/forms.py:1457 +#: archaeological_finds/forms.py:1458 msgid "Volume - lower than (l)" msgstr "Volume - plus petit que (l)" -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:1459 msgid "Volume - higher than (l)" msgstr "Volume - plus grand que (l)" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1461 msgid "Weight - lower than (g)" msgstr "Poids - plus petit que (g)" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1464 msgid "Weight - higher than (g)" msgstr "Poids - plus grand que (g)" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1467 msgid "Clutter long side - lower than (cm)" msgstr "Encombrement grand côté - plus petit que (cm)" -#: archaeological_finds/forms.py:1470 +#: archaeological_finds/forms.py:1471 msgid "Clutter long side - higher than (cm)" msgstr "Encombrement grand côté - plus grand que (cm)" -#: archaeological_finds/forms.py:1474 +#: archaeological_finds/forms.py:1475 msgid "Clutter short side - lower than (cm)" msgstr "Encombrement petit côté - plus petit que (cm)" -#: archaeological_finds/forms.py:1478 +#: archaeological_finds/forms.py:1479 msgid "Clutter short side - higher than (cm)" msgstr "Encombrement petit côté - plus grand que (cm)" -#: archaeological_finds/forms.py:1482 +#: archaeological_finds/forms.py:1483 msgid "Clutter height - lower than (cm)" msgstr "Encombrement hauteur - plus petit que (cm)" -#: archaeological_finds/forms.py:1486 +#: archaeological_finds/forms.py:1487 msgid "Clutter height - higher than (cm)" msgstr "Encombrement hauteur - plus grand que (cm)" -#: archaeological_finds/forms.py:1495 +#: archaeological_finds/forms.py:1496 msgid "Check date after" msgstr "Date de vérification après" -#: archaeological_finds/forms.py:1497 +#: archaeological_finds/forms.py:1498 msgid "Check date before" msgstr "Date de vérification avant" -#: archaeological_finds/forms.py:1510 +#: archaeological_finds/forms.py:1511 msgid "Estimated value - higher than" msgstr "Valeur estimée - plus grand que" -#: archaeological_finds/forms.py:1511 +#: archaeological_finds/forms.py:1512 msgid "Estimated value - lower than" msgstr "Valeur estimée - plus petit que" -#: archaeological_finds/forms.py:1512 +#: archaeological_finds/forms.py:1513 msgid "Insurance value - higher than" msgstr "Valeur d'assurance - plus grand que" -#: archaeological_finds/forms.py:1513 +#: archaeological_finds/forms.py:1514 msgid "Insurance value - lower than" msgstr "Valeur d'assurance - plus petit que" -#: archaeological_finds/forms.py:1515 +#: archaeological_finds/forms.py:1516 msgid "Appraisal date after" msgstr "Date d'évaluation après" -#: archaeological_finds/forms.py:1518 +#: archaeological_finds/forms.py:1519 msgid "Appraisal date before" msgstr "Date d'évaluation avant" -#: archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1522 msgid "Loan?" msgstr "Prêt ?" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1524 msgid "Treatment file end date before" msgstr "Dossier de traitement - date de clotûre avant" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1527 msgid "Treatment end date before" msgstr "Traitement - date de clôture avant" -#: archaeological_finds/forms.py:1592 archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1908 +#: archaeological_finds/forms.py:1593 archaeological_finds/models_finds.py:1005 +#: archaeological_finds/models_finds.py:1763 #: archaeological_finds/templates/ishtar/sheet_find.html:300 -#: ishtar_common/forms_common.py:1745 -#: man_app/templates/ishtar/sheet_find.html:313 +#: ishtar_common/forms_common.py:1922 +#: man_app/templates/ishtar/sheet_find.html:301 +#: na_app/templates/ishtar/sheet_find.html:312 msgid "Reference container" msgstr "Contenant de référence" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1600 msgid "Reference container - Warehouse (location)" msgstr "Lieu de conservation du contenant de référence" -#: archaeological_finds/forms.py:1618 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1619 archaeological_finds/models_finds.py:1004 #: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: ishtar_common/forms_common.py:1737 -#: man_app/templates/ishtar/sheet_find.html:338 +#: ishtar_common/forms_common.py:1914 +#: man_app/templates/ishtar/sheet_find.html:326 +#: na_app/templates/ishtar/sheet_find.html:337 msgid "Current container" msgstr "Contenant actuel" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1626 msgid "Current container - Warehouse (location)" msgstr "Lieu de conservation du contenant actuel" -#: archaeological_finds/forms.py:1645 archaeological_finds/forms.py:1666 -#: archaeological_finds/forms.py:1722 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:1646 archaeological_finds/forms.py:1667 +#: archaeological_finds/forms.py:1723 archaeological_finds/views.py:382 msgid "Find search" msgstr "Rechercher un mobilier" -#: archaeological_finds/forms.py:1761 archaeological_finds/forms.py:1924 +#: archaeological_finds/forms.py:1762 archaeological_finds/forms.py:1925 #: archaeological_finds/models_treatments.py:397 #: archaeological_finds/templates/ishtar/sheet_treatment.html:110 msgid "Upstream finds" msgstr "Mobilier amont" -#: archaeological_finds/forms.py:1784 +#: archaeological_finds/forms.py:1785 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: archaeological_finds/forms.py:1905 +#: archaeological_finds/forms.py:1906 msgid "Precise description" msgstr "Description précise" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1921 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1964 msgid "Find basket - 001 - Search" msgstr "Panier mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:1975 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1976 archaeological_finds/forms.py:1994 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "Recherche de panier" -#: archaeological_finds/forms.py:2010 +#: archaeological_finds/forms.py:2011 msgid "Find basket" msgstr "Panier de mobilier" -#: archaeological_finds/forms.py:2013 +#: archaeological_finds/forms.py:2014 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:198 @@ -3738,22 +3836,25 @@ msgstr "Panier de mobilier" #: archaeological_finds/templates/ishtar/sheet_find.html:384 #: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_find.html:460 -#: ishtar_common/forms_common.py:1679 ishtar_common/models.py:959 -#: ishtar_common/models.py:1806 ishtar_common/models.py:3546 -#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 -#: ishtar_common/models_common.py:2143 ishtar_common/models_common.py:2159 -#: ishtar_common/models_imports.py:576 -#: man_app/templates/ishtar/sheet_find.html:397 -#: man_app/templates/ishtar/sheet_find.html:435 -#: man_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/forms_common.py:1856 ishtar_common/models.py:970 +#: ishtar_common/models.py:1816 ishtar_common/models.py:3560 +#: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 +#: ishtar_common/models_common.py:1953 ishtar_common/models_common.py:1969 +#: ishtar_common/models_imports.py:692 +#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:423 +#: man_app/templates/ishtar/sheet_find.html:461 +#: na_app/templates/ishtar/sheet_find.html:396 +#: na_app/templates/ishtar/sheet_find.html:434 +#: na_app/templates/ishtar/sheet_find.html:472 msgid "Label" msgstr "Dénomination" -#: archaeological_finds/forms.py:2055 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:2056 archaeological_finds/forms.py:2111 msgid "A basket with this slug already exists." msgstr "Un panier avec cet identifiant textuel existe déjà." -#: archaeological_finds/forms.py:2102 +#: archaeological_finds/forms.py:2103 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." @@ -3781,7 +3882,7 @@ msgstr "Responsable de suivi scientifique" #: archaeological_finds/models_finds.py:177 #: archaeological_finds/models_treatments.py:213 #: archaeological_finds/models_treatments.py:757 -#: ishtar_common/models_imports.py:963 +#: ishtar_common/models_imports.py:1082 msgid "Treatment type" msgstr "Type de traitement" @@ -3800,8 +3901,8 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/models_treatments.py:746 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2449 -#: archaeological_operations/models.py:2786 ishtar_common/views.py:510 +#: archaeological_operations/models.py:2455 +#: archaeological_operations/models.py:2792 ishtar_common/views.py:510 msgid "Treatment" msgstr "Traitement" @@ -3904,8 +4005,8 @@ msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/models_treatments.py:1181 #: archaeological_finds/models_treatments.py:1201 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2448 -#: archaeological_operations/models.py:2778 ishtar_common/views.py:509 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2454 +#: archaeological_operations/models.py:2784 ishtar_common/views.py:509 msgid "Treatment request" msgstr "Demande de traitement" @@ -3923,8 +4024,8 @@ 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:1900 -#: archaeological_finds/models_finds.py:3395 +#: archaeological_finds/models_finds.py:1755 +#: archaeological_finds/models_finds.py:3130 #: archaeological_finds/models_treatments.py:267 #: archaeological_finds/models_treatments.py:761 #: archaeological_finds/templates/ishtar/sheet_find.html:389 @@ -3934,16 +4035,20 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_warehouse/models.py:1199 #: archaeological_warehouse/models.py:2064 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2240 ishtar_common/forms_common.py:2431 +#: ishtar_common/forms_common.py:2416 ishtar_common/forms_common.py:2607 #: ishtar_common/templates/ishtar/sheet_document.html:100 -#: man_app/templates/ishtar/sheet_find.html:402 -#: man_app/templates/ishtar/sheet_find.html:440 -#: man_app/templates/ishtar/sheet_find.html:478 +#: man_app/templates/ishtar/sheet_find.html:390 +#: man_app/templates/ishtar/sheet_find.html:428 +#: man_app/templates/ishtar/sheet_find.html:466 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:439 +#: na_app/templates/ishtar/sheet_find.html:477 msgid "Container" msgstr "Contenant" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2438 +#: ishtar_common/forms_common.py:2614 msgid "Change " msgstr "Changer " @@ -3952,12 +4057,12 @@ msgid "reference and current containers" msgstr "le contenant de référence et le contenant actuel" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2442 +#: ishtar_common/forms_common.py:2618 msgid "the reference container" msgstr "le contenant de référence" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2443 +#: ishtar_common/forms_common.py:2619 msgid "the current container" msgstr "le contenant actuel" @@ -4006,7 +4111,7 @@ msgid "Treatment file - 001 - Search" msgstr "Dossier de traitement - 001 - Recherche" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4252 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4266 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "Réf. interne" @@ -4016,7 +4121,8 @@ msgstr "Réf. interne" #: archaeological_finds/models_treatments.py:1129 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 -#: man_app/templates/ishtar/sheet_find.html:515 +#: man_app/templates/ishtar/sheet_find.html:503 +#: na_app/templates/ishtar/sheet_find.html:514 msgid "Applicant" msgstr "Demandeur" @@ -4025,7 +4131,8 @@ msgstr "Demandeur" #: archaeological_finds/models_treatments.py:1137 #: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 -#: man_app/templates/ishtar/sheet_find.html:516 +#: man_app/templates/ishtar/sheet_find.html:504 +#: na_app/templates/ishtar/sheet_find.html:515 msgid "Applicant organisation" msgstr "Organisation demandeuse" @@ -4129,7 +4236,7 @@ msgid "Treatment one to many - creation" msgstr "Traitement de un à plusieurs - création" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2453 ishtar_common/models.py:3762 +#: archaeological_operations/models.py:2459 ishtar_common/models.py:3776 msgid "Code" msgstr "Code" @@ -4226,7 +4333,7 @@ msgid "Treatment types" msgstr "Types de traitement" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:1901 #: archaeological_finds/models_treatments.py:75 #: archaeological_finds/models_treatments.py:291 #: archaeological_finds/models_treatments.py:303 @@ -4244,7 +4351,8 @@ msgstr "Type d'intégrité / intérêt" msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: archaeological_finds/models_finds.py:244 ishtar_common/models_imports.py:970 +#: archaeological_finds/models_finds.py:244 +#: ishtar_common/models_imports.py:1089 msgid "Remarkability type" msgstr "Type de remarquabilité" @@ -4252,7 +4360,8 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: archaeological_finds/models_finds.py:258 ishtar_common/models_imports.py:973 +#: archaeological_finds/models_finds.py:258 +#: ishtar_common/models_imports.py:1092 msgid "Batch type" msgstr "Type de lot" @@ -4261,8 +4370,8 @@ msgid "Batch types" msgstr "Types de lot" #: archaeological_finds/models_finds.py:285 -#: archaeological_finds/models_finds.py:1928 -#: ishtar_common/models_imports.py:976 +#: archaeological_finds/models_finds.py:1783 +#: ishtar_common/models_imports.py:1095 msgid "Functional area" msgstr "Domaine fonctionnel" @@ -4274,7 +4383,8 @@ msgstr "Type de qualité du type d'objet" msgid "Object type quality types" msgstr "Types de qualité du type d'objet" -#: archaeological_finds/models_finds.py:314 ishtar_common/models_imports.py:971 +#: archaeological_finds/models_finds.py:314 +#: ishtar_common/models_imports.py:1090 msgid "Alteration type" msgstr "Type d'altération" @@ -4282,7 +4392,8 @@ msgstr "Type d'altération" msgid "Alteration types" msgstr "Types d'altération" -#: archaeological_finds/models_finds.py:329 ishtar_common/models_imports.py:972 +#: archaeological_finds/models_finds.py:329 +#: ishtar_common/models_imports.py:1091 msgid "Alteration cause type" msgstr "Type de cause d'altération" @@ -4290,7 +4401,8 @@ msgstr "Type de cause d'altération" msgid "Alteration cause types" msgstr "Types de cause d'altération" -#: archaeological_finds/models_finds.py:344 ishtar_common/models_imports.py:966 +#: archaeological_finds/models_finds.py:344 +#: ishtar_common/models_imports.py:1085 msgid "Treatment emergency type" msgstr "Type d'urgence de traitement" @@ -4306,7 +4418,8 @@ msgstr "Type de communicabilité" msgid "Communicability types" msgstr "Types de communicabilité" -#: archaeological_finds/models_finds.py:373 ishtar_common/models_imports.py:974 +#: archaeological_finds/models_finds.py:373 +#: ishtar_common/models_imports.py:1093 msgid "Checked type" msgstr "Type de vérification" @@ -4323,6 +4436,7 @@ msgid "Material index" msgstr "Index matériel" #: archaeological_finds/models_finds.py:456 +#: ishtar_common/models_imports.py:2777 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4333,7 +4447,7 @@ msgid "Short ID" msgstr "Identifiant court" #: archaeological_finds/models_finds.py:462 -#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4362 +#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4376 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" @@ -4346,7 +4460,7 @@ msgid "Concatenation of associated material types codes" msgstr "Concaténation des types de matériaux associés" #: archaeological_finds/models_finds.py:492 -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1692 msgid "Base find" msgstr "Mobilier d'origine" @@ -4354,15 +4468,15 @@ msgstr "Mobilier d'origine" msgid "Base finds" msgstr "Mobilier d'origine" -#: archaeological_finds/models_finds.py:893 +#: archaeological_finds/models_finds.py:748 msgid "g" msgstr "g" -#: archaeological_finds/models_finds.py:894 +#: archaeological_finds/models_finds.py:749 msgid "kg" msgstr "kg" -#: archaeological_finds/models_finds.py:906 +#: archaeological_finds/models_finds.py:761 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -4374,697 +4488,699 @@ msgstr "kg" msgid "Modify" msgstr "Modifier" -#: archaeological_finds/models_finds.py:962 archaeological_finds/views.py:537 +#: archaeological_finds/models_finds.py:817 archaeological_finds/views.py:537 msgid "Manage basket" msgstr "Gérer un panier" -#: archaeological_finds/models_finds.py:974 +#: archaeological_finds/models_finds.py:829 #: archaeological_warehouse/models.py:1930 msgid "Add treatment" msgstr "Ajouter un traitement" -#: archaeological_finds/models_finds.py:985 +#: archaeological_finds/models_finds.py:840 msgid "Add treatment file" msgstr "Ajouter une demande de traitement" -#: archaeological_finds/models_finds.py:1135 +#: archaeological_finds/models_finds.py:990 msgid "Operation (code)" msgstr "Opération (code)" -#: archaeological_finds/models_finds.py:1140 +#: archaeological_finds/models_finds.py:995 msgid "Batch" msgstr "Lot" -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:996 msgid "Base find - Comment" msgstr "Mobilier d'origine - Commentaires" -#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:997 msgid "Base find - Description" msgstr "Mobilier d'origine - Description" -#: archaeological_finds/models_finds.py:1144 +#: archaeological_finds/models_finds.py:999 msgid "Base find - Topographic localisation" msgstr "Mobilier d'origine - Localisation topographique" -#: archaeological_finds/models_finds.py:1146 +#: archaeological_finds/models_finds.py:1001 msgid "Base find - Special interest" msgstr "Mobilier d'origine - Intérêt spécifique" -#: archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:1002 msgid "Base find - Discovery date (exact or beginning)" msgstr "Mobilier d'origine - Date de découverte (exacte ou début)" -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/models_finds.py:1003 msgid "Base find - Discovery date (end)" msgstr "Mobilier d'origine - Date de découverte (fin)" -#: archaeological_finds/models_finds.py:1177 +#: archaeological_finds/models_finds.py:1032 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:714 -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1746 +#: archaeological_operations/forms.py:716 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1751 #: archaeological_operations/models.py:985 #: archaeological_operations/models.py:1072 -#: archaeological_operations/models.py:1376 ishtar_common/models.py:5014 -#: ishtar_common/models_imports.py:945 +#: archaeological_operations/models.py:1376 ishtar_common/models.py:5028 +#: ishtar_common/models_imports.py:1064 msgid "Operation type" msgstr "Type d'opération" -#: archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:1064 msgid "Weight (kg)" msgstr "Poids (kg)" -#: archaeological_finds/models_finds.py:1271 +#: archaeological_finds/models_finds.py:1126 msgctxt "key for text search" msgid "short-id" msgstr "id-court" -#: archaeological_finds/models_finds.py:1275 +#: archaeological_finds/models_finds.py:1130 msgctxt "key for text search" msgid "complete-id" msgstr "id-complet" -#: archaeological_finds/models_finds.py:1279 +#: archaeological_finds/models_finds.py:1134 msgctxt "key for text search" msgid "free-id" msgstr "id-libre" -#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1137 msgctxt "key for text search" msgid "denomination" msgstr "denomination" -#: archaeological_finds/models_finds.py:1297 archaeological_finds/tests.py:1358 -#: archaeological_finds/tests.py:1542 archaeological_warehouse/models.py:973 +#: archaeological_finds/models_finds.py:1152 archaeological_finds/tests.py:1403 +#: archaeological_finds/tests.py:1587 archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "code-patriarche" msgstr "code-patriarche" -#: archaeological_finds/models_finds.py:1301 ishtar_common/models.py:4080 +#: archaeological_finds/models_finds.py:1156 ishtar_common/models.py:4094 msgctxt "key for text search" msgid "operation-type" msgstr "type-operation" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1160 #: archaeological_operations/models.py:382 -#: archaeological_operations/models.py:1141 ishtar_common/models.py:4124 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4138 msgctxt "key for text search" msgid "area" msgstr "zone" -#: archaeological_finds/models_finds.py:1314 +#: archaeological_finds/models_finds.py:1169 #: archaeological_warehouse/models.py:982 msgctxt "key for text search" msgid "site-name" msgstr "site-nom" -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1174 +#: archaeological_finds/models_finds.py:1630 #: archaeological_warehouse/models.py:987 msgctxt "key for text search" msgid "context-record-site" msgstr "ue-site" -#: archaeological_finds/models_finds.py:1324 +#: archaeological_finds/models_finds.py:1179 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "context-record-site-name" msgstr "ue-site-nom" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_finds/models_finds.py:1770 -#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4088 -#: ishtar_common/models.py:4193 +#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1625 +#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4102 +#: ishtar_common/models.py:4207 msgctxt "key for text search" msgid "context-record" msgstr "ue" -#: archaeological_finds/models_finds.py:1336 +#: archaeological_finds/models_finds.py:1191 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "ue-type-relation" -#: archaeological_finds/models_finds.py:1340 archaeological_finds/tests.py:1265 -#: archaeological_finds/tests.py:1540 archaeological_warehouse/models.py:1008 +#: archaeological_finds/models_finds.py:1195 archaeological_finds/tests.py:1310 +#: archaeological_finds/tests.py:1585 archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "material" msgstr "materiau" -#: archaeological_finds/models_finds.py:1344 +#: archaeological_finds/models_finds.py:1199 #: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "object-type" msgstr "type-objet" -#: archaeological_finds/models_finds.py:1348 +#: archaeological_finds/models_finds.py:1203 msgctxt "key for text search" msgid "recommended-treatments" msgstr "traitements-recommandes" -#: archaeological_finds/models_finds.py:1352 archaeological_finds/tests.py:1483 +#: archaeological_finds/models_finds.py:1207 archaeological_finds/tests.py:1528 #: archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "conservatory" msgstr "conservation" -#: archaeological_finds/models_finds.py:1356 +#: archaeological_finds/models_finds.py:1211 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "integrity" msgstr "integrite" -#: archaeological_finds/models_finds.py:1360 +#: archaeological_finds/models_finds.py:1215 #: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "remarkability" msgstr "remarquabilite" -#: archaeological_finds/models_finds.py:1364 archaeological_finds/tests.py:1407 -#: ishtar_common/models.py:4014 +#: archaeological_finds/models_finds.py:1219 archaeological_finds/tests.py:1452 +#: ishtar_common/models.py:4028 msgctxt "key for text search" msgid "description" msgstr "description" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1222 msgctxt "key for text search" msgid "batch" msgstr "lot" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1226 msgctxt "key for text search" msgid "checked" msgstr "verifie" -#: archaeological_finds/models_finds.py:1375 ishtar_common/models.py:4108 +#: archaeological_finds/models_finds.py:1230 ishtar_common/models.py:4122 msgctxt "key for text search" msgid "container" msgstr "contenant" -#: archaeological_finds/models_finds.py:1379 -#: archaeological_finds/models_finds.py:1773 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_finds/models_finds.py:1628 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "location" msgstr "localisation" -#: archaeological_finds/models_finds.py:1383 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "current-location" msgstr "localisation-actuelle" -#: archaeological_finds/models_finds.py:1387 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "current-container" msgstr "contenant-actuel" -#: archaeological_finds/models_finds.py:1391 +#: archaeological_finds/models_finds.py:1246 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "panier" -#: archaeological_finds/models_finds.py:1398 +#: archaeological_finds/models_finds.py:1253 msgctxt "key for text search" msgid "last-modified-by" msgstr "modifie-en-dernier-par" -#: archaeological_finds/models_finds.py:1402 -#: ishtar_common/models_common.py:1479 +#: archaeological_finds/models_finds.py:1257 +#: ishtar_common/models_common.py:1509 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" -#: archaeological_finds/models_finds.py:1405 archaeological_finds/tests.py:1562 +#: archaeological_finds/models_finds.py:1260 archaeological_finds/tests.py:1607 msgctxt "key for text search" msgid "loan" msgstr "pret" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1262 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "demande-fin-de-traitement-avant" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1266 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "fin-de-traitement-avant" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1270 msgctxt "key for text search" msgid "previous-id" msgstr "id-precedent" -#: archaeological_finds/models_finds.py:1422 +#: archaeological_finds/models_finds.py:1277 msgctxt "key for text search" msgid "seal-number" msgstr "numero-scelle" -#: archaeological_finds/models_finds.py:1425 +#: archaeological_finds/models_finds.py:1280 msgctxt "key for text search" msgid "excavation-id" msgstr "id-fouille" -#: archaeological_finds/models_finds.py:1429 +#: archaeological_finds/models_finds.py:1284 msgctxt "key for text search" msgid "museum-id" msgstr "id-musee" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1287 msgctxt "key for text search" msgid "laboratory-id" msgstr "numero-laboratoire" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1291 msgctxt "key for text search" msgid "mark" msgstr "marquage" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1294 msgctxt "key for text search" msgid "discovery-date-before" msgstr "date-decouverte-avant" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1298 msgctxt "key for text search" msgid "discovery-date-after" msgstr "date-decouverte-apres" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1302 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "date-decouverte-taq-avant" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1306 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "date-decouverte-taq-apres" -#: archaeological_finds/models_finds.py:1455 +#: archaeological_finds/models_finds.py:1310 msgctxt "key for text search" msgid "is-complete" msgstr "est-complet" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1313 msgctxt "key for text search" msgid "material-type-quality" msgstr "type-materiaux-qualite" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1317 msgctxt "key for text search" msgid "object-type-quality" msgstr "type-objet-qualite" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1321 msgctxt "key for text search" msgid "find-number" msgstr "nombre-mobilier" -#: archaeological_finds/models_finds.py:1469 +#: archaeological_finds/models_finds.py:1324 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "nmi" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1328 msgctxt "key for text search" msgid "decoration" msgstr "decor" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "inscription" msgstr "inscription" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "manufacturing-place" msgstr "lieu-fabrication" -#: archaeological_finds/models_finds.py:1483 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "communicabilities" msgstr "communicabilite" -#: archaeological_finds/models_finds.py:1490 +#: archaeological_finds/models_finds.py:1345 msgctxt "key for text search" msgid "material-comment" msgstr "materiau-commentaire" -#: archaeological_finds/models_finds.py:1494 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "dating-comment" msgstr "commentaire-datation" -#: archaeological_finds/models_finds.py:1498 +#: archaeological_finds/models_finds.py:1353 msgctxt "key for text search" msgid "conservatory-comment" msgstr "commentaire-conservation" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1357 msgctxt "key for text search" msgid "length-lower" msgstr "longueur-plus-petit" -#: archaeological_finds/models_finds.py:1505 +#: archaeological_finds/models_finds.py:1360 msgctxt "key for text search" msgid "width-lower" msgstr "largeur-plus-petit" -#: archaeological_finds/models_finds.py:1508 +#: archaeological_finds/models_finds.py:1363 msgctxt "key for text search" msgid "height-lower" msgstr "hauteur-plus-petit" -#: archaeological_finds/models_finds.py:1511 +#: archaeological_finds/models_finds.py:1366 msgctxt "key for text search" msgid "thickness-lower" msgstr "epaisseur-plus-petit" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "diameter-lower" msgstr "diametre-plus-petit" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1372 msgctxt "key for text search" msgid "circumference-lower" msgstr "circonference-plus-petit" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1376 msgctxt "key for text search" msgid "volume-lower" msgstr "volume-plus-petit" -#: archaeological_finds/models_finds.py:1524 +#: archaeological_finds/models_finds.py:1379 msgctxt "key for text search" msgid "weight-lower" msgstr "poids-plus-petit" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1382 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "encombrement-cote-long-plus-petit" -#: archaeological_finds/models_finds.py:1531 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "encombrement-cote-court-plus-petit" -#: archaeological_finds/models_finds.py:1535 +#: archaeological_finds/models_finds.py:1390 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "encombrement-hauteur-plus-petit" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1394 msgctxt "key for text search" msgid "length-higher" msgstr "longueur-plus-grand" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1397 msgctxt "key for text search" msgid "width-higher" msgstr "largeur-plus-grand" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "height-higher" msgstr "hauteur-plus-grand" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1403 msgctxt "key for text search" msgid "thickness-higher" msgstr "epaisseur-plus-grand" -#: archaeological_finds/models_finds.py:1551 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "diameter-higher" msgstr "diametre-plus-grand" -#: archaeological_finds/models_finds.py:1554 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "circumference-higher" msgstr "circonference-plus-grand" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "volume-higher" msgstr "volume-plus-grand" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1416 msgctxt "key for text search" msgid "weight-higher" msgstr "poids-plus-grand" -#: archaeological_finds/models_finds.py:1564 +#: archaeological_finds/models_finds.py:1419 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "encombrement-cote-long-plus-grand" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1423 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "encombrement-cote-court-plus-grand" -#: archaeological_finds/models_finds.py:1572 +#: archaeological_finds/models_finds.py:1427 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "encombrement-hauteur-plus-grand" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1431 msgctxt "key for text search" msgid "dimensions-comment" msgstr "commentaire-dimensions" -#: archaeological_finds/models_finds.py:1580 +#: archaeological_finds/models_finds.py:1435 msgctxt "key for text search" msgid "topographic-localisation" msgstr "localisation-topographique" -#: archaeological_finds/models_finds.py:1584 +#: archaeological_finds/models_finds.py:1439 msgctxt "key for text search" msgid "check-date-before" msgstr "date-verification-avant" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1442 msgctxt "key for text search" msgid "check-date-after" msgstr "date-verification-apres" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1445 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "alterations" msgstr "alterations" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1449 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "alteration-causes" msgstr "causes-alterations" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1453 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "treatment-emergency" msgstr "urgence-traitement" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1457 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "valeur-estimee-plus-grand" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "valeur-estimee-plus-petit" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "valeur-assurance-plus-grand" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "valeur-assurance-plus-petit" -#: archaeological_finds/models_finds.py:1618 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "date-evaluation-avant" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "date-evaluation-apres" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1481 #: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "attribution-culturelle" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "functional-area" msgstr "domaine-fonctionnel" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1423 +#: archaeological_finds/models_finds.py:1489 archaeological_finds/tests.py:1468 msgctxt "key for text search" msgid "operation-address" msgstr "operation-adresse" -#: archaeological_finds/models_finds.py:1642 +#: archaeological_finds/models_finds.py:1497 #: archaeological_operations/models.py:1169 msgctxt "key for text search" msgid "scientist" msgstr "scientifique" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1378 +#: archaeological_finds/models_finds.py:1501 archaeological_finds/tests.py:1423 #: archaeological_operations/models.py:1173 -#: archaeological_operations/tests.py:2879 -#: archaeological_operations/tests.py:3357 +#: archaeological_operations/tests.py:2924 +#: archaeological_operations/tests.py:3421 msgctxt "key for text search" msgid "operator" msgstr "operateur" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "operation-remain" msgstr "operation-vestige" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "site-remain" msgstr "site-vestige" -#: archaeological_finds/models_finds.py:1749 -#: archaeological_finds/models_finds.py:2397 +#: archaeological_finds/models_finds.py:1604 +#: archaeological_finds/models_finds.py:2252 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4231 -#: ishtar_common/models.py:4582 +#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4245 +#: ishtar_common/models.py:4596 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2748 +#: ishtar_common/views.py:3011 msgid "Packaging" msgstr "Conditionnement" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1612 msgid "Treatment many to one" msgstr "Traitement de plusieurs à un" -#: archaeological_finds/models_finds.py:1871 +#: archaeological_finds/models_finds.py:1726 msgid "Weight" msgstr "Poids" -#: archaeological_finds/models_finds.py:1873 +#: archaeological_finds/models_finds.py:1728 msgid "Weight unit" msgstr "Unité de poids" -#: archaeological_finds/models_finds.py:1882 +#: archaeological_finds/models_finds.py:1737 #: archaeological_finds/templates/ishtar/sheet_find.html:417 -#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:418 +#: na_app/templates/ishtar/sheet_find.html:429 msgid "Upstream treatment" msgstr "Traitement amont" -#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:1744 #: archaeological_finds/templates/ishtar/sheet_find.html:455 -#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:456 +#: na_app/templates/ishtar/sheet_find.html:467 msgid "Downstream treatment" msgstr "Traitement aval" -#: archaeological_finds/models_finds.py:1960 +#: archaeological_finds/models_finds.py:1815 msgid "Clutter - long side (cm)" msgstr "Encombrement - grand côté (cm)" -#: archaeological_finds/models_finds.py:1963 +#: archaeological_finds/models_finds.py:1818 msgid "Clutter - short side (cm)" msgstr "Encombrement - petit côté (cm)" -#: archaeological_finds/models_finds.py:1966 +#: archaeological_finds/models_finds.py:1821 msgid "Clutter - height (cm)" msgstr "Encombrement - hauteur (cm)" -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1842 msgid "Collection" msgstr "Collection" -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1847 msgid "Do not use - need evolutions" msgstr "Ne pas utiliser - Nécessite des évolutions" -#: archaeological_finds/models_finds.py:2049 +#: archaeological_finds/models_finds.py:1904 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:2058 +#: archaeological_finds/models_finds.py:1913 msgid "Cached object types label" msgstr "Nom en cache des types d'objet" -#: archaeological_finds/models_finds.py:2064 +#: archaeological_finds/models_finds.py:1919 msgid "Cached material types label" msgstr "Nom en cache des types de matériaux" -#: archaeological_finds/models_finds.py:2097 +#: archaeological_finds/models_finds.py:1952 msgid "FIND" msgstr "MOBILIER" -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/models_finds.py:2090 msgid "Material types string" msgstr "Chaîne de caractère des types de matériau" -#: archaeological_finds/models_finds.py:2236 +#: archaeological_finds/models_finds.py:2091 msgid "Material types code string" msgstr "Code des types de matériau" -#: archaeological_finds/models_finds.py:2237 +#: archaeological_finds/models_finds.py:2092 msgid "Recommendations string from material" msgstr "Chaîne de caractères - recommandations pour le matériau" -#: archaeological_finds/models_finds.py:2238 +#: archaeological_finds/models_finds.py:2093 msgid "Complete ID of associated base finds" msgstr "Identifiant complet du mobilier d'origine associé" -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2094 msgid "Label of associated context records" msgstr "Dénomination des unités d'enregistrement associées" -#: archaeological_finds/models_finds.py:2370 +#: archaeological_finds/models_finds.py:2225 msgid "Add to basket" msgstr "Ajouter au panier" -#: archaeological_finds/models_finds.py:2378 +#: archaeological_finds/models_finds.py:2233 msgid "Simple treatment" msgstr "Traitement simple" -#: archaeological_finds/models_finds.py:2386 +#: archaeological_finds/models_finds.py:2241 msgid "Divide treatment" msgstr "Traitement de division" -#: archaeological_finds/models_finds.py:2971 +#: archaeological_finds/models_finds.py:2706 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:2977 +#: archaeological_finds/models_finds.py:2712 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:3418 ishtar_common/forms_common.py:122 -#: ishtar_common/forms_common.py:2516 ishtar_common/ishtar_menu.py:38 -#: ishtar_common/models.py:2909 ishtar_common/models.py:3240 -#: ishtar_common/models.py:3434 ishtar_common/models.py:3683 +#: archaeological_finds/models_finds.py:3153 ishtar_common/forms_common.py:126 +#: ishtar_common/forms_common.py:2692 ishtar_common/ishtar_menu.py:38 +#: ishtar_common/models.py:2919 ishtar_common/models.py:3250 +#: ishtar_common/models.py:3444 ishtar_common/models.py:3697 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" -#: archaeological_finds/models_finds.py:3426 +#: archaeological_finds/models_finds.py:3161 msgid "Property" msgstr "Propriété" -#: archaeological_finds/models_finds.py:3427 +#: archaeological_finds/models_finds.py:3162 msgid "Properties" msgstr "Propriétés" @@ -5095,7 +5211,7 @@ msgstr "libelle" #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2588 +#: archaeological_operations/models.py:2594 msgctxt "key for text search" msgid "index" msgstr "index" @@ -5144,9 +5260,12 @@ msgstr "Mobilier aval" #: archaeological_finds/templates/ishtar/sheet_find.html:388 #: archaeological_finds/templates/ishtar/sheet_find.html:426 #: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:401 -#: man_app/templates/ishtar/sheet_find.html:439 -#: man_app/templates/ishtar/sheet_find.html:477 +#: man_app/templates/ishtar/sheet_find.html:389 +#: man_app/templates/ishtar/sheet_find.html:427 +#: man_app/templates/ishtar/sheet_find.html:465 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:438 +#: na_app/templates/ishtar/sheet_find.html:476 msgid "Doer" msgstr "Opérateur" @@ -5196,7 +5315,8 @@ msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:494 -#: man_app/templates/ishtar/sheet_find.html:507 +#: man_app/templates/ishtar/sheet_find.html:495 +#: na_app/templates/ishtar/sheet_find.html:506 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -5263,6 +5383,7 @@ msgstr "Date de découverte" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: man_app/templates/ishtar/sheet_find.html:16 +#: na_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -5272,40 +5393,48 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:41 #: man_app/templates/ishtar/sheet_find.html:43 +#: na_app/templates/ishtar/sheet_find.html:41 msgid "Image / Base find" msgstr "Image / Mobilier d'origine" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: man_app/templates/ishtar/sheet_find.html:58 +#: na_app/templates/ishtar/sheet_find.html:56 msgid "Preservation / Treatments" msgstr "Conservation / Traitements" #: archaeological_finds/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_find.html:176 msgid "Administrative index" msgstr "Index administratif" #: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: man_app/templates/ishtar/sheet_find.html:272 +#: man_app/templates/ishtar/sheet_find.html:260 +#: na_app/templates/ishtar/sheet_find.html:271 msgid "Checked" msgstr "Vérifié" #: archaeological_finds/templates/ishtar/sheet_find.html:296 -#: man_app/templates/ishtar/sheet_find.html:309 +#: man_app/templates/ishtar/sheet_find.html:297 +#: na_app/templates/ishtar/sheet_find.html:308 msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" #: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: man_app/templates/ishtar/sheet_find.html:339 +#: man_app/templates/ishtar/sheet_find.html:327 +#: na_app/templates/ishtar/sheet_find.html:338 msgid "Reference container / current container" msgstr "Contenant de référence / contenant actuel" #: archaeological_finds/templates/ishtar/sheet_find.html:372 -#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:373 +#: na_app/templates/ishtar/sheet_find.html:384 msgid "Container information not available." msgstr "Information de contenant non disponible." #: archaeological_finds/templates/ishtar/sheet_find.html:379 -#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:380 +#: na_app/templates/ishtar/sheet_find.html:391 msgid "Simple treatments" msgstr "Traitements simples" @@ -5313,19 +5442,26 @@ msgstr "Traitements simples" #: archaeological_finds/templates/ishtar/sheet_find.html:421 #: archaeological_finds/templates/ishtar/sheet_find.html:459 #: archaeological_finds/templates/ishtar/sheet_find.html:498 -#: man_app/templates/ishtar/sheet_find.html:396 -#: man_app/templates/ishtar/sheet_find.html:434 -#: man_app/templates/ishtar/sheet_find.html:472 -#: man_app/templates/ishtar/sheet_find.html:511 +#: man_app/templates/ishtar/sheet_find.html:384 +#: man_app/templates/ishtar/sheet_find.html:422 +#: man_app/templates/ishtar/sheet_find.html:460 +#: man_app/templates/ishtar/sheet_find.html:499 +#: na_app/templates/ishtar/sheet_find.html:395 +#: na_app/templates/ishtar/sheet_find.html:433 +#: na_app/templates/ishtar/sheet_find.html:471 +#: na_app/templates/ishtar/sheet_find.html:510 msgid "Year - index" msgstr "Année - index" #: archaeological_finds/templates/ishtar/sheet_find.html:387 #: archaeological_finds/templates/ishtar/sheet_find.html:425 #: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: man_app/templates/ishtar/sheet_find.html:400 -#: man_app/templates/ishtar/sheet_find.html:438 -#: man_app/templates/ishtar/sheet_find.html:476 +#: man_app/templates/ishtar/sheet_find.html:388 +#: man_app/templates/ishtar/sheet_find.html:426 +#: man_app/templates/ishtar/sheet_find.html:464 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:437 +#: na_app/templates/ishtar/sheet_find.html:475 msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" @@ -5335,7 +5471,8 @@ msgstr "Mobilier associé (max. 15 affichés)" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 -#: man_app/templates/ishtar/sheet_find.html:464 +#: man_app/templates/ishtar/sheet_find.html:452 +#: na_app/templates/ishtar/sheet_find.html:463 msgid "Export as CSV" msgstr "Export en CSV" @@ -5345,8 +5482,10 @@ msgstr "Export en CSV" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 -#: man_app/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:503 +#: man_app/templates/ishtar/sheet_find.html:452 +#: man_app/templates/ishtar/sheet_find.html:491 +#: na_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:502 msgid "CSV" msgstr "CSV" @@ -5354,7 +5493,8 @@ msgstr "CSV" #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: ishtar_common/templates/ishtar/sheet_document.html:138 -#: man_app/templates/ishtar/sheet_find.html:587 +#: man_app/templates/ishtar/sheet_find.html:533 +#: na_app/templates/ishtar/sheet_find.html:544 msgid "Associated documents" msgstr "Documents associés" @@ -5365,8 +5505,9 @@ msgstr "Demandes de traitements associés" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 -#: ishtar_common/forms_common.py:1923 +#: ishtar_common/forms_common.py:2100 #: ishtar_common/templates/ishtar/sheet_document.html:57 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "Contenu" @@ -5448,23 +5589,27 @@ msgstr "" msgid "Treatment informations:" msgstr "Informations sur le traitement :" -#: archaeological_finds/tests.py:945 archaeological_warehouse/models.py:1682 +#: archaeological_finds/tests.py:714 ishtar_common/forms_common.py:406 +msgid "This importer need a document archive." +msgstr "Cet import nécessite une archive de documents." + +#: archaeological_finds/tests.py:984 archaeological_warehouse/models.py:1682 msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." -#: archaeological_finds/tests.py:1565 archaeological_finds/tests.py:1591 -#: archaeological_finds/tests.py:1601 archaeological_operations/tests.py:3115 -#: ishtar_common/forms.py:1172 ishtar_common/forms.py:1251 +#: archaeological_finds/tests.py:1610 archaeological_finds/tests.py:1636 +#: archaeological_finds/tests.py:1646 archaeological_operations/tests.py:3160 +#: ishtar_common/forms.py:1193 ishtar_common/forms.py:1272 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:606 ishtar_common/views_item.py:876 -#: ishtar_common/views_item.py:913 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:638 ishtar_common/views_item.py:908 +#: ishtar_common/views_item.py:945 ishtar_common/wizards.py:501 msgid "Yes" msgstr "Oui" -#: archaeological_finds/tests.py:1566 archaeological_finds/tests.py:1592 -#: archaeological_finds/tests.py:1602 ishtar_common/forms.py:1173 -#: ishtar_common/forms.py:1253 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1637 +#: archaeological_finds/tests.py:1647 ishtar_common/forms.py:1194 +#: ishtar_common/forms.py:1274 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:503 msgid "No" msgstr "Non" @@ -5563,29 +5708,30 @@ msgstr "" "recherche a été épinglée." #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1061 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:3076 -#: archaeological_operations/templates/ishtar/sheet_operation.html:493 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1079 +#: archaeological_operations/forms.py:1085 +#: archaeological_operations/models.py:3082 +#: archaeological_operations/templates/ishtar/sheet_operation.html:523 +#: na_app/templates/ishtar/sheet_operation.html:501 msgid "Parcels" msgstr "Parcelles" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3064 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3060 +#: archaeological_operations/models.py:3066 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3062 -#: archaeological_operations/models.py:3090 -#: archaeological_operations/models.py:3158 +#: archaeological_operations/models.py:3068 +#: archaeological_operations/models.py:3096 +#: archaeological_operations/models.py:3164 msgid "Public domain" msgstr "Domaine public" @@ -5642,19 +5788,19 @@ msgid "Operation - 001 - Search" msgstr "Opération - 001 - Recherche" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:732 +#: archaeological_operations/forms.py:734 #: archaeological_operations/models.py:1407 msgid "Old code" msgstr "Ancien code" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:713 +#: archaeological_operations/forms.py:715 #: archaeological_operations/models.py:1504 msgid "DRASSM code" msgstr "Code DRASSM" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:720 #: archaeological_operations/models.py:1447 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" @@ -5664,23 +5810,23 @@ msgid "Is open?" msgstr "Est ouvert ?" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:769 -#: archaeological_operations/models.py:2729 +#: archaeological_operations/forms.py:771 +#: archaeological_operations/models.py:2735 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:758 -#: archaeological_operations/forms.py:1684 +#: archaeological_operations/forms.py:760 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:1346 msgid "Operator" msgstr "Opérateur" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1127 -#: archaeological_operations/forms.py:1221 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/forms.py:1848 +#: archaeological_operations/forms.py:1129 +#: archaeological_operations/forms.py:1224 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1853 #: archaeological_operations/models.py:307 #: archaeological_operations/models.py:316 #: archaeological_operations/models.py:497 @@ -5712,33 +5858,33 @@ msgid "Abstract (full text search)" msgstr "Résumé (recherche en texte intégral)" #: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1450 msgid "Comment about scientific documentation" msgstr "Commentaire relatif à la documentation scientifique" #: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:823 #: archaeological_operations/models.py:991 #: archaeological_operations/models.py:1485 msgid "Record quality" msgstr "Qualité d'enregistrement" #: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:787 +#: archaeological_operations/forms.py:789 #: archaeological_operations/models.py:1402 msgid "Report processing" msgstr "Traitement du rapport" #: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:740 +#: archaeological_operations/forms.py:742 #: archaeological_operations/models.py:1476 msgid "Virtual operation" msgstr "Opération virtuelle" #: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1692 +#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:1697 #: archaeological_operations/models.py:992 #: archaeological_operations/models.py:1495 msgid "Documentation received" @@ -5753,8 +5899,8 @@ msgid "Documentation deadline after" msgstr "Date limite de versement de la documentation après" #: archaeological_operations/forms.py:579 -#: archaeological_operations/forms.py:815 -#: archaeological_operations/forms.py:1696 +#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:1701 #: archaeological_operations/models.py:993 #: archaeological_operations/models.py:1500 msgid "Finds received" @@ -5768,87 +5914,87 @@ msgstr "Date limite de versement du mobilier avant" msgid "Finds deadline after" msgstr "Date limite de versement du mobilier après" -#: archaeological_operations/forms.py:669 ishtar_common/models.py:4242 +#: archaeological_operations/forms.py:671 ishtar_common/models.py:4256 msgid "Associated file" msgstr "Dossier associé" -#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:684 msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" -#: archaeological_operations/forms.py:716 -#: archaeological_operations/forms.py:1744 +#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:1749 #: archaeological_operations/models.py:1446 msgid "Generic name" msgstr "Nom générique" -#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:745 msgid "Actors" msgstr "Acteurs" -#: archaeological_operations/forms.py:745 +#: archaeological_operations/forms.py:747 msgid "Head scientist" msgstr "Responsable d'opération" -#: archaeological_operations/forms.py:766 +#: archaeological_operations/forms.py:768 #: archaeological_operations/models.py:1444 msgid "Operator reference" msgstr "Référence de l'opérateur" -#: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1346 -#: archaeological_operations/forms.py:1700 -#: archaeological_operations/forms.py:1837 +#: archaeological_operations/forms.py:782 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1842 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1360 msgid "Collaborators" msgstr "Collaborateurs" -#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:783 msgid "Dates / Administrative" msgstr "Dates / Administratif" -#: archaeological_operations/forms.py:785 +#: archaeological_operations/forms.py:787 #: archaeological_operations/models.py:1331 msgid "Report delivery date" msgstr "Date de livraison du rapport" -#: archaeological_operations/forms.py:807 +#: archaeological_operations/forms.py:809 #: archaeological_operations/models.py:1492 msgid "Deadline for submission of the documentation" msgstr "Date limite de versement de la documentation" -#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:814 #: archaeological_operations/models.py:1498 msgid "Deadline for submission of the finds" msgstr "Date limite de versement du mobilier" -#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:819 msgid "Scientific" msgstr "Scientifique" -#: archaeological_operations/forms.py:824 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:948 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:1067 msgid "Remain type" msgstr "Type de vestige" -#: archaeological_operations/forms.py:830 +#: archaeological_operations/forms.py:832 #: archaeological_operations/models.py:1490 msgid "Abstract" msgstr "Résumé" -#: archaeological_operations/forms.py:884 +#: archaeological_operations/forms.py:886 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" "Avant de renseigner la date de fin de chantier, il est nécessaire de " "renseigner une date de début." -#: archaeological_operations/forms.py:889 +#: archaeological_operations/forms.py:891 msgid "The excavation end date cannot be before the start date." msgstr "La date de fin de chantier ne peut être antérieure à la date de début." -#: archaeological_operations/forms.py:919 +#: archaeological_operations/forms.py:921 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " @@ -5857,252 +6003,253 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: archaeological_operations/forms.py:923 +#: archaeological_operations/forms.py:925 msgid "Bad operation code" msgstr "Mauvais code d'opération" -#: archaeological_operations/forms.py:929 -#: archaeological_operations/models.py:1942 +#: archaeological_operations/forms.py:931 +#: archaeological_operations/models.py:1948 msgid "Operation code" msgstr "Code de l'opération" -#: archaeological_operations/forms.py:964 -#: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: archaeological_operations/forms.py:966 +#: archaeological_operations/templates/ishtar/sheet_operation.html:312 +#: na_app/templates/ishtar/sheet_operation.html:290 msgid "Court-ordered seizure" msgstr "Saisie judiciaire" -#: archaeological_operations/forms.py:965 +#: archaeological_operations/forms.py:967 msgid "Operation - 015 - Court-ordered seizure" msgstr "Opération - 015 - Saisie judiciaire" -#: archaeological_operations/forms.py:974 +#: archaeological_operations/forms.py:976 #: archaeological_operations/models.py:1507 msgid "Seizure name" msgstr "Nom de la saisie" -#: archaeological_operations/forms.py:977 +#: archaeological_operations/forms.py:979 #: archaeological_operations/models.py:1509 msgid "Official report number" msgstr "Numéro de procès-verbal ou de saisine" -#: archaeological_operations/forms.py:983 +#: archaeological_operations/forms.py:985 msgid "Protagonist" msgstr "Protagoniste" -#: archaeological_operations/forms.py:989 +#: archaeological_operations/forms.py:991 #: archaeological_operations/models.py:1521 msgid "Applicant authority" msgstr "Autorité requérante" -#: archaeological_operations/forms.py:995 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1529 msgid "Writer of the minutes" msgstr "Rédacteur du procès verbal" -#: archaeological_operations/forms.py:1000 +#: archaeological_operations/forms.py:1002 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: archaeological_operations/forms.py:1001 +#: archaeological_operations/forms.py:1003 msgid "Operation - 033 - Preventive - Excavation" msgstr "Opération - 033 - Préventif - Fouille" -#: archaeological_operations/forms.py:1004 +#: archaeological_operations/forms.py:1006 #: archaeological_operations/models.py:1386 msgid "Cost (euros)" msgstr "Coût (euros)" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1007 #: archaeological_operations/models.py:1390 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: archaeological_operations/forms.py:1007 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1394 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: archaeological_operations/forms.py:1009 +#: archaeological_operations/forms.py:1011 #: archaeological_operations/models.py:1398 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: archaeological_operations/forms.py:1019 +#: archaeological_operations/forms.py:1021 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1022 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "Opération - 037 - Préventif - Diagnostic" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: archaeological_operations/forms.py:1027 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: archaeological_operations/forms.py:1030 +#: archaeological_operations/forms.py:1032 #: archaeological_operations/models.py:1425 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: archaeological_operations/forms.py:1051 +#: archaeological_operations/forms.py:1053 msgid "Operation - 040 - Towns" msgstr "Opération - 040 - Communes" -#: archaeological_operations/forms.py:1056 +#: archaeological_operations/forms.py:1058 msgid "Operation - 040 - Towns (2)" msgstr "Opération - 040 - Communes (2)" -#: archaeological_operations/forms.py:1078 +#: archaeological_operations/forms.py:1080 msgid "Operation - 050 - Parcels" msgstr "Opération - 050 - Parcelles" -#: archaeological_operations/forms.py:1085 +#: archaeological_operations/forms.py:1087 msgid "Operation - 050 - Parcels (2)" msgstr "Opération - 050 - Parcelles (2)" -#: archaeological_operations/forms.py:1119 -#: archaeological_operations/forms.py:1215 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1796 +#: archaeological_operations/forms.py:1121 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1801 #: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:1848 -#: ishtar_common/forms_common.py:2134 ishtar_common/forms_common.py:2365 -#: ishtar_common/models.py:2349 +#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:2025 +#: ishtar_common/forms_common.py:2311 ishtar_common/forms_common.py:2541 +#: ishtar_common/models.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "Référence" -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1342 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1848 msgid "Cultural attributions" msgstr "Attributions culturelles" -#: archaeological_operations/forms.py:1152 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/forms.py:1816 +#: archaeological_operations/forms.py:1154 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/forms.py:1821 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: archaeological_operations/forms.py:1195 +#: archaeological_operations/forms.py:1198 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: archaeological_operations/forms.py:1200 +#: archaeological_operations/forms.py:1203 msgid "Would you like to delete this operation?" msgstr "Voulez-vous supprimer cette opération ?" -#: archaeological_operations/forms.py:1209 +#: archaeological_operations/forms.py:1212 msgid "Archaeological site - 001 - Search" msgstr "Site archéologique - 001 - Recherche" -#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1232 msgid "Top operation" msgstr "Opération chapeau" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1350 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1355 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "Lieu-dit IGN" -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "Lieu-dit cadastre" -#: archaeological_operations/forms.py:1248 -#: archaeological_operations/forms.py:1398 +#: archaeological_operations/forms.py:1251 +#: archaeological_operations/forms.py:1403 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "Numéro AffMar" -#: archaeological_operations/forms.py:1250 -#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1253 +#: archaeological_operations/forms.py:1405 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "Numéro DRASSM" -#: archaeological_operations/forms.py:1252 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1407 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "Nom de l'épave" -#: archaeological_operations/forms.py:1255 -#: archaeological_operations/forms.py:1410 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1415 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "Localisation SHOM" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1404 +#: archaeological_operations/forms.py:1261 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "Code épave" -#: archaeological_operations/forms.py:1260 -#: archaeological_operations/forms.py:1406 +#: archaeological_operations/forms.py:1263 +#: archaeological_operations/forms.py:1411 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "Date de naufrage" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1413 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "Zone de découverte" -#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1327 msgid "Archaeological site - 010 - General" msgstr "Site archéologique - 010 - Général" -#: archaeological_operations/forms.py:1384 +#: archaeological_operations/forms.py:1389 msgid "Archaeological site - 020 - Towns" msgstr "Site archéologique - 020 - Villes" -#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1398 #: archaeological_operations/templates/ishtar/sheet_site.html:53 msgid "Underwater" msgstr "Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1394 +#: archaeological_operations/forms.py:1399 msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1478 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1590 -#: archaeological_operations/forms.py:1657 +#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:1595 +#: archaeological_operations/forms.py:1662 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1498 -#: archaeological_operations/models.py:2754 +#: archaeological_operations/forms.py:1503 +#: archaeological_operations/models.py:2760 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:2789 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:2795 msgid "Signature date" msgstr "Date de signature" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1521 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1550 +#: archaeological_operations/forms.py:1555 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -6111,48 +6258,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:1554 +#: archaeological_operations/forms.py:1559 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1572 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1572 ishtar_common/forms.py:1288 -#: ishtar_common/models.py:2021 +#: archaeological_operations/forms.py:1577 ishtar_common/forms.py:1309 +#: ishtar_common/models.py:2031 msgid "Template" msgstr "Patron" -#: archaeological_operations/forms.py:1596 -#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1601 +#: archaeological_operations/forms.py:1605 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:1618 +#: archaeological_operations/forms.py:1623 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1620 +#: archaeological_operations/forms.py:1625 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1646 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:730 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1662 +#: archaeological_operations/forms.py:1667 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1771 +#: archaeological_operations/forms.py:1776 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:1827 +#: archaeological_operations/forms.py:1832 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -6192,7 +6339,7 @@ msgstr "Type de qualité d'enregistrement" msgid "Types of record quality" msgstr "Types de qualité d'enregistrement" -#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:944 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:1063 msgid "Cultural attribution type" msgstr "Type d'attribution culturelle" @@ -6202,7 +6349,7 @@ msgstr "Types d'attribution culturelle" #: archaeological_operations/models.py:376 #: archaeological_operations/models.py:1177 -#: archaeological_operations/tests.py:3101 +#: archaeological_operations/tests.py:3146 msgctxt "key for text search" msgid "remain" msgstr "vestige" @@ -6262,19 +6409,20 @@ msgid "Create associated operation" msgstr "Créer une opération associée" #: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1542 #: archaeological_warehouse/models.py:406 msgid "Cached town label" msgstr "Nom en cache des communes" #: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1554 msgid "Cached remains label" msgstr "Nom en cache des vestiges" #: archaeological_operations/models.py:567 #: archaeological_operations/models.py:1465 -#: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: archaeological_operations/templates/ishtar/sheet_operation.html:354 +#: na_app/templates/ishtar/sheet_operation.html:332 msgid "Archaeological sites" msgstr "Entités archéologiques" @@ -6299,9 +6447,9 @@ msgstr "" msgid "top ope." msgstr "ope. sup." -#: archaeological_operations/models.py:803 ishtar_common/forms.py:1171 -#: ishtar_common/models.py:5142 ishtar_common/models.py:5303 -#: ishtar_common/models.py:5363 ishtar_common/views_item.py:1607 +#: archaeological_operations/models.py:803 ishtar_common/forms.py:1192 +#: ishtar_common/models.py:5156 ishtar_common/models.py:5317 +#: ishtar_common/models.py:5377 ishtar_common/views_item.py:1653 msgid "Unknown" msgstr "Inconnu" @@ -6372,7 +6520,7 @@ msgid "address" msgstr "adresse" #: archaeological_operations/models.py:1162 -#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3158 msgctxt "key for text search" msgid "is-open" msgstr "est-ouvert" @@ -6403,7 +6551,7 @@ msgid "end-after" msgstr "fini-apres" #: archaeological_operations/models.py:1197 -#: archaeological_operations/tests.py:3156 +#: archaeological_operations/tests.py:3201 msgctxt "key for text search" msgid "relation-types" msgstr "type-relation" @@ -6424,6 +6572,7 @@ msgid "record-quality" msgstr "qualite-enregistrement" #: archaeological_operations/models.py:1214 +#: archaeological_operations/tests.py:3248 msgctxt "key for text search" msgid "report-processing" msgstr "traitement-rapport" @@ -6468,8 +6617,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "code-drassm" -#: archaeological_operations/models.py:1288 ishtar_common/models.py:4104 -#: ishtar_common/models.py:4196 +#: archaeological_operations/models.py:1288 ishtar_common/models.py:4118 +#: ishtar_common/models.py:4210 msgctxt "key for text search" msgid "file" msgstr "dossier" @@ -6497,282 +6646,292 @@ msgstr "" msgid "Name of the protagonist" msgstr "Nom du protagoniste" -#: archaeological_operations/models.py:1558 +#: archaeological_operations/models.py:1536 +msgid "Cached label" +msgstr "Libellé en cache" + +#: archaeological_operations/models.py:1564 #: archaeological_operations/templates/ishtar/sheet_site.html:86 -#: ishtar_common/models.py:988 +#: ishtar_common/models.py:999 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "Opérations" -#: archaeological_operations/models.py:1598 +#: archaeological_operations/models.py:1604 msgid "List of associated context records" msgstr "Liste des unités d'enregistrement associées" -#: archaeological_operations/models.py:1599 +#: archaeological_operations/models.py:1605 msgid "List of associated containers" msgstr "Liste des contenants associés" -#: archaeological_operations/models.py:1672 +#: archaeological_operations/models.py:1678 msgid "OPE" msgstr "OPE" -#: archaeological_operations/models.py:1784 +#: archaeological_operations/models.py:1775 +msgid "No associated town" +msgstr "Pas de commune associée" + +#: archaeological_operations/models.py:1790 msgid "Intercommunal" msgstr "Intercommunal" -#: archaeological_operations/models.py:1908 +#: archaeological_operations/models.py:1914 msgid "context record" msgstr "UE" -#: archaeological_operations/models.py:1927 +#: archaeological_operations/models.py:1933 msgid "Code patriarche" msgstr "Code patriarche" -#: archaeological_operations/models.py:1975 +#: archaeological_operations/models.py:1981 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:2036 +#: archaeological_operations/models.py:2042 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2052 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: archaeological_operations/models.py:2054 +#: archaeological_operations/models.py:2060 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: archaeological_operations/models.py:2062 +#: archaeological_operations/models.py:2068 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: archaeological_operations/models.py:2116 +#: archaeological_operations/models.py:2122 #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of finds" msgstr "Nombre de mobiliers possédés" -#: archaeological_operations/models.py:2178 -#: archaeological_operations/models.py:2257 +#: archaeological_operations/models.py:2184 +#: archaeological_operations/models.py:2263 msgid "No type" msgstr "Pas de type" -#: archaeological_operations/models.py:2222 +#: archaeological_operations/models.py:2228 msgid "Number of sources" msgstr "Nombre de documents" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2273 msgid "Mean" msgstr "Moyenne" -#: archaeological_operations/models.py:2359 ishtar_common/models_imports.py:949 +#: archaeological_operations/models.py:2365 +#: ishtar_common/models_imports.py:1068 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: archaeological_operations/models.py:2360 +#: archaeological_operations/models.py:2366 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2391 msgid "Operation record relation" msgstr "Relation entre opérations" -#: archaeological_operations/models.py:2386 +#: archaeological_operations/models.py:2392 msgid "Operation record relations" msgstr "Relations entre opérations" -#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2458 msgid "Intended to" msgstr "Destiné à" -#: archaeological_operations/models.py:2457 +#: archaeological_operations/models.py:2463 msgid "Associated template" msgstr "Patron associé" -#: archaeological_operations/models.py:2460 +#: archaeological_operations/models.py:2466 msgid "Indexed" msgstr "Indexé" -#: archaeological_operations/models.py:2464 +#: archaeological_operations/models.py:2470 msgid "Act types" msgstr "Types d'acte" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "other-ref" msgstr "autre-ref" -#: archaeological_operations/models.py:2600 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "indexed" msgstr "indexe" -#: archaeological_operations/models.py:2603 +#: archaeological_operations/models.py:2609 #: archaeological_warehouse/models.py:963 msgctxt "key for text search" msgid "operation-town" msgstr "operation-commune" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2613 msgctxt "key for text search" msgid "file-town" msgstr "dossier-commune" -#: archaeological_operations/models.py:2619 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "operation-department" msgstr "operation-departement" -#: archaeological_operations/models.py:2623 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-department" msgstr "dossier-departement" -#: archaeological_operations/models.py:2627 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "object" msgstr "objet" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2636 msgctxt "key for text search" msgid "signature-before" msgstr "signature-avant" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2640 msgctxt "key for text search" msgid "signature-after" msgstr "signature-apres" -#: archaeological_operations/models.py:2638 +#: archaeological_operations/models.py:2644 msgctxt "key for text search" msgid "file-name" msgstr "dossier-nom" -#: archaeological_operations/models.py:2650 +#: archaeological_operations/models.py:2656 msgctxt "key for text search" msgid "file-reference" msgstr "dossier-reference" -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2660 msgctxt "key for text search" msgid "file-year" msgstr "dossier-annee" -#: archaeological_operations/models.py:2657 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "file-other-reference" msgstr "dossier-autre-reference" -#: archaeological_operations/models.py:2661 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "file-in-charge" msgstr "dossier-responsable" -#: archaeological_operations/models.py:2665 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "file-permit-reference" msgstr "dossier-ref-permis" -#: archaeological_operations/models.py:2669 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "treatment-name" msgstr "traitement-nom" -#: archaeological_operations/models.py:2673 +#: archaeological_operations/models.py:2679 msgctxt "key for text search" msgid "treatment-reference" msgstr "traitement-reference" -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:2683 msgctxt "key for text search" msgid "treatment-year" msgstr "traitement-annee" -#: archaeological_operations/models.py:2680 +#: archaeological_operations/models.py:2686 msgctxt "key for text search" msgid "treatment-index" msgstr "traitement-index" -#: archaeological_operations/models.py:2683 +#: archaeological_operations/models.py:2689 msgctxt "key for text search" msgid "treatment-type" msgstr "traitement-type" -#: archaeological_operations/models.py:2687 +#: archaeological_operations/models.py:2693 msgctxt "key for text search" msgid "treatment-file-name" msgstr "dossier-traitement-nom" -#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:2697 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "dossier-traitement-reference" -#: archaeological_operations/models.py:2695 +#: archaeological_operations/models.py:2701 msgctxt "key for text search" msgid "treatment-file-year" msgstr "dossier-traitement-annee" -#: archaeological_operations/models.py:2699 +#: archaeological_operations/models.py:2705 msgctxt "key for text search" msgid "treatment-file-index" msgstr "dossier-traitement-index" -#: archaeological_operations/models.py:2703 +#: archaeological_operations/models.py:2709 msgctxt "key for text search" msgid "treatment-file-type" msgstr "dossier-traitement-type" -#: archaeological_operations/models.py:2737 +#: archaeological_operations/models.py:2743 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2799 +#: archaeological_operations/models.py:2805 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2811 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:2979 +#: archaeological_operations/models.py:2985 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:3069 +#: archaeological_operations/models.py:3075 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3071 ishtar_common/models.py:2602 -#: ishtar_common/models.py:2904 ishtar_common/models.py:3691 -#: ishtar_common/models_common.py:3510 ishtar_common/models_common.py:3545 -#: ishtar_common/models_common.py:4471 +#: archaeological_operations/models.py:3077 ishtar_common/models.py:2612 +#: ishtar_common/models.py:2914 ishtar_common/models.py:3705 +#: ishtar_common/models_common.py:3318 ishtar_common/models_common.py:3353 +#: ishtar_common/models_common.py:4279 msgid "Cached name" msgstr "Nom en cache" -#: archaeological_operations/models.py:3344 ishtar_common/models.py:3556 +#: archaeological_operations/models.py:3369 ishtar_common/models.py:3570 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3359 +#: archaeological_operations/models.py:3384 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3360 +#: archaeological_operations/models.py:3385 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3382 ishtar_common/models.py:5010 +#: archaeological_operations/models.py:3407 ishtar_common/models.py:5024 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3385 +#: archaeological_operations/models.py:3410 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3386 +#: archaeological_operations/models.py:3411 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -6794,60 +6953,75 @@ msgid "View PDF" msgstr "Voir le PDF" #: archaeological_operations/templates/ishtar/sheet_operation.html:53 +#: na_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "Sites / parcelles / actes administratifs" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 -#: archaeological_operations/templates/ishtar/sheet_operation.html:400 -#: archaeological_operations/templates/ishtar/sheet_operation.html:498 -#: ishtar_common/models.py:988 +#: archaeological_operations/templates/ishtar/sheet_operation.html:430 +#: archaeological_operations/templates/ishtar/sheet_operation.html:528 +#: ishtar_common/models.py:999 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:408 +#: na_app/templates/ishtar/sheet_operation.html:506 msgid "Context records" msgstr "Unités d'Enregistrement" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 -#: archaeological_operations/templates/ishtar/sheet_operation.html:467 +#: archaeological_operations/templates/ishtar/sheet_operation.html:497 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:208 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:215 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:475 msgid "Statistics" msgstr "Statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:159 +#: na_app/templates/ishtar/sheet_operation.html:159 msgid "Excavation dates (start/end)" msgstr "Date de chantier (début/fin)" #: archaeological_operations/templates/ishtar/sheet_operation.html:228 +#: na_app/templates/ishtar/sheet_operation.html:228 msgid "Duration" msgstr "Durée" -#: archaeological_operations/templates/ishtar/sheet_operation.html:270 +#: archaeological_operations/templates/ishtar/sheet_operation.html:286 +#: na_app/templates/ishtar/sheet_operation.html:278 msgid "This operation is virtual." msgstr "Cette opération est virtuelle." -#: archaeological_operations/templates/ishtar/sheet_operation.html:359 +#: archaeological_operations/templates/ishtar/sheet_operation.html:389 +#: na_app/templates/ishtar/sheet_operation.html:367 msgid "Document from this operation" msgstr "Documents de cette opération" -#: archaeological_operations/templates/ishtar/sheet_operation.html:391 +#: archaeological_operations/templates/ishtar/sheet_operation.html:421 +#: na_app/templates/ishtar/sheet_operation.html:399 msgid "No relations" msgstr "Pas de relation" -#: archaeological_operations/templates/ishtar/sheet_operation.html:410 +#: archaeological_operations/templates/ishtar/sheet_operation.html:440 +#: na_app/templates/ishtar/sheet_operation.html:418 msgid "Documents from associated context records" msgstr "Documents des Unités d'Enregistrement associées" -#: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: archaeological_operations/templates/ishtar/sheet_operation.html:445 +#: na_app/templates/ishtar/sheet_operation.html:423 msgid "Diagram of stratigraphic relations" msgstr "Diagramme de relations stratigraphiques" -#: archaeological_operations/templates/ishtar/sheet_operation.html:444 +#: archaeological_operations/templates/ishtar/sheet_operation.html:474 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:452 msgid "Associated containers" msgstr "Contenants associés" -#: archaeological_operations/templates/ishtar/sheet_operation.html:472 +#: archaeological_operations/templates/ishtar/sheet_operation.html:502 #: archaeological_warehouse/templates/ishtar/sheet_container.html:213 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 #: ishtar_common/models_rest.py:77 @@ -6857,26 +7031,34 @@ msgstr "Contenants associés" #: ishtar_common/templates/ishtar/blocks/window_nav.html:79 #: ishtar_common/templates/ishtar/blocks/window_nav.html:85 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:220 +#: na_app/templates/ishtar/sheet_operation.html:480 msgid "Export" msgstr "Exporter" -#: archaeological_operations/templates/ishtar/sheet_operation.html:477 +#: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:218 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: na_app/templates/ishtar/sheet_container.html:225 +#: na_app/templates/ishtar/sheet_operation.html:485 msgid "Regenerate statistics" msgstr "Re-générer les statistiques" -#: archaeological_operations/templates/ishtar/sheet_operation.html:482 +#: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:223 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: na_app/templates/ishtar/sheet_container.html:230 +#: na_app/templates/ishtar/sheet_operation.html:490 msgid "Last update:" msgstr "Dernière mise à jour :" -#: archaeological_operations/templates/ishtar/sheet_operation.html:562 +#: archaeological_operations/templates/ishtar/sheet_operation.html:592 +#: na_app/templates/ishtar/sheet_operation.html:570 msgid "Sources" msgstr "Documents" -#: archaeological_operations/templates/ishtar/sheet_operation.html:580 +#: archaeological_operations/templates/ishtar/sheet_operation.html:610 +#: na_app/templates/ishtar/sheet_operation.html:588 msgid "Finds by context records" msgstr "Mobilier par Unités d'Enregistrement" @@ -6884,17 +7066,17 @@ msgstr "Mobilier par Unités d'Enregistrement" msgid "This act is indexed!" msgstr "Cet acte est indexé !" -#: archaeological_operations/tests.py:841 +#: archaeological_operations/tests.py:885 #: 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:871 +#: archaeological_operations/tests.py:915 #: 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:909 +#: archaeological_operations/tests.py:953 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" @@ -6902,31 +7084,31 @@ msgstr "" "Le(s) erreur(s) suivante(s) ont été rencontrées lors de l'analyse du fichier " "source :" -#: archaeological_operations/tests.py:1823 +#: archaeological_operations/tests.py:1867 #: archaeological_operations/views.py:459 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:2552 ishtar_common/forms.py:447 +#: archaeological_operations/tests.py:2597 ishtar_common/forms.py:457 msgid "This item is locked for edition." msgstr "Cet élément est verrouillé pour l'édition." -#: archaeological_operations/tests.py:2565 +#: archaeological_operations/tests.py:2610 #: ishtar_common/templates/ishtar/sheet.html:139 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:4700 +#: archaeological_operations/tests.py:4764 msgid "is not a valid JSON message" msgstr "n'est pas un message JSON valide" -#: archaeological_operations/tests.py:4713 +#: archaeological_operations/tests.py:4777 msgid "{result['created']} matches created" msgstr "{result['created']} correspondances créées" -#: archaeological_operations/tests.py:4731 +#: archaeological_operations/tests.py:4795 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " @@ -6935,7 +7117,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:4738 ishtar_common/admin.py:2476 +#: archaeological_operations/tests.py:4802 ishtar_common/admin.py:2518 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " @@ -6944,15 +7126,15 @@ msgstr "" "Ces types n'ont pas été touvés : {missing_types}. Pas la même version " "d'Ishtar ?" -#: archaeological_operations/tests.py:4744 +#: archaeological_operations/tests.py:4808 msgid "{result['deleted']} matches deleted" msgstr "{result['deleted']} correspondances supprimées" -#: archaeological_operations/tests.py:4817 ishtar_common/admin.py:2564 +#: archaeological_operations/tests.py:4881 ishtar_common/admin.py:2606 msgid "{result['updated']} match key(s) updated." msgstr "{result['updated']} clé(s) de correspondance mises à jour." -#: archaeological_operations/tests.py:4823 ishtar_common/models_rest.py:377 +#: archaeological_operations/tests.py:4887 ishtar_common/models_rest.py:377 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." @@ -6960,7 +7142,7 @@ msgstr "" "{ctype} - {distant_key}, {distant_label} non référécé dans la base de " "données." -#: archaeological_operations/tests.py:4830 ishtar_common/models_rest.py:356 +#: archaeological_operations/tests.py:4894 ishtar_common/models_rest.py:356 #: ishtar_common/models_rest.py:362 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -6986,7 +7168,7 @@ msgstr "Clôturer une opération" msgid "Operation deletion" msgstr "Supprimer une opération" -#: archaeological_operations/views.py:570 ishtar_common/models.py:996 +#: archaeological_operations/views.py:570 ishtar_common/models.py:1007 msgid "Site deletion" msgstr "Supprimer un site" @@ -7024,7 +7206,7 @@ msgstr "" #: archaeological_warehouse/models.py:414 #: archaeological_warehouse/models.py:929 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1928 ishtar_common/models.py:5238 +#: ishtar_common/forms_common.py:2105 ishtar_common/models.py:5252 #: ishtar_common/views.py:505 msgid "Warehouse" msgstr "Lieu de conservation" @@ -7048,6 +7230,7 @@ msgstr "Les champs « ordre » doivent être différents." #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:378 #: archaeological_warehouse/templates/ishtar/sheet_container.html:181 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "Divisions" @@ -7061,7 +7244,7 @@ msgstr "Lieu de conservation - 001 - Recherche" #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:263 -#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:962 +#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:1081 msgid "Warehouse type" msgstr "Type de lieu de conservation" @@ -7094,32 +7277,32 @@ msgstr "" "l'organisation. Si une nouvelle organisation est créée depuis ce lieu de " "conservation, les champs suivants sont utilisés pour cette organisation." -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:596 -#: ishtar_common/forms_common.py:983 ishtar_common/models_common.py:3766 -#: ishtar_common/models_common.py:3955 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:772 +#: ishtar_common/forms_common.py:1161 ishtar_common/models_common.py:3574 +#: ishtar_common/models_common.py:3763 msgid "Address complement" msgstr "Complément d'adresse" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:599 -#: ishtar_common/forms_common.py:986 ishtar_common/models_common.py:3771 +#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:775 +#: ishtar_common/forms_common.py:1164 ishtar_common/models_common.py:3579 msgid "Town (freeform)" msgstr "Commune (saisie libre)" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:601 -#: ishtar_common/forms_common.py:988 ishtar_common/models_common.py:3777 +#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:777 +#: ishtar_common/forms_common.py:1166 ishtar_common/models_common.py:3585 msgid "Country" msgstr "Pays" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:603 -#: ishtar_common/forms_common.py:959 ishtar_common/models_common.py:3791 -#: ishtar_common/models_common.py:3967 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:1137 ishtar_common/models_common.py:3599 +#: ishtar_common/models_common.py:3775 #: 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:253 ishtar_common/forms_common.py:605 -#: ishtar_common/forms_common.py:969 ishtar_common/models_common.py:3807 +#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:781 +#: ishtar_common/forms_common.py:1147 ishtar_common/models_common.py:3615 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7153,7 +7336,8 @@ msgstr "Ancienne référence" #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1141 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:1079 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "Type de contenant" @@ -7289,6 +7473,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:183 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "Contenants" @@ -7430,7 +7615,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "mobilier-ID-libre" -#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4100 +#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4114 msgctxt "key for text search" msgid "find-denomination" msgstr "mobilier-denomination" @@ -7485,7 +7670,7 @@ msgstr "Localisation - en cache" msgid "Cached division" msgstr "Division mise en cache" -#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4344 +#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4358 msgid "Container ID" msgstr "ID contenant" @@ -7551,50 +7736,61 @@ msgstr "Localisations de contenant" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "Nombre de contenants" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "Nombre de divisions" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of owned finds" msgstr "Nombre de mobiliers accueillis" #: archaeological_warehouse/templates/ishtar/sheet_container.html:128 +#: na_app/templates/ishtar/sheet_container.html:135 msgid "Measured weight (kg)" msgstr "Poids mesuré (kg)" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Calculated weight (kg)" msgstr "Poids calculé (kg)" #: archaeological_warehouse/templates/ishtar/sheet_container.html:133 +#: na_app/templates/ishtar/sheet_container.html:140 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" "Le poids calculé et le poids mesuré sont trop différent (au delà de 10%%)." #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "Vide" #: archaeological_warehouse/templates/ishtar/sheet_container.html:231 +#: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "Pas de contenant ou de division dans ce contenant." #: archaeological_warehouse/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "Mobiliers par localisation" #: archaeological_warehouse/templates/ishtar/sheet_container.html:261 +#: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "Contenants par localisation" #: archaeological_warehouse/templates/ishtar/sheet_container.html:289 +#: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "Document associé à ce contenant" @@ -7783,7 +7979,7 @@ msgstr "Fusionner dans" msgid "Merge selected items" msgstr "Fusionner les éléments sélectionnés" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:724 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:902 msgid "At least two items have to be selected." msgstr "Au moins deux éléments doivent être sélectionnés." @@ -7804,7 +8000,7 @@ msgstr "Modifier le parent des éléments sélectionnés" msgid "{} parent(s) were changed to {}." msgstr "{} parent(s) a/ont été changé(s) en {}." -#: ishtar_common/admin.py:495 ishtar_common/models.py:1486 +#: ishtar_common/admin.py:495 ishtar_common/models.py:1496 msgid "Maps - default center" msgstr "Cartes - centre par défaut" @@ -7835,14 +8031,14 @@ msgstr "" "d'adapter les importeurs. La regénération des identifiants est parfois " "nécessaire." -#: ishtar_common/admin.py:660 ishtar_common/models.py:965 +#: ishtar_common/admin.py:660 ishtar_common/models.py:976 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "Profil" -#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1295 -#: ishtar_common/forms_common.py:1330 ishtar_common/forms_common.py:1331 -#: ishtar_common/models.py:3020 +#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1475 +#: ishtar_common/forms_common.py:1507 ishtar_common/forms_common.py:1508 +#: ishtar_common/models.py:3030 msgid "Profiles" msgstr "Profils" @@ -7967,10 +8163,12 @@ msgid "Parents" msgstr "Parents" #: ishtar_common/admin.py:1177 ishtar_common/admin.py:1642 +#: ishtar_common/admin.py:1665 msgid "Make available" msgstr "Rendre disponible" #: ishtar_common/admin.py:1178 ishtar_common/admin.py:1643 +#: ishtar_common/admin.py:1666 msgid "Make unavailable" msgstr "Rendre indisponible" @@ -8014,85 +8212,86 @@ msgstr "Sélectionner seulement un importeur." msgid "Export as libreoffice template" msgstr "Exporter comme un patron libreoffice" -#: ishtar_common/admin.py:1694 +#: ishtar_common/admin.py:1717 msgid "{} importer column(s) duplicated: {}." msgstr "{} colonne(s) dupliquée(s) : {}." -#: ishtar_common/admin.py:1725 +#: ishtar_common/admin.py:1748 msgid "{} importer column(s) right-shifted." msgstr "{} colonne(s) décalée(s) à droite." -#: ishtar_common/admin.py:1738 +#: ishtar_common/admin.py:1761 msgid "Shift right" msgstr "Décaler à droite" -#: ishtar_common/admin.py:1765 +#: ishtar_common/admin.py:1788 msgid "{} importer column(s) left-shifted." msgstr "{} colonne(s) décalée(s) à gauche." -#: ishtar_common/admin.py:1772 +#: ishtar_common/admin.py:1795 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:1786 +#: ishtar_common/admin.py:1809 msgid "Shift left" msgstr "Décaler à gauche" -#: ishtar_common/admin.py:1821 +#: ishtar_common/admin.py:1844 msgid "Importer available" msgstr "Importeur disponible" -#: ishtar_common/admin.py:1976 +#: ishtar_common/admin.py:2018 msgid "Display selected" msgstr "Afficher les éléments sélectionnés" -#: ishtar_common/admin.py:1977 +#: ishtar_common/admin.py:2019 msgid "Hide selected" msgstr "Cacher les éléments sélectionnés" -#: ishtar_common/admin.py:2007 ishtar_common/models.py:1629 +#: ishtar_common/admin.py:2049 ishtar_common/models.py:1639 msgid "Form" msgstr "Formulaire" -#: ishtar_common/admin.py:2028 ishtar_common/models.py:1769 +#: ishtar_common/admin.py:2070 ishtar_common/models.py:1779 msgid "Field" msgstr "Champ" -#: ishtar_common/admin.py:2159 ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2201 ishtar_common/admin.py:2253 msgid "Select only one task." msgstr "Sélectionner seulement une seule tâche." -#: ishtar_common/admin.py:2166 +#: ishtar_common/admin.py:2208 msgid "Export already exported/scheduled." msgstr "Export déjà réalisé/planifié." -#: ishtar_common/admin.py:2178 +#: ishtar_common/admin.py:2220 msgid "Launch export" msgstr "Lancer l'export" -#: ishtar_common/admin.py:2218 +#: ishtar_common/admin.py:2260 msgid "Import already imported/scheduled." msgstr "Import déjà réalisé/planifié." -#: ishtar_common/admin.py:2230 ishtar_common/models_imports.py:1427 +#: ishtar_common/admin.py:2272 ishtar_common/models_imports.py:1597 +#: ishtar_common/models_imports.py:2249 msgid "Launch import" msgstr "Lancer l'import" -#: ishtar_common/admin.py:2298 ishtar_common/models.py:962 +#: ishtar_common/admin.py:2340 ishtar_common/models.py:973 msgid "Content type" msgstr "Type de contenu" -#: ishtar_common/admin.py:2361 ishtar_common/admin.py:2499 -#: ishtar_common/admin.py:2543 +#: ishtar_common/admin.py:2403 ishtar_common/admin.py:2541 +#: ishtar_common/admin.py:2585 msgid "Select only one source." msgstr "Sélectionner une seule source." -#: ishtar_common/admin.py:2383 +#: ishtar_common/admin.py:2425 msgid "Timeout: failed to join {}." msgstr "Temps expiré : échec pour joindre {}" -#: ishtar_common/admin.py:2391 +#: ishtar_common/admin.py:2433 msgid "" "Bad response for {} - {}. Response status code {} != 200. No access to {}. " "If it is not expected, check your key." @@ -8100,30 +8299,30 @@ msgstr "" "Mauvaise réponse pour {} - {}. Code de réponse {} != 200. Pas d'accès à {}. " "Si cela n'est pas attendu, vérifiez votre clé." -#: ishtar_common/admin.py:2403 +#: ishtar_common/admin.py:2445 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:2438 +#: ishtar_common/admin.py:2480 msgid "Table/exports configuration updated" msgstr "Configuration tableau/exports mis à jour" -#: ishtar_common/admin.py:2444 +#: ishtar_common/admin.py:2486 #, python-brace-format msgid "{created} matches created" msgstr "{created} correspondances créées" -#: ishtar_common/admin.py:2450 +#: ishtar_common/admin.py:2492 #, python-brace-format msgid "{updated} matches updated" msgstr "{updated} correspondances mises à jour" -#: ishtar_common/admin.py:2456 +#: ishtar_common/admin.py:2498 #, python-brace-format msgid "{deleted} matches deleted" msgstr "{deleted} correspondances supprimés" -#: ishtar_common/admin.py:2465 +#: ishtar_common/admin.py:2507 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " @@ -8132,52 +8331,52 @@ 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:2484 +#: ishtar_common/admin.py:2526 msgid "Update table, export format and types from source" msgstr "" "Mettre à jour des formats de tableau, d'export et des types depuis la source" -#: ishtar_common/admin.py:2508 +#: ishtar_common/admin.py:2550 msgid "" "Document not generated: is the LibreOffice daemon configured and running?" msgstr "" "Document non généré: est-ce que le démon LibreOffice daemon est configuré et " "fonctionne ?" -#: ishtar_common/admin.py:2528 +#: ishtar_common/admin.py:2570 msgid "Generate match document" msgstr "Générer le document de correspondance" -#: ishtar_common/admin.py:2552 +#: ishtar_common/admin.py:2594 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:2557 +#: ishtar_common/admin.py:2599 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:2570 +#: ishtar_common/admin.py:2612 msgid "Update association from match document" msgstr "Mettre à jour les associations depuis un document de correspondance" -#: ishtar_common/admin.py:2604 +#: ishtar_common/admin.py:2646 msgid "Enable match" msgstr "Activer la correspondance" -#: ishtar_common/admin.py:2605 +#: ishtar_common/admin.py:2647 msgid "Disable match" msgstr "Désactiver la correspondance" -#: ishtar_common/admin.py:2615 ishtar_common/models_rest.py:81 +#: ishtar_common/admin.py:2657 ishtar_common/models_rest.py:81 msgid "API - Remote access - Search model" msgstr "API - Accès distant - Modèle de recherche" -#: ishtar_common/admin.py:2618 ishtar_common/models.py:715 -#: ishtar_common/models_common.py:809 ishtar_common/models_imports.py:851 -#: ishtar_common/models_imports.py:1950 ishtar_common/models_rest.py:111 +#: ishtar_common/admin.py:2660 ishtar_common/models.py:726 +#: ishtar_common/models_common.py:811 ishtar_common/models_imports.py:970 +#: ishtar_common/models_imports.py:2827 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8186,15 +8385,15 @@ msgstr "API - Accès distant - Modèle de recherche" msgid "Key" msgstr "Clé" -#: ishtar_common/admin.py:2620 +#: ishtar_common/admin.py:2662 msgid "Save first to choose a key" msgstr "Enregistrer d'abord pour choisir une clé" -#: ishtar_common/admin.py:2650 +#: ishtar_common/admin.py:2692 msgid "Available keys: " msgstr "Clés disponibles : " -#: ishtar_common/admin.py:2683 +#: ishtar_common/admin.py:2725 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." @@ -8202,7 +8401,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:2691 +#: ishtar_common/admin.py:2733 msgid "You cannot set only x or only y coordinate." msgstr "Vous ne pouvez pas seulement renseigner une coordonnée x ou y." @@ -8279,60 +8478,60 @@ msgstr "" msgid "changelog" msgstr "journal des modifications" -#: ishtar_common/data_importer.py:279 +#: ishtar_common/data_importer.py:277 #, 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:298 +#: ishtar_common/data_importer.py:296 #, 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:310 +#: ishtar_common/data_importer.py:308 #, python-format msgid "\"%(value)s\" is not a float" msgstr "\"%(value)s\" n'est pas un nombre à virgule" -#: ishtar_common/data_importer.py:320 +#: ishtar_common/data_importer.py:318 #, 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:377 ishtar_common/data_importer.py:391 -#: ishtar_common/data_importer.py:615 +#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:613 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "\"%(value)s\" n'est pas une date valide" -#: ishtar_common/data_importer.py:404 +#: 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:473 +#: ishtar_common/data_importer.py:471 #, 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:480 +#: 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:482 +#: 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:644 +#: ishtar_common/data_importer.py:642 #, 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:753 +#: ishtar_common/data_importer.py:752 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 " @@ -8342,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:759 +#: ishtar_common/data_importer.py:758 #, 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:761 ishtar_common/views.py:1702 +#: ishtar_common/data_importer.py:760 ishtar_common/views.py:1818 msgid "No data provided" msgstr "Aucune donnée fournie" -#: ishtar_common/data_importer.py:762 +#: ishtar_common/data_importer.py:761 msgid "Value is required" msgstr "Valeur requise" -#: ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:762 #, python-format msgid "At least %d columns must be filled" msgstr "Au moins %d colonnes doivent être remplies" -#: ishtar_common/data_importer.py:764 +#: ishtar_common/data_importer.py:763 msgid "The regexp doesn't match." msgstr "L'expression régulière ne fonctionne pas." -#: ishtar_common/data_importer.py:766 +#: ishtar_common/data_importer.py:765 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." @@ -8372,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:770 +#: ishtar_common/data_importer.py:769 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." @@ -8380,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:774 +#: ishtar_common/data_importer.py:773 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:1361 ishtar_common/views.py:1780 -#: ishtar_common/views.py:1790 +#: ishtar_common/data_importer.py:1391 ishtar_common/views.py:1896 +#: ishtar_common/views.py:1906 msgid "Not imported" msgstr "Non importé" -#: ishtar_common/data_importer.py:1655 +#: ishtar_common/data_importer.py:1681 msgid "Importer configuration error: \"{}\"." msgstr "Erreur de configuration de l'importeur : \"{}\"." -#: ishtar_common/data_importer.py:1660 +#: ishtar_common/data_importer.py:1686 msgid "Import error: {} - \"{}\"." msgstr "Erreur d'import : {} - \"{}\"." -#: ishtar_common/data_importer.py:1742 +#: ishtar_common/data_importer.py:1770 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:1869 +#: ishtar_common/data_importer.py:1901 msgid "* created *" msgstr "* créé *" -#: ishtar_common/data_importer.py:1944 +#: ishtar_common/data_importer.py:1971 msgid "* match not find *" msgstr "* correspondance non trouvée *" -#: ishtar_common/data_importer.py:1952 +#: ishtar_common/data_importer.py:1979 msgid "* the query match more than 10 results*" msgstr "* la requête correspond à plus de 10 résultats *" -#: ishtar_common/data_importer.py:1957 +#: ishtar_common/data_importer.py:1984 msgid " or " msgstr " ou " -#: ishtar_common/data_importer.py:2043 +#: ishtar_common/data_importer.py:2072 msgid "unicity key(s) \"{}\" is/are missing" msgstr "clé(s) d'unicité \"{}\" manquante(s)" -#: ishtar_common/data_importer.py:2046 +#: ishtar_common/data_importer.py:2075 msgid "Import error {}, {}" msgstr "Erreur d'import {}, {}" -#: ishtar_common/data_importer.py:2126 +#: ishtar_common/data_importer.py:2158 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "Erreur d'import {}, chemin \"{}\", contexte : {}, erreur : {}" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "line" msgstr "ligne" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "col" msgstr "colonne" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "error" msgstr "erreur" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "field" msgstr "champ" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "source" msgstr "source" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "result" msgstr "résultat" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2210 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -8471,8 +8670,8 @@ msgstr "Entrez un nom correct composé de lettres, espaces et tirets." msgid "File too large. Size should not exceed {} Mo." msgstr "Fichier trop gros. La taille ne doit pas excéder {} Mo." -#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1337 -#: ishtar_common/views.py:2671 +#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1514 +#: ishtar_common/views.py:2934 msgid "Confirm" msgstr "Confirmer" @@ -8480,99 +8679,99 @@ msgstr "Confirmer" msgid "Are you sure you want to delete?" msgstr "Êtes-vous sûr de vouloir supprimer ?" -#: ishtar_common/forms.py:437 ishtar_common/forms.py:1027 +#: ishtar_common/forms.py:447 ishtar_common/forms.py:1047 msgid "You should select an item." msgstr "Vous devez sélectionner un élément." -#: ishtar_common/forms.py:445 +#: ishtar_common/forms.py:455 msgid "Invalid selection." msgstr "Sélection invalide." -#: ishtar_common/forms.py:526 +#: ishtar_common/forms.py:536 msgid "There are identical items." msgstr "Il y a des éléments identiques." -#: ishtar_common/forms.py:938 +#: ishtar_common/forms.py:958 msgid "Created before" msgstr "Créée avant" -#: ishtar_common/forms.py:941 +#: ishtar_common/forms.py:961 msgid "Created after" msgstr "Créée après" -#: ishtar_common/forms.py:944 man_app/templates/ishtar/sheet_basefind.html:74 +#: ishtar_common/forms.py:964 man_app/templates/ishtar/sheet_basefind.html:74 msgid "Last modified by" msgstr "Modifiée en dernier par" -#: ishtar_common/forms.py:951 +#: ishtar_common/forms.py:971 msgid "Modified before" msgstr "Modifiée avant" -#: ishtar_common/forms.py:954 +#: ishtar_common/forms.py:974 msgid "Modified after" msgstr "Modifiée après" -#: ishtar_common/forms.py:956 +#: ishtar_common/forms.py:976 msgid "Is locked?" msgstr "Est verrouillée ?" -#: ishtar_common/forms.py:984 ishtar_common/forms_common.py:2175 +#: ishtar_common/forms.py:1004 ishtar_common/forms_common.py:2352 msgid "Has an image?" msgstr "A une image ?" -#: ishtar_common/forms.py:986 +#: ishtar_common/forms.py:1006 msgid "Has an attached file?" msgstr "A un fichier rattaché ?" -#: ishtar_common/forms.py:989 +#: ishtar_common/forms.py:1009 msgid "Has a web address?" msgstr "A une adresse web ?" -#: ishtar_common/forms.py:1029 +#: ishtar_common/forms.py:1049 msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1237 msgid " - append to existing" msgstr " - ajouter à l'existant" -#: ishtar_common/forms.py:1219 +#: ishtar_common/forms.py:1240 msgid " - replace" msgstr " - remplacer" -#: ishtar_common/forms.py:1249 +#: ishtar_common/forms.py:1270 msgid "Set to null" msgstr "Mettre à la valeur null" -#: ishtar_common/forms.py:1311 +#: ishtar_common/forms.py:1332 msgid "Geo - Name" msgstr "Géo - Nom" -#: ishtar_common/forms.py:1312 +#: ishtar_common/forms.py:1333 msgid "Geo - Data type" msgstr "Géo - Type de données" -#: ishtar_common/forms.py:1313 +#: ishtar_common/forms.py:1334 msgid "Geo - Origin" msgstr "Géo - Type d'origine" -#: ishtar_common/forms.py:1314 +#: ishtar_common/forms.py:1335 msgid "Geo - Provider" msgstr "Géo - Fournisseur" -#: ishtar_common/forms.py:1315 +#: ishtar_common/forms.py:1336 msgid "Geo - Z - higher than" msgstr "Géo - Z - plus grand que" -#: ishtar_common/forms.py:1316 +#: ishtar_common/forms.py:1337 msgid "Geo - Z - lower than" msgstr "Géo - Z - plus petit que" -#: ishtar_common/forms.py:1317 +#: ishtar_common/forms.py:1338 msgid "Geo - Comment" msgstr "Géo - Commentaire" -#: ishtar_common/forms_common.py:90 +#: ishtar_common/forms_common.py:94 msgid "" "<p>Type name, department code of the town you would like to select. The " "search is insensitive to case.</p>\n" @@ -8589,37 +8788,50 @@ msgstr "" "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" -#: ishtar_common/forms_common.py:148 +#: ishtar_common/forms_common.py:152 msgid "Password" msgstr "Mot de passe" -#: ishtar_common/forms_common.py:157 ishtar_common/forms_common.py:1220 -#: ishtar_common/forms_common.py:1235 ishtar_common/wizards.py:2003 +#: ishtar_common/forms_common.py:162 ishtar_common/forms_common.py:1398 +#: ishtar_common/forms_common.py:1417 ishtar_common/wizards.py:2003 msgid "New password" msgstr "Nouveau mot de passe" -#: ishtar_common/forms_common.py:164 +#: ishtar_common/forms_common.py:170 msgid "New password confirmation" msgstr "Confirmation de nouveau mot de passe" -#: ishtar_common/forms_common.py:173 +#: ishtar_common/forms_common.py:180 msgid "Old password" msgstr "Ancien mot de passe" -#: ishtar_common/forms_common.py:211 ishtar_common/forms_common.py:306 +#: ishtar_common/forms_common.py:218 msgid "Associated images (web link to a zip file)" msgstr "Images associées (lien web vers un fichier zip)" -#: ishtar_common/forms_common.py:233 ishtar_common/forms_common.py:324 +#: ishtar_common/forms_common.py:240 ishtar_common/forms_common.py:370 msgid "Import (table)" msgstr "Import (table)" -#: ishtar_common/forms_common.py:285 +#: ishtar_common/forms_common.py:241 ishtar_common/forms_common.py:371 +#: ishtar_common/forms_common.py:455 ishtar_common/forms_common.py:522 +msgid "CSV options" +msgstr "Options CSV" + +#: ishtar_common/forms_common.py:297 +msgid "Bad format. Extension of the file must be {}." +msgstr "Mauvais format. L'extension du fichier doit être {}." + +#: ishtar_common/forms_common.py:299 +msgid "Bad format. Extension of the file must be: {} or {}." +msgstr "Mauvais format. L'extension du fichier doit être : {} ou {}." + +#: ishtar_common/forms_common.py:320 msgid "This is not a valid CSV file. Check file format and encoding." msgstr "" "Cela n’est pas un CSV valide. Vérifiez le format de fichier et le codage." -#: ishtar_common/forms_common.py:297 +#: ishtar_common/forms_common.py:332 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." @@ -8627,36 +8839,48 @@ msgstr "" "Cet import n'a pas de clé d'unicité paramétrée. L'import conservateur n'est " "pas possible." -#: ishtar_common/forms_common.py:332 +#: ishtar_common/forms_common.py:352 +msgid "Associated documents (web link to a zip file)" +msgstr "Documents associés (lien web vers un fichier zip)" + +#: ishtar_common/forms_common.py:372 ishtar_common/forms_common.py:523 +msgid "Documents/Images" +msgstr "Documents/Images" + +#: ishtar_common/forms_common.py:384 msgid "You put either a file or a download link for images but not both." msgstr "" "Vous devez soit déposer un fichier soit renseigner un lien pour les images " "mais pas les deux." -#: ishtar_common/forms_common.py:343 ishtar_common/tests.py:2591 +#: ishtar_common/forms_common.py:395 ishtar_common/tests.py:2884 msgid "\"Associated images\" field must be a valid zip file." msgstr "Le champ « images associées » doit être un fichier zip valide." -#: ishtar_common/forms_common.py:356 +#: ishtar_common/forms_common.py:417 msgid "Invalid link or no file is available for this link." msgstr "Lien invalide ou aucun fichier n'est disponible sur ce lien." -#: ishtar_common/forms_common.py:399 +#: ishtar_common/forms_common.py:454 msgid "Import (GIS)" msgstr "Import (GIS)" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:484 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" "Le fichier SIG doit être un fichier zip contenant un Shapefile ou un fichier " "Geopackage." -#: ishtar_common/forms_common.py:450 +#: ishtar_common/forms_common.py:521 +msgid "Import (group)" +msgstr "Import (groupe)" + +#: ishtar_common/forms_common.py:551 ishtar_common/models_imports.py:538 msgid "Target" msgstr "Cible" -#: ishtar_common/forms_common.py:451 ishtar_common/models.py:1832 -#: ishtar_common/models_imports.py:852 +#: ishtar_common/forms_common.py:552 ishtar_common/models.py:1842 +#: ishtar_common/models_imports.py:971 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8664,207 +8888,207 @@ msgstr "Cible" msgid "Value" msgstr "Valeur" -#: ishtar_common/forms_common.py:452 +#: ishtar_common/forms_common.py:553 msgid "Remember" msgstr "Enregistrer" -#: ishtar_common/forms_common.py:477 +#: ishtar_common/forms_common.py:579 msgid "Set to NULL" msgstr "Mettre à la valeur NULL" -#: ishtar_common/forms_common.py:484 +#: ishtar_common/forms_common.py:586 msgid "this import only" msgstr "cet import seulement" -#: ishtar_common/forms_common.py:485 +#: ishtar_common/forms_common.py:587 msgid "me" msgstr "moi" -#: ishtar_common/forms_common.py:498 +#: ishtar_common/forms_common.py:600 msgid "the current group: {}" msgstr "le groupe actuel {}" -#: ishtar_common/forms_common.py:504 +#: ishtar_common/forms_common.py:606 msgid "all users" msgstr "tous les utilisateurs" -#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:698 -#: ishtar_common/models.py:2514 ishtar_common/models_imports.py:929 -#: ishtar_common/models_imports.py:930 +#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:876 +#: ishtar_common/models.py:2524 ishtar_common/models_imports.py:1048 +#: ishtar_common/models_imports.py:1049 msgid "Organization type" msgstr "Type d'organisation" -#: ishtar_common/forms_common.py:587 ishtar_common/forms_common.py:2140 -#: ishtar_common/models.py:2592 +#: ishtar_common/forms_common.py:763 ishtar_common/forms_common.py:2317 +#: ishtar_common/models.py:2602 msgid "Web address" msgstr "Adresse web" -#: ishtar_common/forms_common.py:589 ishtar_common/forms_common.py:701 -#: ishtar_common/models.py:2490 ishtar_common/models.py:2507 -#: ishtar_common/models.py:2594 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:879 +#: ishtar_common/models.py:2500 ishtar_common/models.py:2517 +#: ishtar_common/models.py:2604 msgid "Grammatical gender" msgstr "Genre grammatical" -#: ishtar_common/forms_common.py:592 ishtar_common/forms_common.py:704 +#: ishtar_common/forms_common.py:768 ishtar_common/forms_common.py:882 msgid "Can be used by templates" msgstr "Peut être utilisé par les patrons" -#: ishtar_common/forms_common.py:602 ishtar_common/forms_common.py:826 -#: ishtar_common/forms_common.py:955 ishtar_common/forms_common.py:1050 -#: ishtar_common/forms_common.py:1217 ishtar_common/models_common.py:3809 -#: ishtar_common/models_common.py:3977 ishtar_common/wizards.py:1968 +#: ishtar_common/forms_common.py:778 ishtar_common/forms_common.py:1004 +#: ishtar_common/forms_common.py:1133 ishtar_common/forms_common.py:1228 +#: ishtar_common/forms_common.py:1395 ishtar_common/models_common.py:3617 +#: ishtar_common/models_common.py:3785 ishtar_common/wizards.py:1968 msgid "Email" msgstr "Courriel" -#: ishtar_common/forms_common.py:655 ishtar_common/forms_common.py:671 +#: ishtar_common/forms_common.py:833 ishtar_common/forms_common.py:849 #: ishtar_common/views.py:335 msgid "Organization search" msgstr "Rechercher une organisation" -#: ishtar_common/forms_common.py:688 +#: ishtar_common/forms_common.py:866 msgid "Organization - Quick action - Modify" msgstr "Organisation - Action rapide - Modification" -#: ishtar_common/forms_common.py:741 +#: ishtar_common/forms_common.py:919 msgid "Merge all items into" msgstr "Fusionner tous les éléments dans" -#: ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:957 msgid "Organization to merge" msgstr "Organisation à fusionner" -#: ishtar_common/forms_common.py:823 ishtar_common/forms_common.py:951 -#: ishtar_common/forms_common.py:1049 ishtar_common/models.py:2879 +#: ishtar_common/forms_common.py:1001 ishtar_common/forms_common.py:1129 +#: ishtar_common/forms_common.py:1227 ishtar_common/models.py:2889 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "Prénom" -#: ishtar_common/forms_common.py:824 ishtar_common/forms_common.py:889 -#: ishtar_common/forms_common.py:948 ishtar_common/forms_common.py:1722 -#: ishtar_common/forms_common.py:2132 ishtar_common/forms_common.py:2364 -#: ishtar_common/models.py:2866 ishtar_common/models.py:2870 -#: ishtar_common/models.py:4240 ishtar_common/models_imports.py:932 +#: ishtar_common/forms_common.py:1002 ishtar_common/forms_common.py:1067 +#: ishtar_common/forms_common.py:1126 ishtar_common/forms_common.py:1899 +#: ishtar_common/forms_common.py:2309 ishtar_common/forms_common.py:2540 +#: ishtar_common/models.py:2876 ishtar_common/models.py:2880 +#: ishtar_common/models.py:4254 ishtar_common/models_imports.py:1051 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "Titre" -#: ishtar_common/forms_common.py:825 ishtar_common/forms_common.py:949 -#: ishtar_common/models.py:2876 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1127 +#: ishtar_common/models.py:2886 #: ishtar_common/templates/ishtar/merge_person.html:12 #: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "Formule d'appel" -#: ishtar_common/forms_common.py:844 ishtar_common/forms_common.py:860 -#: ishtar_common/forms_common.py:1025 ishtar_common/views.py:276 +#: ishtar_common/forms_common.py:1022 ishtar_common/forms_common.py:1038 +#: ishtar_common/forms_common.py:1203 ishtar_common/views.py:276 msgid "Person search" msgstr "Rechercher une personne" -#: ishtar_common/forms_common.py:878 +#: ishtar_common/forms_common.py:1056 msgid "Person - Quick action - Modify" msgstr "Personne - Action rapide - Modification" -#: ishtar_common/forms_common.py:900 ishtar_common/models.py:2671 +#: ishtar_common/forms_common.py:1078 ishtar_common/models.py:2681 msgid "Person types" msgstr "Types de personne" -#: ishtar_common/forms_common.py:918 +#: ishtar_common/forms_common.py:1096 msgid "Person to merge" msgstr "Personne à fusionner" -#: ishtar_common/forms_common.py:940 +#: ishtar_common/forms_common.py:1118 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "Identité" -#: ishtar_common/forms_common.py:954 ishtar_common/models.py:2889 +#: ishtar_common/forms_common.py:1132 ishtar_common/models.py:2899 #: ishtar_common/templates/ishtar/merge_person.html:9 #: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:957 ishtar_common/models_common.py:3793 +#: ishtar_common/forms_common.py:1135 ishtar_common/models_common.py:3601 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:961 ishtar_common/models_common.py:3796 -#: ishtar_common/models_common.py:3799 +#: ishtar_common/forms_common.py:1139 ishtar_common/models_common.py:3604 +#: ishtar_common/models_common.py:3607 msgid "Phone description 2" msgstr "Type de téléphone 2" -#: ishtar_common/forms_common.py:963 +#: ishtar_common/forms_common.py:1141 msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:965 ishtar_common/models_common.py:3803 +#: ishtar_common/forms_common.py:1143 ishtar_common/models_common.py:3611 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:967 ishtar_common/models_common.py:3801 +#: ishtar_common/forms_common.py:1145 ishtar_common/models_common.py:3609 msgid "Phone 3" msgstr "Téléphone 3" -#: ishtar_common/forms_common.py:972 +#: ishtar_common/forms_common.py:1150 msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:990 ishtar_common/models_common.py:3778 +#: ishtar_common/forms_common.py:1168 ishtar_common/models_common.py:3586 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:993 ishtar_common/models_common.py:3780 +#: ishtar_common/forms_common.py:1171 ishtar_common/models_common.py:3588 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:998 ishtar_common/models_common.py:3783 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3591 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:1001 ishtar_common/models_common.py:3786 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3594 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:1004 ishtar_common/models_common.py:3789 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:3597 msgid "Other address: country" msgstr "Autre adresse : pays" -#: ishtar_common/forms_common.py:1016 +#: ishtar_common/forms_common.py:1194 msgid "Already has an account" msgstr "A déjà un compte" -#: ishtar_common/forms_common.py:1017 ishtar_common/forms_common.py:1355 -#: ishtar_common/models.py:3197 ishtar_common/models.py:3218 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/forms_common.py:1195 ishtar_common/forms_common.py:1532 +#: ishtar_common/models.py:3207 ishtar_common/models.py:3228 +#: ishtar_common/models_imports.py:1056 msgid "Profile type" msgstr "Type de profil" -#: ishtar_common/forms_common.py:1047 ishtar_common/models.py:3398 +#: ishtar_common/forms_common.py:1225 ishtar_common/models.py:3408 #: ishtar_common/wizards.py:1967 msgid "Username" msgstr "Nom d'utilisateur" -#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1247 ishtar_common/forms_common.py:1260 msgid "Account search" msgstr "Rechercher un compte" -#: ishtar_common/forms_common.py:1144 ishtar_common/forms_common.py:1192 -#: ishtar_common/forms_common.py:1196 ishtar_common/models.py:2670 -#: ishtar_common/models_imports.py:931 +#: ishtar_common/forms_common.py:1322 ishtar_common/forms_common.py:1370 +#: ishtar_common/forms_common.py:1374 ishtar_common/models.py:2680 +#: ishtar_common/models_imports.py:1050 msgid "Person type" msgstr "Type de personne" -#: ishtar_common/forms_common.py:1211 ishtar_common/forms_common.py:1215 +#: ishtar_common/forms_common.py:1389 ishtar_common/forms_common.py:1393 #: ishtar_common/ishtar_menu.py:80 msgid "Account" msgstr "Compte" -#: ishtar_common/forms_common.py:1227 +#: ishtar_common/forms_common.py:1407 msgid "New password (confirmation)" msgstr "Nouveau mot de passe (confirmation)" -#: ishtar_common/forms_common.py:1237 +#: ishtar_common/forms_common.py:1419 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." @@ -8873,169 +9097,172 @@ msgstr "" "le mot de passe. À la création, si vous laissez ces champs vides, " "l'utilisateur ne sera pas à même de se connecter." -#: ishtar_common/forms_common.py:1275 +#: ishtar_common/forms_common.py:1457 msgid "Your password and confirmation password do not match." msgstr "La vérification du mot de passe a échoué." -#: ishtar_common/forms_common.py:1281 +#: ishtar_common/forms_common.py:1463 msgid "You must provide a correct password." msgstr "Vous devez fournir un mot de passe correct." -#: ishtar_common/forms_common.py:1290 +#: ishtar_common/forms_common.py:1470 msgid "This username already exists." msgstr "Ce nom d'utilisateur existe déjà." -#: ishtar_common/forms_common.py:1322 +#: ishtar_common/forms_common.py:1499 msgid "Choose different name for profiles." msgstr "Choisissez un nom différent pour les profils." -#: ishtar_common/forms_common.py:1339 +#: ishtar_common/forms_common.py:1516 msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: ishtar_common/forms_common.py:1352 ishtar_common/models.py:3226 -#: ishtar_common/views.py:1344 +#: ishtar_common/forms_common.py:1529 ishtar_common/models.py:3236 +#: ishtar_common/views.py:1345 msgid "Current profile" msgstr "Profil actuel" -#: ishtar_common/forms_common.py:1358 +#: ishtar_common/forms_common.py:1535 msgid "Pin automatically items on creation and modification" msgstr "" "Épingler automatiquement les éléments à la création et à la modification" -#: ishtar_common/forms_common.py:1363 +#: ishtar_common/forms_common.py:1540 msgid "Duplicate this profile" msgstr "Dupliquer ce profil" -#: ishtar_common/forms_common.py:1366 +#: ishtar_common/forms_common.py:1543 msgid "Delete this profile" msgstr "Supprimer ce profil" -#: ishtar_common/forms_common.py:1403 ishtar_common/forms_common.py:1411 +#: ishtar_common/forms_common.py:1580 ishtar_common/forms_common.py:1588 msgid "External source - {}" msgstr "Source externe - {}" -#: ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1637 msgid "A profile with the same name exists." msgstr "Un profil avec un nom identique existe." -#: ishtar_common/forms_common.py:1493 +#: ishtar_common/forms_common.py:1670 msgid " (duplicate)" msgstr " (copie)" -#: ishtar_common/forms_common.py:1522 +#: ishtar_common/forms_common.py:1699 msgid "There are identical towns." msgstr "Il y a des communes identiques." -#: ishtar_common/forms_common.py:1609 +#: ishtar_common/forms_common.py:1786 msgid "Only one choice can be checked." msgstr "Seul un choix peut être coché." -#: ishtar_common/forms_common.py:1659 +#: ishtar_common/forms_common.py:1836 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" "Les images trop grandes sont retaillées en : %(width)dx%(height)d (le ratio " "est conservé)." -#: ishtar_common/forms_common.py:1684 +#: ishtar_common/forms_common.py:1861 msgid "This value already exist" msgstr "Cette valeur existe déjà" -#: ishtar_common/forms_common.py:1700 ishtar_common/models.py:3836 -#: ishtar_common/models_imports.py:940 +#: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3850 +#: ishtar_common/models_imports.py:1059 msgid "Document tag" msgstr "Mot-clé du document" -#: ishtar_common/forms_common.py:1709 +#: ishtar_common/forms_common.py:1886 msgid "Document - General" msgstr "Document - Général" -#: ishtar_common/forms_common.py:1730 ishtar_common/forms_common.py:2138 -#: ishtar_common/forms_common.py:2344 ishtar_common/models.py:4306 +#: ishtar_common/forms_common.py:1907 ishtar_common/forms_common.py:2315 +#: ishtar_common/forms_common.py:2520 ishtar_common/models.py:4320 msgid "Medium" msgstr "Support" -#: ishtar_common/forms_common.py:1733 ishtar_common/forms_common.py:1922 -#: ishtar_common/forms_common.py:2137 ishtar_common/forms_common.py:2343 -#: ishtar_common/models.py:4313 ishtar_common/models_imports.py:936 -#: ishtar_common/models_imports.py:938 +#: ishtar_common/forms_common.py:1910 ishtar_common/forms_common.py:2099 +#: ishtar_common/forms_common.py:2314 ishtar_common/forms_common.py:2519 +#: ishtar_common/models.py:4327 ishtar_common/models_imports.py:1055 +#: ishtar_common/models_imports.py:1057 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "Format" -#: ishtar_common/forms_common.py:1735 ishtar_common/forms_common.py:2139 -#: ishtar_common/forms_common.py:2345 ishtar_common/models.py:4318 +#: ishtar_common/forms_common.py:1912 ishtar_common/forms_common.py:2316 +#: ishtar_common/forms_common.py:2521 ishtar_common/models.py:4332 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "Échelle" -#: ishtar_common/forms_common.py:1753 ishtar_common/forms_common.py:1924 -#: ishtar_common/forms_common.py:2571 ishtar_common/forms_common.py:2572 -#: ishtar_common/models.py:3697 ishtar_common/models.py:3963 -#: ishtar_common/models.py:4320 +#: ishtar_common/forms_common.py:1930 ishtar_common/forms_common.py:2101 +#: ishtar_common/forms_common.py:2747 ishtar_common/forms_common.py:2748 +#: ishtar_common/models.py:3711 ishtar_common/models.py:3977 +#: ishtar_common/models.py:4334 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "Auteurs" -#: ishtar_common/forms_common.py:1759 ishtar_common/forms_common.py:2143 -#: ishtar_common/models.py:4262 +#: ishtar_common/forms_common.py:1936 ishtar_common/forms_common.py:2320 +#: ishtar_common/models.py:4276 msgid "Publisher" msgstr "Éditions" -#: ishtar_common/forms_common.py:1783 ishtar_common/forms_common.py:2165 -#: ishtar_common/models.py:4269 +#: ishtar_common/forms_common.py:1960 ishtar_common/forms_common.py:2342 +#: ishtar_common/models.py:4283 msgid "Year of publication" msgstr "Année de publication" -#: ishtar_common/forms_common.py:1788 +#: ishtar_common/forms_common.py:1965 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "Licences" -#: ishtar_common/forms_common.py:1791 ishtar_common/forms_common.py:2346 -#: ishtar_common/models.py:4274 +#: ishtar_common/forms_common.py:1968 ishtar_common/forms_common.py:2522 +#: ishtar_common/models.py:4288 msgid "Tags" msgstr "Mots-clés" -#: ishtar_common/forms_common.py:1797 ishtar_common/forms_common.py:2166 -#: ishtar_common/models.py:982 ishtar_common/models.py:4277 -#: ishtar_common/models_imports.py:941 overload_translation/models.py:11 +#: ishtar_common/forms_common.py:1974 ishtar_common/forms_common.py:2343 +#: ishtar_common/models.py:993 ishtar_common/models.py:4291 +#: ishtar_common/models_imports.py:1060 overload_translation/models.py:11 msgid "Language" msgstr "Langue" -#: ishtar_common/forms_common.py:1800 ishtar_common/forms_common.py:2168 -#: ishtar_common/models.py:4282 +#: ishtar_common/forms_common.py:1977 ishtar_common/forms_common.py:2345 +#: ishtar_common/models.py:4296 msgid "ISSN" msgstr "ISSN" -#: ishtar_common/forms_common.py:1806 ishtar_common/forms_common.py:2167 -#: ishtar_common/models.py:4283 +#: ishtar_common/forms_common.py:1983 ishtar_common/forms_common.py:2344 +#: ishtar_common/models.py:4297 msgid "ISBN" msgstr "ISBN" -#: ishtar_common/forms_common.py:1812 ishtar_common/forms_common.py:1927 -#: ishtar_common/forms_common.py:2177 ishtar_common/models.py:4286 -#: ishtar_common/models.py:5354 +#: ishtar_common/forms_common.py:1989 ishtar_common/forms_common.py:2104 +#: ishtar_common/forms_common.py:2354 ishtar_common/models.py:4300 +#: ishtar_common/models.py:5368 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 +#: ishtar_common/templates/ishtar/import_table.html:2 #: ishtar_common/templates/ishtar/sheet_document.html:93 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:2 +#: ishtar_common/views.py:2239 msgid "Source" msgstr "Source" -#: ishtar_common/forms_common.py:1815 ishtar_common/forms_common.py:2183 -#: ishtar_common/models.py:4293 +#: ishtar_common/forms_common.py:1992 ishtar_common/forms_common.py:2360 +#: ishtar_common/models.py:4307 msgid "Source - free input" msgstr "Source - saisie libre" -#: ishtar_common/forms_common.py:1820 ishtar_common/models.py:4299 +#: ishtar_common/forms_common.py:1997 ishtar_common/models.py:4313 msgid "Source - page range" msgstr "Source - intervalle de pages" -#: ishtar_common/forms_common.py:1824 +#: ishtar_common/forms_common.py:2001 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " @@ -9045,61 +9272,61 @@ msgstr "" "\"242;245;249\", pages et intervalles de pages multiples : " "\"242-245;249;262-265\"." -#: ishtar_common/forms_common.py:1830 ishtar_common/models.py:4330 +#: ishtar_common/forms_common.py:2007 ishtar_common/models.py:4344 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: ishtar_common/forms_common.py:1833 +#: ishtar_common/forms_common.py:2010 msgid "Image" msgstr "Image" -#: ishtar_common/forms_common.py:1841 +#: ishtar_common/forms_common.py:2018 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "Fichier" -#: ishtar_common/forms_common.py:1858 ishtar_common/models.py:4333 +#: ishtar_common/forms_common.py:2035 ishtar_common/models.py:4347 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "Date de réception" -#: ishtar_common/forms_common.py:1864 ishtar_common/models.py:4339 +#: ishtar_common/forms_common.py:2041 ishtar_common/models.py:4353 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: ishtar_common/forms_common.py:1871 ishtar_common/models.py:4353 +#: ishtar_common/forms_common.py:2048 ishtar_common/models.py:4367 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "Information supplémentaire" -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2173 -#: ishtar_common/models.py:4355 +#: ishtar_common/forms_common.py:2050 ishtar_common/forms_common.py:2350 +#: ishtar_common/models.py:4369 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "Existe en doublon" -#: ishtar_common/forms_common.py:1920 ishtar_common/forms_common.py:2743 +#: ishtar_common/forms_common.py:2097 ishtar_common/forms_common.py:2933 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "Éléments reliés" -#: ishtar_common/forms_common.py:1926 +#: ishtar_common/forms_common.py:2103 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "Éditions" -#: ishtar_common/forms_common.py:1929 +#: ishtar_common/forms_common.py:2106 msgid "Advanced" msgstr "Avancé" -#: ishtar_common/forms_common.py:1976 +#: ishtar_common/forms_common.py:2153 msgid "Incorrect page range." msgstr "Intervalle de pages incorrect." -#: ishtar_common/forms_common.py:2063 +#: ishtar_common/forms_common.py:2240 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." @@ -9108,162 +9335,162 @@ msgstr "" "fichier. Si vous avez fourni une image, vérifiez que celle-ci n'est pas " "corrompue." -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2249 msgid "A document has to be attached at least to one item" msgstr "Un document doit être rattaché à au moins un élément" -#: ishtar_common/forms_common.py:2115 +#: ishtar_common/forms_common.py:2292 msgid "Document - 001 - Search" msgstr "Document - 001 - Recherche" -#: ishtar_common/forms_common.py:2128 ishtar_common/forms_common.py:2338 -#: ishtar_common/forms_common.py:2507 ishtar_common/forms_common.py:2558 -#: ishtar_common/models.py:3696 +#: ishtar_common/forms_common.py:2305 ishtar_common/forms_common.py:2514 +#: ishtar_common/forms_common.py:2683 ishtar_common/forms_common.py:2734 +#: ishtar_common/models.py:3710 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "Auteur" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2318 msgid "Tag" msgstr "Mot-clé" -#: ishtar_common/forms_common.py:2169 ishtar_common/models.py:4272 +#: ishtar_common/forms_common.py:2346 ishtar_common/models.py:4286 msgid "License" msgstr "Licence" -#: ishtar_common/forms_common.py:2172 +#: ishtar_common/forms_common.py:2349 msgid "Additional informations" msgstr "Informations supplémentaires" -#: ishtar_common/forms_common.py:2174 +#: ishtar_common/forms_common.py:2351 msgid "Has a file?" msgstr "A un fichier ?" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2362 msgid "Warehouse - Container" msgstr "Lieu de conservation - Contenant" -#: ishtar_common/forms_common.py:2193 +#: ishtar_common/forms_common.py:2370 msgid "Warehouse - Reference container" msgstr "Lieu de conservation - Contenant de référence" -#: ishtar_common/forms_common.py:2210 +#: ishtar_common/forms_common.py:2387 msgid "Operation - type" msgstr "Opération - type" -#: ishtar_common/forms_common.py:2223 +#: ishtar_common/forms_common.py:2399 msgid "Basket - Finds" msgstr "Panier - mobilier" -#: ishtar_common/forms_common.py:2238 +#: ishtar_common/forms_common.py:2414 msgid "Find - denomination" msgstr "Mobilier - dénomination" -#: ishtar_common/forms_common.py:2250 ishtar_common/forms_common.py:2262 +#: ishtar_common/forms_common.py:2426 ishtar_common/forms_common.py:2438 msgid "Receipt date before" msgstr "Date de réception avant" -#: ishtar_common/forms_common.py:2253 ishtar_common/forms_common.py:2265 +#: ishtar_common/forms_common.py:2429 ishtar_common/forms_common.py:2441 msgid "Receipt date after" msgstr "Date de réception après" -#: ishtar_common/forms_common.py:2256 +#: ishtar_common/forms_common.py:2432 msgid "Creation date before" msgstr "Date de création avant" -#: ishtar_common/forms_common.py:2259 +#: ishtar_common/forms_common.py:2435 msgid "Creation date after" msgstr "Date de création après" -#: ishtar_common/forms_common.py:2288 ishtar_common/forms_common.py:2303 +#: ishtar_common/forms_common.py:2464 ishtar_common/forms_common.py:2479 msgid "Document search" msgstr "Recherche document" -#: ishtar_common/forms_common.py:2322 +#: ishtar_common/forms_common.py:2498 msgid "Document - Quick action - Modify" msgstr "Document - Action rapide - Modification" -#: ishtar_common/forms_common.py:2336 ishtar_common/models_imports.py:933 -#: ishtar_common/models_imports.py:934 +#: ishtar_common/forms_common.py:2512 ishtar_common/models_imports.py:1052 +#: ishtar_common/models_imports.py:1053 msgid "Source type" msgstr "Type de document" -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2543 msgid "Edit duplicated item" msgstr "Éditer l'élément dupliqué" -#: ishtar_common/forms_common.py:2441 +#: ishtar_common/forms_common.py:2617 msgid "current and reference containers" msgstr "le contenant actuel et le contenant de référence" -#: ishtar_common/forms_common.py:2480 -#: ishtar_common/templates/ishtar/import_table.html:33 +#: ishtar_common/forms_common.py:2656 +#: ishtar_common/templates/ishtar/import_table.html:58 msgid "Action" msgstr "Action" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Lock" msgstr "Verrouiller" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Unlock" msgstr "Déverrouiller" -#: ishtar_common/forms_common.py:2498 +#: ishtar_common/forms_common.py:2674 msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: ishtar_common/forms_common.py:2518 ishtar_common/models.py:3666 -#: ishtar_common/models.py:3688 ishtar_common/models_imports.py:935 +#: ishtar_common/forms_common.py:2694 ishtar_common/models.py:3680 +#: ishtar_common/models.py:3702 ishtar_common/models_imports.py:1054 msgid "Author type" msgstr "Type d'auteur" -#: ishtar_common/forms_common.py:2535 +#: ishtar_common/forms_common.py:2711 msgid "This author already exist." msgstr "Cet auteur existe déjà." -#: ishtar_common/forms_common.py:2547 +#: ishtar_common/forms_common.py:2723 msgid "Author selection" msgstr "Sélection d'auteur" -#: ishtar_common/forms_common.py:2565 +#: ishtar_common/forms_common.py:2741 msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: ishtar_common/forms_common.py:2578 ishtar_common/forms_common.py:2643 -#: ishtar_common/models.py:960 +#: ishtar_common/forms_common.py:2754 ishtar_common/forms_common.py:2819 +#: ishtar_common/models.py:971 msgid "Query" msgstr "Requête" -#: ishtar_common/forms_common.py:2582 ishtar_common/models.py:967 +#: ishtar_common/forms_common.py:2758 ishtar_common/models.py:978 msgid "Is an alert" msgstr "Est une alerte" -#: ishtar_common/forms_common.py:2604 +#: ishtar_common/forms_common.py:2780 msgid "A label is required for a new search query." msgstr "Un libellé est nécessaire pour une nouvelle requête de recherche." -#: ishtar_common/forms_common.py:2608 +#: ishtar_common/forms_common.py:2784 msgid "Select the search query to update" msgstr "Sélectionner la requête de recherche à mettre à jour" -#: ishtar_common/forms_common.py:2615 ishtar_common/forms_common.py:2636 +#: ishtar_common/forms_common.py:2791 ishtar_common/forms_common.py:2812 msgid "Query does not exist." msgstr "Cette requête n'existe pas." -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2847 msgid "Geo item" msgstr "Élément géographique" -#: ishtar_common/forms_common.py:2672 +#: ishtar_common/forms_common.py:2848 msgid "Geo item - General" msgstr "Élément géographique - Général" -#: ishtar_common/forms_common.py:2689 ishtar_common/models_common.py:2373 +#: ishtar_common/forms_common.py:2865 ishtar_common/models_common.py:2183 msgid "Import key" msgstr "Clé d'import" -#: ishtar_common/forms_common.py:2692 +#: ishtar_common/forms_common.py:2869 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." @@ -9271,102 +9498,102 @@ msgstr "" "Une mise à jour via import correspondant à l'élément source et à cette clé " "va écraser la donnée." -#: ishtar_common/forms_common.py:2700 ishtar_common/models_common.py:2388 +#: ishtar_common/forms_common.py:2880 ishtar_common/models_common.py:2198 #: 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:2703 ishtar_common/models_common.py:2380 +#: ishtar_common/forms_common.py:2883 ishtar_common/models_common.py:2190 #: 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:2706 ishtar_common/models_common.py:2396 +#: ishtar_common/forms_common.py:2886 ishtar_common/models_common.py:2206 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "Fournisseur" -#: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:2746 -#: ishtar_common/models_common.py:2362 +#: ishtar_common/forms_common.py:2889 ishtar_common/forms_common.py:2937 +#: ishtar_common/models_common.py:2172 msgid "Buffer" msgstr "Tampon" -#: ishtar_common/forms_common.py:2713 +#: ishtar_common/forms_common.py:2894 msgid "Buffer type" msgstr "Type de tampon" -#: ishtar_common/forms_common.py:2717 ishtar_common/models_common.py:2409 -#: ishtar_common/models_common.py:4305 +#: ishtar_common/forms_common.py:2898 ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:4113 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: ishtar_common/forms_common.py:2721 ishtar_common/models_common.py:2412 -#: ishtar_common/models_common.py:4308 +#: ishtar_common/forms_common.py:2903 ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:4116 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: ishtar_common/forms_common.py:2725 ishtar_common/models_common.py:2415 -#: ishtar_common/models_common.py:4311 +#: ishtar_common/forms_common.py:2908 ishtar_common/models_common.py:2225 +#: ishtar_common/models_common.py:4119 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: ishtar_common/forms_common.py:2744 +#: ishtar_common/forms_common.py:2935 msgid "Metadata" msgstr "Métadonnées" -#: ishtar_common/forms_common.py:2745 ishtar_common/models.py:2375 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2232 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2281 -#: ishtar_common/models_common.py:2298 ishtar_common/models_common.py:2311 -#: ishtar_common/models_common.py:2440 ishtar_common/models_common.py:3531 +#: ishtar_common/forms_common.py:2936 ishtar_common/models.py:2385 +#: ishtar_common/models_common.py:1984 ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2074 ishtar_common/models_common.py:2091 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2121 +#: ishtar_common/models_common.py:2250 ishtar_common/models_common.py:3339 msgid "Geography" msgstr "Géographie" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:3133 msgid "If you set a buffer set a buffer type." msgstr "Si vous definissez un tampon, designez son type." -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:3137 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:2937 +#: ishtar_common/forms_common.py:3140 msgid "A value is expected for Z." msgstr "Une valeur est attendue pour Z." -#: ishtar_common/forms_common.py:2956 +#: ishtar_common/forms_common.py:3158 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:2996 +#: ishtar_common/forms_common.py:3198 msgid "Geometry type" msgstr "Type de géométrie" -#: ishtar_common/forms_common.py:2998 +#: ishtar_common/forms_common.py:3200 msgid "Coordinates" msgstr "Coordonnées" -#: ishtar_common/forms_common.py:2999 ishtar_common/models_common.py:2331 -#: ishtar_common/models_common.py:4320 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2141 +#: ishtar_common/models_common.py:4128 msgid "Point" msgstr "Point" -#: ishtar_common/forms_common.py:3000 +#: ishtar_common/forms_common.py:3202 msgid "Point 3D" msgstr "Point 3D" -#: ishtar_common/forms_common.py:3001 +#: ishtar_common/forms_common.py:3203 msgid "Multi-points" msgstr "Points multiples" -#: ishtar_common/forms_common.py:3002 +#: ishtar_common/forms_common.py:3204 msgid "Multi-lines" msgstr "Lignes multiples" -#: ishtar_common/forms_common.py:3003 +#: ishtar_common/forms_common.py:3205 msgid "Multi-polygons" msgstr "Polygones multi-parties" @@ -9375,12 +9602,12 @@ msgstr "Polygones multi-parties" msgid "Home" msgstr "Accueil" -#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2517 -#: ishtar_common/models.py:2619 ishtar_common/models.py:2673 -#: ishtar_common/models.py:2747 ishtar_common/models.py:2921 -#: ishtar_common/models.py:3200 ishtar_common/models.py:3212 -#: ishtar_common/models.py:3249 ishtar_common/models.py:3453 -#: ishtar_common/models.py:3669 ishtar_common/models.py:3705 +#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2527 +#: ishtar_common/models.py:2629 ishtar_common/models.py:2683 +#: ishtar_common/models.py:2757 ishtar_common/models.py:2931 +#: ishtar_common/models.py:3210 ishtar_common/models.py:3222 +#: ishtar_common/models.py:3259 ishtar_common/models.py:3463 +#: ishtar_common/models.py:3683 ishtar_common/models.py:3719 msgid "Directory" msgstr "Annuaire" @@ -9388,22 +9615,23 @@ msgstr "Annuaire" msgid "Addition/modification" msgstr "Ajout/modification" -#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:201 -#: ishtar_common/models_imports.py:449 ishtar_common/models_imports.py:507 -#: ishtar_common/models_imports.py:614 ishtar_common/models_imports.py:668 -#: ishtar_common/models_imports.py:688 ishtar_common/models_imports.py:717 -#: ishtar_common/models_imports.py:771 ishtar_common/models_imports.py:831 -#: ishtar_common/models_imports.py:874 ishtar_common/models_imports.py:1053 -#: ishtar_common/models_imports.py:1313 ishtar_common/models_imports.py:1314 -#: ishtar_common/models_imports.py:1971 +#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:220 +#: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:555 +#: ishtar_common/models_imports.py:623 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:787 ishtar_common/models_imports.py:807 +#: ishtar_common/models_imports.py:836 ishtar_common/models_imports.py:890 +#: ishtar_common/models_imports.py:950 ishtar_common/models_imports.py:993 +#: ishtar_common/models_imports.py:1187 ishtar_common/models_imports.py:1523 +#: ishtar_common/models_imports.py:1948 ishtar_common/models_imports.py:2820 +#: ishtar_common/models_imports.py:2848 msgid "Imports" msgstr "Imports" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1519 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1586 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:1999 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2115 msgid "Old imports" msgstr "Anciens imports" @@ -9411,96 +9639,96 @@ msgstr "Anciens imports" msgid "Documentation / Images" msgstr "Documentation / Images" -#: ishtar_common/models.py:390 +#: ishtar_common/models.py:399 msgid "Not a valid item." msgstr "Élément invalide." -#: ishtar_common/models.py:405 +#: ishtar_common/models.py:414 msgid "A selected item is not a valid item." msgstr "Un élément sélectionné n'est pas valide." -#: ishtar_common/models.py:415 +#: ishtar_common/models.py:424 msgid "This item already exists." msgstr "Cet élément existe déjà." -#: ishtar_common/models.py:579 +#: ishtar_common/models.py:590 msgid "Generated relation image (SVG)" msgstr "Image des relations (SVG généré)" -#: ishtar_common/models.py:586 +#: ishtar_common/models.py:597 msgid "Generated relation image (PNG)" msgstr "Image des relations (PNG généré)" -#: ishtar_common/models.py:593 +#: ishtar_common/models.py:604 msgid "Generated relation image (DOT)" msgstr "Image des relations (DOT généré)" -#: ishtar_common/models.py:600 +#: ishtar_common/models.py:611 msgid "Generated above relation image (SVG)" msgstr "Image des relations au dessus (SVG généré)" -#: ishtar_common/models.py:607 +#: ishtar_common/models.py:618 msgid "Generated above relation image (DOT)" msgstr "Image des relations au dessus (DOT généré)" -#: ishtar_common/models.py:614 +#: ishtar_common/models.py:625 msgid "Generated above relation image (PNG)" msgstr "Image des relations au dessus (PNG généré)" -#: ishtar_common/models.py:621 +#: ishtar_common/models.py:632 msgid "Generated below relation image (SVG)" msgstr "Image des relations au dessous (SVG généré)" -#: ishtar_common/models.py:628 +#: ishtar_common/models.py:639 msgid "Generated below relation image (DOT)" msgstr "Image des relations au dessous (DOT généré)" -#: ishtar_common/models.py:635 +#: ishtar_common/models.py:646 msgid "Generated below relation image (PNG)" msgstr "Image des relations au dessous (PNG généré)" -#: ishtar_common/models.py:677 +#: ishtar_common/models.py:688 msgid "Custom data - Menu" msgstr "Données personnalisées - Menu" -#: ishtar_common/models.py:678 +#: ishtar_common/models.py:689 msgid "Custom data - Menus" msgstr "Données personnalisées - Menus" -#: ishtar_common/models.py:681 ishtar_common/models.py:745 -#: ishtar_common/models.py:1663 ishtar_common/models.py:1815 +#: ishtar_common/models.py:692 ishtar_common/models.py:756 +#: ishtar_common/models.py:1673 ishtar_common/models.py:1825 msgid "Custom data / custom forms" msgstr "Données personnalisées / formulaires personnalisés" -#: ishtar_common/models.py:691 +#: ishtar_common/models.py:702 msgid "Text" msgstr "Texte" -#: ishtar_common/models.py:692 +#: ishtar_common/models.py:703 msgid "Long text" msgstr "Texte long" -#: ishtar_common/models.py:693 ishtar_common/models_imports.py:993 +#: ishtar_common/models.py:704 ishtar_common/models_imports.py:1112 msgid "Integer" msgstr "Entier" -#: ishtar_common/models.py:694 +#: ishtar_common/models.py:705 msgid "Boolean" msgstr "Booléen" -#: ishtar_common/models.py:695 ishtar_common/models_imports.py:994 +#: ishtar_common/models.py:706 ishtar_common/models_imports.py:1113 msgid "Float" msgstr "Nombre à virgule" -#: ishtar_common/models.py:697 +#: ishtar_common/models.py:708 msgid "Choices" msgstr "Choix" -#: ishtar_common/models.py:698 +#: ishtar_common/models.py:709 msgid "Multi-choices" msgstr "Choix multiples" -#: ishtar_common/models.py:718 +#: ishtar_common/models.py:729 msgid "" "Value of the key in the JSON schema. For hierarchical key use \"__\" to " "explain it. For instance for the key 'my_subkey' with data such as " @@ -9512,199 +9740,199 @@ msgstr "" "{'ma_clef': {'ma_sousclef': 'valeur'}}, sa valeur sera atteinte avec : " "ma_clef__ma_sousclef." -#: ishtar_common/models.py:725 +#: ishtar_common/models.py:736 msgid "Display" msgstr "Afficher" -#: ishtar_common/models.py:730 +#: ishtar_common/models.py:741 msgid "Use in search indexes" msgstr "Utiliser dans les index de recherche" -#: ishtar_common/models.py:741 +#: ishtar_common/models.py:752 msgid "Custom data - Field" msgstr "Données personnalisées - Champ" -#: ishtar_common/models.py:742 +#: ishtar_common/models.py:753 msgid "Custom data - Fields" msgstr "Données personnalisées - Champs" -#: ishtar_common/models.py:758 +#: ishtar_common/models.py:769 msgid "Content types of the field and of the menu do not match" msgstr "Les types de contenu du champ et du menu ne correspondent pas" -#: ishtar_common/models.py:763 +#: ishtar_common/models.py:774 msgid "Above" msgstr "Au-dessus" -#: ishtar_common/models.py:764 +#: ishtar_common/models.py:775 msgid "Below" msgstr "Dessous" -#: ishtar_common/models.py:765 +#: ishtar_common/models.py:776 msgid "Equal" msgstr "Égal" -#: ishtar_common/models.py:766 +#: ishtar_common/models.py:777 msgid "Include" msgstr "Contient" -#: ishtar_common/models.py:767 +#: ishtar_common/models.py:778 msgid "Is included" msgstr "Est contenu" -#: ishtar_common/models.py:773 +#: ishtar_common/models.py:784 msgid "Symmetrical" msgstr "Symétrique" -#: ishtar_common/models.py:774 +#: ishtar_common/models.py:785 msgid "Tiny label" msgstr "Dénomination courte" -#: ishtar_common/models.py:777 +#: ishtar_common/models.py:788 msgid "Inverse relation" msgstr "Relation inverse" -#: ishtar_common/models.py:783 +#: ishtar_common/models.py:794 msgid "Logical relation" msgstr "Relation logique" -#: ishtar_common/models.py:796 +#: ishtar_common/models.py:807 msgid "Cannot have symmetrical and an inverse_relation" msgstr "Ne peut pas être symétrique et avoir une relation inverse" -#: ishtar_common/models.py:970 +#: ishtar_common/models.py:981 msgid "Search query" msgstr "Requête de recherche" -#: ishtar_common/models.py:971 +#: ishtar_common/models.py:982 msgid "Search queries" msgstr "Requêtes de recherche" -#: ishtar_common/models.py:979 +#: ishtar_common/models.py:990 msgid "ISO code" msgstr "Code ISO" -#: ishtar_common/models.py:983 +#: ishtar_common/models.py:994 msgid "Languages" msgstr "Langues" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "Euro" msgstr "Euro" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "US dollar" msgstr "Dollar US" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Site" msgstr "Site" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Archaeological entity" msgstr "Entité (EA)" -#: ishtar_common/models.py:993 +#: ishtar_common/models.py:1004 msgid "Site search" msgstr "Rechercher un site" -#: ishtar_common/models.py:994 +#: ishtar_common/models.py:1005 msgid "New site" msgstr "Ajouter un site" -#: ishtar_common/models.py:995 +#: ishtar_common/models.py:1006 msgid "Site modification" msgstr "Modifier un site" -#: ishtar_common/models.py:997 +#: ishtar_common/models.py:1008 msgid "Site (attached to the operation)" msgstr "Site (rattaché à l'opération)" -#: ishtar_common/models.py:998 +#: ishtar_common/models.py:1009 msgid "Site name (attached to the operation)" msgstr "Site nom (rattaché à l'opération)" -#: ishtar_common/models.py:999 +#: ishtar_common/models.py:1010 msgid "Site (attached to the context record)" msgstr "Site (rattaché à l'UE)" -#: ishtar_common/models.py:1000 +#: ishtar_common/models.py:1011 msgid "Site name (attached to the context record)" msgstr "Site nom (rattaché à l'UE)" -#: ishtar_common/models.py:1003 +#: ishtar_common/models.py:1014 msgid "Archaeological entity search" msgstr "Rechercher une entité archéologique" -#: ishtar_common/models.py:1004 +#: ishtar_common/models.py:1015 msgid "New archaeological entity" msgstr "Nouvelle entité archéologique" -#: ishtar_common/models.py:1005 +#: ishtar_common/models.py:1016 msgid "Archaeological entity modification" msgstr "Modifier une entité archéologique" -#: ishtar_common/models.py:1006 +#: ishtar_common/models.py:1017 msgid "Archaeological entity deletion" msgstr "Supprimer une entité archéologique" -#: ishtar_common/models.py:1008 +#: ishtar_common/models.py:1019 msgid "Archaeological entity (attached to the operation)" msgstr "Entité Archéologique (rattachée à l'opération)" -#: ishtar_common/models.py:1011 +#: ishtar_common/models.py:1022 msgid "Archaeological entity name (attached to the operation)" msgstr "Entité Archéologique nom (rattachée à l'opération)" -#: ishtar_common/models.py:1014 +#: ishtar_common/models.py:1025 msgid "Archaeological entity (attached to the context record)" msgstr "Entité Archéologique (rattachée à l'UE)" -#: ishtar_common/models.py:1017 +#: ishtar_common/models.py:1028 msgid "Archaeological entity name (attached to the context record)" msgstr "Entité Archéologique nom (rattachée à l'UE)" -#: ishtar_common/models.py:1023 +#: ishtar_common/models.py:1034 msgid "name.firstname" msgstr "nom.prenom" -#: ishtar_common/models.py:1024 +#: ishtar_common/models.py:1035 msgid "firstname.name" msgstr "prenom.nom" -#: ishtar_common/models.py:1032 +#: ishtar_common/models.py:1043 msgid "Current active" msgstr "Actuellement utilisé" -#: ishtar_common/models.py:1034 +#: ishtar_common/models.py:1045 msgid "Activate experimental feature" msgstr "Activer les fonctionnalités expérimentales" -#: ishtar_common/models.py:1037 +#: ishtar_common/models.py:1048 msgid "Warning name" msgstr "Nom pour bandeau d'avertissement" -#: ishtar_common/models.py:1038 +#: ishtar_common/models.py:1049 msgid "Warning message" msgstr "Message d'avertissement" -#: ishtar_common/models.py:1039 +#: ishtar_common/models.py:1050 msgid "Footer text" msgstr "Texte de pied de page" -#: ishtar_common/models.py:1040 ishtar_common/models.py:1640 +#: ishtar_common/models.py:1051 ishtar_common/models.py:1650 msgid "You can use markdown syntax." msgstr "Vous pouvez utiliser la syntaxe markdown." -#: ishtar_common/models.py:1042 +#: ishtar_common/models.py:1053 msgid "Import - Delete image/document zip on archive" msgstr "Import - Supprimer le zip image/document lors de l'archivage" -#: ishtar_common/models.py:1045 +#: ishtar_common/models.py:1056 msgid "Document - Remove redundant association" msgstr "Document - Supprimer les associations redondantes" -#: ishtar_common/models.py:1048 +#: ishtar_common/models.py:1059 msgid "" "For instance, remove operation association of a document also associated to " "a find of this operation. Only manage association of operations, context " @@ -9714,23 +9942,23 @@ msgstr "" "ci est aussi associé à un mobilier de cette opération. Ne gère que les " "associations d'opérations, unités d'enregistrement et mobiliers." -#: ishtar_common/models.py:1055 +#: ishtar_common/models.py:1066 msgid "Container - calculate weight only when all find has a weight" msgstr "Contenants - calculer seulement quand tous les mobiliers ont un poids" -#: ishtar_common/models.py:1059 +#: ishtar_common/models.py:1070 msgid "Parent relations engine" msgstr "Moteur de gestion des relations parentes" -#: ishtar_common/models.py:1061 +#: ishtar_common/models.py:1072 msgid "SQL views" msgstr "Vues SQL" -#: ishtar_common/models.py:1062 +#: ishtar_common/models.py:1073 msgid "Cache tables" msgstr "Tables de cache" -#: ishtar_common/models.py:1067 +#: ishtar_common/models.py:1078 msgid "" "If you experience performance problems with complex relations (for instance: " "complex statigraphic relations), set it to \"Cache tables\" in order to use " @@ -9743,44 +9971,44 @@ msgstr "" "pas de mettre à jour ces tables avec la commande manage.py " "\"migrate_relations_cache_tables\"." -#: ishtar_common/models.py:1075 +#: ishtar_common/models.py:1086 msgid "Alternate configuration" msgstr "Configuration alternative" -#: ishtar_common/models.py:1078 +#: ishtar_common/models.py:1089 msgid "Choose an alternate configuration for label, index management" msgstr "" "Choisir une configuration alternative pour les libellés, gestion des index" -#: ishtar_common/models.py:1082 +#: ishtar_common/models.py:1093 msgid "Files module" msgstr "Module Dossiers" -#: ishtar_common/models.py:1084 +#: ishtar_common/models.py:1095 msgid "Archaeological site module" msgstr "Module Site archéologique" -#: ishtar_common/models.py:1087 +#: ishtar_common/models.py:1098 msgid "Archaeological site type" msgstr "Type de site archéologique" -#: ishtar_common/models.py:1092 +#: ishtar_common/models.py:1103 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: ishtar_common/models.py:1094 +#: ishtar_common/models.py:1105 msgid "Finds module" msgstr "Module Mobilier" -#: ishtar_common/models.py:1096 +#: ishtar_common/models.py:1107 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: ishtar_common/models.py:1099 +#: ishtar_common/models.py:1110 msgid "Find index is based on" msgstr "Index mobilier basé sur" -#: ishtar_common/models.py:1104 +#: ishtar_common/models.py:1115 msgid "" "To prevent irrelevant indexes, change this parameter only if there is no " "find in the database" @@ -9788,27 +10016,27 @@ msgstr "" "Pour éviter des index non pertinents, ne changer ce paramètre que s'il n'y a " "pas encore de mobilier dans cette base de données" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Warehouses module" msgstr "Module Lieu de conservation" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: ishtar_common/models.py:1111 +#: ishtar_common/models.py:1122 msgid "Preservation module" msgstr "Module de conservation" -#: ishtar_common/models.py:1112 +#: ishtar_common/models.py:1123 msgid "Mapping module" msgstr "Module cartographique" -#: ishtar_common/models.py:1114 +#: ishtar_common/models.py:1125 msgid "Point precision (search and sheets)" msgstr "Précision du point (recherche et fiches)" -#: ishtar_common/models.py:1118 +#: ishtar_common/models.py:1129 msgid "" "Number of digit to round from the decimal point for coordinates in WGS84 " "(latitude, longitude). Empty value means no round." @@ -9816,11 +10044,11 @@ msgstr "" "Nombre de chiffres après la virgule pour les coordonnées en WGS84 (latitude, " "longitude). Une valeur vide signifie pas d'arrondissement." -#: ishtar_common/models.py:1123 +#: ishtar_common/models.py:1134 msgid "Locate warehouse and containers" msgstr "Localiser les lieux de conservation et les contenants" -#: ishtar_common/models.py:1126 +#: ishtar_common/models.py:1137 msgid "" "Mapping module must be activated. With many containers and background task " "not activated, activating this option may consume many resources." @@ -9829,32 +10057,32 @@ msgstr "" "les tâches de fond non activées, activer cette option peut consommer " "beaucoup de ressources." -#: ishtar_common/models.py:1132 +#: ishtar_common/models.py:1143 msgid "Use town to locate when coordinates are missing" msgstr "" "Utiliser la commune pour la localisation quand les coordonnées manquent" -#: ishtar_common/models.py:1134 +#: ishtar_common/models.py:1145 msgid "Generate relation graph" msgstr "Générer le graphe de relations" -#: ishtar_common/models.py:1136 +#: ishtar_common/models.py:1147 msgid "Preventive operator module" msgstr "Module opérateur préventif" -#: ishtar_common/models.py:1138 +#: ishtar_common/models.py:1149 msgid "Underwater module" msgstr "Module sous-marin / subaquatique" -#: ishtar_common/models.py:1140 +#: ishtar_common/models.py:1151 msgid "Parcel are mandatory for context records" msgstr "Parcelles cadastrales obligatoires pour les Unités d'Enregistrement" -#: ishtar_common/models.py:1143 +#: ishtar_common/models.py:1154 msgid "Home page" msgstr "Page d'accueil" -#: ishtar_common/models.py:1147 +#: ishtar_common/models.py:1158 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " @@ -9864,31 +10092,31 @@ msgstr "" "défaut apparaît. Utiliser la syntaxe Markdown. {random_image} peut être " "utilisé pour afficher une image au hasard." -#: ishtar_common/models.py:1153 +#: ishtar_common/models.py:1164 msgid "Main operation code prefix" msgstr "Préfixe principal pour le code opération" -#: ishtar_common/models.py:1160 +#: ishtar_common/models.py:1171 msgid "Default operation code prefix" msgstr "Préfixe par défaut pour le code opération" -#: ishtar_common/models.py:1167 +#: ishtar_common/models.py:1178 msgid "Operation region code" msgstr "Code région des opérations" -#: ishtar_common/models.py:1170 +#: ishtar_common/models.py:1181 msgid "Operation complete identifier" msgstr "Identifiant complet de l'opération" -#: ishtar_common/models.py:1173 +#: ishtar_common/models.py:1185 msgid "Formula to manage operation complete identifier." msgstr "Formule pour gérer l'identifiant complet de l'opération." -#: ishtar_common/models.py:1176 +#: ishtar_common/models.py:1188 msgid "Operation custom index key" msgstr "Clé d'index personnalisé d'opération" -#: ishtar_common/models.py:1180 +#: ishtar_common/models.py:1192 msgid "" "Keys to be used to manage operation custom index. Separate keys with a " "semicolon." @@ -9896,33 +10124,33 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des opérations. Séparer les " "clés par un point-virgule." -#: ishtar_common/models.py:1185 +#: ishtar_common/models.py:1197 msgid "Operation cached label" msgstr "Nom en cache de l'opération" -#: ishtar_common/models.py:1189 ishtar_common/models.py:1212 -#: ishtar_common/models.py:1245 ishtar_common/models.py:1264 -#: ishtar_common/models.py:1297 ishtar_common/models.py:1330 -#: ishtar_common/models.py:1363 ishtar_common/models.py:1396 -#: ishtar_common/models.py:1429 ishtar_common/models.py:1462 +#: ishtar_common/models.py:1201 ishtar_common/models.py:1224 +#: ishtar_common/models.py:1257 ishtar_common/models.py:1276 +#: ishtar_common/models.py:1308 ishtar_common/models.py:1341 +#: ishtar_common/models.py:1373 ishtar_common/models.py:1406 +#: ishtar_common/models.py:1439 ishtar_common/models.py:1472 msgid "Formula to manage cached label. If not set a default formula is used." msgstr "" "Formule pour gérer le nom en cache. S'il n'est pas fourni, une formule par " "défaut est utilisée." -#: ishtar_common/models.py:1193 +#: ishtar_common/models.py:1205 msgid "Archaeological site complete identifier" msgstr "Identifiant complet de site archéologique" -#: ishtar_common/models.py:1196 +#: ishtar_common/models.py:1208 msgid "Formula to manage archaeological site complete identifier." msgstr "Formule pour gérer l'identifiant complet du site archéologique." -#: ishtar_common/models.py:1199 +#: ishtar_common/models.py:1211 msgid "Archaeological site custom index key" msgstr "Clé d'index personnalisé de site archéologique" -#: ishtar_common/models.py:1203 +#: ishtar_common/models.py:1215 msgid "" "Keys to be used to manage archaeological site custom index. Separate keys " "with a semicolon." @@ -9930,15 +10158,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des sites archéologiques. " "Séparer les clés par un point-virgule." -#: ishtar_common/models.py:1208 +#: ishtar_common/models.py:1220 msgid "Site cached label" msgstr "Nom en cache du site" -#: ishtar_common/models.py:1216 +#: ishtar_common/models.py:1228 msgid "File external id" msgstr "Identifiant de fichier" -#: ishtar_common/models.py:1219 +#: ishtar_common/models.py:1231 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -9948,19 +10176,19 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1226 +#: ishtar_common/models.py:1238 msgid "Archaeological file complete identifier" msgstr "Identifiant complet de dossier archéologique" -#: ishtar_common/models.py:1229 +#: ishtar_common/models.py:1241 msgid "Formula to manage archaeological file complete identifier." msgstr "Formule pour gérer l'identifiant complet de dossier archéologique." -#: ishtar_common/models.py:1232 +#: ishtar_common/models.py:1244 msgid "Archaeological file custom index key" msgstr "Clé d'index personnalisé de dossier archéologique" -#: ishtar_common/models.py:1236 +#: ishtar_common/models.py:1248 msgid "" "Keys to be used to manage archaeological file custom index. Separate keys " "with a semicolon." @@ -9968,15 +10196,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des dossiers archéologiques. " "Séparer les clés par un point-virgule." -#: ishtar_common/models.py:1241 +#: ishtar_common/models.py:1253 msgid "File cached label" msgstr "Nom en cache du dossier archéologique" -#: ishtar_common/models.py:1249 +#: ishtar_common/models.py:1261 msgid "Parcel external id" msgstr "Identifiant de parcelle" -#: ishtar_common/models.py:1253 +#: ishtar_common/models.py:1265 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -9986,15 +10214,15 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1260 +#: ishtar_common/models.py:1272 msgid "Parcel cached label" msgstr "Nom en cache de parcelle" -#: ishtar_common/models.py:1268 +#: ishtar_common/models.py:1280 msgid "Context record external id" msgstr "Identifiant d'unité d'enregistrement" -#: ishtar_common/models.py:1271 +#: ishtar_common/models.py:1283 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -10004,19 +10232,19 @@ msgstr "" "avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1278 +#: ishtar_common/models.py:1290 msgid "Context record complete identifier" msgstr "Identifiant complet d'Unité d'Enregistrement" -#: ishtar_common/models.py:1281 +#: ishtar_common/models.py:1293 msgid "Formula to manage context record complete identifier." msgstr "Formule pour gérer l'identifiant complet d'unité d'enregistrement." -#: ishtar_common/models.py:1284 +#: ishtar_common/models.py:1296 msgid "Context record custom index key" msgstr "Clé d'index personnalisé d'Unité d'Enregistrement" -#: ishtar_common/models.py:1288 +#: ishtar_common/models.py:1300 msgid "" "Keys to be used to manage context record custom index. Separate keys with a " "semicolon." @@ -10024,15 +10252,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des unités d'enregistrement. " "Séparer les clés par un point-virgule." -#: ishtar_common/models.py:1293 +#: ishtar_common/models.py:1305 msgid "Context record cached label" msgstr "Nom en cache de l'unité d'enregistrement" -#: ishtar_common/models.py:1301 +#: ishtar_common/models.py:1312 msgid "Base find external id" msgstr "Identifiant de mobilier d'origine" -#: ishtar_common/models.py:1304 +#: ishtar_common/models.py:1315 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -10042,19 +10270,19 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1311 +#: ishtar_common/models.py:1322 msgid "Base find complete identifier" msgstr "Identifiant complet de mobilier d'origine" -#: ishtar_common/models.py:1314 +#: ishtar_common/models.py:1325 msgid "Formula to manage base find complete identifier." msgstr "Formule pour gérer l'identifiant complet de mobilier d'origine." -#: ishtar_common/models.py:1317 +#: ishtar_common/models.py:1328 msgid "Base find custom index key" msgstr "Clé d'index personnalisé de mobilier d'origine" -#: ishtar_common/models.py:1321 +#: ishtar_common/models.py:1332 msgid "" "Keys to be used to manage base find custom index. Separate keys with a " "semicolon." @@ -10062,15 +10290,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des mobiliers d'origine. " "Séparer les clés par un point-virgule." -#: ishtar_common/models.py:1326 +#: ishtar_common/models.py:1337 msgid "Base find cached label" msgstr "Nom en cache du mobilier d'origine" -#: ishtar_common/models.py:1334 +#: ishtar_common/models.py:1345 msgid "Find external id" msgstr "Identifiant de mobilier" -#: ishtar_common/models.py:1337 +#: ishtar_common/models.py:1348 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -10080,34 +10308,34 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1344 +#: ishtar_common/models.py:1355 msgid "Find complete identifier" msgstr "Identifiant complet de mobilier" -#: ishtar_common/models.py:1347 +#: ishtar_common/models.py:1358 msgid "Formula to manage find complete identifier." msgstr "Formule pour gérer l'identifiant complet de mobilier." -#: ishtar_common/models.py:1350 +#: ishtar_common/models.py:1361 msgid "Find custom index key" msgstr "Clé d'index personnalisé de mobilier" -#: ishtar_common/models.py:1354 +#: ishtar_common/models.py:1365 msgid "" "Keys to be used to manage find custom index. Separate keys with a semicolon." msgstr "" "Clés à utiliser pour gérer l'index personnalisé des mobiliers. Séparer les " "clés par un point-virgule." -#: ishtar_common/models.py:1359 +#: ishtar_common/models.py:1370 msgid "Find cached label" msgstr "Nom en cache du mobilier" -#: ishtar_common/models.py:1367 +#: ishtar_common/models.py:1377 msgid "Container external id" msgstr "ID du contenant" -#: ishtar_common/models.py:1370 +#: ishtar_common/models.py:1380 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -10117,19 +10345,19 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1377 +#: ishtar_common/models.py:1387 msgid "Container complete identifier" msgstr "Identifiant complet de contenant" -#: ishtar_common/models.py:1380 +#: ishtar_common/models.py:1390 msgid "Formula to manage container complete identifier." msgstr "Formule pour gérer l'identifiant complet de contenant." -#: ishtar_common/models.py:1383 +#: ishtar_common/models.py:1393 msgid "Container custom index key" msgstr "Clé d'index personnalisé de contenant" -#: ishtar_common/models.py:1387 +#: ishtar_common/models.py:1397 msgid "" "Keys to be used to manage container custom index. Separate keys with a " "semicolon." @@ -10137,15 +10365,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des contenants. Séparer les " "clés par un point-virgule." -#: ishtar_common/models.py:1392 +#: ishtar_common/models.py:1402 msgid "Container cached label" msgstr "Nom en cache du contenant" -#: ishtar_common/models.py:1400 +#: ishtar_common/models.py:1410 msgid "Warehouse external id" msgstr "Identifiant du lieu de conservation" -#: ishtar_common/models.py:1403 +#: ishtar_common/models.py:1413 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -10155,19 +10383,19 @@ msgstr "" "avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1410 +#: ishtar_common/models.py:1420 msgid "Warehouse complete identifier" msgstr "Identifiant complet de lieu de conservation" -#: ishtar_common/models.py:1413 +#: ishtar_common/models.py:1423 msgid "Formula to manage warehouse complete identifier." msgstr "Formule pour gérer l'identifiant complet de lieu de conservation." -#: ishtar_common/models.py:1416 +#: ishtar_common/models.py:1426 msgid "Warehouse custom index key" msgstr "Clé d'index personnalisé de lieu de conservation" -#: ishtar_common/models.py:1420 +#: ishtar_common/models.py:1430 msgid "" "Keys to be used to manage warehouse custom index. Separate keys with a " "semicolon." @@ -10175,15 +10403,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des lieux de conservation. " "Séparer les clés par un point-virgule." -#: ishtar_common/models.py:1425 +#: ishtar_common/models.py:1435 msgid "Warehouse cached label" msgstr "Nom en cache du lieu de conservation" -#: ishtar_common/models.py:1433 +#: ishtar_common/models.py:1443 msgid "Document external id" msgstr "ID externe document" -#: ishtar_common/models.py:1436 +#: ishtar_common/models.py:1446 msgid "" "Formula to manage document external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -10193,19 +10421,19 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: ishtar_common/models.py:1443 +#: ishtar_common/models.py:1453 msgid "Document complete identifier" msgstr "Identifiant complet de document" -#: ishtar_common/models.py:1446 +#: ishtar_common/models.py:1456 msgid "Formula to manage document complete identifier." msgstr "Formule pour gérer l'identifiant complet de document." -#: ishtar_common/models.py:1449 +#: ishtar_common/models.py:1459 msgid "Document custom index key" msgstr "Clé d'index personnalisé de document" -#: ishtar_common/models.py:1453 +#: ishtar_common/models.py:1463 msgid "" "Keys to be used to manage document custom index. Separate keys with a " "semicolon." @@ -10213,15 +10441,15 @@ msgstr "" "Clés à utiliser pour gérer l'index personnalisé des documents. Séparer les " "clés par un point-virgule." -#: ishtar_common/models.py:1458 +#: ishtar_common/models.py:1468 msgid "Document cached label" msgstr "Nom en cache du document" -#: ishtar_common/models.py:1466 +#: ishtar_common/models.py:1476 msgid "Raw name for person" msgstr "Nom brut pour une personne" -#: ishtar_common/models.py:1469 +#: ishtar_common/models.py:1479 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -10231,35 +10459,35 @@ msgstr "" "Une formule incorrecte peut rendre l'application inutilisable et l'import de " "données externes peut alors être destructif." -#: ishtar_common/models.py:1475 +#: ishtar_common/models.py:1485 msgid "Use auto index for finds" msgstr "Utiliser les index automatiques pour le mobilier" -#: ishtar_common/models.py:1477 +#: ishtar_common/models.py:1487 msgid "Currency" msgstr "Devise" -#: ishtar_common/models.py:1480 +#: ishtar_common/models.py:1490 msgid "Naming style for accounts" msgstr "Type de nommage pour les comptes" -#: ishtar_common/models.py:1488 +#: ishtar_common/models.py:1498 msgid "Maps - default zoom" msgstr "Cartes - zoom par défaut" -#: ishtar_common/models.py:1491 +#: ishtar_common/models.py:1501 msgid "Spatial Reference System for display" msgstr "Système de référence spatiale pour l'affichage" -#: ishtar_common/models.py:1495 +#: ishtar_common/models.py:1505 msgid "Spatial Reference System used for display when no SRS is defined" msgstr "Système de référence spatiale utilisé quand aucun SRS n'est défini" -#: ishtar_common/models.py:1502 +#: ishtar_common/models.py:1512 msgid "Spatial Reference System in database" msgstr "Système de référence spatiale dans la base de données" -#: ishtar_common/models.py:1506 +#: ishtar_common/models.py:1516 msgid "" "Set it to the most used spatial reference system. Warning: after change " "launch the migrate_srid script." @@ -10267,36 +10495,36 @@ msgstr "" "Réglez-le sur le système de référence spatiale le plus utilisé. Attention : " "après changement lancez le script migrate_srid." -#: ishtar_common/models.py:1514 +#: ishtar_common/models.py:1524 msgid "Default language for documentation" msgstr "Langue par défaut pour les documents" -#: ishtar_common/models.py:1518 +#: ishtar_common/models.py:1528 msgid "" "If set, by default the selected language will be set for localized documents." msgstr "" "Si activé, la langue sélectionnée sera utilisée par défaut pour les " "documents localisés." -#: ishtar_common/models.py:1526 +#: ishtar_common/models.py:1536 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: ishtar_common/models.py:1527 +#: ishtar_common/models.py:1537 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: ishtar_common/models.py:1529 ishtar_common/models.py:1839 -#: ishtar_common/models.py:2062 ishtar_common/models.py:5109 -#: ishtar_common/models.py:5139 ishtar_common/models_imports.py:123 +#: ishtar_common/models.py:1539 ishtar_common/models.py:1849 +#: ishtar_common/models.py:2072 ishtar_common/models.py:5123 +#: ishtar_common/models.py:5153 ishtar_common/models_imports.py:132 msgid "General settings" msgstr "Paramêtres généraux" -#: ishtar_common/models.py:1632 +#: ishtar_common/models.py:1642 msgid "Enable this form" msgstr "Activer ce formulaire" -#: ishtar_common/models.py:1635 +#: ishtar_common/models.py:1645 msgid "" "Disable with caution: disabling a form with mandatory fields may lead to " "database errors." @@ -10304,15 +10532,15 @@ msgstr "" "Désactiver avec précaution : désactiver un formulaire avec des champs " "obligatoires peut entraîner des erreurs dans la base de données." -#: ishtar_common/models.py:1639 +#: ishtar_common/models.py:1649 msgid "Header text" msgstr "Texte d'entête" -#: ishtar_common/models.py:1642 +#: ishtar_common/models.py:1652 msgid "Apply to all" msgstr "S'applique à tous" -#: ishtar_common/models.py:1645 +#: ishtar_common/models.py:1655 msgid "" "Apply this form to all users. If set to True, selecting user and user type " "is useless." @@ -10320,90 +10548,90 @@ msgstr "" "Activer ce formulaire pour tous les utilisateurs. Si mis à Vrai, " "sélectionner des utilisateurs ou des types d'utilisateurs est inutile." -#: ishtar_common/models.py:1651 +#: ishtar_common/models.py:1661 msgid "Deprecated - use profile types" msgstr "Obsolète - utiliser les types de profils" -#: ishtar_common/models.py:1659 +#: ishtar_common/models.py:1669 msgid "Custom form" msgstr "Formulaire personnalisé" -#: ishtar_common/models.py:1660 +#: ishtar_common/models.py:1670 msgid "Custom forms" msgstr "Formulaires personnalisés" -#: ishtar_common/models.py:1675 ishtar_common/models_imports.py:170 -#: ishtar_common/models_rest.py:116 +#: ishtar_common/models.py:1685 ishtar_common/models_imports.py:178 +#: ishtar_common/models_imports.py:437 ishtar_common/models_rest.py:116 msgid "Users" msgstr "Utilisateurs" -#: ishtar_common/models.py:1681 +#: ishtar_common/models.py:1691 msgid "User types" msgstr "Types d'utilisateur" -#: ishtar_common/models.py:1773 +#: ishtar_common/models.py:1783 msgid "Excluded field" msgstr "Champ exclus" -#: ishtar_common/models.py:1774 +#: ishtar_common/models.py:1784 msgid "Excluded fields" msgstr "Champs exclus" -#: ishtar_common/models.py:1808 +#: ishtar_common/models.py:1818 #: ishtar_common/templates/blocks/form_flex_snippet.html:18 #: ishtar_common/templates/blocks/table_form_snippet.html:9 msgid "Help" msgstr "Aide" -#: ishtar_common/models.py:1812 +#: ishtar_common/models.py:1822 msgid "Custom forms - Json data field" msgstr "Formulaires personnalisés - Champ de donnée Json" -#: ishtar_common/models.py:1813 +#: ishtar_common/models.py:1823 msgid "Custom forms - Json data fields" msgstr "Formulaires personnalisés - Champs de donnée Json" -#: ishtar_common/models.py:1828 +#: ishtar_common/models.py:1838 msgid "Variable name" msgstr "Nom de la variable" -#: ishtar_common/models.py:1830 +#: ishtar_common/models.py:1840 msgid "Description of the variable" msgstr "Description de la variable" -#: ishtar_common/models.py:1836 +#: ishtar_common/models.py:1846 msgid "Global variable" msgstr "Variable globale" -#: ishtar_common/models.py:1837 +#: ishtar_common/models.py:1847 msgid "Global variables" msgstr "Variables globales" -#: ishtar_common/models.py:1868 +#: ishtar_common/models.py:1878 msgid "Model name" msgstr "Nom de modèle" -#: ishtar_common/models.py:1869 +#: ishtar_common/models.py:1879 msgid "Associated primary key" msgstr "Clé primaire associée" -#: ishtar_common/models.py:1875 +#: ishtar_common/models.py:1885 msgid "Cache for stats" msgstr "Cache pour les statistiques" -#: ishtar_common/models.py:1876 +#: ishtar_common/models.py:1886 msgid "Caches for stats" msgstr "Caches pour les statistiques" -#: ishtar_common/models.py:2028 +#: ishtar_common/models.py:2038 msgid "Base template for labels" msgstr "Patron de base pour les étiquettes" -#: ishtar_common/models.py:2035 +#: ishtar_common/models.py:2045 msgid "Labels: targets for labels in the LibreOffice file" msgstr "Étiquettes : cibles des étiquettes dans le fichier LibreOffice" -#: ishtar_common/models.py:2039 +#: ishtar_common/models.py:2049 msgid "" "Each target is separated by a semi-colon. The first target is the name of " "the object including the data in base template. Following targets will be " @@ -10415,169 +10643,169 @@ msgstr "" "remplies avec le contenu de la première cible. Par exemple : \"Cadre1;Cadre2;" "Cadre3;Cadre4;Cadre5;Cadre6\" pour une planche avec 6 étiquettes." -#: ishtar_common/models.py:2048 +#: ishtar_common/models.py:2058 msgid "Used for labels" msgstr "Utilisé pour les étiquettes" -#: ishtar_common/models.py:2050 +#: ishtar_common/models.py:2060 msgid "Number of label per page" msgstr "Nombre d'étiquettes par page" -#: ishtar_common/models.py:2053 +#: ishtar_common/models.py:2063 msgid "Only relevant for label template" msgstr "Seulement applicable pour les patrons d'étiquettes" -#: ishtar_common/models.py:2059 +#: ishtar_common/models.py:2069 msgid "Document template" msgstr "Patron de document" -#: ishtar_common/models.py:2060 +#: ishtar_common/models.py:2070 msgid "Document templates" msgstr "Patrons de document" -#: ishtar_common/models.py:2073 +#: ishtar_common/models.py:2083 msgid "For label template, you must provide number of label per page." msgstr "" "Pour les patrons d'étiquettes, vous devez fournir le nombre d'étiquettes par " "page." -#: ishtar_common/models.py:2355 +#: ishtar_common/models.py:2365 msgid "Only four level of parent are managed." msgstr "Seulement quatre niveaux de parents sont gérés." -#: ishtar_common/models.py:2412 +#: ishtar_common/models.py:2422 msgid "Communal area boundaries" msgstr "Limites de zone communale" -#: ishtar_common/models.py:2463 +#: ishtar_common/models.py:2473 msgid "Male" msgstr "Masculin" -#: ishtar_common/models.py:2464 +#: ishtar_common/models.py:2474 msgid "Female" msgstr "Féminin" -#: ishtar_common/models.py:2465 +#: ishtar_common/models.py:2475 msgid "Neutral" msgstr "Neutre" -#: ishtar_common/models.py:2515 +#: ishtar_common/models.py:2525 msgid "Organization types" msgstr "Types d'organisation" -#: ishtar_common/models.py:2525 +#: ishtar_common/models.py:2535 msgid "Error: planning_service type is missing" msgstr "Erreur : le type planning_service est manquant" -#: ishtar_common/models.py:2533 ishtar_common/models.py:2709 +#: ishtar_common/models.py:2543 ishtar_common/models.py:2719 msgid "Error: general_contractor type is missing" msgstr "Erreur : le type general_contractor est manquant" -#: ishtar_common/models.py:2571 +#: ishtar_common/models.py:2581 msgctxt "key for text search" msgid "precise-town" msgstr "commune-precis" -#: ishtar_common/models.py:2609 +#: ishtar_common/models.py:2619 msgid "Organizations" msgstr "Organisations" -#: ishtar_common/models.py:2638 +#: ishtar_common/models.py:2648 msgid "unknown organization" msgstr "organisation inconnue" -#: ishtar_common/models.py:2687 +#: ishtar_common/models.py:2697 msgid "/" msgstr "/" -#: ishtar_common/models.py:2693 +#: ishtar_common/models.py:2703 msgid "Error: sra_agent and head_scientist types are missing" msgstr "Erreur : les types sra_agent et head_scientist sont manquants" -#: ishtar_common/models.py:2701 +#: ishtar_common/models.py:2711 msgid "Error: sra_agent type is missing" msgstr "Erreur : le type sra_agent est manquant" -#: ishtar_common/models.py:2717 +#: ishtar_common/models.py:2727 msgid "Error: responsible_planning_service type is missing" msgstr "Erreur : le type responsible_planning_service est manquant" -#: ishtar_common/models.py:2729 +#: ishtar_common/models.py:2739 msgid "Error: publisher type is missing" msgstr "Erreur : le type publisher est manquant" -#: ishtar_common/models.py:2737 +#: ishtar_common/models.py:2747 msgid "Error: operator type is missing" msgstr "Erreur : le type opérateur est manquant" -#: ishtar_common/models.py:2741 ishtar_common/models.py:2755 +#: ishtar_common/models.py:2751 ishtar_common/models.py:2765 msgid "Long title" msgstr "Titre long" -#: ishtar_common/models.py:2744 ishtar_common/models_imports.py:987 +#: ishtar_common/models.py:2754 ishtar_common/models_imports.py:1106 msgid "Title type" msgstr "Type de titre" -#: ishtar_common/models.py:2745 +#: ishtar_common/models.py:2755 msgid "Title types" msgstr "Types de titre" -#: ishtar_common/models.py:2772 +#: ishtar_common/models.py:2782 msgid "Mr" msgstr "M." -#: ishtar_common/models.py:2773 +#: ishtar_common/models.py:2783 msgid "Miss" msgstr "Mlle" -#: ishtar_common/models.py:2774 +#: ishtar_common/models.py:2784 msgid "Mr and Mrs" msgstr "M. et Mme" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2785 msgid "Mrs" msgstr "Mme" -#: ishtar_common/models.py:2776 +#: ishtar_common/models.py:2786 msgid "Doctor" msgstr "Dr." -#: ishtar_common/models.py:2824 ishtar_common/models.py:3411 +#: ishtar_common/models.py:2834 ishtar_common/models.py:3421 msgctxt "key for text search" msgid "surname" msgstr "prenom" -#: ishtar_common/models.py:2827 ishtar_common/models.py:3415 +#: ishtar_common/models.py:2837 ishtar_common/models.py:3425 msgctxt "key for text search" msgid "email" msgstr "courriel" -#: ishtar_common/models.py:2830 ishtar_common/models.py:3999 +#: ishtar_common/models.py:2840 ishtar_common/models.py:4013 msgctxt "key for text search" msgid "title" msgstr "titre" -#: ishtar_common/models.py:2833 +#: ishtar_common/models.py:2843 msgctxt "key for text search" msgid "salutation" msgstr "salutation" -#: ishtar_common/models.py:2840 ishtar_common/models.py:3423 +#: ishtar_common/models.py:2850 ishtar_common/models.py:3433 msgctxt "key for text search" msgid "organization" msgstr "organisation" -#: ishtar_common/models.py:2844 +#: ishtar_common/models.py:2854 msgctxt "key for text search" msgid "has-account" msgstr "a-un-compte" -#: ishtar_common/models.py:2848 +#: ishtar_common/models.py:2858 msgctxt "key for text search" msgid "profile-type" msgstr "type-profil" -#: ishtar_common/models.py:2884 +#: ishtar_common/models.py:2894 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." @@ -10586,59 +10814,59 @@ msgstr "" "traduction initiale (surname correspond en anglais au nom de famille, pas au " "prénom)." -#: ishtar_common/models.py:2891 +#: ishtar_common/models.py:2901 msgid "Contact type" msgstr "Type de contact" -#: ishtar_common/models.py:2894 ishtar_common/models.py:3014 +#: ishtar_common/models.py:2904 ishtar_common/models.py:3024 msgid "Types" msgstr "Types" -#: ishtar_common/models.py:2899 +#: ishtar_common/models.py:2909 msgid "Is attached to" msgstr "Est rattaché à" -#: ishtar_common/models.py:2910 +#: ishtar_common/models.py:2920 msgid "Persons" msgstr "Personnes" -#: ishtar_common/models.py:3171 +#: ishtar_common/models.py:3181 msgid "Manage account" msgstr "Gérer le compte" -#: ishtar_common/models.py:3194 +#: ishtar_common/models.py:3204 msgid "Groups" msgstr "Groupes" -#: ishtar_common/models.py:3198 +#: ishtar_common/models.py:3208 msgid "Profile types" msgstr "Types de profil" -#: ishtar_common/models.py:3210 +#: ishtar_common/models.py:3220 msgid "Profile type summary" msgstr "Résumé du type de profil" -#: ishtar_common/models.py:3211 +#: ishtar_common/models.py:3221 msgid "Profile types summary" msgstr "Résumés des types de profil" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3237 msgid "Show field number" msgstr "Afficher les numéros des champs" -#: ishtar_common/models.py:3228 +#: ishtar_common/models.py:3238 msgid "Automatically pin" msgstr "Épingler automatiquement" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3239 msgid "Display pin menu" msgstr "Montrer le menu d'épinglage" -#: ishtar_common/models.py:3231 +#: ishtar_common/models.py:3241 msgid "Use background tasks" msgstr "Utiliser les tâches de fond" -#: ishtar_common/models.py:3232 +#: ishtar_common/models.py:3242 msgid "" "If set to true, each import, export, document generation is set as a " "background task." @@ -10646,135 +10874,139 @@ msgstr "" "Si mis à vrai, chaque import, export, génération de document est définie " "comme une tâche de fond." -#: ishtar_common/models.py:3236 +#: ishtar_common/models.py:3246 msgid "Send email when the task is finished" msgstr "Envoyer un courriel quand la tâche de fond est finie." -#: ishtar_common/models.py:3246 +#: ishtar_common/models.py:3256 msgid "User profile" msgstr "Profil d'utilisateur" -#: ishtar_common/models.py:3247 +#: ishtar_common/models.py:3257 msgid "User profiles" msgstr "Profils d'utilisateurs" -#: ishtar_common/models.py:3334 ishtar_common/models.py:5116 +#: ishtar_common/models.py:3344 ishtar_common/models.py:5130 msgid "Scheduled" msgstr "Planifié" -#: ishtar_common/models.py:3335 ishtar_common/models.py:5117 +#: ishtar_common/models.py:3345 ishtar_common/models.py:5131 msgid "In progress" msgstr "En cours" -#: ishtar_common/models.py:3336 ishtar_common/models.py:5119 -#: ishtar_common/models_imports.py:1131 +#: ishtar_common/models.py:3346 ishtar_common/models.py:5133 +#: ishtar_common/models_imports.py:1285 ishtar_common/models_imports.py:1299 msgid "Finished" msgstr "Terminé" -#: ishtar_common/models.py:3342 +#: ishtar_common/models.py:3352 msgid "Generate label" msgstr "Générer l'étiquette" -#: ishtar_common/models.py:3354 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/models.py:3364 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:12 msgid "View" msgstr "Voir" -#: ishtar_common/models.py:3356 +#: ishtar_common/models.py:3366 msgid "Arguments" msgstr "Arguments" -#: ishtar_common/models.py:3364 ishtar_common/models.py:5133 -#: ishtar_common/models.py:5292 +#: ishtar_common/models.py:3374 ishtar_common/models.py:5147 +#: ishtar_common/models.py:5306 +#: ishtar_common/templates/ishtar/import_table.html:4 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:4 +#: ishtar_common/views.py:2241 msgid "Result" msgstr "Résultat" -#: ishtar_common/models.py:3367 +#: ishtar_common/models.py:3377 msgid "Background task" msgstr "Tâche de fond" -#: ishtar_common/models.py:3368 +#: ishtar_common/models.py:3378 msgid "Background tasks" msgstr "Tâches de fond" -#: ishtar_common/models.py:3404 +#: ishtar_common/models.py:3414 msgctxt "key for text search" msgid "username" msgstr "nom-utilisateur" -#: ishtar_common/models.py:3439 +#: ishtar_common/models.py:3449 msgid "Password last update" msgstr "Dernière mise à jour du mot de passe" -#: ishtar_common/models.py:3442 +#: ishtar_common/models.py:3452 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: ishtar_common/models.py:3445 +#: ishtar_common/models.py:3455 msgid "Latest news version" msgstr "Version des dernières nouveautés" -#: ishtar_common/models.py:3447 +#: ishtar_common/models.py:3457 msgid "Display news" msgstr "Afficher les nouveautés" -#: ishtar_common/models.py:3450 +#: ishtar_common/models.py:3460 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: ishtar_common/models.py:3451 +#: ishtar_common/models.py:3461 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: ishtar_common/models.py:3549 +#: ishtar_common/models.py:3563 msgid "Public" msgstr "Public" -#: ishtar_common/models.py:3667 +#: ishtar_common/models.py:3681 msgid "Author types" msgstr "Types d'auteur" -#: ishtar_common/models.py:3752 +#: ishtar_common/models.py:3766 msgid "COInS export - type" msgstr "Export COInS - type" -#: ishtar_common/models.py:3755 +#: ishtar_common/models.py:3769 msgid "COInS export - genre" msgstr "Export COInS - genre" -#: ishtar_common/models.py:3758 +#: ishtar_common/models.py:3772 msgid "Is localized" msgstr "Est localisé" -#: ishtar_common/models.py:3760 +#: ishtar_common/models.py:3774 msgid "Setting a language for this type of document is relevant" msgstr "Indiquer une langue pour ce type de document est pertinent" -#: ishtar_common/models.py:3765 +#: ishtar_common/models.py:3779 msgid "Document type" msgstr "Type de document" -#: ishtar_common/models.py:3766 +#: ishtar_common/models.py:3780 msgid "Document types" msgstr "Types de document" -#: ishtar_common/models.py:3780 ishtar_common/models.py:3808 +#: ishtar_common/models.py:3794 ishtar_common/models.py:3822 msgid "Only available for these document types" msgstr "Seulement disponible pour ces types de document" -#: ishtar_common/models.py:3784 ishtar_common/models_imports.py:942 -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models.py:3798 ishtar_common/models_imports.py:1061 +#: ishtar_common/models_imports.py:1105 msgid "Support type" msgstr "Type de support" -#: ishtar_common/models.py:3785 +#: ishtar_common/models.py:3799 msgid "Support types" msgstr "Types de support" -#: ishtar_common/models.py:3795 +#: ishtar_common/models.py:3809 msgid "Iframe template" msgstr "Patron d'iframe" -#: ishtar_common/models.py:3799 +#: ishtar_common/models.py:3813 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." @@ -10782,287 +11014,288 @@ msgstr "" "Patron pour insérer une iframe pour ce format. Utilisez les patrons django " "avec une variable {{document}} correspondant au document actuel." -#: ishtar_common/models.py:3812 +#: ishtar_common/models.py:3826 msgid "Format type" msgstr "Type de format" -#: ishtar_common/models.py:3813 +#: ishtar_common/models.py:3827 msgid "Format types" msgstr "Types de format" -#: ishtar_common/models.py:3823 ishtar_common/models_rest.py:109 +#: ishtar_common/models.py:3837 ishtar_common/models_rest.py:109 #: ishtar_common/templates/ishtar/merge_organization.html:11 #: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "URL" -#: ishtar_common/models.py:3826 ishtar_common/models_imports.py:939 +#: ishtar_common/models.py:3840 ishtar_common/models_imports.py:1058 msgid "License type" msgstr "Type de licence" -#: ishtar_common/models.py:3827 +#: ishtar_common/models.py:3841 msgid "License types" msgstr "Types de licence" -#: ishtar_common/models.py:3837 +#: ishtar_common/models.py:3851 msgid "Document tags" msgstr "Mots-clés du document" -#: ishtar_common/models.py:3964 +#: ishtar_common/models.py:3978 msgid "Identifier" msgstr "Identifiant" -#: ishtar_common/models.py:3987 +#: ishtar_common/models.py:4001 msgctxt "key for text search" msgid "author" msgstr "auteur" -#: ishtar_common/models.py:3991 +#: ishtar_common/models.py:4005 msgctxt "key for text search" msgid "publisher" msgstr "editeur" -#: ishtar_common/models.py:3995 +#: ishtar_common/models.py:4009 msgctxt "key for text search" msgid "publishing-year" msgstr "annee-publication" -#: ishtar_common/models.py:4010 +#: ishtar_common/models.py:4024 msgctxt "key for text search" msgid "internal-reference" msgstr "reference-interne" -#: ishtar_common/models.py:4018 +#: ishtar_common/models.py:4032 msgctxt "key for text search" msgid "tag" msgstr "mot-cle" -#: ishtar_common/models.py:4021 +#: ishtar_common/models.py:4035 msgctxt "key for text search" msgid "format" msgstr "format" -#: ishtar_common/models.py:4025 +#: ishtar_common/models.py:4039 msgctxt "key for text search" msgid "medium" msgstr "support" -#: ishtar_common/models.py:4029 +#: ishtar_common/models.py:4043 msgctxt "key for text search" msgid "language" msgstr "langue" -#: ishtar_common/models.py:4033 +#: ishtar_common/models.py:4047 msgctxt "key for text search" msgid "license" msgstr "licence" -#: ishtar_common/models.py:4037 +#: ishtar_common/models.py:4051 msgctxt "key for text search" msgid "scale" msgstr "echelle" -#: ishtar_common/models.py:4040 +#: ishtar_common/models.py:4054 msgctxt "key for text search" msgid "url" msgstr "url" -#: ishtar_common/models.py:4044 +#: ishtar_common/models.py:4058 msgctxt "key for text search" msgid "isbn" msgstr "isbn" -#: ishtar_common/models.py:4047 +#: ishtar_common/models.py:4061 msgctxt "key for text search" msgid "issn" msgstr "issn" -#: ishtar_common/models.py:4050 +#: ishtar_common/models.py:4064 msgctxt "key for text search" msgid "source" msgstr "source" -#: ishtar_common/models.py:4054 +#: ishtar_common/models.py:4068 msgctxt "key for text search" msgid "source-free-input" msgstr "source-saisie-libre" -#: ishtar_common/models.py:4058 +#: ishtar_common/models.py:4072 msgctxt "key for text search" msgid "warehouse-container" msgstr "depot-contenant" -#: ishtar_common/models.py:4062 +#: ishtar_common/models.py:4076 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "depot-reference-contenant" -#: ishtar_common/models.py:4069 +#: ishtar_common/models.py:4083 msgctxt "key for text search" msgid "additional-information" msgstr "informations-supplementaires" -#: ishtar_common/models.py:4073 +#: ishtar_common/models.py:4087 msgctxt "key for text search" msgid "has-duplicate" msgstr "existe-en-doublon" -#: ishtar_common/models.py:4092 +#: ishtar_common/models.py:4106 msgctxt "key for text search" msgid "basket-finds" msgstr "panier-mobilier" -#: ishtar_common/models.py:4096 ishtar_common/models.py:4197 +#: ishtar_common/models.py:4110 ishtar_common/models.py:4211 msgctxt "key for text search" msgid "find" msgstr "mobilier" -#: ishtar_common/models.py:4116 ishtar_common/models.py:4200 +#: ishtar_common/models.py:4130 ishtar_common/models.py:4214 msgctxt "key for text search" msgid "warehouse" msgstr "depot" -#: ishtar_common/models.py:4128 ishtar_common/models_common.py:1967 +#: ishtar_common/models.py:4142 ishtar_common/models_common.py:1777 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" -#: ishtar_common/models.py:4131 +#: ishtar_common/models.py:4145 msgctxt "key for text search" msgid "has-file" msgstr "a-un-fichier" -#: ishtar_common/models.py:4135 +#: ishtar_common/models.py:4149 msgctxt "key for text search" msgid "receipt-date-before" msgstr "date-reception-avant" -#: ishtar_common/models.py:4139 +#: ishtar_common/models.py:4153 msgctxt "key for text search" msgid "receipt-date-after" msgstr "date-reception-apres" -#: ishtar_common/models.py:4144 +#: ishtar_common/models.py:4158 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "reception-documentation-date-avant" -#: ishtar_common/models.py:4149 +#: ishtar_common/models.py:4163 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "reception-documentation-date-apres" -#: ishtar_common/models.py:4153 +#: ishtar_common/models.py:4167 msgctxt "key for text search" msgid "creation-date-before" msgstr "date-creation-avant" -#: ishtar_common/models.py:4157 +#: ishtar_common/models.py:4171 msgctxt "key for text search" msgid "creation-date-after" msgstr "date-creation-apres" -#: ishtar_common/models.py:4204 +#: ishtar_common/models.py:4218 msgctxt "key for text search" msgid "treatment" msgstr "traitement" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4222 msgctxt "key for text search" msgid "treatment-file" msgstr "dossier-traitement" -#: ishtar_common/models.py:4324 +#: ishtar_common/models.py:4338 msgid "Authors (raw)" msgstr "Auteurs (brut)" -#: ishtar_common/models.py:4341 +#: ishtar_common/models.py:4355 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "Nombre d'éléments" -#: ishtar_common/models.py:4348 +#: ishtar_common/models.py:4362 msgid "Container reference ID" msgstr "ID contenant de référence" -#: ishtar_common/models.py:4356 +#: ishtar_common/models.py:4370 msgid "Symbolic links" msgstr "Liens symboliques" -#: ishtar_common/models.py:4358 +#: ishtar_common/models.py:4372 msgid "Related" msgstr "Lié" -#: ishtar_common/models.py:4367 +#: ishtar_common/models.py:4381 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "Document" -#: ishtar_common/models.py:4371 +#: ishtar_common/models.py:4385 msgid "Can view own Document" msgstr "Peut voir ses propres Documents" -#: ishtar_common/models.py:4372 +#: ishtar_common/models.py:4386 msgid "Can add own Document" msgstr "Peut ajouter son propre Document" -#: ishtar_common/models.py:4373 +#: ishtar_common/models.py:4387 msgid "Can change own Document" msgstr "Peut modifier ses propres Documents" -#: ishtar_common/models.py:4374 +#: ishtar_common/models.py:4388 msgid "Can delete own Document" msgstr "Peut supprimer ses propres Documents" -#: ishtar_common/models.py:4594 +#: ishtar_common/models.py:4608 msgid "Add sub-document" msgstr "Ajouter un sous-document" -#: ishtar_common/models.py:4596 +#: ishtar_common/models.py:4610 msgid "sub-document" msgstr "sous-document" -#: ishtar_common/models.py:5011 +#: ishtar_common/models.py:5025 msgid "Is judiciary" msgstr "Est judiciaire" -#: ishtar_common/models.py:5015 +#: ishtar_common/models.py:5029 msgid "Operation types" msgstr "Types d'opération" -#: ishtar_common/models.py:5065 +#: ishtar_common/models.py:5079 msgid "Judiciary" msgstr "Judiciaire" -#: ishtar_common/models.py:5069 +#: ishtar_common/models.py:5083 msgid "Research" msgstr "Programmé" -#: ishtar_common/models.py:5102 +#: ishtar_common/models.py:5116 msgid "Filename" msgstr "Nom de fichier" -#: ishtar_common/models.py:5106 +#: ishtar_common/models.py:5120 msgid "Administration script" msgstr "Script d'administration" -#: ishtar_common/models.py:5107 +#: ishtar_common/models.py:5121 msgid "Administration scripts" msgstr "Scripts d'administration" -#: ishtar_common/models.py:5118 ishtar_common/models_imports.py:1130 +#: ishtar_common/models.py:5132 ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1298 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: ishtar_common/models.py:5136 +#: ishtar_common/models.py:5150 msgid "Administration task" msgstr "Tâche d'administration" -#: ishtar_common/models.py:5137 +#: ishtar_common/models.py:5151 msgid "Administration tasks" msgstr "Tâches d'administration" -#: ishtar_common/models.py:5157 +#: ishtar_common/models.py:5171 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." @@ -11070,7 +11303,7 @@ msgstr "" "ISHTAR_SCRIPT_DIR n'est pas défini dans votre fichier local_settings. " "Contactez l'administrateur." -#: ishtar_common/models.py:5169 +#: ishtar_common/models.py:5183 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " @@ -11081,11 +11314,11 @@ msgstr "" "problème de sécurité et cela n'est pas permis. Seul un chemin complet est " "permis." -#: ishtar_common/models.py:5182 +#: ishtar_common/models.py:5196 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "ISHTAR_SCRIPT_DIR : « {} » n'est pas un répertoire valable." -#: ishtar_common/models.py:5200 +#: ishtar_common/models.py:5214 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." @@ -11093,28 +11326,30 @@ msgstr "" "Le script « {} »n'est pas un fichier valable de votre répertoire de script. " "Vérifiez la configuration." -#: ishtar_common/models.py:5242 ishtar_common/models_imports.py:1121 +#: ishtar_common/models.py:5256 ishtar_common/models_imports.py:1275 +#: ishtar_common/models_imports.py:1292 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "Créé" -#: ishtar_common/models.py:5247 +#: ishtar_common/models.py:5261 msgid "Filter on" msgstr "Filtrer sur" -#: ishtar_common/models.py:5250 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5264 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "Requête filtrante" -#: ishtar_common/models.py:5253 +#: ishtar_common/models.py:5267 msgid "Textual query on this item (try it on the main interface)" msgstr "" "Requête textuelle sur cet élément (testez-la sur l'interface principale)" -#: ishtar_common/models.py:5256 +#: ishtar_common/models.py:5270 msgid "Export geographic data" msgstr "Exporter les données géographiques" -#: ishtar_common/models.py:5259 +#: ishtar_common/models.py:5273 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" @@ -11122,15 +11357,15 @@ msgstr "" "Les données géographiques peuvent représenter un volume important " "d'information. Celles-ci peuvent être exclues de l'export." -#: ishtar_common/models.py:5267 +#: ishtar_common/models.py:5281 msgid "Put locks on associated items" msgstr "Mettre un verrou sur les éléments associés" -#: ishtar_common/models.py:5272 +#: ishtar_common/models.py:5286 msgid "Lock user" msgstr "Utilisateur pour le verrou" -#: ishtar_common/models.py:5276 +#: ishtar_common/models.py:5290 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." @@ -11139,67 +11374,68 @@ msgstr "" "aucun utilisateur n'est désigné les verrous pourront être supprimés par " "n'importe quel utilisateur avec les permissions d'édition." -#: ishtar_common/models.py:5281 +#: ishtar_common/models.py:5295 msgid "Export types" msgstr "Exporter les types" -#: ishtar_common/models.py:5282 +#: ishtar_common/models.py:5296 msgid "Export configuration" msgstr "Exporter la configuration" -#: ishtar_common/models.py:5283 +#: ishtar_common/models.py:5297 msgid "Export importers" msgstr "Exporter les importeurs" -#: ishtar_common/models.py:5284 +#: ishtar_common/models.py:5298 msgid "Export towns, areas..." msgstr "Exporter les villes, les zones, ..." -#: ishtar_common/models.py:5285 +#: ishtar_common/models.py:5299 msgid "Export directory" msgstr "Exporter l'annuaire" -#: ishtar_common/models.py:5286 +#: ishtar_common/models.py:5300 msgid "Export documents" msgstr "Exporter les documents" -#: ishtar_common/models.py:5287 +#: ishtar_common/models.py:5301 msgid "Export main items" msgstr "Exporter les éléments principaux" -#: ishtar_common/models.py:5294 +#: ishtar_common/models.py:5308 msgid "Result information" msgstr "Informations" -#: ishtar_common/models.py:5297 +#: ishtar_common/models.py:5311 msgid "Archive - Export" msgstr "Archive - Export" -#: ishtar_common/models.py:5298 +#: ishtar_common/models.py:5312 msgid "Archive - Exports" msgstr "Archive - Exports" -#: ishtar_common/models.py:5300 ishtar_common/models.py:5360 -#: ishtar_common/templates/ishtar/import_table.html:51 +#: ishtar_common/models.py:5314 ishtar_common/models.py:5374 +#: ishtar_common/templates/ishtar/import_table.html:107 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "Archive" -#: ishtar_common/models.py:5310 +#: ishtar_common/models.py:5324 msgid "Whole database" msgstr "Base de données complète" -#: ishtar_common/models.py:5322 +#: ishtar_common/models.py:5336 msgid "To filter filter type and filter text must be filled." msgstr "" "Pour filtrer, à la fois le type de filtre et la requête filtrante doivent " "être remplis." -#: ishtar_common/models.py:5334 +#: ishtar_common/models.py:5348 msgid "Import user" msgstr "Utilisateur pour l'import" -#: ishtar_common/models.py:5338 +#: ishtar_common/models.py:5352 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." @@ -11208,447 +11444,475 @@ msgstr "" "version des éléments. Si ce champ est laissé vide aucun historique ne sera " "renseigné." -#: ishtar_common/models.py:5347 +#: ishtar_common/models.py:5361 msgid "Delete before adding" msgstr "Supprimer avant ajout" -#: ishtar_common/models.py:5349 +#: ishtar_common/models.py:5363 msgid "Delete existing items before adding" msgstr "Supprime les éléments existants avant d'ajouter de nouveaux éléments" -#: ishtar_common/models.py:5352 +#: ishtar_common/models.py:5366 msgid "Releasing locks on associated items" msgstr "Relâcher les verrous sur les éléments associés" -#: ishtar_common/models.py:5357 +#: ishtar_common/models.py:5371 msgid "Archive - Import" msgstr "Archive - Import" -#: ishtar_common/models.py:5358 +#: ishtar_common/models.py:5372 msgid "Archive - Imports" msgstr "Archive - Imports" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Search vector" msgstr "Vecteur de recherche" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Auto filled at save" msgstr "Auto-rempli à la sauvegarde" -#: ishtar_common/models_common.py:1440 +#: ishtar_common/models_common.py:1085 +msgid "Timestamp geo" +msgstr "Horodatage géographique" + +#: ishtar_common/models_common.py:1086 +msgid "Timestamp label" +msgstr "Horodatage libellé" + +#: ishtar_common/models_common.py:1470 msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_common/models_common.py:1448 +#: ishtar_common/models_common.py:1478 msgid "Creator" msgstr "Créateur" -#: ishtar_common/models_common.py:1455 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:1485 ishtar_common/models_common.py:2176 msgid "Need update" msgstr "Nécessite une mise à jour" -#: ishtar_common/models_common.py:1457 +#: ishtar_common/models_common.py:1487 msgid "Item locked for edition" msgstr "Élément verrouillé pour l'édition" -#: ishtar_common/models_common.py:1463 +#: ishtar_common/models_common.py:1493 msgid "Locked by" msgstr "Verrouillé par" -#: ishtar_common/models_common.py:1483 +#: ishtar_common/models_common.py:1513 msgctxt "key for text search" msgid "modified-by" msgstr "modifie-par" -#: ishtar_common/models_common.py:1487 +#: ishtar_common/models_common.py:1517 msgctxt "key for text search" msgid "created-before" msgstr "creee-avant" -#: ishtar_common/models_common.py:1491 +#: ishtar_common/models_common.py:1521 msgctxt "key for text search" msgid "created-after" msgstr "creee-apres" -#: ishtar_common/models_common.py:1494 +#: ishtar_common/models_common.py:1524 msgctxt "key for text search" msgid "modified-before" msgstr "modifie-avant" -#: ishtar_common/models_common.py:1498 +#: ishtar_common/models_common.py:1528 msgctxt "key for text search" msgid "modified-after" msgstr "modifie-apres" -#: ishtar_common/models_common.py:1501 +#: ishtar_common/models_common.py:1531 msgctxt "key for text search" msgid "locked" msgstr "verrou" -#: ishtar_common/models_common.py:1971 +#: ishtar_common/models_common.py:1781 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:1975 +#: ishtar_common/models_common.py:1785 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:2055 +#: ishtar_common/models_common.py:1865 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:2057 +#: ishtar_common/models_common.py:1867 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:2220 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2051 msgid "Authority name" msgstr "Registre" -#: ishtar_common/models_common.py:2221 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2051 msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:2032 msgid "Number of decimal places" msgstr "Nombre de décimales" -#: ishtar_common/models_common.py:2223 +#: ishtar_common/models_common.py:2033 msgid "Number of decimal places for Z" msgstr "Nombre de décimales pour Z" -#: ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:2036 msgid "Geographic - Spatial reference system" msgstr "Géographie - Système de référence spatiale" -#: ishtar_common/models_common.py:2227 +#: ishtar_common/models_common.py:2037 msgid "Geographic - Spatial reference systems" msgstr "Géographie - Systèmes de référence spatiale" -#: ishtar_common/models_common.py:2258 +#: ishtar_common/models_common.py:2068 msgid "Geographic - Origin type" msgstr "Géographie - Type d'origine" -#: ishtar_common/models_common.py:2259 +#: ishtar_common/models_common.py:2069 msgid "Geographic - Origin types" msgstr "Géographie - Types d'origine" -#: ishtar_common/models_common.py:2275 +#: ishtar_common/models_common.py:2085 msgid "Geographic - Data type" msgstr "Géographie - Type de données" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2086 msgid "Geographic - Data types" msgstr "Géographie - Types de données" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2102 msgid "Geographic - Provider type" msgstr "Géographie - Type de fournisseur" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2103 msgid "Geographic - Provider types" msgstr "Géographie - Types de fournisseur" -#: ishtar_common/models_common.py:2305 +#: ishtar_common/models_common.py:2115 msgid "Geographic - Buffer type" msgstr "Géographie - Type de tampon" -#: ishtar_common/models_common.py:2306 +#: ishtar_common/models_common.py:2116 msgid "Geographic - Buffer types" msgstr "Géographie - Types de tampon" -#: ishtar_common/models_common.py:2332 +#: ishtar_common/models_common.py:2142 msgid "Line(s)" msgstr "Ligne(s)" -#: ishtar_common/models_common.py:2333 +#: ishtar_common/models_common.py:2143 msgid "Point(s)" msgstr "Point(s)" -#: ishtar_common/models_common.py:2334 +#: ishtar_common/models_common.py:2144 msgid "Polygon(s)" msgstr "Polygone(s)" -#: ishtar_common/models_common.py:2374 +#: ishtar_common/models_common.py:2184 msgid "Use this for update imports" msgstr "Utilisez cela pour des imports de mise à jour" -#: ishtar_common/models_common.py:2381 +#: ishtar_common/models_common.py:2191 msgid "For instance: topographical survey, georeferencing, ..." msgstr "Par exemple : levé topographiques, géoréférencement, ..." -#: ishtar_common/models_common.py:2389 +#: ishtar_common/models_common.py:2199 msgid "For instance: outline, z-sup, ..." msgstr "Par exemple : contour, Z-supérieur, ..." -#: ishtar_common/models_common.py:2397 +#: ishtar_common/models_common.py:2207 msgid "Data provider" msgstr "Fournisseur de données" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:4301 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:4109 msgid "X" msgstr "X/Long" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:2401 -#: ishtar_common/models_common.py:2402 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:2212 msgid "User input" msgstr "Saisie utilisateur" -#: ishtar_common/models_common.py:2401 ishtar_common/models_common.py:4302 +#: ishtar_common/models_common.py:2211 ishtar_common/models_common.py:4110 msgid "Y" msgstr "Y/Lat" -#: ishtar_common/models_common.py:2402 ishtar_common/models_common.py:4303 +#: ishtar_common/models_common.py:2212 ishtar_common/models_common.py:4111 msgid "Z" msgstr "Z" -#: ishtar_common/models_common.py:2405 +#: ishtar_common/models_common.py:2215 msgid "X (cached)" msgstr "X (cache)" -#: ishtar_common/models_common.py:2406 +#: ishtar_common/models_common.py:2216 msgid "Y (cached)" msgstr "Y (cache)" -#: ishtar_common/models_common.py:2407 +#: ishtar_common/models_common.py:2217 msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2419 ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:4123 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: ishtar_common/models_common.py:2424 ishtar_common/models_common.py:4321 +#: ishtar_common/models_common.py:2234 ishtar_common/models_common.py:4129 msgid "Point (2D)" msgstr "Point (2D)" -#: ishtar_common/models_common.py:2425 +#: ishtar_common/models_common.py:2235 msgid "Point (3D)" msgstr "Point (3D)" -#: ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:2236 msgid "Multi points" msgstr "Points multiples" -#: ishtar_common/models_common.py:2427 +#: ishtar_common/models_common.py:2237 msgid "Multi lines" msgstr "Lignes multiples" -#: ishtar_common/models_common.py:2428 +#: ishtar_common/models_common.py:2238 msgid "Multi polygons" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:2431 ishtar_common/models_common.py:2432 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:2242 msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2560 +#: ishtar_common/models_common.py:2370 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:3022 +#: ishtar_common/models_common.py:2832 msgid "Main geodata" msgstr "Élément géographique principal" -#: ishtar_common/models_common.py:3026 +#: ishtar_common/models_common.py:2836 msgid "Geodata" msgstr "Élément géographique" -#: ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:2840 msgctxt "key for text search" msgid "geo-name" msgstr "geo-nom" -#: ishtar_common/models_common.py:3033 +#: ishtar_common/models_common.py:2843 msgctxt "key for text search" msgid "geo-type" msgstr "geo-type" -#: ishtar_common/models_common.py:3036 +#: ishtar_common/models_common.py:2846 msgctxt "key for text search" msgid "geo-origin" msgstr "geo-origine" -#: ishtar_common/models_common.py:3039 +#: ishtar_common/models_common.py:2849 msgctxt "key for text search" msgid "geo-provider" msgstr "geo-fournisseur" -#: ishtar_common/models_common.py:3042 +#: ishtar_common/models_common.py:2852 msgctxt "key for text search" msgid "z-higher" msgstr "z-plus-grand" -#: ishtar_common/models_common.py:3046 +#: ishtar_common/models_common.py:2856 msgctxt "key for text search" msgid "z-lower" msgstr "z-plus-petit" -#: ishtar_common/models_common.py:3050 +#: ishtar_common/models_common.py:2860 msgctxt "key for text search" msgid "geo-comment" msgstr "geo-commentaire" -#: ishtar_common/models_common.py:3072 +#: ishtar_common/models_common.py:2882 msgid "Add geographic item" msgstr "Ajouter élément géographique" -#: ishtar_common/models_common.py:3074 +#: ishtar_common/models_common.py:2884 msgid "geo." msgstr "géo." -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3273 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:3467 +#: ishtar_common/models_common.py:3275 msgid "regen." msgstr "regén." -#: ishtar_common/models_common.py:3487 +#: ishtar_common/models_common.py:3295 msgid "Localisation" msgstr "Localisation" -#: ishtar_common/models_common.py:3489 +#: ishtar_common/models_common.py:3297 msgid "Limit" msgstr "Limite" -#: ishtar_common/models_common.py:3499 +#: ishtar_common/models_common.py:3307 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:3503 +#: ishtar_common/models_common.py:3311 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:3507 +#: ishtar_common/models_common.py:3315 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:3773 +#: ishtar_common/models_common.py:3581 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:3805 +#: ishtar_common/models_common.py:3613 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:3811 +#: ishtar_common/models_common.py:3619 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:3844 +#: ishtar_common/models_common.py:3652 msgid "Town with code: {} does not exists" msgstr "La commune avec le code : {} n'existe pas" -#: ishtar_common/models_common.py:3881 +#: ishtar_common/models_common.py:3689 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:3962 +#: ishtar_common/models_common.py:3770 msgid "Postal code - Town" msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:3972 +#: ishtar_common/models_common.py:3780 msgid "Mobile" msgstr "Mobile" -#: ishtar_common/models_common.py:3990 +#: ishtar_common/models_common.py:3798 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:4323 +#: ishtar_common/models_common.py:4131 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:4326 +#: ishtar_common/models_common.py:4134 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:4328 +#: ishtar_common/models_common.py:4136 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:4330 +#: ishtar_common/models_common.py:4138 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:4337 +#: ishtar_common/models_common.py:4145 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" -#: ishtar_common/models_imports.py:116 +#: ishtar_common/models_imports.py:125 msgid "Class name" msgstr "Nom de la classe" -#: ishtar_common/models_imports.py:120 +#: ishtar_common/models_imports.py:129 msgid "Data model" msgstr "Modèle de données" -#: ishtar_common/models_imports.py:121 +#: ishtar_common/models_imports.py:130 msgid "Data models" msgstr "Modèles de données" -#: ishtar_common/models_imports.py:138 +#: ishtar_common/models_imports.py:142 #: ishtar_common/templates/blocks/DataTables-stats.html:32 #: ishtar_common/templates/blocks/DataTables-tabs.html:8 msgid "Table" msgstr "Tableau" -#: ishtar_common/models_imports.py:139 +#: ishtar_common/models_imports.py:143 msgid "GIS" msgstr "SIG" -#: ishtar_common/models_imports.py:159 +#: ishtar_common/models_imports.py:163 +msgid "Tab number" +msgstr "Numéro d'onglet" + +#: ishtar_common/models_imports.py:164 +msgid "" +"When using an Excel or Calc file choose the tab number. Keep it to 1 by " +"default." +msgstr "" +"Lorsque on utilise un fichier Excel ou Calc choisir un numéron d'onglet. " +"Laisser à 1 par défaut." + +#: ishtar_common/models_imports.py:167 msgid "Layer name" msgstr "Nom de la couche" -#: ishtar_common/models_imports.py:163 +#: ishtar_common/models_imports.py:171 msgid "For GIS file with multiple layers" msgstr "Pour fichiers GIS avec de multiples couches" -#: ishtar_common/models_imports.py:166 +#: ishtar_common/models_imports.py:174 msgid "Set as main geometry" msgstr "Définir comme géométrie principale" -#: ishtar_common/models_imports.py:168 +#: ishtar_common/models_imports.py:176 msgid "Only relevant for GIS files" msgstr "Seulement applicable pour les fichiers SIG" -#: ishtar_common/models_imports.py:173 +#: ishtar_common/models_imports.py:181 msgid "Associated model" msgstr "Modèle associé" -#: ishtar_common/models_imports.py:181 +#: ishtar_common/models_imports.py:189 msgid "Models that can accept new items" msgstr "Modèles qui peuvent accepter de nouveaux éléments" -#: ishtar_common/models_imports.py:183 +#: ishtar_common/models_imports.py:191 msgid "Leave blank for no restrictions" msgstr "Laissez vide pour aucune restriction" -#: ishtar_common/models_imports.py:186 +#: ishtar_common/models_imports.py:194 msgid "Can be exported" msgstr "Peut être exporté" -#: ishtar_common/models_imports.py:188 +#: ishtar_common/models_imports.py:195 +msgid "Can be import" +msgstr "Peut être importé" + +#: ishtar_common/models_imports.py:196 +msgid "Archive required" +msgstr "Fichier d'archive nécessaire" + +#: ishtar_common/models_imports.py:198 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: ishtar_common/models_imports.py:189 +#: ishtar_common/models_imports.py:199 msgid "" "Mandatory for update importer. Set to key that identify items without " "ambiguity. Warning: __ is not supported, only use level 1 key." @@ -11657,19 +11921,49 @@ msgstr "" "les éléments sans ambiguïté. Attention : __ n'est pas pris en charge, " "n'utiliser seulement des clés de niveau 1." -#: ishtar_common/models_imports.py:198 +#: ishtar_common/models_imports.py:205 +msgid "Pre-import form message" +msgstr "Message du formulaire de pré-import" + +#: ishtar_common/models_imports.py:208 +msgid "Error messages to ignore" +msgstr "Messages d'erreur à ignorer" + +#: ishtar_common/models_imports.py:209 +msgid "" +"If an error is encountered with the following character strings, the error " +"is not reported in the error file. Each message is separated with a line " +"break." +msgstr "" +"Si une erreur est rencontré et qu'elle contient les chaînes de caractères " +"suivantes, elle n'est pas reportée dans le fichier d'erreur. Chaque message " +"est séparé par un retour à la ligne." + +#: ishtar_common/models_imports.py:217 msgid "Importer - Type" msgstr "Importeur - Type" -#: ishtar_common/models_imports.py:199 +#: ishtar_common/models_imports.py:218 msgid "Importer - Types" msgstr "Importeur - Types" -#: ishtar_common/models_imports.py:223 ishtar_common/models_rest.py:277 +#: ishtar_common/models_imports.py:250 ishtar_common/models_rest.py:277 msgid "List types" msgstr "Liste de types" -#: ishtar_common/models_imports.py:402 ishtar_common/models_imports.py:419 +#: ishtar_common/models_imports.py:440 +msgid "Importer - Group" +msgstr "Importeur - Groupe" + +#: ishtar_common/models_imports.py:441 +msgid "Importer - Groups" +msgstr "Importeur - Groupes" + +#: ishtar_common/models_imports.py:475 +msgid "Importer - Group <-> Importer" +msgstr "Importeur - Groupe <-> Importeur" + +#: ishtar_common/models_imports.py:496 ishtar_common/models_imports.py:513 msgid "" "Importer configuration error: \"{}\" is not available for \"{}\". Check your " "default and column configuration" @@ -11677,37 +11971,65 @@ msgstr "" "Erreur de configuration de l'importeur : \"{}\" n'existe pas pour \"{}\". " "Vérifiez la configuration des colonnes et des éléments par défaut" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:539 +msgid "" +"The target of the default values. Can be set to empty with \"-\". Use the " +"\"__\" notation to pass between models." +msgstr "" +"Cible des valeurs par défaut. Peut être définie comme vide avec \"-\". " +"Utiliser la notation \"__\" pour passer d'un modèle à l'autre." + +#: ishtar_common/models_imports.py:543 +msgid "Required fields" +msgstr "Champs requis" + +#: ishtar_common/models_imports.py:545 +msgid "" +"Theses defaults values only apply if the designated fields are not empty. " +"Use the \"__\" notation to pass between models.Leave empty to always apply." +msgstr "" +"Ces valeurs par défaut ne s'appliquent que si les champs désignés ne sont " +"pas vides. Utiliser la notation \"__\" pour passer d'un modèle à l'autre. " +"Laisser les champs vides pour qu'ils s'appliquent toujours." + +#: ishtar_common/models_imports.py:552 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:553 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: ishtar_common/models_imports.py:504 +#: ishtar_common/models_imports.py:620 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: ishtar_common/models_imports.py:505 +#: ishtar_common/models_imports.py:621 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: ishtar_common/models_imports.py:580 +#: ishtar_common/models_imports.py:697 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "Numéro de colonne" -#: ishtar_common/models_imports.py:596 +#: ishtar_common/models_imports.py:698 +msgid "" +"Column number in the table. Put 0 or negative number for pre-importer field." +msgstr "" +"Numéro de colonne dans le tableau. Mettre 0 ou un nombre négatif pour un " +"champ pré-importeur." + +#: ishtar_common/models_imports.py:715 msgid "Required" msgstr "Requis" -#: ishtar_common/models_imports.py:598 +#: ishtar_common/models_imports.py:717 msgid "Export field name" msgstr "Nom du champ à exporter" -#: ishtar_common/models_imports.py:603 +#: ishtar_common/models_imports.py:722 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." @@ -11715,55 +12037,55 @@ msgstr "" "Remplir ce champ si le nom du champ est ambigu pour l'export, par exemple " "dans le cas de champs concaténés." -#: ishtar_common/models_imports.py:610 +#: ishtar_common/models_imports.py:729 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: ishtar_common/models_imports.py:611 +#: ishtar_common/models_imports.py:730 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: ishtar_common/models_imports.py:654 +#: ishtar_common/models_imports.py:773 msgid "Field name" msgstr "Nom du champ" -#: ishtar_common/models_imports.py:656 ishtar_common/models_imports.py:759 +#: ishtar_common/models_imports.py:775 ishtar_common/models_imports.py:878 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: ishtar_common/models_imports.py:657 ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:776 ishtar_common/models_imports.py:879 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: ishtar_common/models_imports.py:659 ishtar_common/models_imports.py:762 +#: ishtar_common/models_imports.py:778 ishtar_common/models_imports.py:881 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: ishtar_common/models_imports.py:664 +#: ishtar_common/models_imports.py:783 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: ishtar_common/models_imports.py:665 +#: ishtar_common/models_imports.py:784 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: ishtar_common/models_imports.py:682 +#: ishtar_common/models_imports.py:801 msgid "Regular expression" msgstr "Expression régulière" -#: ishtar_common/models_imports.py:686 +#: ishtar_common/models_imports.py:805 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: ishtar_common/models_imports.py:687 +#: ishtar_common/models_imports.py:806 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: ishtar_common/models_imports.py:702 +#: ishtar_common/models_imports.py:821 msgid "Format string" msgstr "Chaîne pour le formatage" -#: ishtar_common/models_imports.py:705 +#: ishtar_common/models_imports.py:824 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " @@ -11776,227 +12098,225 @@ msgstr "" "place \"{item}\" peut être utilisé. L'entrée est considérée comme une chaîne " "de caractères." -#: ishtar_common/models_imports.py:715 +#: ishtar_common/models_imports.py:834 msgid "Importer - Value format" msgstr "Importeur - Format de valeur" -#: ishtar_common/models_imports.py:716 +#: ishtar_common/models_imports.py:835 msgid "Importer - Value formats" msgstr "Importeur - Formats de valeur" -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:848 msgid "The string provided generate an error. Fix it." msgstr "La chaîne de caractère saisie génère une erreur. Corrigez-là." -#: ishtar_common/models_imports.py:768 +#: ishtar_common/models_imports.py:887 msgid "Importer - Target" msgstr "Importeur - Cible" -#: ishtar_common/models_imports.py:769 +#: ishtar_common/models_imports.py:888 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:607 -#: ishtar_common/views_item.py:1425 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:639 +#: ishtar_common/views_item.py:1471 msgid "True" msgstr "Oui" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:1427 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:1473 msgid "False" msgstr "Non" -#: ishtar_common/models_imports.py:822 +#: ishtar_common/models_imports.py:941 msgid "All users can use it" msgstr "Tous les utilisateurs peuvent l'utiliser" -#: ishtar_common/models_imports.py:824 +#: ishtar_common/models_imports.py:943 msgid "All users can modify it" msgstr "Tous les utilisateurs peuvent le modifier" -#: ishtar_common/models_imports.py:829 +#: ishtar_common/models_imports.py:948 msgid "Importer - Target key group" msgstr "Importeur - Groupe de clé de rapprochement" -#: ishtar_common/models_imports.py:830 +#: ishtar_common/models_imports.py:949 msgid "Importer - Target key groups" msgstr "Importeur - Groupes de clé de rapprochement" -#: ishtar_common/models_imports.py:853 +#: ishtar_common/models_imports.py:972 msgid "Is set" msgstr "Est défini" -#: ishtar_common/models_imports.py:871 +#: ishtar_common/models_imports.py:990 msgid "Importer - Target key" msgstr "Importeur - Clé de rapprochement" -#: ishtar_common/models_imports.py:872 +#: ishtar_common/models_imports.py:991 msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:1065 msgid "Period" msgstr "Période" -#: ishtar_common/models_imports.py:947 +#: ishtar_common/models_imports.py:1066 msgid "Report state" msgstr "État de rapport" -#: ishtar_common/models_imports.py:952 +#: ishtar_common/models_imports.py:1071 msgid "Activity type" msgstr "Type d'activité" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:1076 msgid "Dating quality" msgstr "Qualité de datation" -#: ishtar_common/models_imports.py:958 +#: ishtar_common/models_imports.py:1077 msgid "Material" msgstr "Matériau" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:1080 msgid "Warehouse division" msgstr "Division de lieu de conservation" -#: ishtar_common/models_imports.py:969 +#: ishtar_common/models_imports.py:1088 msgid "Integrity type" msgstr "Type d'intégrité" -#: ishtar_common/models_imports.py:979 +#: ishtar_common/models_imports.py:1098 msgid "Identification type" msgstr "Type d'identification" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:1102 msgid "Context record relation type" msgstr "Type de relation entre Unités d'Enregistrement" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:1104 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: ishtar_common/models_imports.py:995 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:1114 overload_translation/models.py:7 msgid "String" msgstr "Chaîne de caractères" -#: ishtar_common/models_imports.py:999 +#: ishtar_common/models_imports.py:1118 msgid "INSEE code" msgstr "Code INSEE" -#: ishtar_common/models_imports.py:1000 +#: ishtar_common/models_imports.py:1119 msgid "Upper case" msgstr "Majuscule" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1120 msgid "Lower case" msgstr "Minuscule" -#: ishtar_common/models_imports.py:1002 +#: ishtar_common/models_imports.py:1121 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: ishtar_common/models_imports.py:1003 +#: ishtar_common/models_imports.py:1122 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: ishtar_common/models_imports.py:1004 +#: ishtar_common/models_imports.py:1123 msgid "Unknow type" msgstr "Type inconnu" -#: ishtar_common/models_imports.py:1023 +#: ishtar_common/models_imports.py:1142 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1143 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: ishtar_common/models_imports.py:1025 +#: ishtar_common/models_imports.py:1144 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: ishtar_common/models_imports.py:1042 +#: ishtar_common/models_imports.py:1174 +msgid "Formater type" +msgstr "Type de formateur" + +#: ishtar_common/models_imports.py:1176 msgid "Options" msgstr "Options" -#: ishtar_common/models_imports.py:1044 +#: ishtar_common/models_imports.py:1178 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: ishtar_common/models_imports.py:1049 +#: ishtar_common/models_imports.py:1183 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: ishtar_common/models_imports.py:1050 +#: ishtar_common/models_imports.py:1184 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: ishtar_common/models_imports.py:1122 +#: ishtar_common/models_imports.py:1276 ishtar_common/models_imports.py:1293 msgid "Analyse in progress" msgstr "Analyse en cours" -#: ishtar_common/models_imports.py:1123 +#: ishtar_common/models_imports.py:1277 ishtar_common/models_imports.py:1294 msgid "Analysed" msgstr "Analysé" -#: ishtar_common/models_imports.py:1124 +#: ishtar_common/models_imports.py:1278 msgid "Check modified in queue" msgstr "Vérification des modifications dans la file" -#: ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1279 ishtar_common/models_imports.py:1295 msgid "Import in queue" msgstr "Import en file d'attente" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1280 msgid "Check modified in progress" msgstr "Vérification des modifications en cours" -#: ishtar_common/models_imports.py:1127 +#: ishtar_common/models_imports.py:1281 ishtar_common/models_imports.py:1296 msgid "Import in progress" msgstr "Import en cours" -#: ishtar_common/models_imports.py:1128 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1297 msgid "Post-processing in progress" msgstr "Post-traitement en cours" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1283 msgid "Partially imported" msgstr "Importé partiellement" -#: ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1286 ishtar_common/models_imports.py:1300 msgid "Archived" msgstr "Archivé" -#: ishtar_common/models_imports.py:1201 -msgid "Importer type" -msgstr "Type d'importeur" - -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1370 msgid "Imported file" msgstr "Fichier importé" -#: ishtar_common/models_imports.py:1211 -msgid "Associated images (zip file)" -msgstr "Images associées (fichier zip)" +#: ishtar_common/models_imports.py:1378 +msgid "Associated documents (zip file)" +msgstr "Documents associés (fichier zip)" -#: ishtar_common/models_imports.py:1224 -msgid "If a group is selected, target key saved in this group will be used." -msgstr "" -"Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce " -"groupe sont utilisées." +#: ishtar_common/models_imports.py:1386 +msgid "Archive file" +msgstr "Fichier d'archive" -#: ishtar_common/models_imports.py:1228 +#: ishtar_common/models_imports.py:1394 msgid "Encoding" msgstr "Codage" -#: ishtar_common/models_imports.py:1229 +#: ishtar_common/models_imports.py:1395 msgid "Only required for CSV file" msgstr "Seulement requis pour les fichiers CSV" -#: ishtar_common/models_imports.py:1232 +#: ishtar_common/models_imports.py:1398 msgid "CSV separator" msgstr "Séparateur CSV" -#: ishtar_common/models_imports.py:1237 +#: ishtar_common/models_imports.py:1403 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." @@ -12004,11 +12324,11 @@ msgstr "" "Séparateur pour les CSV. Le standard est la virgule mais Microsoft Excel ne " "suit pas cette norme et utilise le point-virgule." -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1408 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: ishtar_common/models_imports.py:1244 +#: ishtar_common/models_imports.py:1410 msgid "" "Number of header lines in your file (can be 0 and should be 0 for geopackage " "or Shapefile)." @@ -12016,159 +12336,215 @@ msgstr "" "Nombre de lignes d'entête dans votre fichier (peut être égal à zéro et doit " "être égal à zéro pour geopackage et Shapefile)." -#: ishtar_common/models_imports.py:1247 +#: ishtar_common/models_imports.py:1508 +msgid "Importer group type" +msgstr "Type de groupe d'importeur" + +#: ishtar_common/models_imports.py:1509 +msgid "Current import" +msgstr "Import en cours" + +#: ishtar_common/models_imports.py:1515 +msgid "Import - Group" +msgstr "Import - Groupe" + +#: ishtar_common/models_imports.py:1516 +msgid "Import - Groups" +msgstr "Import - Groupes" + +#: ishtar_common/models_imports.py:1593 ishtar_common/models_imports.py:2245 +msgid "Analyse" +msgstr "Analyser" + +#: ishtar_common/models_imports.py:1595 ishtar_common/models_imports.py:1599 +#: ishtar_common/models_imports.py:2247 ishtar_common/models_imports.py:2257 +msgid "Re-analyse" +msgstr "Analyser de nouveau" + +#: ishtar_common/models_imports.py:1600 ishtar_common/models_imports.py:2258 +msgid "Re-import" +msgstr "Ré-importer" + +#: ishtar_common/models_imports.py:1601 ishtar_common/models_imports.py:2265 +msgid "Archive" +msgstr "Archiver" + +#: ishtar_common/models_imports.py:1604 ishtar_common/models_imports.py:2268 +msgid "Unarchive" +msgstr "Désarchiver" + +#: ishtar_common/models_imports.py:1606 ishtar_common/models_imports.py:2272 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 +#: ishtar_common/templates/ishtar/form_delete.html:11 +#: ishtar_common/views.py:2782 ishtar_common/widgets.py:453 +#: ishtar_common/widgets.py:489 +msgid "Delete" +msgstr "Supprimer" + +#: ishtar_common/models_imports.py:1864 +msgid "Importer type" +msgstr "Type d'importeur" + +#: ishtar_common/models_imports.py:1872 +msgid "If a group is selected, target key saved in this group will be used." +msgstr "" +"Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce " +"groupe sont utilisées." + +#: ishtar_common/models_imports.py:1876 +msgid "Imported values" +msgstr "Valeurs importées" + +#: ishtar_common/models_imports.py:1884 msgid "Error file" msgstr "Fichier erreur" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1892 msgid "Result file" msgstr "Fichier résultant" -#: ishtar_common/models_imports.py:1263 +#: ishtar_common/models_imports.py:1900 msgid "Match file" msgstr "Fichier de correspondance" -#: ishtar_common/models_imports.py:1271 -msgid "Archive file" -msgstr "Fichier d'archive" - -#: ishtar_common/models_imports.py:1282 +#: ishtar_common/models_imports.py:1911 msgid "Conservative import" msgstr "Import conservateur" -#: ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1913 msgid "If set to true, do not overload existing values." msgstr "Si coché, ne surchargera pas les valeurs existantes." -#: ishtar_common/models_imports.py:1293 +#: ishtar_common/models_imports.py:1916 msgid "Remaining seconds" msgstr "Secondes restantes" -#: ishtar_common/models_imports.py:1295 +#: ishtar_common/models_imports.py:1918 msgid "Current line" msgstr "Ligne actuelle" -#: ishtar_common/models_imports.py:1296 +#: ishtar_common/models_imports.py:1919 msgid "Number of line" msgstr "Nombre de lignes" -#: ishtar_common/models_imports.py:1298 +#: ishtar_common/models_imports.py:1921 msgid "Imported line numbers" msgstr "Numéros des lignes importées" -#: ishtar_common/models_imports.py:1303 +#: ishtar_common/models_imports.py:1926 msgid "Changed have been checked" msgstr "Les changements ont été vérifiés" -#: ishtar_common/models_imports.py:1305 +#: ishtar_common/models_imports.py:1928 msgid "Changed line numbers" msgstr "Numéro des lignes modifiées" -#: ishtar_common/models_imports.py:1312 -msgid "Import" -msgstr "Import" +#: ishtar_common/models_imports.py:1934 +#: ishtar_common/templates/ishtar/import_table.html:76 +msgid "Group" +msgstr "Groupe" -#: ishtar_common/models_imports.py:1355 ishtar_common/models_imports.py:1499 -msgid "Error in the CSV file." -msgstr "Erreur dans le fichier CSV." +#: ishtar_common/models_imports.py:1937 +msgid "Next import" +msgstr "Import suivant" -#: ishtar_common/models_imports.py:1424 -msgid "Analyse" -msgstr "Analyser" +#: ishtar_common/models_imports.py:1940 +msgid "Import - Import" +msgstr "Import - Import" -#: ishtar_common/models_imports.py:1426 ishtar_common/models_imports.py:1435 -msgid "Re-analyse" -msgstr "Analyser de nouveau" +#: ishtar_common/models_imports.py:1941 +msgid "Import - Imports" +msgstr "Import - Imports" -#: ishtar_common/models_imports.py:1430 +#: ishtar_common/models_imports.py:2174 ishtar_common/models_imports.py:2322 +msgid "Error in the CSV file." +msgstr "Erreur dans le fichier CSV." + +#: ishtar_common/models_imports.py:2252 msgid "Step by step import" msgstr "Import pas à pas" -#: ishtar_common/models_imports.py:1431 ishtar_common/models_imports.py:1440 +#: ishtar_common/models_imports.py:2253 ishtar_common/models_imports.py:2262 msgid "Re-check for changes" msgstr "Re-vérifier les changements" -#: ishtar_common/models_imports.py:1433 ishtar_common/models_imports.py:1442 +#: ishtar_common/models_imports.py:2255 ishtar_common/models_imports.py:2264 msgid "Check for changes" msgstr "Vérifier les changements" -#: ishtar_common/models_imports.py:1436 -msgid "Re-import" -msgstr "Ré-importer" - -#: ishtar_common/models_imports.py:1439 +#: ishtar_common/models_imports.py:2261 msgid "Step by step re-import" msgstr "Ré-import pas à pas" -#: ishtar_common/models_imports.py:1443 -msgid "Archive" -msgstr "Archiver" - -#: ishtar_common/models_imports.py:1446 -msgid "Unarchive" -msgstr "Désarchiver" - -#: ishtar_common/models_imports.py:1448 +#: ishtar_common/models_imports.py:2270 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "Modifier" -#: ishtar_common/models_imports.py:1449 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 -#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 -#: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2519 ishtar_common/widgets.py:453 -#: ishtar_common/widgets.py:489 -msgid "Delete" -msgstr "Supprimer" - -#: ishtar_common/models_imports.py:1543 ishtar_common/models_imports.py:1546 -#: ishtar_common/models_imports.py:1608 +#: ishtar_common/models_imports.py:2366 ishtar_common/models_imports.py:2369 +#: ishtar_common/models_imports.py:2431 msgid "Invalid GIS file." msgstr "Fichier SIG invalide." -#: ishtar_common/models_imports.py:1556 +#: ishtar_common/models_imports.py:2379 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "Géométrie \"{geometry}\" non gérée." -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:2401 msgid "CRS not managed." msgstr "CRS non géré." -#: ishtar_common/models_imports.py:1605 +#: ishtar_common/models_imports.py:2428 msgid "Error reading feature {idx + 1} - {e}" msgstr "Erreur en lisant l'entité geographique {idx + 1} - {e}" -#: ishtar_common/models_imports.py:1644 +#: ishtar_common/models_imports.py:2469 msgid "Modification check {} added to the queue" msgstr "Vérification des changements {} ajoutée à la file d'attente" -#: ishtar_common/models_imports.py:1712 +#: ishtar_common/models_imports.py:2537 msgid "Import {} added to the queue" msgstr "Import {} ajouté à la file d'attente" -#: ishtar_common/models_imports.py:1743 +#: ishtar_common/models_imports.py:2568 msgid "Error on imported file: {}" msgstr "Erreur sur le fichier d'import : {}" -#: ishtar_common/models_imports.py:1779 +#: ishtar_common/models_imports.py:2604 msgid "Import {} finished with errors" msgstr "Import {} fini avec des erreurs" -#: ishtar_common/models_imports.py:1787 +#: ishtar_common/models_imports.py:2612 msgid "Import {} finished with no errors" msgstr "Import {} fini avec aucune erreur" -#: ishtar_common/models_imports.py:1958 +#: ishtar_common/models_imports.py:2778 +msgid "Ignored" +msgstr "Ignoré" + +#: ishtar_common/models_imports.py:2781 ishtar_common/models_imports.py:2782 +msgid "Import - Ignored error" +msgstr "Import - Erreur ignorée" + +#: ishtar_common/models_imports.py:2817 +msgid "Import - Pre-import value" +msgstr "Importeur - Valeur de pré-import" + +#: ishtar_common/models_imports.py:2818 +msgid "Import - Pre-import values" +msgstr "Importeur - Valeurs de pré-import" + +#: ishtar_common/models_imports.py:2835 msgid "Specific key to an import" msgstr "Clé spécifique à un import" -#: ishtar_common/models_imports.py:1969 +#: ishtar_common/models_imports.py:2846 msgid "Import - Item key" msgstr "Import - Clé de rapprochement" -#: ishtar_common/models_imports.py:1970 +#: ishtar_common/models_imports.py:2847 msgid "Import - Item keys" msgstr "Import - Clés de rapprochement" @@ -12386,15 +12762,15 @@ msgstr "Voir sur le site" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1757 -#: ishtar_common/views.py:1761 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1873 +#: ishtar_common/views.py:1877 msgid "Previous" msgstr "Précédent" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1764 -#: ishtar_common/views.py:1766 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1880 +#: ishtar_common/views.py:1882 msgid "Next" msgstr "Suivant" @@ -12562,7 +12938,6 @@ msgstr "Clic droit sur l'image pour l'enregistrer." #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 -#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "Pas de données" @@ -12681,8 +13056,8 @@ msgstr "et" msgid ", " msgstr ", " -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2346 -#: ishtar_common/utils.py:2354 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2636 +#: ishtar_common/utils.py:2644 msgid "." msgstr "." @@ -12767,6 +13142,10 @@ msgstr "" "Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s " "- logiciel libre sous licence AGPL v3." +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:15 +msgid "Download" +msgstr "Télécharger" + #: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:5 msgctxt "Sheet" msgid "Creation" @@ -12777,6 +13156,14 @@ msgctxt "Sheet" msgid "Modification" msgstr "Modification" +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:23 +msgid "Imports (creation)" +msgstr "Imports (création)" + +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:32 +msgid "Imports (update)" +msgstr "Imports (mis à jour)" + #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "Principal" @@ -12813,6 +13200,10 @@ msgstr "Re-générer l'image" msgid "Generate image" msgstr "Générer l'image" +#: ishtar_common/templates/ishtar/blocks/view_import_csv.html:19 +msgid "Ignore" +msgstr "Ignorer" + #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:78 msgid "Support" msgstr "Support" @@ -12881,7 +13272,7 @@ msgid "Link" msgstr "Lien" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1238 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1239 msgid "Changelog" msgstr "Journal des modifications" @@ -12896,7 +13287,7 @@ msgstr "Rechercher et sélectionner un élément dans le tableau" #: ishtar_common/templates/ishtar/forms/search_query.html:77 #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 -#: ishtar_common/templates/ishtar/import_list.html:38 +#: ishtar_common/templates/ishtar/import_list.html:41 #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 @@ -12948,7 +13339,7 @@ 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 +#: ishtar_common/templates/ishtar/import_delete.html:28 msgid "Are you sure to want to delete this import?" msgstr "Êtes vous sûr de vouloir supprimer cet import ?" @@ -13089,6 +13480,10 @@ msgstr "import (table)" msgid "import (GIS)" msgstr "import (SIG)" +#: ishtar_common/templates/ishtar/import_list.html:27 +msgid "import (group)" +msgstr "import (groupe)" + #: ishtar_common/templates/ishtar/import_step_by_step.html:14 msgid "Add/modified" msgstr "Ajout/modification" @@ -13110,7 +13505,7 @@ msgid "Go" msgstr "Aller" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1600 +#: ishtar_common/views.py:1716 msgid "Import step by step" msgstr "Import pas à pas" @@ -13123,7 +13518,9 @@ msgid "Column" msgstr "Colonne" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 -#: ishtar_common/templates/ishtar/import_table.html:35 +#: ishtar_common/templates/ishtar/import_table.html:5 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:5 +#: ishtar_common/views.py:2240 msgid "Error" msgstr "Erreur" @@ -13185,7 +13582,6 @@ msgid "Objects matched with no changes" msgstr "Objets mis en correspondance sans changement" #: ishtar_common/templates/ishtar/import_step_by_step.html:263 -#: ishtar_common/templates/ishtar/import_table.html:49 msgid "Source file" msgstr "Fichier source" @@ -13209,46 +13605,47 @@ msgstr "" "Des modifications sur le fichier source ont été faites. Sauvegardez ou " "annulez ces modifications avant l'import." -#: ishtar_common/templates/ishtar/import_table.html:23 -msgid "No pending imports." -msgstr "Pas d'imports en attente." - -#: ishtar_common/templates/ishtar/import_table.html:29 -msgctxt "file" -msgid "File" -msgstr "Fichier" - -#: ishtar_common/templates/ishtar/import_table.html:30 +#: ishtar_common/templates/ishtar/import_table.html:3 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:3 msgid "Media" msgstr "Média" -#: ishtar_common/templates/ishtar/import_table.html:32 +#: ishtar_common/templates/ishtar/import_table.html:6 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:6 +#: ishtar_common/views.py:2242 +msgid "Match" +msgstr "Correspondance" + +#: ishtar_common/templates/ishtar/import_table.html:51 +msgid "No pending imports." +msgstr "Pas d'imports en attente." + +#: ishtar_common/templates/ishtar/import_table.html:57 msgid "Status" msgstr "État" -#: ishtar_common/templates/ishtar/import_table.html:34 -msgid "Unmatched items" -msgstr "Éléments sans correspondance" +#: ishtar_common/templates/ishtar/import_table.html:59 +msgctxt "file" +msgid "Files" +msgstr "Fichiers" -#: ishtar_common/templates/ishtar/import_table.html:36 -msgid "Control" -msgstr "Contrôle" +#: ishtar_common/templates/ishtar/import_table.html:60 +msgid "Pré-import form / matching" +msgstr "Formulaire pré-import/correspondances" -#: ishtar_common/templates/ishtar/import_table.html:37 -#: ishtar_common/templates/ishtar/import_table.html:77 -msgid "Match" -msgstr "Correspondance" +#: ishtar_common/templates/ishtar/import_table.html:61 +msgid "Diagnostic files" +msgstr "Fichiers de diagnostics" -#: ishtar_common/templates/ishtar/import_table.html:56 -msgid "Media file" -msgstr "Fichier média" +#: ishtar_common/templates/ishtar/import_table.html:119 +#: ishtar_common/templates/ishtar/import_table.html:192 +msgid "Pre-import values" +msgstr "Valeurs de pré-import" -#: ishtar_common/templates/ishtar/import_table.html:81 -#: ishtar_common/templates/ishtar/import_table.html:84 -#: ishtar_common/templates/ishtar/import_table.html:87 -msgctxt "not a directory" -msgid "File" -msgstr "Fichier" +#: ishtar_common/templates/ishtar/import_table.html:126 +#: ishtar_common/templates/ishtar/import_table.html:199 +msgid "Make match" +msgstr "Établir les correspondances" #: ishtar_common/templates/ishtar/manage_basket.html:9 msgid "Checking \"Select all\" only selects the current page." @@ -13321,6 +13718,26 @@ msgstr "Lien Internet" msgid "Other" msgstr "Autre" +#: ishtar_common/templates/ishtar/sheet_import.html:4 +msgid "Import" +msgstr "Import" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:32 +msgid "Updated" +msgstr "Mis à jour" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:98 +msgid "Associated imports" +msgstr "Imports associés" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:106 +msgid "Pre-import values " +msgstr "Valeurs de pré-import " + +#: ishtar_common/templates/ishtar/sheet_importgroup.html:4 +msgid "Import group" +msgstr "Groupe d'import" + #: ishtar_common/templates/ishtar/sheet_organization.html:21 msgid "Person in the organization" msgstr "Personnes au sein de l'organisation" @@ -13884,48 +14301,48 @@ msgstr "Pas de résultats" msgid "Loading..." msgstr "Chargement..." -#: ishtar_common/utils.py:200 ishtar_common/views.py:125 +#: ishtar_common/utils.py:207 ishtar_common/views.py:125 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:692 +#: ishtar_common/utils.py:968 msgid " (...)" msgstr " (...)" -#: ishtar_common/utils.py:770 +#: ishtar_common/utils.py:1046 msgid "Information" msgstr "Information" -#: ishtar_common/utils.py:771 +#: ishtar_common/utils.py:1047 msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: ishtar_common/utils.py:1637 +#: ishtar_common/utils.py:1927 msgid "The maximum supported file size is {} Mo." msgstr "La taille maximale supportée pour le fichier est de {} Mo." -#: ishtar_common/utils.py:2323 +#: ishtar_common/utils.py:2613 msgid "uppercase letter" msgstr "majuscule" -#: ishtar_common/utils.py:2324 +#: ishtar_common/utils.py:2614 msgid "lowercase letter" msgstr "minuscule" -#: ishtar_common/utils.py:2325 +#: ishtar_common/utils.py:2615 msgid "number" msgstr "nombre" -#: ishtar_common/utils.py:2326 +#: ishtar_common/utils.py:2616 msgid "punctuation sign" msgstr "signe de ponctuation" -#: ishtar_common/utils.py:2345 +#: ishtar_common/utils.py:2635 msgid "This password must contain one of this character: " msgstr "Ce mot de passe doit contenir un de ces caractères : " -#: ishtar_common/utils.py:2351 +#: ishtar_common/utils.py:2641 msgid "Your password must contain each of these characters: " msgstr "Votre mot de passe doit contenir chacun de ces caractères : " @@ -13978,128 +14395,136 @@ msgstr "Gérer les comptes" msgid "Account deletion" msgstr "Supprimer un compte" -#: ishtar_common/views.py:1104 ishtar_common/views_item.py:177 +#: ishtar_common/views.py:1105 ishtar_common/views_item.py:177 #: ishtar_common/views_item.py:218 ishtar_common/views_item.py:235 msgid "Operation not permitted." msgstr "Opération non permise." -#: ishtar_common/views.py:1471 +#: ishtar_common/views.py:1490 msgid "Import: create (table)" msgstr "Import : créer (table)" -#: ishtar_common/views.py:1491 -msgid "Edit import" -msgstr "Modifier l'import" +#: ishtar_common/views.py:1515 +msgid "Import: edit (table)" +msgstr "Import : modification (table)" -#: ishtar_common/views.py:1513 +#: ishtar_common/views.py:1522 msgid "Import: create (GIS)" -msgstr "Import : créer (SIG)" +msgstr "Import : création (SIG)" + +#: ishtar_common/views.py:1529 +msgid "Import: create (group)" +msgstr "Import : création (groupe)" + +#: ishtar_common/views.py:1535 +msgid "Import: pre-form" +msgstr "Import : pré-formulaire" -#: ishtar_common/views.py:1949 +#: ishtar_common/views.py:2065 msgid "Col. " msgstr "Col. " -#: ishtar_common/views.py:1956 ishtar_common/views.py:1971 +#: ishtar_common/views.py:2072 ishtar_common/views.py:2087 msgid "* empty *" msgstr "* vide *" -#: ishtar_common/views.py:2013 +#: ishtar_common/views.py:2173 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: ishtar_common/views.py:2049 +#: ishtar_common/views.py:2211 ishtar_common/views.py:2222 msgid "Delete import" msgstr "Supprimer un import" -#: ishtar_common/views.py:2087 +#: ishtar_common/views.py:2350 msgid "Merge persons" msgstr "Fusionner des personnes" -#: ishtar_common/views.py:2111 +#: ishtar_common/views.py:2374 msgid "Select the main person" msgstr "Choisir la personne principale" -#: ishtar_common/views.py:2119 +#: ishtar_common/views.py:2382 msgid "Merge organization" msgstr "Fusionner des organisations" -#: ishtar_common/views.py:2129 +#: ishtar_common/views.py:2392 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: ishtar_common/views.py:2169 ishtar_common/views.py:2184 +#: ishtar_common/views.py:2432 ishtar_common/views.py:2447 msgid "Corporation manager" msgstr "Représentant de la personne morale" -#: ishtar_common/views.py:2198 +#: ishtar_common/views.py:2461 msgid "New tag" msgstr "Nouvelle étiquette" -#: ishtar_common/views.py:2211 +#: ishtar_common/views.py:2474 msgid "Document: search" msgstr "Document : recherche" -#: ishtar_common/views.py:2231 +#: ishtar_common/views.py:2494 msgid "Document creation" msgstr "Document : création" -#: ishtar_common/views.py:2299 +#: ishtar_common/views.py:2562 msgid "Document modification" msgstr "Document : modification" -#: ishtar_common/views.py:2327 +#: ishtar_common/views.py:2590 msgid "Main image for" msgstr "Image principale pour" -#: ishtar_common/views.py:2352 +#: ishtar_common/views.py:2615 msgid "Document deletion" msgstr "Document : suppression" -#: ishtar_common/views.py:2389 +#: ishtar_common/views.py:2652 msgid "Error on your template" msgstr "Erreur sur votre patron" -#: ishtar_common/views.py:2495 +#: ishtar_common/views.py:2758 msgid "Delete bookmark" msgstr "Supprimer le marque-page" -#: ishtar_common/views.py:2518 +#: ishtar_common/views.py:2781 msgid "Bookmark - Delete" msgstr "Marque-page - Suppression" -#: ishtar_common/views.py:2561 +#: ishtar_common/views.py:2824 msgid "Some items have been locked by other users." msgstr "Des éléments ont été verrouillés par d'autres utilisateurs." -#: ishtar_common/views.py:2562 +#: ishtar_common/views.py:2825 msgid "Some items are locked." msgstr "Des éléments sont verrouillés." -#: ishtar_common/views.py:2567 +#: ishtar_common/views.py:2830 msgid "Not available" msgstr "Non disponible" -#: ishtar_common/views.py:2568 +#: ishtar_common/views.py:2831 msgid "Action not available for these items." msgstr "Action non disponible pour ces éléments." -#: ishtar_common/views.py:2687 +#: ishtar_common/views.py:2950 msgid "lock/unlock" msgstr "verrouiller/déverrouiller" -#: ishtar_common/views.py:2803 ishtar_common/views.py:2898 +#: ishtar_common/views.py:3066 ishtar_common/views.py:3161 msgid "Geo item creation" msgstr "Élément géographique création" -#: ishtar_common/views.py:2935 ishtar_common/views.py:2986 +#: ishtar_common/views.py:3198 ishtar_common/views.py:3249 msgid "Main geo item for" msgstr "Élément géo. principal pour" -#: ishtar_common/views.py:2946 +#: ishtar_common/views.py:3209 msgid "Geo item modification" msgstr "Élément géographique modification" -#: ishtar_common/views.py:2999 +#: ishtar_common/views.py:3262 msgid "Delete geographic item" msgstr "Supprimer des données géographiques" @@ -14113,7 +14538,7 @@ msgstr "Nouveau %s" msgid "Modify a %s" msgstr "Modifier un %s" -#: ishtar_common/views_item.py:923 +#: ishtar_common/views_item.py:955 msgctxt "key for text search" msgid "today" msgstr "aujourdhui" @@ -14184,8 +14609,25 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" -msgid "No associated town" -msgstr "Pas de commune associée" +#~ msgctxt "file" +#~ msgid "File" +#~ msgstr "Fichier" + +#~ msgid "Unmatched items" +#~ msgstr "Éléments sans correspondance" + +#~ msgid "Control" +#~ msgstr "Contrôle" + +#~ msgid "Media file" +#~ msgstr "Fichier média" + +#~ msgctxt "not a directory" +#~ msgid "File" +#~ msgstr "Fichier" + +#~ msgid "Edit import" +#~ msgstr "Modifier l'import" #~ msgid "Center" #~ msgstr "Centre" @@ -14367,9 +14809,6 @@ msgstr "Pas de commune associée" #~ msgid "Field completed" #~ msgstr "Terrain achevé" -#~ msgid "Associated report" -#~ msgstr "Rapport associé" - #~ msgid "Closed" #~ msgstr "Clos" @@ -14556,9 +14995,6 @@ msgstr "Pas de commune associée" #~ msgid "Show pin menu" #~ msgstr "Montrer le menu d'épinglage" -#~ msgid "New import" -#~ msgstr "Nouvel import" - #~ msgid "Can view all Documents" #~ msgstr "Peut voir tous les Documents" @@ -14698,9 +15134,6 @@ msgstr "Pas de commune associée" #~ msgid "Begining date" #~ msgstr "Date de début" -#~ msgid "Previous value:" -#~ msgstr "Valeur précédente :" - #~ msgctxt "key for text search" #~ msgid "modified-since" #~ msgstr "modifie-depuis" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index db47ae29a..cc7275c83 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: 2023-09-27 14:17+0200\n" +"POT-Creation-Date: 2023-11-18 17:48+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,28 +20,29 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:738 +#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:718 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1181 -#: archaeological_finds/models_finds.py:2464 +#: archaeological_finds/models_finds.py:1036 +#: archaeological_finds/models_finds.py:2319 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:575 #: archaeological_operations/forms.py:381 -#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1238 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1557 -#: archaeological_operations/models.py:2429 -#: archaeological_operations/models.py:2447 -#: archaeological_operations/models.py:2563 -#: archaeological_operations/models.py:2762 -#: archaeological_operations/models.py:3051 +#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:2435 +#: archaeological_operations/models.py:2453 +#: archaeological_operations/models.py:2569 +#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:3057 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2202 -#: ishtar_common/models.py:5234 ishtar_common/views.py:499 +#: archaeological_warehouse/models.py:897 ishtar_common/forms_common.py:2379 +#: ishtar_common/models.py:5248 ishtar_common/views.py:499 +#: na_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -87,17 +88,17 @@ msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1115 archaeological_files/forms.py:1151 -#: archaeological_finds/forms.py:1260 archaeological_finds/forms.py:1966 +#: archaeological_finds/forms.py:1261 archaeological_finds/forms.py:1967 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:561 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:836 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1213 -#: archaeological_operations/forms.py:1424 +#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1429 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:641 ishtar_common/forms_common.py:819 -#: ishtar_common/forms_common.py:1044 ishtar_common/forms_common.py:2119 +#: ishtar_common/forms_common.py:819 ishtar_common/forms_common.py:997 +#: ishtar_common/forms_common.py:1222 ishtar_common/forms_common.py:2296 msgid "Full text search" msgstr "" @@ -105,14 +106,14 @@ msgstr "" #: archaeological_context_records/forms.py:301 #: archaeological_context_records/forms.py:554 #: archaeological_context_records/forms.py:608 -#: archaeological_context_records/models.py:750 -#: archaeological_context_records/models.py:1457 +#: archaeological_context_records/models.py:730 +#: archaeological_context_records/models.py:1347 #: archaeological_warehouse/forms.py:454 msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1739 +#: archaeological_operations/forms.py:1744 msgid "Code PATRIARCHE" msgstr "" @@ -121,7 +122,7 @@ msgid "Operation - name" msgstr "" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2213 +#: ishtar_common/forms_common.py:2389 msgid "Operation - year" msgstr "" @@ -131,14 +132,14 @@ msgstr "" #: archaeological_context_records/forms.py:157 #: archaeological_context_records/forms.py:715 -#: archaeological_context_records/models.py:744 +#: archaeological_context_records/models.py:724 #: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5235 +#: archaeological_operations/models.py:566 ishtar_common/models.py:5249 msgid "Archaeological site" msgstr "" #: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1348 +#: archaeological_finds/forms.py:1349 msgid "Search within related operations" msgstr "" @@ -149,23 +150,24 @@ msgstr "" #: archaeological_context_records/forms.py:168 #: archaeological_context_records/forms.py:511 -#: archaeological_context_records/models.py:536 -#: archaeological_context_records/models.py:825 +#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:805 msgid "Activity" msgstr "" #: archaeological_context_records/forms.py:169 #: archaeological_context_records/forms.py:513 -#: archaeological_context_records/models.py:535 -#: archaeological_context_records/models.py:818 +#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:798 #: archaeological_finds/forms.py:273 archaeological_finds/forms.py:541 #: archaeological_finds/forms.py:717 #: archaeological_finds/templates/ishtar/sheet_find.html:147 -#: ishtar_common/forms_common.py:1921 +#: ishtar_common/forms_common.py:2098 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 #: man_app/templates/ishtar/sheet_find.html:151 +#: na_app/templates/ishtar/sheet_find.html:159 msgid "Identification" msgstr "" @@ -173,18 +175,18 @@ msgstr "" #: archaeological_context_records/forms.py:292 #: archaeological_context_records/forms.py:556 #: archaeological_context_records/forms.py:609 -#: archaeological_context_records/models.py:522 -#: archaeological_context_records/models.py:523 -#: archaeological_context_records/models.py:722 -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 +#: archaeological_context_records/models.py:702 +#: archaeological_context_records/models.py:1349 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:127 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1164 -#: archaeological_finds/models_finds.py:1139 +#: archaeological_finds/models_finds.py:994 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1064 -#: archaeological_operations/forms.py:1438 -#: archaeological_operations/models.py:3075 -#: archaeological_operations/models.py:3350 +#: archaeological_operations/forms.py:1066 +#: archaeological_operations/forms.py:1443 +#: archaeological_operations/models.py:3081 +#: archaeological_operations/models.py:3375 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -201,8 +203,8 @@ msgstr "" #: archaeological_context_records/forms.py:175 #: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:537 -#: archaeological_context_records/models.py:830 +#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:810 msgid "Excavation techniques" msgstr "" @@ -216,17 +218,20 @@ msgstr "" #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:58 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:707 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:683 +#: archaeological_operations/forms.py:709 +#: archaeological_operations/forms.py:1326 +#: archaeological_operations/forms.py:1498 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 #: ishtar_common/templates/ishtar/sheet_area.html:30 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "" @@ -238,17 +243,17 @@ msgstr "" #: archaeological_context_records/forms.py:546 #: archaeological_context_records/forms.py:610 #: archaeological_context_records/forms.py:708 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:730 -#: archaeological_finds/models_finds.py:1136 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:710 +#: archaeological_finds/models_finds.py:991 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1036 -#: archaeological_operations/models.py:3056 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:3062 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:294 -#: ishtar_common/forms_common.py:88 ishtar_common/forms_common.py:110 -#: ishtar_common/models_common.py:3526 ishtar_common/models_common.py:4299 +#: ishtar_common/forms_common.py:92 ishtar_common/forms_common.py:114 +#: ishtar_common/models_common.py:3334 ishtar_common/models_common.py:4107 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" @@ -262,87 +267,89 @@ msgstr "" #: archaeological_context_records/forms.py:303 #: archaeological_context_records/forms.py:557 #: archaeological_context_records/forms.py:612 -#: archaeological_context_records/models.py:524 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:775 -#: archaeological_context_records/models.py:1458 +#: archaeological_context_records/models.py:504 +#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:1348 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:305 -#: archaeological_context_records/models.py:751 -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:731 +#: archaeological_context_records/models.py:1350 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:138 #: archaeological_finds/forms.py:291 archaeological_finds/forms.py:293 #: archaeological_finds/forms.py:548 archaeological_finds/forms.py:550 #: archaeological_finds/forms.py:718 archaeological_finds/forms.py:764 -#: archaeological_finds/forms.py:1362 +#: archaeological_finds/forms.py:1363 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:426 -#: archaeological_finds/models_finds.py:1850 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/models_treatments.py:260 #: archaeological_finds/templates/ishtar/sheet_find.html:169 -#: ishtar_common/forms_common.py:1868 ishtar_common/forms_common.py:2136 -#: ishtar_common/models.py:1036 ishtar_common/models.py:4342 -#: ishtar_common/models_imports.py:153 ishtar_common/models_imports.py:581 -#: ishtar_common/models_imports.py:681 ishtar_common/models_imports.py:700 +#: ishtar_common/forms_common.py:2045 ishtar_common/forms_common.py:2313 +#: ishtar_common/models.py:1047 ishtar_common/models.py:4356 +#: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:434 +#: ishtar_common/models_imports.py:700 ishtar_common/models_imports.py:800 +#: ishtar_common/models_imports.py:819 #: man_app/templates/ishtar/sheet_find.html:170 +#: na_app/templates/ishtar/sheet_find.html:181 msgid "Description" msgstr "" #: archaeological_context_records/forms.py:307 -#: archaeological_context_records/models.py:781 +#: archaeological_context_records/models.py:761 msgid "Filling" msgstr "" #: archaeological_context_records/forms.py:309 -#: archaeological_context_records/models.py:752 +#: archaeological_context_records/models.py:732 msgid "General comment" msgstr "" #: archaeological_context_records/forms.py:320 #: archaeological_files/forms.py:308 archaeological_files/forms.py:822 -#: archaeological_files/models.py:639 archaeological_operations/forms.py:736 +#: archaeological_files/models.py:639 archaeological_operations/forms.py:738 msgid "Total surface (m2)" msgstr "" #: archaeological_context_records/forms.py:326 -#: archaeological_context_records/models.py:755 +#: archaeological_context_records/models.py:735 msgid "Length (m)" msgstr "" #: archaeological_context_records/forms.py:327 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/models.py:736 msgid "Width (m)" msgstr "" #: archaeological_context_records/forms.py:328 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/models.py:737 msgid "Thickness (m)" msgstr "" #: archaeological_context_records/forms.py:329 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/models.py:738 msgid "Diameter (m)" msgstr "" #: archaeological_context_records/forms.py:330 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/models.py:739 msgid "Depth (m)" msgstr "" #: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/models.py:741 msgid "Depth of appearance (m)" msgstr "" #: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:753 +#: archaeological_context_records/models.py:733 msgid "Opening date" msgstr "" #: archaeological_context_records/forms.py:338 -#: archaeological_context_records/models.py:754 +#: archaeological_context_records/models.py:734 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_files/models.py:602 #: archaeological_files/templates/ishtar/sheet_file.html:80 @@ -353,22 +360,24 @@ msgstr "" #: archaeological_finds/models_treatments.py:1142 #: archaeological_operations/models.py:1325 #: archaeological_operations/templates/ishtar/sheet_operation.html:204 -#: ishtar_common/forms.py:1005 ishtar_common/forms.py:1006 +#: ishtar_common/forms.py:1025 ishtar_common/forms.py:1026 +#: na_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "" #: archaeological_context_records/forms.py:341 -#: ishtar_common/forms_common.py:1708 +#: ishtar_common/forms_common.py:1885 msgid "Documentation" msgstr "" #: archaeological_context_records/forms.py:347 -#: archaeological_context_records/models.py:765 +#: archaeological_context_records/models.py:745 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:224 #: archaeological_finds/models_treatments.py:760 #: archaeological_warehouse/forms.py:737 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" @@ -383,23 +392,27 @@ msgstr "" #: archaeological_context_records/forms.py:441 #: archaeological_context_records/forms.py:463 #: archaeological_context_records/models.py:163 -#: archaeological_finds/forms.py:1154 archaeological_finds/forms.py:1175 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/forms.py:1155 archaeological_finds/forms.py:1176 +#: archaeological_finds/models_finds.py:1748 #: archaeological_finds/templates/ishtar/sheet_find.html:213 #: man_app/templates/ishtar/sheet_find.html:214 +#: na_app/templates/ishtar/sheet_find.html:225 msgid "Dating" msgstr "" #: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:107 -#: archaeological_context_records/models.py:534 -#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1161 -#: archaeological_finds/models_finds.py:1189 +#: archaeological_context_records/models.py:514 +#: archaeological_finds/forms.py:810 archaeological_finds/forms.py:1162 +#: archaeological_finds/models_finds.py:1044 #: archaeological_finds/templates/ishtar/sheet_find.html:221 -#: archaeological_operations/forms.py:827 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 +#: archaeological_operations/forms.py:829 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: man_app/templates/ishtar/sheet_find.html:222 +#: na_app/templates/ishtar/sheet_find.html:233 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:561 msgid "Chronological period" msgstr "" @@ -408,32 +421,36 @@ msgstr "" #: archaeological_files/forms.py:786 archaeological_files/models.py:75 #: archaeological_files/models.py:708 #: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_finds/forms.py:1163 +#: archaeological_finds/forms.py:1164 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3422 +#: archaeological_finds/models_finds.py:3157 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:758 #: archaeological_finds/templates/ishtar/sheet_find.html:222 #: 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_operations/forms.py:782 +#: archaeological_operations/forms.py:784 #: archaeological_operations/models.py:104 #: archaeological_operations/models.py:1326 -#: archaeological_operations/models.py:3354 +#: archaeological_operations/models.py:3379 #: man_app/templates/ishtar/sheet_find.html:223 -#: man_app/templates/ishtar/sheet_find.html:403 -#: man_app/templates/ishtar/sheet_find.html:441 -#: man_app/templates/ishtar/sheet_find.html:479 +#: man_app/templates/ishtar/sheet_find.html:391 +#: man_app/templates/ishtar/sheet_find.html:429 +#: man_app/templates/ishtar/sheet_find.html:467 +#: na_app/templates/ishtar/sheet_find.html:234 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:440 +#: na_app/templates/ishtar/sheet_find.html:478 msgid "Start date" msgstr "" #: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 -#: archaeological_files/models.py:709 archaeological_finds/forms.py:1164 -#: archaeological_finds/models_finds.py:3423 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:1165 +#: archaeological_finds/models_finds.py:3158 #: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:223 #: archaeological_finds/templates/ishtar/sheet_find.html:391 @@ -441,38 +458,46 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3355 -#: ishtar_common/models_imports.py:1290 +#: archaeological_operations/models.py:3380 +#: ishtar_common/models_imports.py:1416 #: man_app/templates/ishtar/sheet_find.html:224 -#: man_app/templates/ishtar/sheet_find.html:404 -#: man_app/templates/ishtar/sheet_find.html:442 -#: man_app/templates/ishtar/sheet_find.html:480 -#: man_app/templates/ishtar/sheet_find.html:518 +#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:506 +#: na_app/templates/ishtar/sheet_find.html:235 +#: na_app/templates/ishtar/sheet_find.html:403 +#: na_app/templates/ishtar/sheet_find.html:441 +#: na_app/templates/ishtar/sheet_find.html:479 +#: na_app/templates/ishtar/sheet_find.html:517 msgid "End date" msgstr "" #: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:120 -#: archaeological_finds/forms.py:1165 +#: archaeological_finds/forms.py:1166 #: archaeological_finds/templates/ishtar/sheet_find.html:225 #: man_app/templates/ishtar/sheet_find.html:226 +#: na_app/templates/ishtar/sheet_find.html:237 msgid "Quality" msgstr "" #: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:82 #: archaeological_context_records/models.py:113 -#: archaeological_finds/forms.py:1162 +#: archaeological_finds/forms.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:224 #: man_app/templates/ishtar/sheet_find.html:225 +#: na_app/templates/ishtar/sheet_find.html:236 msgid "Dating type" msgstr "" #: archaeological_context_records/forms.py:453 #: archaeological_context_records/models.py:125 -#: archaeological_finds/forms.py:1166 +#: archaeological_finds/forms.py:1167 #: archaeological_finds/templates/ishtar/sheet_find.html:226 #: man_app/templates/ishtar/sheet_find.html:227 +#: na_app/templates/ishtar/sheet_find.html:238 msgid "Precise on dating" msgstr "" @@ -483,15 +508,15 @@ msgstr "" #: archaeological_context_records/forms.py:476 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:274 -#: archaeological_context_records/models.py:1588 +#: archaeological_context_records/models.py:1478 #: archaeological_context_records/views.py:248 #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:716 archaeological_finds/forms.py:734 -#: archaeological_finds/forms.py:1341 archaeological_finds/models_finds.py:1132 -#: archaeological_finds/models_finds.py:2456 +#: archaeological_finds/forms.py:1342 archaeological_finds/models_finds.py:987 +#: archaeological_finds/models_finds.py:2311 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2215 ishtar_common/models.py:5236 +#: ishtar_common/forms_common.py:2391 ishtar_common/models.py:5250 #: ishtar_common/views.py:503 msgid "Context record" msgstr "" @@ -500,7 +525,9 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:82 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 -#: archaeological_operations/templates/ishtar/sheet_operation.html:374 +#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:382 msgid "Relations" msgstr "" @@ -510,7 +537,7 @@ msgstr "" #: archaeological_context_records/forms.py:500 #: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:782 +#: archaeological_context_records/models.py:762 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:48 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" @@ -521,22 +548,22 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:515 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/models.py:764 msgid "TAQ" msgstr "" #: archaeological_context_records/forms.py:516 -#: archaeological_context_records/models.py:793 +#: archaeological_context_records/models.py:773 msgid "Estimated TAQ" msgstr "" #: archaeological_context_records/forms.py:517 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/models.py:779 msgid "TPQ" msgstr "" #: archaeological_context_records/forms.py:518 -#: archaeological_context_records/models.py:808 +#: archaeological_context_records/models.py:788 msgid "Estimated TPQ" msgstr "" @@ -545,8 +572,8 @@ msgid "Comments on dating" msgstr "" #: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:616 -#: archaeological_operations/forms.py:629 +#: archaeological_operations/forms.py:618 +#: archaeological_operations/forms.py:631 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" @@ -561,9 +588,9 @@ msgid "Would you like to delete this context record?" msgstr "" #: archaeological_context_records/forms.py:644 -#: archaeological_finds/forms.py:970 archaeological_finds/forms.py:995 -#: archaeological_operations/forms.py:1809 ishtar_common/forms_common.py:2382 -#: ishtar_common/models.py:3284 ishtar_common/models.py:3654 +#: archaeological_finds/forms.py:971 archaeological_finds/forms.py:996 +#: archaeological_operations/forms.py:1814 ishtar_common/forms_common.py:2558 +#: ishtar_common/models.py:3294 ishtar_common/models.py:3668 msgid " - duplicate" msgstr "" @@ -572,9 +599,9 @@ msgid "Context record - Quick action - Modify" msgstr "" #: archaeological_context_records/forms.py:694 -#: archaeological_context_records/models.py:1351 -#: archaeological_context_records/models.py:1390 -#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1239 +#: archaeological_context_records/models.py:1278 +#: archaeological_context_records/models.py:1346 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" @@ -633,7 +660,6 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:46 #: archaeological_warehouse/ishtar_menu.py:80 ishtar_common/ishtar_menu.py:48 #: ishtar_common/ishtar_menu.py:115 ishtar_common/ishtar_menu.py:192 -#: ishtar_common/templates/ishtar/import_table.html:31 msgid "Creation" msgstr "" @@ -689,8 +715,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:937 -#: archaeological_finds/tests.py:1341 archaeological_finds/tests.py:1541 +#: archaeological_context_records/tests.py:935 +#: archaeological_finds/tests.py:1386 archaeological_finds/tests.py:1586 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -737,13 +763,14 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2073 -#: archaeological_finds/models_finds.py:3388 -#: archaeological_finds/models_finds.py:3410 +#: archaeological_finds/models_finds.py:1928 +#: archaeological_finds/models_finds.py:3123 +#: archaeological_finds/models_finds.py:3145 #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2231 ishtar_common/models.py:5237 +#: ishtar_common/forms_common.py:2407 ishtar_common/models.py:5251 #: ishtar_common/views.py:507 man_app/templates/ishtar/sheet_find.html:5 +#: na_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "" @@ -758,21 +785,22 @@ msgstr "" #: archaeological_finds/models_finds.py:255 #: archaeological_finds/models_finds.py:299 #: archaeological_finds/models_finds.py:370 -#: archaeological_finds/models_finds.py:1845 +#: archaeological_finds/models_finds.py:1700 #: archaeological_finds/models_treatments.py:66 #: archaeological_finds/models_treatments.py:752 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3381 +#: archaeological_operations/models.py:3406 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:734 -#: archaeological_warehouse/models.py:766 ishtar_common/models.py:673 -#: ishtar_common/models.py:729 ishtar_common/models.py:772 -#: ishtar_common/models.py:1807 ishtar_common/models.py:3663 -#: ishtar_common/models.py:5009 ishtar_common/models_common.py:2219 -#: ishtar_common/models_common.py:2255 ishtar_common/models_common.py:2272 -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:2302 +#: archaeological_warehouse/models.py:766 ishtar_common/models.py:684 +#: ishtar_common/models.py:740 ishtar_common/models.py:783 +#: ishtar_common/models.py:1817 ishtar_common/models.py:3677 +#: ishtar_common/models.py:5023 ishtar_common/models_common.py:2029 +#: ishtar_common/models_common.py:2065 ishtar_common/models_common.py:2082 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2112 +#: ishtar_common/models_imports.py:469 msgid "Order" msgstr "" @@ -813,7 +841,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:955 +#: ishtar_common/models_imports.py:1074 msgid "Documentation type" msgstr "" @@ -821,15 +849,15 @@ msgstr "" msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:511 -#: archaeological_context_records/models.py:512 -#: archaeological_context_records/models.py:1461 -#: archaeological_finds/models_finds.py:1151 -#: archaeological_finds/models_finds.py:1152 +#: archaeological_context_records/models.py:491 +#: archaeological_context_records/models.py:492 +#: archaeological_context_records/models.py:1351 +#: archaeological_finds/models_finds.py:1006 +#: archaeological_finds/models_finds.py:1007 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1124 -#: archaeological_operations/forms.py:1220 -#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1126 +#: archaeological_operations/forms.py:1223 +#: archaeological_operations/forms.py:1341 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 #: archaeological_operations/models.py:495 @@ -840,169 +868,170 @@ msgstr "" msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:493 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:514 -#: archaeological_context_records/models.py:515 +#: archaeological_context_records/models.py:494 +#: archaeological_context_records/models.py:495 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:516 +#: archaeological_context_records/models.py:496 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:517 -#: archaeological_finds/models_finds.py:1137 +#: archaeological_context_records/models.py:497 +#: archaeological_finds/models_finds.py:992 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:518 +#: archaeological_context_records/models.py:498 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:501 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:538 -#: archaeological_finds/models_finds.py:1201 +#: archaeological_context_records/models.py:518 +#: archaeological_finds/models_finds.py:1056 #: archaeological_operations/models.py:317 #: archaeological_operations/models.py:994 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:539 -#: archaeological_finds/models_finds.py:1202 +#: archaeological_context_records/models.py:519 +#: archaeological_finds/models_finds.py:1057 #: archaeological_operations/models.py:318 #: archaeological_operations/models.py:995 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:558 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_context_records/tests.py:763 -#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1285 +#: archaeological_context_records/models.py:561 +#: archaeological_context_records/tests.py:761 +#: archaeological_files/models.py:474 archaeological_finds/models_finds.py:1140 #: archaeological_operations/models.py:379 #: archaeological_operations/models.py:1138 -#: archaeological_operations/tests.py:3052 -#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4120 +#: archaeological_operations/tests.py:3097 +#: archaeological_warehouse/models.py:324 ishtar_common/models.py:4134 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:584 ishtar_common/models.py:4084 +#: archaeological_context_records/models.py:564 ishtar_common/models.py:4098 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:587 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1390 +#: archaeological_context_records/models.py:567 +#: archaeological_finds/models_finds.py:1505 archaeological_finds/tests.py:1435 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:591 +#: archaeological_context_records/models.py:571 #: archaeological_operations/models.py:1134 -#: archaeological_operations/models.py:2593 -#: archaeological_operations/tests.py:4540 +#: archaeological_operations/models.py:2599 +#: archaeological_operations/tests.py:4604 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:595 -#: archaeological_finds/models_finds.py:1293 +#: archaeological_context_records/models.py:575 +#: archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:599 -#: archaeological_context_records/models.py:664 -#: archaeological_finds/models_finds.py:1394 -#: archaeological_finds/models_finds.py:1766 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:644 +#: archaeological_finds/models_finds.py:1249 +#: archaeological_finds/models_finds.py:1621 #: archaeological_operations/models.py:414 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4076 -#: ishtar_common/models.py:4189 +#: archaeological_operations/models.py:440 ishtar_common/models.py:4090 +#: ishtar_common/models.py:4203 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:603 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1309 +#: archaeological_context_records/models.py:583 +#: archaeological_context_records/models.py:647 +#: archaeological_finds/models_finds.py:1164 #: archaeological_operations/models.py:1222 #: archaeological_operations/models.py:1287 -#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4112 -#: ishtar_common/models.py:4198 +#: archaeological_warehouse/models.py:977 ishtar_common/models.py:4126 +#: ishtar_common/models.py:4212 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:607 -#: archaeological_context_records/tests.py:830 -#: archaeological_finds/models_finds.py:1332 +#: archaeological_context_records/models.py:587 +#: archaeological_context_records/tests.py:828 +#: archaeological_finds/models_finds.py:1187 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:611 +#: archaeological_context_records/models.py:591 #: archaeological_operations/models.py:373 #: archaeological_operations/models.py:1180 -#: archaeological_operations/tests.py:3030 -#: archaeological_operations/tests.py:3068 -#: archaeological_operations/tests.py:3228 +#: archaeological_operations/tests.py:3075 +#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3252 +#: archaeological_operations/tests.py:3292 msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:615 -#: archaeological_context_records/tests.py:889 +#: archaeological_context_records/models.py:595 +#: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:618 +#: archaeological_context_records/models.py:598 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:621 +#: archaeological_context_records/models.py:601 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:625 +#: archaeological_context_records/models.py:605 #: archaeological_files/models.py:477 archaeological_operations/models.py:1144 -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2617 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:609 #: archaeological_operations/models.py:1241 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:632 -#: archaeological_context_records/tests.py:795 +#: archaeological_context_records/models.py:612 +#: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:636 +#: archaeological_context_records/models.py:616 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:682 -#: archaeological_finds/models_finds.py:1725 +#: archaeological_context_records/models.py:662 +#: archaeological_finds/models_finds.py:1580 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1270 #: archaeological_warehouse/models.py:342 @@ -1010,101 +1039,101 @@ msgstr "" msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:689 -#: archaeological_finds/models_finds.py:1718 +#: archaeological_context_records/models.py:669 +#: archaeological_finds/models_finds.py:1573 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1263 #: archaeological_warehouse/models.py:334 -#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2578 -#: ishtar_common/models.py:2855 ishtar_common/models.py:4215 +#: archaeological_warehouse/models.py:1092 ishtar_common/models.py:2588 +#: ishtar_common/models.py:2865 ishtar_common/models.py:4229 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:699 -#: archaeological_context_records/models.py:1147 +#: archaeological_context_records/models.py:679 +#: archaeological_context_records/models.py:1039 #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 -#: archaeological_finds/models_finds.py:915 -#: archaeological_finds/models_finds.py:1735 -#: archaeological_finds/models_finds.py:2362 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:770 +#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:2217 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 #: archaeological_finds/views.py:1316 archaeological_operations/models.py:484 #: archaeological_operations/models.py:661 #: archaeological_operations/models.py:1280 -#: archaeological_operations/models.py:1917 +#: archaeological_operations/models.py:1923 #: archaeological_operations/views.py:886 #: archaeological_operations/views.py:901 #: archaeological_operations/views.py:908 #: archaeological_operations/views.py:925 ishtar_common/admin.py:1589 -#: ishtar_common/admin.py:1709 ishtar_common/models.py:4224 -#: ishtar_common/models.py:4571 ishtar_common/views.py:2722 -#: ishtar_common/views.py:2740 +#: ishtar_common/admin.py:1732 ishtar_common/models.py:4238 +#: ishtar_common/models.py:4585 ishtar_common/views.py:2985 +#: ishtar_common/views.py:3003 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:696 #: archaeological_files/models.py:540 archaeological_finds/models_finds.py:421 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1694 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:1110 -#: archaeological_operations/models.py:3064 +#: archaeological_operations/models.py:3070 #: archaeological_warehouse/models.py:396 -#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4250 +#: archaeological_warehouse/models.py:1173 ishtar_common/models.py:4264 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:718 +#: archaeological_context_records/models.py:698 #: archaeological_files/models.py:543 archaeological_finds/models_finds.py:423 -#: archaeological_finds/models_finds.py:1841 -#: archaeological_operations/models.py:3067 +#: archaeological_finds/models_finds.py:1696 +#: archaeological_operations/models.py:3073 #: archaeological_warehouse/models.py:398 #: archaeological_warehouse/models.py:1175 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:763 -#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3485 +#: archaeological_context_records/models.py:743 +#: archaeological_operations/models.py:1379 ishtar_common/models_common.py:3293 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/models.py:748 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:752 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:788 +#: archaeological_context_records/models.py:768 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:796 +#: archaeological_context_records/models.py:776 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:783 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:811 +#: archaeological_context_records/models.py:791 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:839 +#: archaeological_context_records/models.py:819 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:91 -#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:2034 +#: archaeological_files/models.py:729 archaeological_finds/models_finds.py:1889 #: archaeological_finds/models_treatments.py:277 #: archaeological_finds/models_treatments.py:1160 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:534 #: archaeological_operations/models.py:1453 -#: archaeological_operations/models.py:2811 +#: archaeological_operations/models.py:2817 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:96 #: archaeological_warehouse/models.py:385 @@ -1112,136 +1141,141 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:193 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:984 ishtar_common/models.py:2360 -#: ishtar_common/models.py:3768 ishtar_common/models.py:3786 -#: ishtar_common/models.py:3815 ishtar_common/models.py:3829 -#: ishtar_common/models.py:3839 ishtar_common/models.py:4368 -#: ishtar_common/models.py:4379 ishtar_common/models_common.py:3513 +#: ishtar_common/models.py:995 ishtar_common/models.py:2370 +#: ishtar_common/models.py:3782 ishtar_common/models.py:3800 +#: ishtar_common/models.py:3829 ishtar_common/models.py:3843 +#: ishtar_common/models.py:3853 ishtar_common/models.py:4382 +#: ishtar_common/models.py:4393 ishtar_common/models_common.py:3321 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: ishtar_common/templates/ishtar/sheet_town.html:104 #: man_app/templates/ishtar/sheet_find.html:67 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_find.html:65 +#: na_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:846 -#: archaeological_finds/models_finds.py:2040 +#: archaeological_context_records/models.py:826 +#: archaeological_finds/models_finds.py:1895 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1167 #: archaeological_operations/models.py:540 #: archaeological_operations/models.py:1459 -#: archaeological_operations/models.py:2818 +#: archaeological_operations/models.py:2824 #: archaeological_warehouse/models.py:392 -#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2366 -#: ishtar_common/models_common.py:3519 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:2376 +#: ishtar_common/models_common.py:3327 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:851 -#: archaeological_finds/models_finds.py:2052 +#: archaeological_context_records/models.py:831 +#: archaeological_finds/models_finds.py:1907 #: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1542 +#: archaeological_operations/models.py:1548 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:854 -#: archaeological_context_records/models.py:860 -#: archaeological_finds/models_finds.py:2055 -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2067 +#: archaeological_context_records/models.py:834 +#: archaeological_context_records/models.py:840 +#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1922 #: archaeological_operations/models.py:548 #: archaeological_operations/models.py:554 #: archaeological_operations/models.py:560 #: archaeological_operations/models.py:1539 #: archaeological_operations/models.py:1545 #: archaeological_operations/models.py:1551 -#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4475 +#: archaeological_operations/models.py:1557 +#: archaeological_warehouse/models.py:409 ishtar_common/models_common.py:4283 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/models.py:837 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:864 -#: archaeological_context_records/models.py:865 +#: archaeological_context_records/models.py:844 +#: archaeological_context_records/models.py:845 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:434 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/models.py:866 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:921 -#: archaeological_finds/models_finds.py:2234 +#: archaeological_context_records/models.py:901 +#: archaeological_finds/models_finds.py:2089 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1135 +#: archaeological_context_records/models.py:1027 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1137 +#: archaeological_context_records/models.py:1029 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1352 +#: archaeological_context_records/models.py:1240 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1385 +#: archaeological_context_records/models.py:1273 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1386 +#: archaeological_context_records/models.py:1274 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1387 +#: archaeological_context_records/models.py:1275 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1388 +#: archaeological_context_records/models.py:1276 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1389 +#: archaeological_context_records/models.py:1277 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/models.py:1279 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:1280 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/models.py:1281 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1282 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:1283 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1402 +#: archaeological_context_records/models.py:1292 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1403 +#: archaeological_context_records/models.py:1293 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1594 +#: archaeological_context_records/models.py:1484 msgid "Context record parent" msgstr "" @@ -1277,6 +1311,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:40 #: archaeological_finds/templates/ishtar/sheet_find.html:48 #: man_app/templates/ishtar/sheet_find.html:50 +#: na_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "" @@ -1291,7 +1326,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:73 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:264 -#: archaeological_finds/forms.py:1763 archaeological_finds/models_finds.py:93 +#: archaeological_finds/forms.py:1764 archaeological_finds/models_finds.py:93 #: archaeological_finds/models_finds.py:107 #: archaeological_finds/models_finds.py:124 #: archaeological_finds/models_finds.py:235 @@ -1306,19 +1341,24 @@ msgstr "" #: archaeological_finds/models_finds.py:362 #: archaeological_finds/models_finds.py:376 #: archaeological_finds/models_finds.py:503 -#: archaeological_finds/models_finds.py:928 -#: archaeological_finds/models_finds.py:2074 -#: archaeological_finds/models_finds.py:2085 -#: archaeological_finds/models_finds.py:3431 +#: archaeological_finds/models_finds.py:783 +#: archaeological_finds/models_finds.py:1929 +#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/models_finds.py:3166 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 -#: archaeological_operations/templates/ishtar/sheet_operation.html:433 -#: archaeological_operations/templates/ishtar/sheet_operation.html:525 +#: archaeological_operations/templates/ishtar/sheet_operation.html:463 +#: archaeological_operations/templates/ishtar/sheet_operation.html:555 #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:188 #: archaeological_warehouse/templates/ishtar/sheet_container.html:235 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: na_app/templates/ishtar/sheet_container.html:195 +#: na_app/templates/ishtar/sheet_container.html:242 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:441 +#: na_app/templates/ishtar/sheet_operation.html:533 msgid "Finds" msgstr "" @@ -1332,7 +1372,11 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 #: man_app/templates/ishtar/sheet_find.html:76 -#: man_app/templates/ishtar/sheet_find.html:600 +#: man_app/templates/ishtar/sheet_find.html:546 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:74 +#: na_app/templates/ishtar/sheet_find.html:557 +#: na_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "" @@ -1340,6 +1384,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:83 #: archaeological_operations/templates/ishtar/sheet_operation.html:107 #: man_app/templates/ishtar/sheet_find.html:85 +#: na_app/templates/ishtar/sheet_find.html:83 +#: na_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "" @@ -1350,8 +1396,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4478 +#: ishtar_common/models_common.py:4286 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_operation.html:138 msgid "Complete identifier" msgstr "" @@ -1361,6 +1410,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:212 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:212 msgid "Surface" msgstr "" @@ -1368,12 +1418,14 @@ msgstr "" #: archaeological_files/forms.py:286 #: archaeological_files/templates/ishtar/sheet_file.html:93 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 -#: archaeological_operations/templates/ishtar/sheet_operation.html:292 +#: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:55 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:300 msgid "Geographic localisation" msgstr "" @@ -1382,10 +1434,12 @@ msgstr "" #: archaeological_finds/forms.py:719 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_finds/templates/ishtar/sheet_find.html:257 -#: archaeological_operations/templates/ishtar/sheet_operation.html:313 +#: archaeological_operations/templates/ishtar/sheet_operation.html:343 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: man_app/templates/ishtar/sheet_basefind.html:65 -#: man_app/templates/ishtar/sheet_find.html:270 +#: man_app/templates/ishtar/sheet_find.html:258 +#: na_app/templates/ishtar/sheet_find.html:269 +#: na_app/templates/ishtar/sheet_operation.html:321 msgid "Sheet" msgstr "" @@ -1394,7 +1448,8 @@ msgid "Operation summary" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:215 -#: archaeological_operations/templates/ishtar/sheet_operation.html:277 +#: archaeological_operations/templates/ishtar/sheet_operation.html:293 +#: na_app/templates/ishtar/sheet_operation.html:285 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -1411,30 +1466,37 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:424 #: archaeological_finds/templates/ishtar/sheet_find.html:462 #: archaeological_operations/templates/ishtar/sheet_operation.html:175 -#: ishtar_common/models.py:3359 ishtar_common/models.py:5128 -#: ishtar_common/models.py:5265 ishtar_common/models.py:5344 -#: ishtar_common/models_common.py:2148 ishtar_common/models_common.py:2163 -#: ishtar_common/models_imports.py:1279 -#: man_app/templates/ishtar/sheet_find.html:399 -#: man_app/templates/ishtar/sheet_find.html:437 -#: man_app/templates/ishtar/sheet_find.html:475 +#: ishtar_common/models.py:3369 ishtar_common/models.py:5142 +#: ishtar_common/models.py:5279 ishtar_common/models.py:5358 +#: ishtar_common/models_common.py:1958 ishtar_common/models_common.py:1973 +#: ishtar_common/models_imports.py:1511 ishtar_common/models_imports.py:1908 +#: man_app/templates/ishtar/sheet_find.html:387 +#: man_app/templates/ishtar/sheet_find.html:425 +#: man_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:398 +#: na_app/templates/ishtar/sheet_find.html:436 +#: na_app/templates/ishtar/sheet_find.html:474 +#: na_app/templates/ishtar/sheet_operation.html:175 msgid "State" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_operations/templates/ishtar/sheet_operation.html:180 +#: na_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: na_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 #: archaeological_files/templates/ishtar/sheet_file.html:82 #: archaeological_operations/templates/ishtar/sheet_operation.html:206 +#: na_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "" @@ -1447,12 +1509,14 @@ msgid "No associated finds." msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:273 -#: archaeological_operations/templates/ishtar/sheet_operation.html:438 +#: archaeological_operations/templates/ishtar/sheet_operation.html:468 +#: na_app/templates/ishtar/sheet_operation.html:446 msgid "Documents from associated finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:286 -#: archaeological_operations/templates/ishtar/sheet_operation.html:404 +#: archaeological_operations/templates/ishtar/sheet_operation.html:434 +#: na_app/templates/ishtar/sheet_operation.html:412 msgid "Context record relations" msgstr "" @@ -1485,7 +1549,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1906 +#: archaeological_operations/models.py:1912 msgid "Add context record" msgstr "" @@ -1522,7 +1586,7 @@ msgstr "" #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:387 archaeological_files/models.py:532 #: archaeological_files/templates/ishtar/sheet_file.html:217 -#: archaeological_finds/forms.py:1275 +#: archaeological_finds/forms.py:1276 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 @@ -1530,20 +1594,20 @@ msgstr "" #: archaeological_finds/forms_treatments.py:644 #: archaeological_finds/forms_treatments.py:726 #: archaeological_finds/forms_treatments.py:840 -#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1038 #: archaeological_finds/models_treatments.py:202 #: archaeological_finds/models_treatments.py:1104 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:727 -#: archaeological_operations/forms.py:1428 -#: archaeological_operations/forms.py:1741 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/forms.py:1746 #: archaeological_operations/models.py:986 #: archaeological_operations/models.py:1363 -#: archaeological_operations/models.py:2561 -#: archaeological_operations/models.py:2790 -#: archaeological_operations/models.py:3054 +#: archaeological_operations/models.py:2567 +#: archaeological_operations/models.py:2796 +#: archaeological_operations/models.py:3060 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1117 msgid "Year" msgstr "" @@ -1555,22 +1619,22 @@ msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1124 -#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1121 -#: archaeological_operations/forms.py:1218 -#: archaeological_operations/forms.py:1333 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1507 +#: archaeological_files/forms.py:1160 archaeological_operations/forms.py:1123 +#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1338 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/forms.py:1512 #: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2799 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1130 #: archaeological_files/forms.py:1167 archaeological_files/models.py:1357 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1441 -#: archaeological_operations/models.py:2433 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3493 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/models.py:2439 ishtar_common/models_common.py:1981 +#: ishtar_common/models_common.py:3301 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1608,30 +1672,30 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:616 #: archaeological_files/forms.py:664 archaeological_files/models.py:648 #: archaeological_finds/forms.py:336 archaeological_finds/forms.py:586 -#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2017 +#: archaeological_finds/forms.py:797 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1414 archaeological_finds/forms.py:2018 #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:427 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1827 #: archaeological_finds/models_treatments.py:259 #: archaeological_finds/models_treatments.py:1156 #: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:741 -#: archaeological_operations/forms.py:1226 -#: archaeological_operations/forms.py:1347 -#: archaeological_operations/forms.py:1444 -#: archaeological_operations/forms.py:1506 +#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1352 +#: archaeological_operations/forms.py:1449 +#: archaeological_operations/forms.py:1511 #: archaeological_operations/models.py:505 #: archaeological_operations/models.py:1448 -#: archaeological_operations/models.py:2807 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:375 -#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:1866 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2715 -#: ishtar_common/models.py:2893 ishtar_common/models.py:3547 -#: ishtar_common/models.py:4351 ishtar_common/models_common.py:183 -#: ishtar_common/models_common.py:2399 ishtar_common/models_imports.py:764 +#: archaeological_warehouse/models.py:1146 ishtar_common/forms_common.py:2043 +#: ishtar_common/forms_common.py:2348 ishtar_common/forms_common.py:2896 +#: ishtar_common/models.py:2903 ishtar_common/models.py:3561 +#: ishtar_common/models.py:4365 ishtar_common/models_common.py:185 +#: ishtar_common/models_common.py:2209 ishtar_common/models_imports.py:883 #: 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 @@ -1657,7 +1721,7 @@ msgstr "" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1220 #: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1446 ishtar_common/forms.py:931 +#: archaeological_operations/forms.py:1451 ishtar_common/forms.py:951 msgid "Created by" msgstr "" @@ -1665,7 +1729,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:585 #: archaeological_finds/forms_treatments.py:864 #: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1457 msgid "Modified by" msgstr "" @@ -1679,9 +1743,9 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:615 #: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:1861 -#: ishtar_common/forms_common.py:2341 ishtar_common/models.py:4336 -#: ishtar_common/models_imports.py:1287 +#: archaeological_operations/models.py:1324 ishtar_common/forms_common.py:2038 +#: ishtar_common/forms_common.py:2517 ishtar_common/models.py:4350 +#: ishtar_common/models_imports.py:1413 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1691,7 +1755,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1146 #: archaeological_finds/templates/ishtar/sheet_find.html:504 -#: man_app/templates/ishtar/sheet_find.html:517 +#: man_app/templates/ishtar/sheet_find.html:505 +#: na_app/templates/ishtar/sheet_find.html:516 msgid "Reception date" msgstr "" @@ -1721,28 +1786,29 @@ msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 #: archaeological_files/models.py:454 archaeological_files/models.py:612 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/forms.py:1034 -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/forms.py:1055 -#: archaeological_operations/forms.py:1383 +#: archaeological_operations/forms.py:723 +#: archaeological_operations/forms.py:1036 +#: archaeological_operations/forms.py:1052 +#: archaeological_operations/forms.py:1057 +#: archaeological_operations/forms.py:1388 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:503 #: archaeological_operations/models.py:1071 #: archaeological_operations/models.py:1073 #: archaeological_operations/models.py:1384 -#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:2808 #: archaeological_operations/templates/ishtar/sheet_operation.html:146 -#: ishtar_common/forms_common.py:1513 ishtar_common/forms_common.py:1526 -#: ishtar_common/forms_common.py:1527 ishtar_common/models.py:2347 -#: ishtar_common/models_common.py:3527 +#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:1703 +#: ishtar_common/forms_common.py:1704 ishtar_common/models.py:2357 +#: ishtar_common/models_common.py:3335 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: na_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:651 -#: archaeological_operations/models.py:2796 ishtar_common/models_common.py:2172 +#: archaeological_operations/models.py:2802 ishtar_common/models_common.py:1982 msgid "Departments" msgstr "" @@ -1764,8 +1830,8 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:598 -#: ishtar_common/forms_common.py:985 ishtar_common/models_common.py:3769 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:774 +#: ishtar_common/forms_common.py:1163 ishtar_common/models_common.py:3577 msgid "Postal code" msgstr "" @@ -1781,8 +1847,8 @@ msgstr "" #: archaeological_files/forms.py:326 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:234 archaeological_warehouse/forms.py:243 -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:981 -#: ishtar_common/models_common.py:3764 ishtar_common/models_common.py:3950 +#: ishtar_common/forms_common.py:770 ishtar_common/forms_common.py:1159 +#: ishtar_common/models_common.py:3572 ishtar_common/models_common.py:3758 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -1848,7 +1914,7 @@ msgstr "" #: archaeological_files/forms.py:596 archaeological_files/models.py:675 #: archaeological_operations/forms.py:525 -#: archaeological_operations/models.py:2747 +#: archaeological_operations/models.py:2753 msgid "Scientist in charge" msgstr "" @@ -1900,7 +1966,7 @@ msgstr "" msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:1925 +#: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2102 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "" @@ -2007,10 +2073,11 @@ msgstr "" #: archaeological_finds/models_treatments.py:203 #: archaeological_finds/models_treatments.py:1105 #: archaeological_finds/templates/ishtar/sheet_find.html:358 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1562 -#: archaeological_operations/models.py:2732 ishtar_common/admin.py:573 -#: ishtar_common/models.py:4249 man_app/templates/ishtar/sheet_find.html:371 +#: archaeological_operations/forms.py:1434 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/models.py:2738 ishtar_common/admin.py:573 +#: ishtar_common/models.py:4263 man_app/templates/ishtar/sheet_find.html:359 +#: na_app/templates/ishtar/sheet_find.html:370 msgid "Index" msgstr "" @@ -2020,10 +2087,11 @@ msgstr "" #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:842 #: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1435 -#: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2463 -#: archaeological_operations/models.py:2722 ishtar_common/models_imports.py:950 +#: archaeological_operations/forms.py:1440 +#: archaeological_operations/forms.py:1501 +#: archaeological_operations/models.py:2469 +#: archaeological_operations/models.py:2728 +#: ishtar_common/models_imports.py:1069 msgid "Act type" msgstr "" @@ -2034,17 +2102,17 @@ msgstr "" #: archaeological_files/forms.py:1162 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1436 -#: archaeological_operations/forms.py:1632 +#: archaeological_operations/forms.py:1441 +#: archaeological_operations/forms.py:1637 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1169 #: archaeological_finds/forms_treatments.py:569 #: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1442 -#: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2791 +#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1508 +#: archaeological_operations/models.py:2797 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2088,12 +2156,12 @@ msgstr "" #: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:751 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:220 archaeological_files/wizards.py:232 -#: archaeological_operations/forms.py:673 -#: archaeological_operations/forms.py:933 -#: archaeological_operations/models.py:1926 -#: archaeological_operations/models.py:2446 -#: archaeological_operations/models.py:2562 -#: archaeological_operations/models.py:2770 +#: archaeological_operations/forms.py:675 +#: archaeological_operations/forms.py:935 +#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2568 +#: archaeological_operations/models.py:2776 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:498 msgid "Archaeological file" msgstr "" @@ -2106,9 +2174,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:3413 +#: archaeological_finds/models_finds.py:3148 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2827 +#: archaeological_operations/models.py:2833 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2119,7 +2187,8 @@ msgstr "" #: archaeological_files/models.py:353 archaeological_files/models.py:1403 #: archaeological_files/models.py:1420 archaeological_files/models.py:1445 #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: ishtar_common/models.py:5067 +#: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: ishtar_common/models.py:5081 msgid "Preventive" msgstr "" @@ -2185,6 +2254,7 @@ msgstr "" #: archaeological_files/models.py:187 #: archaeological_operations/templates/ishtar/sheet_operation.html:229 +#: na_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "" @@ -2205,12 +2275,12 @@ msgid "Equipment/Service" msgstr "" #: archaeological_files/models.py:212 archaeological_warehouse/forms.py:207 -#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:174 -#: ishtar_common/models_common.py:205 +#: archaeological_warehouse/models.py:355 ishtar_common/models_common.py:176 +#: ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:216 ishtar_common/models_common.py:178 +#: archaeological_files/models.py:216 ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2228,7 +2298,7 @@ msgstr "" msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:227 ishtar_common/models_imports.py:951 +#: archaeological_files/models.py:227 ishtar_common/models_imports.py:1070 msgid "Unit" msgstr "" @@ -2240,16 +2310,16 @@ msgstr "" msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:235 ishtar_common/models.py:1630 -#: ishtar_common/models.py:2047 ishtar_common/models.py:3558 -#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:193 -#: ishtar_common/models_imports.py:826 +#: archaeological_files/models.py:235 ishtar_common/models.py:1640 +#: ishtar_common/models.py:2057 ishtar_common/models.py:3572 +#: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:203 +#: ishtar_common/models_imports.py:436 ishtar_common/models_imports.py:945 msgid "Available" msgstr "" #: archaeological_files/models.py:241 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1135 ishtar_common/models.py:2354 -#: ishtar_common/models_common.py:716 +#: ishtar_common/admin.py:1135 ishtar_common/models.py:2364 +#: ishtar_common/models_common.py:718 msgid "Parent" msgstr "" @@ -2309,30 +2379,36 @@ msgstr "" msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1184 +#: archaeological_files/models.py:389 archaeological_finds/models_finds.py:1039 #: archaeological_operations/models.py:313 #: archaeological_operations/models.py:987 ishtar_common/admin.py:1318 -#: ishtar_common/forms_common.py:2248 ishtar_common/models.py:2372 +#: ishtar_common/forms_common.py:2424 ishtar_common/models.py:2382 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "" -#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1187 +#: archaeological_files/models.py:390 archaeological_finds/models_finds.py:1042 #: archaeological_operations/models.py:314 #: archaeological_operations/models.py:988 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1208 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:516 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_operations/templates/ishtar/sheet_operation.html:553 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 -#: ishtar_common/models.py:1931 ishtar_common/models_common.py:749 -#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2160 +#: archaeological_files/models.py:399 archaeological_finds/models_finds.py:1063 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:546 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_operations/templates/ishtar/sheet_operation.html:583 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 +#: ishtar_common/models.py:1941 ishtar_common/models_common.py:751 +#: ishtar_common/models_common.py:1954 ishtar_common/models_common.py:1970 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:524 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: na_app/templates/ishtar/sheet_operation.html:551 +#: na_app/templates/ishtar/sheet_operation.html:561 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Number" msgstr "" @@ -2344,13 +2420,13 @@ msgstr "" msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1289 +#: archaeological_files/models.py:465 archaeological_finds/models_finds.py:1144 #: archaeological_finds/models_treatments.py:157 #: archaeological_finds/models_treatments.py:1059 #: archaeological_operations/models.py:1125 -#: archaeological_operations/models.py:2586 -#: archaeological_operations/tests.py:3036 -#: archaeological_operations/tests.py:3128 +#: archaeological_operations/models.py:2592 +#: archaeological_operations/tests.py:3081 +#: archaeological_operations/tests.py:3173 msgctxt "key for text search" msgid "year" msgstr "" @@ -2358,7 +2434,7 @@ msgstr "" #: archaeological_files/models.py:467 #: archaeological_finds/models_treatments.py:1056 #: archaeological_operations/models.py:363 -#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4006 +#: archaeological_warehouse/models.py:953 ishtar_common/models.py:4020 msgctxt "key for text search" msgid "reference" msgstr "" @@ -2379,9 +2455,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1053 #: archaeological_operations/models.py:366 #: archaeological_operations/models.py:1152 -#: archaeological_operations/tests.py:3172 -#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2564 -#: ishtar_common/models.py:2821 ishtar_common/models.py:3408 +#: archaeological_operations/tests.py:3217 +#: archaeological_warehouse/models.py:317 ishtar_common/models.py:2574 +#: ishtar_common/models.py:2831 ishtar_common/models.py:3418 msgctxt "key for text search" msgid "name" msgstr "" @@ -2390,12 +2466,12 @@ msgstr "" #: archaeological_finds/models_treatments.py:160 #: archaeological_finds/models_treatments.py:1062 #: archaeological_operations/models.py:1158 -#: archaeological_operations/models.py:2597 -#: archaeological_operations/tests.py:3185 +#: archaeological_operations/models.py:2603 +#: archaeological_operations/tests.py:3230 #: archaeological_warehouse/models.py:320 -#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2567 -#: ishtar_common/models.py:2836 ishtar_common/models.py:3419 -#: ishtar_common/models.py:4002 +#: archaeological_warehouse/models.py:949 ishtar_common/models.py:2577 +#: ishtar_common/models.py:2846 ishtar_common/models.py:3429 +#: ishtar_common/models.py:4016 msgctxt "key for text search" msgid "type" msgstr "" @@ -2420,35 +2496,35 @@ msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1487 +#: archaeological_files/models.py:506 archaeological_finds/models_finds.py:1342 #: archaeological_operations/models.py:385 #: archaeological_operations/models.py:1200 -#: archaeological_operations/models.py:2707 -#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4066 +#: archaeological_operations/models.py:2713 +#: archaeological_warehouse/models.py:960 ishtar_common/models.py:4080 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:509 archaeological_finds/models_finds.py:1493 #: archaeological_finds/models_treatments.py:1065 -#: archaeological_finds/tests.py:1435 +#: archaeological_finds/tests.py:1480 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:513 archaeological_operations/models.py:2642 +#: archaeological_files/models.py:513 archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:517 archaeological_operations/models.py:2646 +#: archaeological_files/models.py:517 archaeological_operations/models.py:2652 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:537 #: archaeological_finds/models_treatments.py:1107 -#: ishtar_common/forms_common.py:1853 ishtar_common/forms_common.py:2135 +#: ishtar_common/forms_common.py:2030 ishtar_common/forms_common.py:2312 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" @@ -2459,34 +2535,34 @@ msgstr "" #: archaeological_finds/models_treatments.py:1112 #: archaeological_finds/templates/ishtar/sheet_find.html:500 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1120 -#: archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1797 +#: archaeological_operations/forms.py:1122 +#: archaeological_operations/forms.py:1220 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1802 #: archaeological_operations/models.py:494 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 -#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:644 ishtar_common/forms_common.py:822 -#: ishtar_common/forms_common.py:953 ishtar_common/forms_common.py:1048 -#: ishtar_common/forms_common.py:1300 ishtar_common/forms_common.py:1353 -#: ishtar_common/forms_common.py:2685 ishtar_common/models.py:672 -#: ishtar_common/models.py:712 ishtar_common/models.py:1030 -#: ishtar_common/models.py:1628 ishtar_common/models.py:2017 -#: ishtar_common/models.py:2588 ishtar_common/models.py:2888 -#: ishtar_common/models.py:3216 ishtar_common/models.py:3353 -#: ishtar_common/models.py:5103 ishtar_common/models_common.py:2367 -#: ishtar_common/models_common.py:3484 ishtar_common/models_common.py:3545 -#: ishtar_common/models_imports.py:115 ishtar_common/models_imports.py:150 -#: ishtar_common/models_imports.py:680 ishtar_common/models_imports.py:698 -#: ishtar_common/models_imports.py:821 ishtar_common/models_imports.py:1199 -#: ishtar_common/models_rest.py:110 +#: archaeological_warehouse/models.py:354 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:822 ishtar_common/forms_common.py:1000 +#: ishtar_common/forms_common.py:1131 ishtar_common/forms_common.py:1226 +#: ishtar_common/forms_common.py:1480 ishtar_common/forms_common.py:1530 +#: ishtar_common/forms_common.py:2861 ishtar_common/models.py:683 +#: ishtar_common/models.py:723 ishtar_common/models.py:1041 +#: ishtar_common/models.py:1638 ishtar_common/models.py:2027 +#: ishtar_common/models.py:2598 ishtar_common/models.py:2898 +#: ishtar_common/models.py:3226 ishtar_common/models.py:3363 +#: ishtar_common/models.py:5117 ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:3292 ishtar_common/models_common.py:3353 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:154 +#: ishtar_common/models_imports.py:431 ishtar_common/models_imports.py:799 +#: ishtar_common/models_imports.py:817 ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:1368 ishtar_common/models_rest.py:110 #: 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 +#: ishtar_common/templates/ishtar/import_table.html:55 #: ishtar_common/templates/ishtar/merge_organization.html:9 #: ishtar_common/templates/ishtar/merge_organization.html:20 #: ishtar_common/templates/ishtar/merge_person.html:10 @@ -2495,7 +2571,9 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 #: ishtar_common/templates/ishtar/sheet_town.html:63 -#: man_app/templates/ishtar/sheet_find.html:513 +#: man_app/templates/ishtar/sheet_find.html:501 +#: na_app/templates/ishtar/sheet_find.html:512 +#: na_app/templates/ishtar/sheet_operation.html:153 msgid "Name" msgstr "" @@ -2503,7 +2581,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1121 #: archaeological_finds/templates/ishtar/sheet_find.html:501 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:363 -#: man_app/templates/ishtar/sheet_find.html:514 +#: man_app/templates/ishtar/sheet_find.html:502 +#: na_app/templates/ishtar/sheet_find.html:513 msgid "Person in charge" msgstr "" @@ -2544,10 +2623,10 @@ msgstr "" #: archaeological_finds/forms_treatments.py:439 #: archaeological_finds/models_treatments.py:250 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:372 -#: ishtar_common/forms_common.py:577 ishtar_common/forms_common.py:829 -#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:1053 -#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2608 -#: ishtar_common/models.py:2816 ishtar_common/models.py:3397 +#: ishtar_common/forms_common.py:753 ishtar_common/forms_common.py:1007 +#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1231 +#: ishtar_common/ishtar_menu.py:102 ishtar_common/models.py:2618 +#: ishtar_common/models.py:2826 ishtar_common/models.py:3407 #: ishtar_common/templates/ishtar/merge_person.html:11 #: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 @@ -2591,11 +2670,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1251 archaeological_operations/models.py:1884 +#: archaeological_files/models.py:1251 archaeological_operations/models.py:1890 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1253 archaeological_operations/models.py:1886 +#: archaeological_files/models.py:1253 archaeological_operations/models.py:1892 msgid "parcels" msgstr "" @@ -2629,7 +2708,7 @@ msgid "operation" msgstr "" #: archaeological_files/models.py:1354 archaeological_operations/models.py:1368 -#: archaeological_operations/models.py:3041 +#: archaeological_operations/models.py:3047 msgid "File" msgstr "" @@ -2719,7 +2798,8 @@ msgid "Developed surface" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:181 -#: archaeological_operations/templates/ishtar/sheet_operation.html:345 +#: archaeological_operations/templates/ishtar/sheet_operation.html:375 +#: na_app/templates/ishtar/sheet_operation.html:353 msgid "Associated parcels" msgstr "" @@ -2727,9 +2807,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2828 -#: archaeological_operations/templates/ishtar/sheet_operation.html:350 -#: archaeological_operations/templates/ishtar/sheet_operation.html:487 +#: archaeological_operations/models.py:2834 +#: archaeological_operations/templates/ishtar/sheet_operation.html:380 +#: archaeological_operations/templates/ishtar/sheet_operation.html:517 +#: na_app/templates/ishtar/sheet_operation.html:358 +#: na_app/templates/ishtar/sheet_operation.html:495 msgid "Administrative acts" msgstr "" @@ -2740,12 +2822,12 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2560 -#: archaeological_operations/models.py:2863 +#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2869 #: 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/models.py:733 ishtar_common/models.py:4251 +#: archaeological_warehouse/models.py:733 ishtar_common/models.py:4265 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" @@ -2760,34 +2842,40 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:461 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:8 -#: archaeological_operations/templates/ishtar/sheet_operation.html:506 -#: archaeological_operations/templates/ishtar/sheet_operation.html:570 +#: archaeological_operations/templates/ishtar/sheet_operation.html:536 +#: archaeological_operations/templates/ishtar/sheet_operation.html:600 #: archaeological_warehouse/models.py:293 -#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:645 -#: ishtar_common/forms_common.py:827 ishtar_common/forms_common.py:1051 -#: ishtar_common/forms_common.py:1298 ishtar_common/forms_common.py:1727 -#: ishtar_common/forms_common.py:2133 ishtar_common/forms_common.py:2366 -#: ishtar_common/forms_common.py:3007 ishtar_common/models.py:727 -#: ishtar_common/models.py:2590 ishtar_common/models.py:3965 -#: ishtar_common/models.py:4255 ishtar_common/models_imports.py:156 -#: ishtar_common/models_imports.py:997 +#: archaeological_warehouse/models.py:928 ishtar_common/forms_common.py:823 +#: ishtar_common/forms_common.py:1005 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1478 ishtar_common/forms_common.py:1904 +#: ishtar_common/forms_common.py:2310 ishtar_common/forms_common.py:2542 +#: ishtar_common/forms_common.py:3209 ishtar_common/models.py:738 +#: ishtar_common/models.py:2600 ishtar_common/models.py:3979 +#: ishtar_common/models.py:4269 ishtar_common/models_imports.py:160 +#: ishtar_common/models_imports.py:1116 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 -#: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/import_table.html:56 #: ishtar_common/templates/ishtar/merge_organization.html:10 #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 -#: man_app/templates/ishtar/sheet_find.html:398 -#: man_app/templates/ishtar/sheet_find.html:436 -#: man_app/templates/ishtar/sheet_find.html:474 -#: man_app/templates/ishtar/sheet_find.html:512 +#: man_app/templates/ishtar/sheet_find.html:386 +#: man_app/templates/ishtar/sheet_find.html:424 +#: man_app/templates/ishtar/sheet_find.html:462 +#: man_app/templates/ishtar/sheet_find.html:500 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:435 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:511 +#: na_app/templates/ishtar/sheet_operation.html:514 +#: na_app/templates/ishtar/sheet_operation.html:578 msgid "Type" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 -#: archaeological_operations/forms.py:783 +#: archaeological_operations/forms.py:785 #: archaeological_operations/models.py:1328 msgid "Excavation end date" msgstr "" @@ -2802,8 +2890,8 @@ 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:696 -#: ishtar_common/models_imports.py:996 +#: archaeological_warehouse/forms.py:700 ishtar_common/models.py:707 +#: ishtar_common/models_imports.py:1115 msgid "Date" msgstr "" @@ -2836,6 +2924,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:393 #: archaeological_files/templates/ishtar/sheet_file.html:396 #: archaeological_operations/templates/ishtar/sheet_operation.html:220 +#: na_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" @@ -2846,7 +2935,9 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:269 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 -#: ishtar_common/models.py:1924 ishtar_common/models.py:1956 +#: ishtar_common/models.py:1934 ishtar_common/models.py:1966 +#: na_app/templates/ishtar/sheet_container.html:252 +#: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" @@ -2951,185 +3042,187 @@ msgid "Simple find - 020 - General" msgstr "" #: archaeological_finds/forms.py:276 archaeological_finds/forms.py:544 -#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:956 -#: archaeological_finds/forms.py:1263 archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:743 archaeological_finds/forms.py:957 +#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1904 #: archaeological_finds/models_finds.py:420 -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1701 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:546 -#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:958 -#: archaeological_finds/forms.py:1264 archaeological_finds/forms.py:1970 -#: archaeological_finds/models_finds.py:1847 +#: archaeological_finds/forms.py:747 archaeological_finds/forms.py:959 +#: archaeological_finds/forms.py:1265 archaeological_finds/forms.py:1971 +#: archaeological_finds/models_finds.py:1702 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:1265 archaeological_finds/models_finds.py:1974 +#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:1829 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:752 -#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1848 +#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1703 msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1269 archaeological_finds/models_finds.py:1849 +#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1704 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:754 -#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:1844 +#: archaeological_finds/forms.py:1268 archaeological_finds/models_finds.py:1699 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:755 -#: archaeological_finds/forms.py:1270 archaeological_finds/models_finds.py:1971 +#: archaeological_finds/forms.py:1271 archaeological_finds/models_finds.py:1826 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:2031 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1886 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:553 -#: archaeological_finds/forms.py:1376 archaeological_finds/models_finds.py:1914 +#: archaeological_finds/forms.py:1377 archaeological_finds/models_finds.py:1769 msgid "Is complete?" msgstr "" #: archaeological_finds/forms.py:300 archaeological_finds/forms.py:556 #: archaeological_finds/forms.py:767 archaeological_finds/models_finds.py:91 -#: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1008 +#: archaeological_finds/models_finds.py:1009 +#: archaeological_finds/models_finds.py:1712 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:559 -#: archaeological_finds/forms.py:1385 archaeological_finds/models_finds.py:1861 -#: ishtar_common/models_imports.py:975 +#: archaeological_finds/forms.py:1386 archaeological_finds/models_finds.py:1716 +#: ishtar_common/models_imports.py:1094 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1387 -#: archaeological_finds/models_finds.py:1868 +#: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1388 +#: archaeological_finds/models_finds.py:1723 msgid "Comment on the material" msgstr "" #: archaeological_finds/forms.py:309 archaeological_finds/forms.py:562 #: archaeological_finds/forms.py:770 archaeological_finds/models_finds.py:271 -#: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1916 +#: archaeological_finds/models_finds.py:1010 +#: archaeological_finds/models_finds.py:1011 +#: archaeological_finds/models_finds.py:1771 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:566 -#: archaeological_finds/forms.py:1394 archaeological_finds/models_finds.py:1920 +#: archaeological_finds/forms.py:1395 archaeological_finds/models_finds.py:1775 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:316 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1396 archaeological_finds/models_finds.py:286 +#: archaeological_finds/forms.py:1397 archaeological_finds/models_finds.py:286 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:568 -#: archaeological_finds/forms.py:1403 archaeological_finds/forms.py:1909 -#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/forms.py:1404 archaeological_finds/forms.py:1910 +#: archaeological_finds/models_finds.py:1730 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:570 -#: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1951 +#: archaeological_finds/forms.py:1406 archaeological_finds/models_finds.py:1806 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:574 -#: archaeological_finds/forms.py:1409 archaeological_finds/models_finds.py:1851 +#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1706 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:577 -#: archaeological_finds/forms.py:1410 archaeological_finds/models_finds.py:1852 +#: archaeological_finds/forms.py:1411 archaeological_finds/models_finds.py:1707 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:580 -#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1408 -#: archaeological_finds/models_finds.py:1854 +#: archaeological_finds/forms.py:778 archaeological_finds/forms.py:1409 +#: archaeological_finds/models_finds.py:1709 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:583 -#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1412 -#: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:1946 +#: archaeological_finds/forms.py:781 archaeological_finds/forms.py:1413 +#: archaeological_finds/models_finds.py:1051 +#: archaeological_finds/models_finds.py:1801 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1416 -#: archaeological_finds/models_finds.py:1896 -#: archaeological_operations/forms.py:1223 +#: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1417 +#: archaeological_finds/models_finds.py:1751 +#: archaeological_operations/forms.py:1226 #: archaeological_operations/models.py:500 msgid "Cultural attribution" msgstr "" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:589 -#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1418 -#: archaeological_finds/models_finds.py:1973 +#: archaeological_finds/forms.py:813 archaeological_finds/forms.py:1419 +#: archaeological_finds/models_finds.py:1828 msgid "Comment on dating" msgstr "" #: archaeological_finds/forms.py:345 archaeological_finds/forms.py:592 -#: archaeological_finds/forms.py:1217 +#: archaeological_finds/forms.py:1218 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: man_app/templates/ishtar/sheet_find.html:194 +#: na_app/templates/ishtar/sheet_find.html:205 msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:593 -#: archaeological_finds/models_finds.py:1953 +#: archaeological_finds/models_finds.py:1808 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:594 -#: archaeological_finds/models_finds.py:1954 +#: archaeological_finds/models_finds.py:1809 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:595 -#: archaeological_finds/models_finds.py:1955 +#: archaeological_finds/models_finds.py:1810 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:598 -#: archaeological_finds/models_finds.py:1958 +#: archaeological_finds/models_finds.py:1813 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:596 -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1811 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:597 -#: archaeological_finds/models_finds.py:1957 +#: archaeological_finds/models_finds.py:1812 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:599 -#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1870 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:1725 #: archaeological_warehouse/models.py:731 msgid "Volume (l)" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:600 -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1909 #: archaeological_finds/templates/ishtar/sheet_find.html:202 #: man_app/templates/ishtar/sheet_find.html:203 +#: na_app/templates/ishtar/sheet_find.html:214 msgid "Weight (g)" msgstr "" @@ -3146,19 +3239,19 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:611 -#: archaeological_finds/forms.py:1489 archaeological_finds/models_finds.py:1969 +#: archaeological_finds/forms.py:1490 archaeological_finds/models_finds.py:1824 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:615 -#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1494 -#: archaeological_finds/models_finds.py:1197 -#: archaeological_finds/models_finds.py:1978 +#: archaeological_finds/forms.py:800 archaeological_finds/forms.py:1495 +#: archaeological_finds/models_finds.py:1052 +#: archaeological_finds/models_finds.py:1833 msgid "Check" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:617 -#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:802 archaeological_finds/models_finds.py:1838 msgid "Check date" msgstr "" @@ -3171,7 +3264,7 @@ msgid "Find - 020 - General" msgstr "" #: archaeological_finds/forms.py:497 archaeological_finds/forms.py:750 -#: archaeological_finds/forms.py:1266 archaeological_finds/models_finds.py:425 +#: archaeological_finds/forms.py:1267 archaeological_finds/models_finds.py:425 msgid "Excavation ID" msgstr "" @@ -3187,7 +3280,7 @@ msgstr "" msgid "Discovery date (end)" msgstr "" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1375 +#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:1376 #: archaeological_finds/models_finds.py:445 msgid "Batch/object" msgstr "" @@ -3196,12 +3289,12 @@ msgstr "" msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1492 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:1493 #: archaeological_finds/models_finds.py:453 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1900 +#: archaeological_finds/forms.py:528 archaeological_finds/forms.py:1901 msgid "Resulting find" msgstr "" @@ -3209,7 +3302,7 @@ msgstr "" msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1915 +#: archaeological_finds/forms.py:633 archaeological_finds/forms.py:1916 msgid "Resulting finds" msgstr "" @@ -3239,12 +3332,12 @@ msgstr "" msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:936 -#: archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:672 archaeological_finds/forms.py:937 +#: archaeological_finds/forms.py:1004 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1012 +#: archaeological_finds/forms.py:678 archaeological_finds/forms.py:1013 msgid "Find - Quick action - Modify" msgstr "" @@ -3252,56 +3345,57 @@ msgstr "" msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1065 -#: archaeological_finds/forms.py:1245 +#: archaeological_finds/forms.py:721 archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1246 #: archaeological_finds/templates/ishtar/sheet_find.html:279 -#: man_app/templates/ishtar/sheet_find.html:292 +#: man_app/templates/ishtar/sheet_find.html:280 +#: na_app/templates/ishtar/sheet_find.html:291 msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1503 archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/forms.py:783 archaeological_finds/forms.py:1101 +#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1053 +#: archaeological_finds/models_finds.py:1868 #: archaeological_warehouse/forms.py:586 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1106 -#: archaeological_finds/forms.py:1504 archaeological_finds/models_finds.py:1199 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:785 archaeological_finds/forms.py:1107 +#: archaeological_finds/forms.py:1505 archaeological_finds/models_finds.py:1054 +#: archaeological_finds/models_finds.py:1872 #: archaeological_warehouse/forms.py:587 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1097 -#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1193 -#: archaeological_finds/models_finds.py:1998 -#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:959 +#: archaeological_finds/forms.py:788 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1502 archaeological_finds/models_finds.py:1048 +#: archaeological_finds/models_finds.py:1853 +#: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1078 msgid "Conservatory state" msgstr "" -#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1118 -#: archaeological_finds/forms.py:1508 archaeological_finds/models_finds.py:1200 -#: archaeological_finds/models_finds.py:2023 +#: archaeological_finds/forms.py:791 archaeological_finds/forms.py:1119 +#: archaeological_finds/forms.py:1509 archaeological_finds/models_finds.py:1055 +#: archaeological_finds/models_finds.py:1878 #: archaeological_warehouse/forms.py:591 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1091 -#: archaeological_finds/forms.py:1500 archaeological_finds/models_finds.py:1195 -#: archaeological_finds/models_finds.py:1940 +#: archaeological_finds/forms.py:794 archaeological_finds/forms.py:1092 +#: archaeological_finds/forms.py:1501 archaeological_finds/models_finds.py:1050 +#: archaeological_finds/models_finds.py:1795 #: archaeological_warehouse/forms.py:584 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1123 -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:805 archaeological_finds/forms.py:1124 +#: archaeological_finds/models_finds.py:1884 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1121 -#: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2028 +#: archaeological_finds/forms.py:807 archaeological_finds/forms.py:1122 +#: archaeological_finds/models_finds.py:1066 +#: archaeological_finds/models_finds.py:1883 msgid "Insurance value" msgstr "" @@ -3309,406 +3403,410 @@ msgstr "" msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:879 +#: archaeological_finds/forms.py:880 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:895 ishtar_common/forms_common.py:2584 +#: archaeological_finds/forms.py:896 ishtar_common/forms_common.py:2760 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:899 archaeological_finds/forms.py:1355 -#: archaeological_finds/forms.py:2119 archaeological_finds/forms.py:2124 -#: archaeological_finds/forms.py:2141 archaeological_finds/forms.py:2146 +#: archaeological_finds/forms.py:900 archaeological_finds/forms.py:1356 +#: archaeological_finds/forms.py:2120 archaeological_finds/forms.py:2125 +#: archaeological_finds/forms.py:2142 archaeological_finds/forms.py:2147 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:922 -#: archaeological_finds/models_finds.py:1742 +#: archaeological_finds/models_finds.py:777 +#: archaeological_finds/models_finds.py:1597 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:922 +#: archaeological_finds/forms.py:923 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:929 +#: archaeological_finds/forms.py:930 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:933 archaeological_finds/forms.py:1000 +#: archaeological_finds/forms.py:934 archaeological_finds/forms.py:1001 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1022 archaeological_finds/forms.py:2015 -#: ishtar_common/models.py:1031 ishtar_common/models.py:2018 -#: ishtar_common/models.py:3548 ishtar_common/models_imports.py:151 -#: ishtar_common/models_imports.py:699 +#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: ishtar_common/models.py:1042 ishtar_common/models.py:2028 +#: ishtar_common/models.py:3562 ishtar_common/models_imports.py:155 +#: ishtar_common/models_imports.py:432 ishtar_common/models_imports.py:818 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1023 archaeological_finds/forms.py:2016 +#: archaeological_finds/forms.py:1024 archaeological_finds/forms.py:2017 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1028 archaeological_finds/forms.py:2021 -#: archaeological_finds/forms.py:2063 ishtar_common/models.py:3561 +#: archaeological_finds/forms.py:1029 archaeological_finds/forms.py:2022 +#: archaeological_finds/forms.py:2064 ishtar_common/models.py:3575 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1035 archaeological_finds/forms.py:2028 -#: archaeological_finds/forms.py:2070 ishtar_common/models.py:3567 +#: archaeological_finds/forms.py:1036 archaeological_finds/forms.py:2029 +#: archaeological_finds/forms.py:2071 ishtar_common/models.py:3581 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1066 +#: archaeological_finds/forms.py:1067 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1085 archaeological_finds/forms.py:1499 -#: archaeological_finds/models_finds.py:1194 -#: archaeological_finds/models_finds.py:1934 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1500 +#: archaeological_finds/models_finds.py:1049 +#: archaeological_finds/models_finds.py:1789 #: archaeological_warehouse/forms.py:583 msgid "Integrity / interest" msgstr "" -#: archaeological_finds/forms.py:1112 archaeological_finds/forms.py:1506 -#: archaeological_finds/models_finds.py:1192 -#: archaeological_finds/models_finds.py:2008 +#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1507 +#: archaeological_finds/models_finds.py:1047 +#: archaeological_finds/models_finds.py:1863 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1120 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:1984 +#: archaeological_finds/forms.py:1121 archaeological_finds/models_finds.py:1065 +#: archaeological_finds/models_finds.py:1839 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1126 archaeological_finds/forms.py:1502 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1503 +#: archaeological_finds/models_finds.py:1859 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1176 +#: archaeological_finds/forms.py:1177 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1182 +#: archaeological_finds/forms.py:1183 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1186 +#: archaeological_finds/forms.py:1187 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1208 +#: archaeological_finds/forms.py:1209 #: archaeological_finds/templates/ishtar/sheet_basefind.html:26 #: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "" -#: archaeological_finds/forms.py:1272 archaeological_finds/models_finds.py:1133 +#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:988 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1273 archaeological_finds/models_finds.py:1134 +#: archaeological_finds/forms.py:1274 archaeological_finds/models_finds.py:989 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1277 +#: archaeological_finds/forms.py:1278 msgid "Operation - number (index by year)" msgstr "" -#: archaeological_finds/forms.py:1280 +#: archaeological_finds/forms.py:1281 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1283 +#: archaeological_finds/forms.py:1284 msgid "Operation - Type" msgstr "" -#: archaeological_finds/forms.py:1286 +#: archaeological_finds/forms.py:1287 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1289 +#: archaeological_finds/forms.py:1290 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1300 +#: archaeological_finds/forms.py:1301 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1303 +#: archaeological_finds/forms.py:1304 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1308 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1310 +#: archaeological_finds/forms.py:1311 msgid "Operation - Remains" msgstr "" -#: archaeological_finds/forms.py:1313 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1225 ishtar_common/forms_common.py:1299 -#: ishtar_common/models.py:2373 ishtar_common/models.py:3221 +#: archaeological_finds/forms.py:1314 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1228 ishtar_common/forms_common.py:1479 +#: ishtar_common/models.py:2383 ishtar_common/models.py:3231 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1316 archaeological_warehouse/forms.py:530 +#: archaeological_finds/forms.py:1317 archaeological_warehouse/forms.py:530 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1324 archaeological_warehouse/forms.py:538 +#: archaeological_finds/forms.py:1325 archaeological_warehouse/forms.py:538 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1327 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1328 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1335 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1336 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1338 +#: archaeological_finds/forms.py:1339 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1352 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1364 +#: archaeological_finds/forms.py:1365 msgid "Discovery date (exact or beginning) after" msgstr "" -#: archaeological_finds/forms.py:1367 +#: archaeological_finds/forms.py:1368 msgid "Discovery date (exact or beginning) before" msgstr "" -#: archaeological_finds/forms.py:1370 +#: archaeological_finds/forms.py:1371 msgid "Discovery date (end) after" msgstr "" -#: archaeological_finds/forms.py:1373 +#: archaeological_finds/forms.py:1374 msgid "Discovery date (end) before" msgstr "" -#: archaeological_finds/forms.py:1378 archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1379 archaeological_finds/forms.py:1907 #: archaeological_finds/models_finds.py:90 -#: archaeological_finds/models_finds.py:1190 -#: archaeological_operations/templates/ishtar/sheet_operation.html:533 +#: archaeological_finds/models_finds.py:1045 +#: archaeological_operations/templates/ishtar/sheet_operation.html:563 #: archaeological_warehouse/forms.py:572 +#: na_app/templates/ishtar/sheet_operation.html:541 msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1389 archaeological_finds/models_finds.py:270 -#: archaeological_finds/models_finds.py:1191 -#: archaeological_operations/templates/ishtar/sheet_operation.html:543 -#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:968 +#: archaeological_finds/forms.py:1390 archaeological_finds/models_finds.py:270 +#: archaeological_finds/models_finds.py:1046 +#: archaeological_operations/templates/ishtar/sheet_operation.html:573 +#: archaeological_warehouse/forms.py:578 ishtar_common/models_imports.py:1087 +#: na_app/templates/ishtar/sheet_operation.html:551 msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1421 +#: archaeological_finds/forms.py:1422 msgid "Length - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1424 +#: archaeological_finds/forms.py:1425 msgid "Length - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1427 +#: archaeological_finds/forms.py:1428 msgid "Width - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1430 +#: archaeological_finds/forms.py:1431 msgid "Width - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1433 +#: archaeological_finds/forms.py:1434 msgid "Height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1436 +#: archaeological_finds/forms.py:1437 msgid "Height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1439 +#: archaeological_finds/forms.py:1440 msgid "Thickness - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1442 +#: archaeological_finds/forms.py:1443 msgid "Thickness - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1445 +#: archaeological_finds/forms.py:1446 msgid "Diameter - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1448 +#: archaeological_finds/forms.py:1449 msgid "Diameter - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1452 msgid "Circumference - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1454 +#: archaeological_finds/forms.py:1455 msgid "Circumference - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1457 +#: archaeological_finds/forms.py:1458 msgid "Volume - lower than (l)" msgstr "" -#: archaeological_finds/forms.py:1458 +#: archaeological_finds/forms.py:1459 msgid "Volume - higher than (l)" msgstr "" -#: archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1461 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1463 +#: archaeological_finds/forms.py:1464 msgid "Weight - higher than (g)" msgstr "" -#: archaeological_finds/forms.py:1466 +#: archaeological_finds/forms.py:1467 msgid "Clutter long side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1470 +#: archaeological_finds/forms.py:1471 msgid "Clutter long side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1474 +#: archaeological_finds/forms.py:1475 msgid "Clutter short side - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1478 +#: archaeological_finds/forms.py:1479 msgid "Clutter short side - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1482 +#: archaeological_finds/forms.py:1483 msgid "Clutter height - lower than (cm)" msgstr "" -#: archaeological_finds/forms.py:1486 +#: archaeological_finds/forms.py:1487 msgid "Clutter height - higher than (cm)" msgstr "" -#: archaeological_finds/forms.py:1495 +#: archaeological_finds/forms.py:1496 msgid "Check date after" msgstr "" -#: archaeological_finds/forms.py:1497 +#: archaeological_finds/forms.py:1498 msgid "Check date before" msgstr "" -#: archaeological_finds/forms.py:1510 +#: archaeological_finds/forms.py:1511 msgid "Estimated value - higher than" msgstr "" -#: archaeological_finds/forms.py:1511 +#: archaeological_finds/forms.py:1512 msgid "Estimated value - lower than" msgstr "" -#: archaeological_finds/forms.py:1512 +#: archaeological_finds/forms.py:1513 msgid "Insurance value - higher than" msgstr "" -#: archaeological_finds/forms.py:1513 +#: archaeological_finds/forms.py:1514 msgid "Insurance value - lower than" msgstr "" -#: archaeological_finds/forms.py:1515 +#: archaeological_finds/forms.py:1516 msgid "Appraisal date after" msgstr "" -#: archaeological_finds/forms.py:1518 +#: archaeological_finds/forms.py:1519 msgid "Appraisal date before" msgstr "" -#: archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1522 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1523 +#: archaeological_finds/forms.py:1524 msgid "Treatment file end date before" msgstr "" -#: archaeological_finds/forms.py:1526 +#: archaeological_finds/forms.py:1527 msgid "Treatment end date before" msgstr "" -#: archaeological_finds/forms.py:1592 archaeological_finds/models_finds.py:1150 -#: archaeological_finds/models_finds.py:1908 +#: archaeological_finds/forms.py:1593 archaeological_finds/models_finds.py:1005 +#: archaeological_finds/models_finds.py:1763 #: archaeological_finds/templates/ishtar/sheet_find.html:300 -#: ishtar_common/forms_common.py:1745 -#: man_app/templates/ishtar/sheet_find.html:313 +#: ishtar_common/forms_common.py:1922 +#: man_app/templates/ishtar/sheet_find.html:301 +#: na_app/templates/ishtar/sheet_find.html:312 msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:1599 +#: archaeological_finds/forms.py:1600 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1618 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1619 archaeological_finds/models_finds.py:1004 #: archaeological_finds/templates/ishtar/sheet_find.html:325 -#: ishtar_common/forms_common.py:1737 -#: man_app/templates/ishtar/sheet_find.html:338 +#: ishtar_common/forms_common.py:1914 +#: man_app/templates/ishtar/sheet_find.html:326 +#: na_app/templates/ishtar/sheet_find.html:337 msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:1625 +#: archaeological_finds/forms.py:1626 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:1645 archaeological_finds/forms.py:1666 -#: archaeological_finds/forms.py:1722 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:1646 archaeological_finds/forms.py:1667 +#: archaeological_finds/forms.py:1723 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:1761 archaeological_finds/forms.py:1924 +#: archaeological_finds/forms.py:1762 archaeological_finds/forms.py:1925 #: archaeological_finds/models_treatments.py:397 #: archaeological_finds/templates/ishtar/sheet_treatment.html:110 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:1784 +#: archaeological_finds/forms.py:1785 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:1905 +#: archaeological_finds/forms.py:1906 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1921 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1964 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1975 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1976 archaeological_finds/forms.py:1994 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2010 +#: archaeological_finds/forms.py:2011 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2013 +#: archaeological_finds/forms.py:2014 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:198 @@ -3716,22 +3814,25 @@ 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 -#: ishtar_common/forms_common.py:1679 ishtar_common/models.py:959 -#: ishtar_common/models.py:1806 ishtar_common/models.py:3546 -#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 -#: ishtar_common/models_common.py:2143 ishtar_common/models_common.py:2159 -#: ishtar_common/models_imports.py:576 -#: man_app/templates/ishtar/sheet_find.html:397 -#: man_app/templates/ishtar/sheet_find.html:435 -#: man_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/forms_common.py:1856 ishtar_common/models.py:970 +#: ishtar_common/models.py:1816 ishtar_common/models.py:3560 +#: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 +#: ishtar_common/models_common.py:1953 ishtar_common/models_common.py:1969 +#: ishtar_common/models_imports.py:692 +#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:423 +#: man_app/templates/ishtar/sheet_find.html:461 +#: na_app/templates/ishtar/sheet_find.html:396 +#: na_app/templates/ishtar/sheet_find.html:434 +#: na_app/templates/ishtar/sheet_find.html:472 msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2055 archaeological_finds/forms.py:2110 +#: archaeological_finds/forms.py:2056 archaeological_finds/forms.py:2111 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2102 +#: archaeological_finds/forms.py:2103 msgid "Another basket already exists with this name." msgstr "" @@ -3759,7 +3860,7 @@ msgstr "" #: archaeological_finds/models_finds.py:177 #: archaeological_finds/models_treatments.py:213 #: archaeological_finds/models_treatments.py:757 -#: ishtar_common/models_imports.py:963 +#: ishtar_common/models_imports.py:1082 msgid "Treatment type" msgstr "" @@ -3778,8 +3879,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:746 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2449 -#: archaeological_operations/models.py:2786 ishtar_common/views.py:510 +#: archaeological_operations/models.py:2455 +#: archaeological_operations/models.py:2792 ishtar_common/views.py:510 msgid "Treatment" msgstr "" @@ -3876,8 +3977,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1181 #: archaeological_finds/models_treatments.py:1201 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2448 -#: archaeological_operations/models.py:2778 ishtar_common/views.py:509 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2454 +#: archaeological_operations/models.py:2784 ishtar_common/views.py:509 msgid "Treatment request" msgstr "" @@ -3892,8 +3993,8 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_finds/models_finds.py:3395 +#: archaeological_finds/models_finds.py:1755 +#: archaeological_finds/models_finds.py:3130 #: archaeological_finds/models_treatments.py:267 #: archaeological_finds/models_treatments.py:761 #: archaeological_finds/templates/ishtar/sheet_find.html:389 @@ -3903,16 +4004,20 @@ msgstr "" #: archaeological_warehouse/models.py:1199 #: archaeological_warehouse/models.py:2064 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2240 ishtar_common/forms_common.py:2431 +#: ishtar_common/forms_common.py:2416 ishtar_common/forms_common.py:2607 #: ishtar_common/templates/ishtar/sheet_document.html:100 -#: man_app/templates/ishtar/sheet_find.html:402 -#: man_app/templates/ishtar/sheet_find.html:440 -#: man_app/templates/ishtar/sheet_find.html:478 +#: man_app/templates/ishtar/sheet_find.html:390 +#: man_app/templates/ishtar/sheet_find.html:428 +#: man_app/templates/ishtar/sheet_find.html:466 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:439 +#: na_app/templates/ishtar/sheet_find.html:477 msgid "Container" msgstr "" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2438 +#: ishtar_common/forms_common.py:2614 msgid "Change " msgstr "" @@ -3921,12 +4026,12 @@ msgid "reference and current containers" msgstr "" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2442 +#: ishtar_common/forms_common.py:2618 msgid "the reference container" msgstr "" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2443 +#: ishtar_common/forms_common.py:2619 msgid "the current container" msgstr "" @@ -3975,7 +4080,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4252 +#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4266 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -3985,7 +4090,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1129 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 -#: man_app/templates/ishtar/sheet_find.html:515 +#: man_app/templates/ishtar/sheet_find.html:503 +#: na_app/templates/ishtar/sheet_find.html:514 msgid "Applicant" msgstr "" @@ -3994,7 +4100,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1137 #: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 -#: man_app/templates/ishtar/sheet_find.html:516 +#: man_app/templates/ishtar/sheet_find.html:504 +#: na_app/templates/ishtar/sheet_find.html:515 msgid "Applicant organisation" msgstr "" @@ -4098,7 +4205,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2453 ishtar_common/models.py:3762 +#: archaeological_operations/models.py:2459 ishtar_common/models.py:3776 msgid "Code" msgstr "" @@ -4187,7 +4294,7 @@ msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:1901 #: archaeological_finds/models_treatments.py:75 #: archaeological_finds/models_treatments.py:291 #: archaeological_finds/models_treatments.py:303 @@ -4205,7 +4312,8 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:244 ishtar_common/models_imports.py:970 +#: archaeological_finds/models_finds.py:244 +#: ishtar_common/models_imports.py:1089 msgid "Remarkability type" msgstr "" @@ -4213,7 +4321,8 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:258 ishtar_common/models_imports.py:973 +#: archaeological_finds/models_finds.py:258 +#: ishtar_common/models_imports.py:1092 msgid "Batch type" msgstr "" @@ -4222,8 +4331,8 @@ msgid "Batch types" msgstr "" #: archaeological_finds/models_finds.py:285 -#: archaeological_finds/models_finds.py:1928 -#: ishtar_common/models_imports.py:976 +#: archaeological_finds/models_finds.py:1783 +#: ishtar_common/models_imports.py:1095 msgid "Functional area" msgstr "" @@ -4235,7 +4344,8 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:314 ishtar_common/models_imports.py:971 +#: archaeological_finds/models_finds.py:314 +#: ishtar_common/models_imports.py:1090 msgid "Alteration type" msgstr "" @@ -4243,7 +4353,8 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:329 ishtar_common/models_imports.py:972 +#: archaeological_finds/models_finds.py:329 +#: ishtar_common/models_imports.py:1091 msgid "Alteration cause type" msgstr "" @@ -4251,7 +4362,8 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:344 ishtar_common/models_imports.py:966 +#: archaeological_finds/models_finds.py:344 +#: ishtar_common/models_imports.py:1085 msgid "Treatment emergency type" msgstr "" @@ -4267,7 +4379,8 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:373 ishtar_common/models_imports.py:974 +#: archaeological_finds/models_finds.py:373 +#: ishtar_common/models_imports.py:1093 msgid "Checked type" msgstr "" @@ -4284,6 +4397,7 @@ msgid "Material index" msgstr "" #: archaeological_finds/models_finds.py:456 +#: ishtar_common/models_imports.py:2777 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" @@ -4294,7 +4408,7 @@ msgid "Short ID" msgstr "" #: archaeological_finds/models_finds.py:462 -#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4362 +#: archaeological_finds/models_finds.py:469 ishtar_common/models.py:4376 msgid "Cached value - do not edit" msgstr "" @@ -4307,7 +4421,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:492 -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1692 msgid "Base find" msgstr "" @@ -4315,15 +4429,15 @@ msgstr "" msgid "Base finds" msgstr "" -#: archaeological_finds/models_finds.py:893 +#: archaeological_finds/models_finds.py:748 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:894 +#: archaeological_finds/models_finds.py:749 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:906 +#: archaeological_finds/models_finds.py:761 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -4335,694 +4449,696 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:962 archaeological_finds/views.py:537 +#: archaeological_finds/models_finds.py:817 archaeological_finds/views.py:537 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:974 +#: archaeological_finds/models_finds.py:829 #: archaeological_warehouse/models.py:1930 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:985 +#: archaeological_finds/models_finds.py:840 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1135 +#: archaeological_finds/models_finds.py:990 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1140 +#: archaeological_finds/models_finds.py:995 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1141 +#: archaeological_finds/models_finds.py:996 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1142 +#: archaeological_finds/models_finds.py:997 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1144 +#: archaeological_finds/models_finds.py:999 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1146 +#: archaeological_finds/models_finds.py:1001 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:1002 msgid "Base find - Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/models_finds.py:1148 +#: archaeological_finds/models_finds.py:1003 msgid "Base find - Discovery date (end)" msgstr "" -#: archaeological_finds/models_finds.py:1177 +#: archaeological_finds/models_finds.py:1032 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:714 -#: archaeological_operations/forms.py:1680 -#: archaeological_operations/forms.py:1746 +#: archaeological_operations/forms.py:716 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1751 #: archaeological_operations/models.py:985 #: archaeological_operations/models.py:1072 -#: archaeological_operations/models.py:1376 ishtar_common/models.py:5014 -#: ishtar_common/models_imports.py:945 +#: archaeological_operations/models.py:1376 ishtar_common/models.py:5028 +#: ishtar_common/models_imports.py:1064 msgid "Operation type" msgstr "" -#: archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:1064 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1271 +#: archaeological_finds/models_finds.py:1126 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1275 +#: archaeological_finds/models_finds.py:1130 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1279 +#: archaeological_finds/models_finds.py:1134 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1282 +#: archaeological_finds/models_finds.py:1137 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1297 archaeological_finds/tests.py:1358 -#: archaeological_finds/tests.py:1542 archaeological_warehouse/models.py:973 +#: archaeological_finds/models_finds.py:1152 archaeological_finds/tests.py:1403 +#: archaeological_finds/tests.py:1587 archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1301 ishtar_common/models.py:4080 +#: archaeological_finds/models_finds.py:1156 ishtar_common/models.py:4094 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1160 #: archaeological_operations/models.py:382 -#: archaeological_operations/models.py:1141 ishtar_common/models.py:4124 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4138 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1314 +#: archaeological_finds/models_finds.py:1169 #: archaeological_warehouse/models.py:982 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1174 +#: archaeological_finds/models_finds.py:1630 #: archaeological_warehouse/models.py:987 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1324 +#: archaeological_finds/models_finds.py:1179 #: archaeological_warehouse/models.py:992 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_finds/models_finds.py:1770 -#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4088 -#: ishtar_common/models.py:4193 +#: archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:1625 +#: archaeological_warehouse/models.py:996 ishtar_common/models.py:4102 +#: ishtar_common/models.py:4207 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1336 +#: archaeological_finds/models_finds.py:1191 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1340 archaeological_finds/tests.py:1265 -#: archaeological_finds/tests.py:1540 archaeological_warehouse/models.py:1008 +#: archaeological_finds/models_finds.py:1195 archaeological_finds/tests.py:1310 +#: archaeological_finds/tests.py:1585 archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1344 +#: archaeological_finds/models_finds.py:1199 #: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1348 +#: archaeological_finds/models_finds.py:1203 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1352 archaeological_finds/tests.py:1483 +#: archaeological_finds/models_finds.py:1207 archaeological_finds/tests.py:1528 #: archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1356 +#: archaeological_finds/models_finds.py:1211 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1360 +#: archaeological_finds/models_finds.py:1215 #: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1364 archaeological_finds/tests.py:1407 -#: ishtar_common/models.py:4014 +#: archaeological_finds/models_finds.py:1219 archaeological_finds/tests.py:1452 +#: ishtar_common/models.py:4028 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1367 +#: archaeological_finds/models_finds.py:1222 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1371 +#: archaeological_finds/models_finds.py:1226 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1375 ishtar_common/models.py:4108 +#: archaeological_finds/models_finds.py:1230 ishtar_common/models.py:4122 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1379 -#: archaeological_finds/models_finds.py:1773 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_finds/models_finds.py:1628 #: archaeological_warehouse/models.py:942 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1383 +#: archaeological_finds/models_finds.py:1238 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1387 +#: archaeological_finds/models_finds.py:1242 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1391 +#: archaeological_finds/models_finds.py:1246 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1398 +#: archaeological_finds/models_finds.py:1253 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1402 -#: ishtar_common/models_common.py:1479 +#: archaeological_finds/models_finds.py:1257 +#: ishtar_common/models_common.py:1509 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1405 archaeological_finds/tests.py:1562 +#: archaeological_finds/models_finds.py:1260 archaeological_finds/tests.py:1607 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1407 +#: archaeological_finds/models_finds.py:1262 msgctxt "key for text search" msgid "treatment-file-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1266 msgctxt "key for text search" msgid "treatment-end-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1270 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1422 +#: archaeological_finds/models_finds.py:1277 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1425 +#: archaeological_finds/models_finds.py:1280 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1429 +#: archaeological_finds/models_finds.py:1284 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1287 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1291 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1294 msgctxt "key for text search" msgid "discovery-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1298 msgctxt "key for text search" msgid "discovery-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1302 msgctxt "key for text search" msgid "discovery-date-taq-before" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1306 msgctxt "key for text search" msgid "discovery-date-taq-after" msgstr "" -#: archaeological_finds/models_finds.py:1455 +#: archaeological_finds/models_finds.py:1310 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1458 +#: archaeological_finds/models_finds.py:1313 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1462 +#: archaeological_finds/models_finds.py:1317 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1466 +#: archaeological_finds/models_finds.py:1321 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1469 +#: archaeological_finds/models_finds.py:1324 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1473 +#: archaeological_finds/models_finds.py:1328 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1476 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1479 +#: archaeological_finds/models_finds.py:1334 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1483 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1490 +#: archaeological_finds/models_finds.py:1345 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1494 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1498 +#: archaeological_finds/models_finds.py:1353 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1357 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1505 +#: archaeological_finds/models_finds.py:1360 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1508 +#: archaeological_finds/models_finds.py:1363 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1511 +#: archaeological_finds/models_finds.py:1366 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1372 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1376 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1524 +#: archaeological_finds/models_finds.py:1379 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1382 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1531 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1535 +#: archaeological_finds/models_finds.py:1390 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1394 msgctxt "key for text search" msgid "length-higher" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1397 msgctxt "key for text search" msgid "width-higher" msgstr "" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1403 msgctxt "key for text search" msgid "thickness-higher" msgstr "" -#: archaeological_finds/models_finds.py:1551 +#: archaeological_finds/models_finds.py:1406 msgctxt "key for text search" msgid "diameter-higher" msgstr "" -#: archaeological_finds/models_finds.py:1554 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "circumference-higher" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "volume-higher" msgstr "" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1416 msgctxt "key for text search" msgid "weight-higher" msgstr "" -#: archaeological_finds/models_finds.py:1564 +#: archaeological_finds/models_finds.py:1419 msgctxt "key for text search" msgid "clutter-long-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1423 msgctxt "key for text search" msgid "clutter-short-side-higher" msgstr "" -#: archaeological_finds/models_finds.py:1572 +#: archaeological_finds/models_finds.py:1427 msgctxt "key for text search" msgid "clutter-height-higher" msgstr "" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1431 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1580 +#: archaeological_finds/models_finds.py:1435 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1584 +#: archaeological_finds/models_finds.py:1439 msgctxt "key for text search" msgid "check-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1442 msgctxt "key for text search" msgid "check-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1590 +#: archaeological_finds/models_finds.py:1445 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1449 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1453 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1457 msgctxt "key for text search" msgid "estimated-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1461 msgctxt "key for text search" msgid "estimated-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1465 msgctxt "key for text search" msgid "insurance-value-higher" msgstr "" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1469 msgctxt "key for text search" msgid "insurance-value-lower" msgstr "" -#: archaeological_finds/models_finds.py:1618 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "appraisal-date-before" msgstr "" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "appraisal-date-after" msgstr "" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1481 #: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1485 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1423 +#: archaeological_finds/models_finds.py:1489 archaeological_finds/tests.py:1468 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1642 +#: archaeological_finds/models_finds.py:1497 #: archaeological_operations/models.py:1169 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1378 +#: archaeological_finds/models_finds.py:1501 archaeological_finds/tests.py:1423 #: archaeological_operations/models.py:1173 -#: archaeological_operations/tests.py:2879 -#: archaeological_operations/tests.py:3357 +#: archaeological_operations/tests.py:2924 +#: archaeological_operations/tests.py:3421 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "operation-remain" msgstr "" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1513 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1749 -#: archaeological_finds/models_finds.py:2397 +#: archaeological_finds/models_finds.py:1604 +#: archaeological_finds/models_finds.py:2252 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4231 -#: ishtar_common/models.py:4582 +#: archaeological_warehouse/views.py:299 ishtar_common/models.py:4245 +#: ishtar_common/models.py:4596 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2748 +#: ishtar_common/views.py:3011 msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1612 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1871 +#: archaeological_finds/models_finds.py:1726 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1873 +#: archaeological_finds/models_finds.py:1728 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1882 +#: archaeological_finds/models_finds.py:1737 #: archaeological_finds/templates/ishtar/sheet_find.html:417 -#: man_app/templates/ishtar/sheet_find.html:430 +#: man_app/templates/ishtar/sheet_find.html:418 +#: na_app/templates/ishtar/sheet_find.html:429 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:1744 #: archaeological_finds/templates/ishtar/sheet_find.html:455 -#: man_app/templates/ishtar/sheet_find.html:468 +#: man_app/templates/ishtar/sheet_find.html:456 +#: na_app/templates/ishtar/sheet_find.html:467 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1960 +#: archaeological_finds/models_finds.py:1815 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1963 +#: archaeological_finds/models_finds.py:1818 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1966 +#: archaeological_finds/models_finds.py:1821 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1842 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1847 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2049 +#: archaeological_finds/models_finds.py:1904 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2058 +#: archaeological_finds/models_finds.py:1913 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2064 +#: archaeological_finds/models_finds.py:1919 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2097 +#: archaeological_finds/models_finds.py:1952 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/models_finds.py:2090 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2236 +#: archaeological_finds/models_finds.py:2091 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2237 +#: archaeological_finds/models_finds.py:2092 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2238 +#: archaeological_finds/models_finds.py:2093 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2094 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2370 +#: archaeological_finds/models_finds.py:2225 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2378 +#: archaeological_finds/models_finds.py:2233 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2386 +#: archaeological_finds/models_finds.py:2241 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2971 +#: archaeological_finds/models_finds.py:2706 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2977 +#: archaeological_finds/models_finds.py:2712 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3418 ishtar_common/forms_common.py:122 -#: ishtar_common/forms_common.py:2516 ishtar_common/ishtar_menu.py:38 -#: ishtar_common/models.py:2909 ishtar_common/models.py:3240 -#: ishtar_common/models.py:3434 ishtar_common/models.py:3683 +#: archaeological_finds/models_finds.py:3153 ishtar_common/forms_common.py:126 +#: ishtar_common/forms_common.py:2692 ishtar_common/ishtar_menu.py:38 +#: ishtar_common/models.py:2919 ishtar_common/models.py:3250 +#: ishtar_common/models.py:3444 ishtar_common/models.py:3697 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3426 +#: archaeological_finds/models_finds.py:3161 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3427 +#: archaeological_finds/models_finds.py:3162 msgid "Properties" msgstr "" @@ -5053,7 +5169,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:158 #: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2588 +#: archaeological_operations/models.py:2594 msgctxt "key for text search" msgid "index" msgstr "" @@ -5100,9 +5216,12 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:388 #: archaeological_finds/templates/ishtar/sheet_find.html:426 #: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:401 -#: man_app/templates/ishtar/sheet_find.html:439 -#: man_app/templates/ishtar/sheet_find.html:477 +#: man_app/templates/ishtar/sheet_find.html:389 +#: man_app/templates/ishtar/sheet_find.html:427 +#: man_app/templates/ishtar/sheet_find.html:465 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:438 +#: na_app/templates/ishtar/sheet_find.html:476 msgid "Doer" msgstr "" @@ -5152,7 +5271,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:494 -#: man_app/templates/ishtar/sheet_find.html:507 +#: man_app/templates/ishtar/sheet_find.html:495 +#: na_app/templates/ishtar/sheet_find.html:506 msgid "Treatment requests" msgstr "" @@ -5213,6 +5333,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: man_app/templates/ishtar/sheet_find.html:16 +#: na_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -5220,40 +5341,48 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:41 #: man_app/templates/ishtar/sheet_find.html:43 +#: na_app/templates/ishtar/sheet_find.html:41 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: man_app/templates/ishtar/sheet_find.html:58 +#: na_app/templates/ishtar/sheet_find.html:56 msgid "Preservation / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:164 +#: na_app/templates/ishtar/sheet_find.html:176 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: man_app/templates/ishtar/sheet_find.html:272 +#: man_app/templates/ishtar/sheet_find.html:260 +#: na_app/templates/ishtar/sheet_find.html:271 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:296 -#: man_app/templates/ishtar/sheet_find.html:309 +#: man_app/templates/ishtar/sheet_find.html:297 +#: na_app/templates/ishtar/sheet_find.html:308 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:326 -#: man_app/templates/ishtar/sheet_find.html:339 +#: man_app/templates/ishtar/sheet_find.html:327 +#: na_app/templates/ishtar/sheet_find.html:338 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:372 -#: man_app/templates/ishtar/sheet_find.html:385 +#: man_app/templates/ishtar/sheet_find.html:373 +#: na_app/templates/ishtar/sheet_find.html:384 msgid "Container information not available." msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:379 -#: man_app/templates/ishtar/sheet_find.html:392 +#: man_app/templates/ishtar/sheet_find.html:380 +#: na_app/templates/ishtar/sheet_find.html:391 msgid "Simple treatments" msgstr "" @@ -5261,19 +5390,26 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:421 #: archaeological_finds/templates/ishtar/sheet_find.html:459 #: archaeological_finds/templates/ishtar/sheet_find.html:498 -#: man_app/templates/ishtar/sheet_find.html:396 -#: man_app/templates/ishtar/sheet_find.html:434 -#: man_app/templates/ishtar/sheet_find.html:472 -#: man_app/templates/ishtar/sheet_find.html:511 +#: man_app/templates/ishtar/sheet_find.html:384 +#: man_app/templates/ishtar/sheet_find.html:422 +#: man_app/templates/ishtar/sheet_find.html:460 +#: man_app/templates/ishtar/sheet_find.html:499 +#: na_app/templates/ishtar/sheet_find.html:395 +#: na_app/templates/ishtar/sheet_find.html:433 +#: na_app/templates/ishtar/sheet_find.html:471 +#: na_app/templates/ishtar/sheet_find.html:510 msgid "Year - index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:387 #: archaeological_finds/templates/ishtar/sheet_find.html:425 #: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: man_app/templates/ishtar/sheet_find.html:400 -#: man_app/templates/ishtar/sheet_find.html:438 -#: man_app/templates/ishtar/sheet_find.html:476 +#: man_app/templates/ishtar/sheet_find.html:388 +#: man_app/templates/ishtar/sheet_find.html:426 +#: man_app/templates/ishtar/sheet_find.html:464 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:437 +#: na_app/templates/ishtar/sheet_find.html:475 msgid "Related finds (max. 15 displayed)" msgstr "" @@ -5283,7 +5419,8 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 -#: man_app/templates/ishtar/sheet_find.html:464 +#: man_app/templates/ishtar/sheet_find.html:452 +#: na_app/templates/ishtar/sheet_find.html:463 msgid "Export as CSV" msgstr "" @@ -5293,8 +5430,10 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 -#: man_app/templates/ishtar/sheet_find.html:464 -#: man_app/templates/ishtar/sheet_find.html:503 +#: man_app/templates/ishtar/sheet_find.html:452 +#: man_app/templates/ishtar/sheet_find.html:491 +#: na_app/templates/ishtar/sheet_find.html:463 +#: na_app/templates/ishtar/sheet_find.html:502 msgid "CSV" msgstr "" @@ -5302,7 +5441,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: ishtar_common/templates/ishtar/sheet_document.html:138 -#: man_app/templates/ishtar/sheet_find.html:587 +#: man_app/templates/ishtar/sheet_find.html:533 +#: na_app/templates/ishtar/sheet_find.html:544 msgid "Associated documents" msgstr "" @@ -5313,8 +5453,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 -#: ishtar_common/forms_common.py:1923 +#: ishtar_common/forms_common.py:2100 #: ishtar_common/templates/ishtar/sheet_document.html:57 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -5387,23 +5528,27 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:945 archaeological_warehouse/models.py:1682 +#: archaeological_finds/tests.py:714 ishtar_common/forms_common.py:406 +msgid "This importer need a document archive." +msgstr "" + +#: archaeological_finds/tests.py:984 archaeological_warehouse/models.py:1682 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1565 archaeological_finds/tests.py:1591 -#: archaeological_finds/tests.py:1601 archaeological_operations/tests.py:3115 -#: ishtar_common/forms.py:1172 ishtar_common/forms.py:1251 +#: archaeological_finds/tests.py:1610 archaeological_finds/tests.py:1636 +#: archaeological_finds/tests.py:1646 archaeological_operations/tests.py:3160 +#: ishtar_common/forms.py:1193 ishtar_common/forms.py:1272 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:606 ishtar_common/views_item.py:876 -#: ishtar_common/views_item.py:913 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:638 ishtar_common/views_item.py:908 +#: ishtar_common/views_item.py:945 ishtar_common/wizards.py:501 msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1566 archaeological_finds/tests.py:1592 -#: archaeological_finds/tests.py:1602 ishtar_common/forms.py:1173 -#: ishtar_common/forms.py:1253 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1637 +#: archaeological_finds/tests.py:1647 ishtar_common/forms.py:1194 +#: ishtar_common/forms.py:1274 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:503 msgid "No" msgstr "" @@ -5500,29 +5645,30 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1061 -#: archaeological_operations/forms.py:1077 -#: archaeological_operations/forms.py:1083 -#: archaeological_operations/models.py:3076 -#: archaeological_operations/templates/ishtar/sheet_operation.html:493 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1079 +#: archaeological_operations/forms.py:1085 +#: archaeological_operations/models.py:3082 +#: archaeological_operations/templates/ishtar/sheet_operation.html:523 +#: na_app/templates/ishtar/sheet_operation.html:501 msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3064 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3060 +#: archaeological_operations/models.py:3066 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3062 -#: archaeological_operations/models.py:3090 -#: archaeological_operations/models.py:3158 +#: archaeological_operations/models.py:3068 +#: archaeological_operations/models.py:3096 +#: archaeological_operations/models.py:3164 msgid "Public domain" msgstr "" @@ -5579,19 +5725,19 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:732 +#: archaeological_operations/forms.py:734 #: archaeological_operations/models.py:1407 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:713 +#: archaeological_operations/forms.py:715 #: archaeological_operations/models.py:1504 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:720 #: archaeological_operations/models.py:1447 msgid "Address / Locality" msgstr "" @@ -5601,23 +5747,23 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:769 -#: archaeological_operations/models.py:2729 +#: archaeological_operations/forms.py:771 +#: archaeological_operations/models.py:2735 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:758 -#: archaeological_operations/forms.py:1684 +#: archaeological_operations/forms.py:760 +#: archaeological_operations/forms.py:1689 #: archaeological_operations/models.py:1346 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1127 -#: archaeological_operations/forms.py:1221 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/forms.py:1848 +#: archaeological_operations/forms.py:1129 +#: archaeological_operations/forms.py:1224 +#: archaeological_operations/forms.py:1344 +#: archaeological_operations/forms.py:1853 #: archaeological_operations/models.py:307 #: archaeological_operations/models.py:316 #: archaeological_operations/models.py:497 @@ -5649,33 +5795,33 @@ msgid "Abstract (full text search)" msgstr "" #: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1450 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:823 #: archaeological_operations/models.py:991 #: archaeological_operations/models.py:1485 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:787 +#: archaeological_operations/forms.py:789 #: archaeological_operations/models.py:1402 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:740 +#: archaeological_operations/forms.py:742 #: archaeological_operations/models.py:1476 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:810 -#: archaeological_operations/forms.py:1692 +#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:1697 #: archaeological_operations/models.py:992 #: archaeological_operations/models.py:1495 msgid "Documentation received" @@ -5690,8 +5836,8 @@ msgid "Documentation deadline after" msgstr "" #: archaeological_operations/forms.py:579 -#: archaeological_operations/forms.py:815 -#: archaeological_operations/forms.py:1696 +#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:1701 #: archaeological_operations/models.py:993 #: archaeological_operations/models.py:1500 msgid "Finds received" @@ -5705,385 +5851,386 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:669 ishtar_common/models.py:4242 +#: archaeological_operations/forms.py:671 ishtar_common/models.py:4256 msgid "Associated file" msgstr "" -#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:684 msgid "Operation - 010 - General" msgstr "" -#: archaeological_operations/forms.py:716 -#: archaeological_operations/forms.py:1744 +#: archaeological_operations/forms.py:718 +#: archaeological_operations/forms.py:1749 #: archaeological_operations/models.py:1446 msgid "Generic name" msgstr "" -#: archaeological_operations/forms.py:743 +#: archaeological_operations/forms.py:745 msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:745 +#: archaeological_operations/forms.py:747 msgid "Head scientist" msgstr "" -#: archaeological_operations/forms.py:766 +#: archaeological_operations/forms.py:768 #: archaeological_operations/models.py:1444 msgid "Operator reference" msgstr "" -#: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1346 -#: archaeological_operations/forms.py:1700 -#: archaeological_operations/forms.py:1837 +#: archaeological_operations/forms.py:782 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/forms.py:1842 #: archaeological_operations/models.py:515 #: archaeological_operations/models.py:1360 msgid "Collaborators" msgstr "" -#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:783 msgid "Dates / Administrative" msgstr "" -#: archaeological_operations/forms.py:785 +#: archaeological_operations/forms.py:787 #: archaeological_operations/models.py:1331 msgid "Report delivery date" msgstr "" -#: archaeological_operations/forms.py:807 +#: archaeological_operations/forms.py:809 #: archaeological_operations/models.py:1492 msgid "Deadline for submission of the documentation" msgstr "" -#: archaeological_operations/forms.py:812 +#: archaeological_operations/forms.py:814 #: archaeological_operations/models.py:1498 msgid "Deadline for submission of the finds" msgstr "" -#: archaeological_operations/forms.py:817 +#: archaeological_operations/forms.py:819 msgid "Scientific" msgstr "" -#: archaeological_operations/forms.py:824 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:948 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:1067 msgid "Remain type" msgstr "" -#: archaeological_operations/forms.py:830 +#: archaeological_operations/forms.py:832 #: archaeological_operations/models.py:1490 msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:884 +#: archaeological_operations/forms.py:886 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:889 +#: archaeological_operations/forms.py:891 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:919 +#: archaeological_operations/forms.py:921 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:923 +#: archaeological_operations/forms.py:925 msgid "Bad operation code" msgstr "" -#: archaeological_operations/forms.py:929 -#: archaeological_operations/models.py:1942 +#: archaeological_operations/forms.py:931 +#: archaeological_operations/models.py:1948 msgid "Operation code" msgstr "" -#: archaeological_operations/forms.py:964 -#: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: archaeological_operations/forms.py:966 +#: archaeological_operations/templates/ishtar/sheet_operation.html:312 +#: na_app/templates/ishtar/sheet_operation.html:290 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:965 +#: archaeological_operations/forms.py:967 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:974 +#: archaeological_operations/forms.py:976 #: archaeological_operations/models.py:1507 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:977 +#: archaeological_operations/forms.py:979 #: archaeological_operations/models.py:1509 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:983 +#: archaeological_operations/forms.py:985 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:989 +#: archaeological_operations/forms.py:991 #: archaeological_operations/models.py:1521 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:995 +#: archaeological_operations/forms.py:997 #: archaeological_operations/models.py:1529 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1000 +#: archaeological_operations/forms.py:1002 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1001 +#: archaeological_operations/forms.py:1003 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1004 +#: archaeological_operations/forms.py:1006 #: archaeological_operations/models.py:1386 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1005 +#: archaeological_operations/forms.py:1007 #: archaeological_operations/models.py:1390 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1007 +#: archaeological_operations/forms.py:1009 #: archaeological_operations/models.py:1394 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1009 +#: archaeological_operations/forms.py:1011 #: archaeological_operations/models.py:1398 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1019 +#: archaeological_operations/forms.py:1021 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1022 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1025 +#: archaeological_operations/forms.py:1027 #: archaeological_operations/models.py:1418 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1027 +#: archaeological_operations/forms.py:1029 #: archaeological_operations/models.py:1422 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1030 +#: archaeological_operations/forms.py:1032 #: archaeological_operations/models.py:1425 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1051 +#: archaeological_operations/forms.py:1053 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1056 +#: archaeological_operations/forms.py:1058 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1078 +#: archaeological_operations/forms.py:1080 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1085 +#: archaeological_operations/forms.py:1087 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1119 -#: archaeological_operations/forms.py:1215 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1796 +#: archaeological_operations/forms.py:1121 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1336 +#: archaeological_operations/forms.py:1801 #: archaeological_operations/models.py:492 -#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:1848 -#: ishtar_common/forms_common.py:2134 ishtar_common/forms_common.py:2365 -#: ishtar_common/models.py:2349 +#: archaeological_warehouse/models.py:2071 ishtar_common/forms_common.py:2025 +#: ishtar_common/forms_common.py:2311 ishtar_common/forms_common.py:2541 +#: ishtar_common/models.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "" -#: archaeological_operations/forms.py:1130 -#: archaeological_operations/forms.py:1342 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1848 msgid "Cultural attributions" msgstr "" -#: archaeological_operations/forms.py:1152 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/forms.py:1816 +#: archaeological_operations/forms.py:1154 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/forms.py:1821 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1195 +#: archaeological_operations/forms.py:1198 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1200 +#: archaeological_operations/forms.py:1203 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1209 +#: archaeological_operations/forms.py:1212 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1232 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1350 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1355 #: archaeological_operations/models.py:507 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/forms.py:1354 +#: archaeological_operations/forms.py:1247 +#: archaeological_operations/forms.py:1359 #: archaeological_operations/models.py:510 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1248 -#: archaeological_operations/forms.py:1398 +#: archaeological_operations/forms.py:1251 +#: archaeological_operations/forms.py:1403 #: archaeological_operations/models.py:527 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1250 -#: archaeological_operations/forms.py:1400 +#: archaeological_operations/forms.py:1253 +#: archaeological_operations/forms.py:1405 #: archaeological_operations/models.py:530 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1252 -#: archaeological_operations/forms.py:1402 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1407 #: archaeological_operations/models.py:519 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1255 -#: archaeological_operations/forms.py:1410 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1415 #: archaeological_operations/models.py:521 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1258 -#: archaeological_operations/forms.py:1404 +#: archaeological_operations/forms.py:1261 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/models.py:523 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1260 -#: archaeological_operations/forms.py:1406 +#: archaeological_operations/forms.py:1263 +#: archaeological_operations/forms.py:1411 #: archaeological_operations/models.py:524 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1408 +#: archaeological_operations/forms.py:1265 +#: archaeological_operations/forms.py:1413 #: archaeological_operations/models.py:525 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1327 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1384 +#: archaeological_operations/forms.py:1389 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1398 #: archaeological_operations/templates/ishtar/sheet_site.html:53 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1394 +#: archaeological_operations/forms.py:1399 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1478 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1488 -#: archaeological_operations/forms.py:1590 -#: archaeological_operations/forms.py:1657 +#: archaeological_operations/forms.py:1493 +#: archaeological_operations/forms.py:1595 +#: archaeological_operations/forms.py:1662 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1498 -#: archaeological_operations/models.py:2754 +#: archaeological_operations/forms.py:1503 +#: archaeological_operations/models.py:2760 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:2789 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:2795 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:1521 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1550 +#: archaeological_operations/forms.py:1555 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1554 +#: archaeological_operations/forms.py:1559 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1572 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1572 ishtar_common/forms.py:1288 -#: ishtar_common/models.py:2021 +#: archaeological_operations/forms.py:1577 ishtar_common/forms.py:1309 +#: ishtar_common/models.py:2031 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1596 -#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1601 +#: archaeological_operations/forms.py:1605 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1623 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1620 +#: archaeological_operations/forms.py:1625 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1646 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:730 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1662 +#: archaeological_operations/forms.py:1667 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1771 +#: archaeological_operations/forms.py:1776 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1827 +#: archaeological_operations/forms.py:1832 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6123,7 +6270,7 @@ msgstr "" msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:944 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:1063 msgid "Cultural attribution type" msgstr "" @@ -6133,7 +6280,7 @@ msgstr "" #: archaeological_operations/models.py:376 #: archaeological_operations/models.py:1177 -#: archaeological_operations/tests.py:3101 +#: archaeological_operations/tests.py:3146 msgctxt "key for text search" msgid "remain" msgstr "" @@ -6193,19 +6340,20 @@ msgid "Create associated operation" msgstr "" #: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1542 #: archaeological_warehouse/models.py:406 msgid "Cached town label" msgstr "" #: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1554 msgid "Cached remains label" msgstr "" #: archaeological_operations/models.py:567 #: archaeological_operations/models.py:1465 -#: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: archaeological_operations/templates/ishtar/sheet_operation.html:354 +#: na_app/templates/ishtar/sheet_operation.html:332 msgid "Archaeological sites" msgstr "" @@ -6229,9 +6377,9 @@ msgstr "" msgid "top ope." msgstr "" -#: archaeological_operations/models.py:803 ishtar_common/forms.py:1171 -#: ishtar_common/models.py:5142 ishtar_common/models.py:5303 -#: ishtar_common/models.py:5363 ishtar_common/views_item.py:1607 +#: archaeological_operations/models.py:803 ishtar_common/forms.py:1192 +#: ishtar_common/models.py:5156 ishtar_common/models.py:5317 +#: ishtar_common/models.py:5377 ishtar_common/views_item.py:1653 msgid "Unknown" msgstr "" @@ -6302,7 +6450,7 @@ msgid "address" msgstr "" #: archaeological_operations/models.py:1162 -#: archaeological_operations/tests.py:3113 +#: archaeological_operations/tests.py:3158 msgctxt "key for text search" msgid "is-open" msgstr "" @@ -6333,7 +6481,7 @@ msgid "end-after" msgstr "" #: archaeological_operations/models.py:1197 -#: archaeological_operations/tests.py:3156 +#: archaeological_operations/tests.py:3201 msgctxt "key for text search" msgid "relation-types" msgstr "" @@ -6354,6 +6502,7 @@ msgid "record-quality" msgstr "" #: archaeological_operations/models.py:1214 +#: archaeological_operations/tests.py:3248 msgctxt "key for text search" msgid "report-processing" msgstr "" @@ -6398,8 +6547,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1288 ishtar_common/models.py:4104 -#: ishtar_common/models.py:4196 +#: archaeological_operations/models.py:1288 ishtar_common/models.py:4118 +#: ishtar_common/models.py:4210 msgctxt "key for text search" msgid "file" msgstr "" @@ -6425,282 +6574,292 @@ msgstr "" msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1558 +#: archaeological_operations/models.py:1536 +msgid "Cached label" +msgstr "" + +#: archaeological_operations/models.py:1564 #: archaeological_operations/templates/ishtar/sheet_site.html:86 -#: ishtar_common/models.py:988 +#: ishtar_common/models.py:999 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1598 +#: archaeological_operations/models.py:1604 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1599 +#: archaeological_operations/models.py:1605 msgid "List of associated containers" msgstr "" -#: archaeological_operations/models.py:1672 +#: archaeological_operations/models.py:1678 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1784 +#: archaeological_operations/models.py:1775 +msgid "No associated town" +msgstr "" + +#: archaeological_operations/models.py:1790 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1908 +#: archaeological_operations/models.py:1914 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1927 +#: archaeological_operations/models.py:1933 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1975 +#: archaeological_operations/models.py:1981 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:2036 +#: archaeological_operations/models.py:2042 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2052 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2054 +#: archaeological_operations/models.py:2060 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2062 +#: archaeological_operations/models.py:2068 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2116 +#: archaeological_operations/models.py:2122 #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2178 -#: archaeological_operations/models.py:2257 +#: archaeological_operations/models.py:2184 +#: archaeological_operations/models.py:2263 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2222 +#: archaeological_operations/models.py:2228 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2267 +#: archaeological_operations/models.py:2273 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2359 ishtar_common/models_imports.py:949 +#: archaeological_operations/models.py:2365 +#: ishtar_common/models_imports.py:1068 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2360 +#: archaeological_operations/models.py:2366 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2391 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2386 +#: archaeological_operations/models.py:2392 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2452 +#: archaeological_operations/models.py:2458 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2457 +#: archaeological_operations/models.py:2463 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2460 +#: archaeological_operations/models.py:2466 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2464 +#: archaeological_operations/models.py:2470 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2590 +#: archaeological_operations/models.py:2596 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2600 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2603 +#: archaeological_operations/models.py:2609 #: archaeological_warehouse/models.py:963 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2613 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2619 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2623 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2627 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2636 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2640 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2638 +#: archaeological_operations/models.py:2644 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2650 +#: archaeological_operations/models.py:2656 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2654 +#: archaeological_operations/models.py:2660 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2657 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2661 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2665 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2669 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2673 +#: archaeological_operations/models.py:2679 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2677 +#: archaeological_operations/models.py:2683 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2680 +#: archaeological_operations/models.py:2686 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2683 +#: archaeological_operations/models.py:2689 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2687 +#: archaeological_operations/models.py:2693 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:2697 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2695 +#: archaeological_operations/models.py:2701 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2699 +#: archaeological_operations/models.py:2705 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2703 +#: archaeological_operations/models.py:2709 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2737 +#: archaeological_operations/models.py:2743 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2799 +#: archaeological_operations/models.py:2805 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2811 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2979 +#: archaeological_operations/models.py:2985 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:3069 +#: archaeological_operations/models.py:3075 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3071 ishtar_common/models.py:2602 -#: ishtar_common/models.py:2904 ishtar_common/models.py:3691 -#: ishtar_common/models_common.py:3510 ishtar_common/models_common.py:3545 -#: ishtar_common/models_common.py:4471 +#: archaeological_operations/models.py:3077 ishtar_common/models.py:2612 +#: ishtar_common/models.py:2914 ishtar_common/models.py:3705 +#: ishtar_common/models_common.py:3318 ishtar_common/models_common.py:3353 +#: ishtar_common/models_common.py:4279 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3344 ishtar_common/models.py:3556 +#: archaeological_operations/models.py:3369 ishtar_common/models.py:3570 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3359 +#: archaeological_operations/models.py:3384 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3360 +#: archaeological_operations/models.py:3385 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3382 ishtar_common/models.py:5010 +#: archaeological_operations/models.py:3407 ishtar_common/models.py:5024 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3385 +#: archaeological_operations/models.py:3410 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3386 +#: archaeological_operations/models.py:3411 msgid "Operation types old" msgstr "" @@ -6722,60 +6881,75 @@ msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:53 +#: na_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 -#: archaeological_operations/templates/ishtar/sheet_operation.html:400 -#: archaeological_operations/templates/ishtar/sheet_operation.html:498 -#: ishtar_common/models.py:988 +#: archaeological_operations/templates/ishtar/sheet_operation.html:430 +#: archaeological_operations/templates/ishtar/sheet_operation.html:528 +#: ishtar_common/models.py:999 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:408 +#: na_app/templates/ishtar/sheet_operation.html:506 msgid "Context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:116 -#: archaeological_operations/templates/ishtar/sheet_operation.html:467 +#: archaeological_operations/templates/ishtar/sheet_operation.html:497 #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:208 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:215 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:475 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:159 +#: na_app/templates/ishtar/sheet_operation.html:159 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:228 +#: na_app/templates/ishtar/sheet_operation.html:228 msgid "Duration" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:270 +#: archaeological_operations/templates/ishtar/sheet_operation.html:286 +#: na_app/templates/ishtar/sheet_operation.html:278 msgid "This operation is virtual." msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:359 +#: archaeological_operations/templates/ishtar/sheet_operation.html:389 +#: na_app/templates/ishtar/sheet_operation.html:367 msgid "Document from this operation" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:391 +#: archaeological_operations/templates/ishtar/sheet_operation.html:421 +#: na_app/templates/ishtar/sheet_operation.html:399 msgid "No relations" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:410 +#: archaeological_operations/templates/ishtar/sheet_operation.html:440 +#: na_app/templates/ishtar/sheet_operation.html:418 msgid "Documents from associated context records" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: archaeological_operations/templates/ishtar/sheet_operation.html:445 +#: na_app/templates/ishtar/sheet_operation.html:423 msgid "Diagram of stratigraphic relations" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:444 +#: archaeological_operations/templates/ishtar/sheet_operation.html:474 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:452 msgid "Associated containers" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:472 +#: archaeological_operations/templates/ishtar/sheet_operation.html:502 #: archaeological_warehouse/templates/ishtar/sheet_container.html:213 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 #: ishtar_common/models_rest.py:77 @@ -6785,26 +6959,34 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:79 #: ishtar_common/templates/ishtar/blocks/window_nav.html:85 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:220 +#: na_app/templates/ishtar/sheet_operation.html:480 msgid "Export" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:477 +#: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_warehouse/templates/ishtar/sheet_container.html:218 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: na_app/templates/ishtar/sheet_container.html:225 +#: na_app/templates/ishtar/sheet_operation.html:485 msgid "Regenerate statistics" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:482 +#: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:223 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: na_app/templates/ishtar/sheet_container.html:230 +#: na_app/templates/ishtar/sheet_operation.html:490 msgid "Last update:" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:562 +#: archaeological_operations/templates/ishtar/sheet_operation.html:592 +#: na_app/templates/ishtar/sheet_operation.html:570 msgid "Sources" msgstr "" -#: archaeological_operations/templates/ishtar/sheet_operation.html:580 +#: archaeological_operations/templates/ishtar/sheet_operation.html:610 +#: na_app/templates/ishtar/sheet_operation.html:588 msgid "Finds by context records" msgstr "" @@ -6812,73 +6994,73 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:841 +#: archaeological_operations/tests.py:885 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:871 +#: archaeological_operations/tests.py:915 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:909 +#: archaeological_operations/tests.py:953 #: 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:1823 +#: archaeological_operations/tests.py:1867 #: archaeological_operations/views.py:459 msgid "This parcel is associated with a context record. It can't be deleted." msgstr "" -#: archaeological_operations/tests.py:2552 ishtar_common/forms.py:447 +#: archaeological_operations/tests.py:2597 ishtar_common/forms.py:457 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2565 +#: archaeological_operations/tests.py:2610 #: ishtar_common/templates/ishtar/sheet.html:139 msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4700 +#: archaeological_operations/tests.py:4764 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4713 +#: archaeological_operations/tests.py:4777 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4731 +#: archaeological_operations/tests.py:4795 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4738 ishtar_common/admin.py:2476 +#: archaeological_operations/tests.py:4802 ishtar_common/admin.py:2518 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4744 +#: archaeological_operations/tests.py:4808 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4817 ishtar_common/admin.py:2564 +#: archaeological_operations/tests.py:4881 ishtar_common/admin.py:2606 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4823 ishtar_common/models_rest.py:377 +#: archaeological_operations/tests.py:4887 ishtar_common/models_rest.py:377 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4830 ishtar_common/models_rest.py:356 +#: archaeological_operations/tests.py:4894 ishtar_common/models_rest.py:356 #: ishtar_common/models_rest.py:362 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -6904,7 +7086,7 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:570 ishtar_common/models.py:996 +#: archaeological_operations/views.py:570 ishtar_common/models.py:1007 msgid "Site deletion" msgstr "" @@ -6938,7 +7120,7 @@ msgstr "" #: archaeological_warehouse/models.py:414 #: archaeological_warehouse/models.py:929 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1928 ishtar_common/models.py:5238 +#: ishtar_common/forms_common.py:2105 ishtar_common/models.py:5252 #: ishtar_common/views.py:505 msgid "Warehouse" msgstr "" @@ -6962,6 +7144,7 @@ msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:378 #: archaeological_warehouse/templates/ishtar/sheet_container.html:181 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -6975,7 +7158,7 @@ msgstr "" #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:210 #: archaeological_warehouse/forms.py:319 archaeological_warehouse/models.py:263 -#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:962 +#: archaeological_warehouse/models.py:357 ishtar_common/models_imports.py:1081 msgid "Warehouse type" msgstr "" @@ -7004,32 +7187,32 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:596 -#: ishtar_common/forms_common.py:983 ishtar_common/models_common.py:3766 -#: ishtar_common/models_common.py:3955 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:772 +#: ishtar_common/forms_common.py:1161 ishtar_common/models_common.py:3574 +#: ishtar_common/models_common.py:3763 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:599 -#: ishtar_common/forms_common.py:986 ishtar_common/models_common.py:3771 +#: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:775 +#: ishtar_common/forms_common.py:1164 ishtar_common/models_common.py:3579 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:601 -#: ishtar_common/forms_common.py:988 ishtar_common/models_common.py:3777 +#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:777 +#: ishtar_common/forms_common.py:1166 ishtar_common/models_common.py:3585 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:603 -#: ishtar_common/forms_common.py:959 ishtar_common/models_common.py:3791 -#: ishtar_common/models_common.py:3967 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:1137 ishtar_common/models_common.py:3599 +#: ishtar_common/models_common.py:3775 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:605 -#: ishtar_common/forms_common.py:969 ishtar_common/models_common.py:3807 +#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:781 +#: ishtar_common/forms_common.py:1147 ishtar_common/models_common.py:3615 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7061,7 +7244,8 @@ msgstr "" #: archaeological_warehouse/models.py:899 #: archaeological_warehouse/models.py:1141 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:1079 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" @@ -7194,6 +7378,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:183 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -7329,7 +7514,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4100 +#: archaeological_warehouse/models.py:1004 ishtar_common/models.py:4114 msgctxt "key for text search" msgid "find-denomination" msgstr "" @@ -7384,7 +7569,7 @@ msgstr "" msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4344 +#: archaeological_warehouse/models.py:1161 ishtar_common/models.py:4358 msgid "Container ID" msgstr "" @@ -7446,49 +7631,60 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of owned finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:128 +#: na_app/templates/ishtar/sheet_container.html:135 msgid "Measured weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Calculated weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:133 +#: na_app/templates/ishtar/sheet_container.html:140 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 +#: na_app/templates/ishtar/sheet_container.html:207 msgid "Empty" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:231 +#: na_app/templates/ishtar/sheet_container.html:238 msgid "No container/division inside this container." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_container.html:244 msgid "Finds by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:261 +#: na_app/templates/ishtar/sheet_container.html:268 msgid "Containers by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:289 +#: na_app/templates/ishtar/sheet_container.html:296 msgid "Document for this container" msgstr "" @@ -7667,7 +7863,7 @@ msgstr "" msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:724 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:902 msgid "At least two items have to be selected." msgstr "" @@ -7688,7 +7884,7 @@ msgstr "" msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:495 ishtar_common/models.py:1486 +#: ishtar_common/admin.py:495 ishtar_common/models.py:1496 msgid "Maps - default center" msgstr "" @@ -7715,14 +7911,14 @@ msgid "" "might be required." msgstr "" -#: ishtar_common/admin.py:660 ishtar_common/models.py:965 +#: ishtar_common/admin.py:660 ishtar_common/models.py:976 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1295 -#: ishtar_common/forms_common.py:1330 ishtar_common/forms_common.py:1331 -#: ishtar_common/models.py:3020 +#: ishtar_common/admin.py:661 ishtar_common/forms_common.py:1475 +#: ishtar_common/forms_common.py:1507 ishtar_common/forms_common.py:1508 +#: ishtar_common/models.py:3030 msgid "Profiles" msgstr "" @@ -7843,10 +8039,12 @@ msgid "Parents" msgstr "" #: ishtar_common/admin.py:1177 ishtar_common/admin.py:1642 +#: ishtar_common/admin.py:1665 msgid "Make available" msgstr "" #: ishtar_common/admin.py:1178 ishtar_common/admin.py:1643 +#: ishtar_common/admin.py:1666 msgid "Make unavailable" msgstr "" @@ -7890,159 +8088,160 @@ msgstr "" msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1694 +#: ishtar_common/admin.py:1717 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1725 +#: ishtar_common/admin.py:1748 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1738 +#: ishtar_common/admin.py:1761 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1765 +#: ishtar_common/admin.py:1788 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1772 +#: ishtar_common/admin.py:1795 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1786 +#: ishtar_common/admin.py:1809 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1821 +#: ishtar_common/admin.py:1844 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1976 +#: ishtar_common/admin.py:2018 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1977 +#: ishtar_common/admin.py:2019 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:2007 ishtar_common/models.py:1629 +#: ishtar_common/admin.py:2049 ishtar_common/models.py:1639 msgid "Form" msgstr "" -#: ishtar_common/admin.py:2028 ishtar_common/models.py:1769 +#: ishtar_common/admin.py:2070 ishtar_common/models.py:1779 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2159 ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2201 ishtar_common/admin.py:2253 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2166 +#: ishtar_common/admin.py:2208 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2178 +#: ishtar_common/admin.py:2220 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2218 +#: ishtar_common/admin.py:2260 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2230 ishtar_common/models_imports.py:1427 +#: ishtar_common/admin.py:2272 ishtar_common/models_imports.py:1597 +#: ishtar_common/models_imports.py:2249 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2298 ishtar_common/models.py:962 +#: ishtar_common/admin.py:2340 ishtar_common/models.py:973 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2361 ishtar_common/admin.py:2499 -#: ishtar_common/admin.py:2543 +#: ishtar_common/admin.py:2403 ishtar_common/admin.py:2541 +#: ishtar_common/admin.py:2585 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2383 +#: ishtar_common/admin.py:2425 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2391 +#: ishtar_common/admin.py:2433 msgid "" "Bad response for {} - {}. Response status code {} != 200. No access to {}. " "If it is not expected, check your key." msgstr "" -#: ishtar_common/admin.py:2403 +#: ishtar_common/admin.py:2445 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2438 +#: ishtar_common/admin.py:2480 msgid "Table/exports configuration updated" msgstr "" -#: ishtar_common/admin.py:2444 +#: ishtar_common/admin.py:2486 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2450 +#: ishtar_common/admin.py:2492 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2456 +#: ishtar_common/admin.py:2498 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2465 +#: ishtar_common/admin.py:2507 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2484 +#: ishtar_common/admin.py:2526 msgid "Update table, export format and types from source" msgstr "" -#: ishtar_common/admin.py:2508 +#: ishtar_common/admin.py:2550 msgid "" "Document not generated: is the LibreOffice daemon configured and running?" msgstr "" -#: ishtar_common/admin.py:2528 +#: ishtar_common/admin.py:2570 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2552 +#: ishtar_common/admin.py:2594 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2557 +#: ishtar_common/admin.py:2599 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2570 +#: ishtar_common/admin.py:2612 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2604 +#: ishtar_common/admin.py:2646 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2605 +#: ishtar_common/admin.py:2647 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2615 ishtar_common/models_rest.py:81 +#: ishtar_common/admin.py:2657 ishtar_common/models_rest.py:81 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2618 ishtar_common/models.py:715 -#: ishtar_common/models_common.py:809 ishtar_common/models_imports.py:851 -#: ishtar_common/models_imports.py:1950 ishtar_common/models_rest.py:111 +#: ishtar_common/admin.py:2660 ishtar_common/models.py:726 +#: ishtar_common/models_common.py:811 ishtar_common/models_imports.py:970 +#: ishtar_common/models_imports.py:2827 ishtar_common/models_rest.py:111 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8051,21 +8250,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2620 +#: ishtar_common/admin.py:2662 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2650 +#: ishtar_common/admin.py:2692 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2683 +#: ishtar_common/admin.py:2725 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2691 +#: ishtar_common/admin.py:2733 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8136,173 +8335,173 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:279 +#: ishtar_common/data_importer.py:277 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:298 +#: ishtar_common/data_importer.py:296 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:310 +#: ishtar_common/data_importer.py:308 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:320 +#: ishtar_common/data_importer.py:318 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:377 ishtar_common/data_importer.py:391 -#: ishtar_common/data_importer.py:615 +#: ishtar_common/data_importer.py:375 ishtar_common/data_importer.py:389 +#: ishtar_common/data_importer.py:613 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:404 +#: ishtar_common/data_importer.py:402 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:473 +#: ishtar_common/data_importer.py:471 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:480 +#: ishtar_common/data_importer.py:478 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:482 +#: ishtar_common/data_importer.py:480 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:644 +#: ishtar_common/data_importer.py:642 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:753 +#: ishtar_common/data_importer.py:752 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:759 +#: ishtar_common/data_importer.py:758 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:761 ishtar_common/views.py:1702 +#: ishtar_common/data_importer.py:760 ishtar_common/views.py:1818 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:762 +#: ishtar_common/data_importer.py:761 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:763 +#: ishtar_common/data_importer.py:762 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:764 +#: ishtar_common/data_importer.py:763 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:766 +#: ishtar_common/data_importer.py:765 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:770 +#: ishtar_common/data_importer.py:769 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:774 +#: ishtar_common/data_importer.py:773 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1361 ishtar_common/views.py:1780 -#: ishtar_common/views.py:1790 +#: ishtar_common/data_importer.py:1391 ishtar_common/views.py:1896 +#: ishtar_common/views.py:1906 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1655 +#: ishtar_common/data_importer.py:1681 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1660 +#: ishtar_common/data_importer.py:1686 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1742 +#: ishtar_common/data_importer.py:1770 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1869 +#: ishtar_common/data_importer.py:1901 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:1944 +#: ishtar_common/data_importer.py:1971 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:1952 +#: ishtar_common/data_importer.py:1979 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:1957 +#: ishtar_common/data_importer.py:1984 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2043 +#: ishtar_common/data_importer.py:2072 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2046 +#: ishtar_common/data_importer.py:2075 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2126 +#: ishtar_common/data_importer.py:2158 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2156 +#: ishtar_common/data_importer.py:2188 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2162 +#: ishtar_common/data_importer.py:2194 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2210 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8315,8 +8514,8 @@ msgstr "" msgid "File too large. Size should not exceed {} Mo." msgstr "" -#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1337 -#: ishtar_common/views.py:2671 +#: ishtar_common/forms.py:113 ishtar_common/forms_common.py:1514 +#: ishtar_common/views.py:2934 msgid "Confirm" msgstr "" @@ -8324,99 +8523,99 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: ishtar_common/forms.py:437 ishtar_common/forms.py:1027 +#: ishtar_common/forms.py:447 ishtar_common/forms.py:1047 msgid "You should select an item." msgstr "" -#: ishtar_common/forms.py:445 +#: ishtar_common/forms.py:455 msgid "Invalid selection." msgstr "" -#: ishtar_common/forms.py:526 +#: ishtar_common/forms.py:536 msgid "There are identical items." msgstr "" -#: ishtar_common/forms.py:938 +#: ishtar_common/forms.py:958 msgid "Created before" msgstr "" -#: ishtar_common/forms.py:941 +#: ishtar_common/forms.py:961 msgid "Created after" msgstr "" -#: ishtar_common/forms.py:944 man_app/templates/ishtar/sheet_basefind.html:74 +#: ishtar_common/forms.py:964 man_app/templates/ishtar/sheet_basefind.html:74 msgid "Last modified by" msgstr "" -#: ishtar_common/forms.py:951 +#: ishtar_common/forms.py:971 msgid "Modified before" msgstr "" -#: ishtar_common/forms.py:954 +#: ishtar_common/forms.py:974 msgid "Modified after" msgstr "" -#: ishtar_common/forms.py:956 +#: ishtar_common/forms.py:976 msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:984 ishtar_common/forms_common.py:2175 +#: ishtar_common/forms.py:1004 ishtar_common/forms_common.py:2352 msgid "Has an image?" msgstr "" -#: ishtar_common/forms.py:986 +#: ishtar_common/forms.py:1006 msgid "Has an attached file?" msgstr "" -#: ishtar_common/forms.py:989 +#: ishtar_common/forms.py:1009 msgid "Has a web address?" msgstr "" -#: ishtar_common/forms.py:1029 +#: ishtar_common/forms.py:1049 msgid "Add a new item" msgstr "" -#: ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1237 msgid " - append to existing" msgstr "" -#: ishtar_common/forms.py:1219 +#: ishtar_common/forms.py:1240 msgid " - replace" msgstr "" -#: ishtar_common/forms.py:1249 +#: ishtar_common/forms.py:1270 msgid "Set to null" msgstr "" -#: ishtar_common/forms.py:1311 +#: ishtar_common/forms.py:1332 msgid "Geo - Name" msgstr "" -#: ishtar_common/forms.py:1312 +#: ishtar_common/forms.py:1333 msgid "Geo - Data type" msgstr "" -#: ishtar_common/forms.py:1313 +#: ishtar_common/forms.py:1334 msgid "Geo - Origin" msgstr "" -#: ishtar_common/forms.py:1314 +#: ishtar_common/forms.py:1335 msgid "Geo - Provider" msgstr "" -#: ishtar_common/forms.py:1315 +#: ishtar_common/forms.py:1336 msgid "Geo - Z - higher than" msgstr "" -#: ishtar_common/forms.py:1316 +#: ishtar_common/forms.py:1337 msgid "Geo - Z - lower than" msgstr "" -#: ishtar_common/forms.py:1317 +#: ishtar_common/forms.py:1338 msgid "Geo - Comment" msgstr "" -#: ishtar_common/forms_common.py:90 +#: ishtar_common/forms_common.py:94 msgid "" "<p>Type name, department code of the town you would like to select. The " "search is insensitive to case.</p>\n" @@ -8426,67 +8625,92 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: ishtar_common/forms_common.py:148 +#: ishtar_common/forms_common.py:152 msgid "Password" msgstr "" -#: ishtar_common/forms_common.py:157 ishtar_common/forms_common.py:1220 -#: ishtar_common/forms_common.py:1235 ishtar_common/wizards.py:2003 +#: ishtar_common/forms_common.py:162 ishtar_common/forms_common.py:1398 +#: ishtar_common/forms_common.py:1417 ishtar_common/wizards.py:2003 msgid "New password" msgstr "" -#: ishtar_common/forms_common.py:164 +#: ishtar_common/forms_common.py:170 msgid "New password confirmation" msgstr "" -#: ishtar_common/forms_common.py:173 +#: ishtar_common/forms_common.py:180 msgid "Old password" msgstr "" -#: ishtar_common/forms_common.py:211 ishtar_common/forms_common.py:306 +#: ishtar_common/forms_common.py:218 msgid "Associated images (web link to a zip file)" msgstr "" -#: ishtar_common/forms_common.py:233 ishtar_common/forms_common.py:324 +#: ishtar_common/forms_common.py:240 ishtar_common/forms_common.py:370 msgid "Import (table)" msgstr "" -#: ishtar_common/forms_common.py:285 -msgid "This is not a valid CSV file. Check file format and encoding." +#: ishtar_common/forms_common.py:241 ishtar_common/forms_common.py:371 +#: ishtar_common/forms_common.py:455 ishtar_common/forms_common.py:522 +msgid "CSV options" msgstr "" #: ishtar_common/forms_common.py:297 +msgid "Bad format. Extension of the file must be {}." +msgstr "" + +#: ishtar_common/forms_common.py:299 +msgid "Bad format. Extension of the file must be: {} or {}." +msgstr "" + +#: ishtar_common/forms_common.py:320 +msgid "This is not a valid CSV file. Check file format and encoding." +msgstr "" + +#: ishtar_common/forms_common.py:332 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." msgstr "" -#: ishtar_common/forms_common.py:332 +#: ishtar_common/forms_common.py:352 +msgid "Associated documents (web link to a zip file)" +msgstr "" + +#: ishtar_common/forms_common.py:372 ishtar_common/forms_common.py:523 +msgid "Documents/Images" +msgstr "" + +#: ishtar_common/forms_common.py:384 msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:343 ishtar_common/tests.py:2591 +#: ishtar_common/forms_common.py:395 ishtar_common/tests.py:2884 msgid "\"Associated images\" field must be a valid zip file." msgstr "" -#: ishtar_common/forms_common.py:356 +#: ishtar_common/forms_common.py:417 msgid "Invalid link or no file is available for this link." msgstr "" -#: ishtar_common/forms_common.py:399 +#: ishtar_common/forms_common.py:454 msgid "Import (GIS)" msgstr "" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:484 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" -#: ishtar_common/forms_common.py:450 +#: ishtar_common/forms_common.py:521 +msgid "Import (group)" +msgstr "" + +#: ishtar_common/forms_common.py:551 ishtar_common/models_imports.py:538 msgid "Target" msgstr "" -#: ishtar_common/forms_common.py:451 ishtar_common/models.py:1832 -#: ishtar_common/models_imports.py:852 +#: ishtar_common/forms_common.py:552 ishtar_common/models.py:1842 +#: ishtar_common/models_imports.py:971 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8494,695 +8718,698 @@ msgstr "" msgid "Value" msgstr "" -#: ishtar_common/forms_common.py:452 +#: ishtar_common/forms_common.py:553 msgid "Remember" msgstr "" -#: ishtar_common/forms_common.py:477 +#: ishtar_common/forms_common.py:579 msgid "Set to NULL" msgstr "" -#: ishtar_common/forms_common.py:484 +#: ishtar_common/forms_common.py:586 msgid "this import only" msgstr "" -#: ishtar_common/forms_common.py:485 +#: ishtar_common/forms_common.py:587 msgid "me" msgstr "" -#: ishtar_common/forms_common.py:498 +#: ishtar_common/forms_common.py:600 msgid "the current group: {}" msgstr "" -#: ishtar_common/forms_common.py:504 +#: ishtar_common/forms_common.py:606 msgid "all users" msgstr "" -#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:698 -#: ishtar_common/models.py:2514 ishtar_common/models_imports.py:929 -#: ishtar_common/models_imports.py:930 +#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:876 +#: ishtar_common/models.py:2524 ishtar_common/models_imports.py:1048 +#: ishtar_common/models_imports.py:1049 msgid "Organization type" msgstr "" -#: ishtar_common/forms_common.py:587 ishtar_common/forms_common.py:2140 -#: ishtar_common/models.py:2592 +#: ishtar_common/forms_common.py:763 ishtar_common/forms_common.py:2317 +#: ishtar_common/models.py:2602 msgid "Web address" msgstr "" -#: ishtar_common/forms_common.py:589 ishtar_common/forms_common.py:701 -#: ishtar_common/models.py:2490 ishtar_common/models.py:2507 -#: ishtar_common/models.py:2594 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:879 +#: ishtar_common/models.py:2500 ishtar_common/models.py:2517 +#: ishtar_common/models.py:2604 msgid "Grammatical gender" msgstr "" -#: ishtar_common/forms_common.py:592 ishtar_common/forms_common.py:704 +#: ishtar_common/forms_common.py:768 ishtar_common/forms_common.py:882 msgid "Can be used by templates" msgstr "" -#: ishtar_common/forms_common.py:602 ishtar_common/forms_common.py:826 -#: ishtar_common/forms_common.py:955 ishtar_common/forms_common.py:1050 -#: ishtar_common/forms_common.py:1217 ishtar_common/models_common.py:3809 -#: ishtar_common/models_common.py:3977 ishtar_common/wizards.py:1968 +#: ishtar_common/forms_common.py:778 ishtar_common/forms_common.py:1004 +#: ishtar_common/forms_common.py:1133 ishtar_common/forms_common.py:1228 +#: ishtar_common/forms_common.py:1395 ishtar_common/models_common.py:3617 +#: ishtar_common/models_common.py:3785 ishtar_common/wizards.py:1968 msgid "Email" msgstr "" -#: ishtar_common/forms_common.py:655 ishtar_common/forms_common.py:671 +#: ishtar_common/forms_common.py:833 ishtar_common/forms_common.py:849 #: ishtar_common/views.py:335 msgid "Organization search" msgstr "" -#: ishtar_common/forms_common.py:688 +#: ishtar_common/forms_common.py:866 msgid "Organization - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:741 +#: ishtar_common/forms_common.py:919 msgid "Merge all items into" msgstr "" -#: ishtar_common/forms_common.py:779 +#: ishtar_common/forms_common.py:957 msgid "Organization to merge" msgstr "" -#: ishtar_common/forms_common.py:823 ishtar_common/forms_common.py:951 -#: ishtar_common/forms_common.py:1049 ishtar_common/models.py:2879 +#: ishtar_common/forms_common.py:1001 ishtar_common/forms_common.py:1129 +#: ishtar_common/forms_common.py:1227 ishtar_common/models.py:2889 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "" -#: ishtar_common/forms_common.py:824 ishtar_common/forms_common.py:889 -#: ishtar_common/forms_common.py:948 ishtar_common/forms_common.py:1722 -#: ishtar_common/forms_common.py:2132 ishtar_common/forms_common.py:2364 -#: ishtar_common/models.py:2866 ishtar_common/models.py:2870 -#: ishtar_common/models.py:4240 ishtar_common/models_imports.py:932 +#: ishtar_common/forms_common.py:1002 ishtar_common/forms_common.py:1067 +#: ishtar_common/forms_common.py:1126 ishtar_common/forms_common.py:1899 +#: ishtar_common/forms_common.py:2309 ishtar_common/forms_common.py:2540 +#: ishtar_common/models.py:2876 ishtar_common/models.py:2880 +#: ishtar_common/models.py:4254 ishtar_common/models_imports.py:1051 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 #: ishtar_common/templates/ishtar/merge_person.html:10 #: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "" -#: ishtar_common/forms_common.py:825 ishtar_common/forms_common.py:949 -#: ishtar_common/models.py:2876 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1127 +#: ishtar_common/models.py:2886 #: ishtar_common/templates/ishtar/merge_person.html:12 #: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "" -#: ishtar_common/forms_common.py:844 ishtar_common/forms_common.py:860 -#: ishtar_common/forms_common.py:1025 ishtar_common/views.py:276 +#: ishtar_common/forms_common.py:1022 ishtar_common/forms_common.py:1038 +#: ishtar_common/forms_common.py:1203 ishtar_common/views.py:276 msgid "Person search" msgstr "" -#: ishtar_common/forms_common.py:878 +#: ishtar_common/forms_common.py:1056 msgid "Person - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:900 ishtar_common/models.py:2671 +#: ishtar_common/forms_common.py:1078 ishtar_common/models.py:2681 msgid "Person types" msgstr "" -#: ishtar_common/forms_common.py:918 +#: ishtar_common/forms_common.py:1096 msgid "Person to merge" msgstr "" -#: ishtar_common/forms_common.py:940 +#: ishtar_common/forms_common.py:1118 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "" -#: ishtar_common/forms_common.py:954 ishtar_common/models.py:2889 +#: ishtar_common/forms_common.py:1132 ishtar_common/models.py:2899 #: ishtar_common/templates/ishtar/merge_person.html:9 #: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:957 ishtar_common/models_common.py:3793 +#: ishtar_common/forms_common.py:1135 ishtar_common/models_common.py:3601 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:961 ishtar_common/models_common.py:3796 -#: ishtar_common/models_common.py:3799 +#: ishtar_common/forms_common.py:1139 ishtar_common/models_common.py:3604 +#: ishtar_common/models_common.py:3607 msgid "Phone description 2" msgstr "" -#: ishtar_common/forms_common.py:963 +#: ishtar_common/forms_common.py:1141 msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:965 ishtar_common/models_common.py:3803 +#: ishtar_common/forms_common.py:1143 ishtar_common/models_common.py:3611 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:967 ishtar_common/models_common.py:3801 +#: ishtar_common/forms_common.py:1145 ishtar_common/models_common.py:3609 msgid "Phone 3" msgstr "" -#: ishtar_common/forms_common.py:972 +#: ishtar_common/forms_common.py:1150 msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:990 ishtar_common/models_common.py:3778 +#: ishtar_common/forms_common.py:1168 ishtar_common/models_common.py:3586 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:993 ishtar_common/models_common.py:3780 +#: ishtar_common/forms_common.py:1171 ishtar_common/models_common.py:3588 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:998 ishtar_common/models_common.py:3783 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3591 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1001 ishtar_common/models_common.py:3786 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3594 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1004 ishtar_common/models_common.py:3789 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:3597 msgid "Other address: country" msgstr "" -#: ishtar_common/forms_common.py:1016 +#: ishtar_common/forms_common.py:1194 msgid "Already has an account" msgstr "" -#: ishtar_common/forms_common.py:1017 ishtar_common/forms_common.py:1355 -#: ishtar_common/models.py:3197 ishtar_common/models.py:3218 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/forms_common.py:1195 ishtar_common/forms_common.py:1532 +#: ishtar_common/models.py:3207 ishtar_common/models.py:3228 +#: ishtar_common/models_imports.py:1056 msgid "Profile type" msgstr "" -#: ishtar_common/forms_common.py:1047 ishtar_common/models.py:3398 +#: ishtar_common/forms_common.py:1225 ishtar_common/models.py:3408 #: ishtar_common/wizards.py:1967 msgid "Username" msgstr "" -#: ishtar_common/forms_common.py:1069 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1247 ishtar_common/forms_common.py:1260 msgid "Account search" msgstr "" -#: ishtar_common/forms_common.py:1144 ishtar_common/forms_common.py:1192 -#: ishtar_common/forms_common.py:1196 ishtar_common/models.py:2670 -#: ishtar_common/models_imports.py:931 +#: ishtar_common/forms_common.py:1322 ishtar_common/forms_common.py:1370 +#: ishtar_common/forms_common.py:1374 ishtar_common/models.py:2680 +#: ishtar_common/models_imports.py:1050 msgid "Person type" msgstr "" -#: ishtar_common/forms_common.py:1211 ishtar_common/forms_common.py:1215 +#: ishtar_common/forms_common.py:1389 ishtar_common/forms_common.py:1393 #: ishtar_common/ishtar_menu.py:80 msgid "Account" msgstr "" -#: ishtar_common/forms_common.py:1227 +#: ishtar_common/forms_common.py:1407 msgid "New password (confirmation)" msgstr "" -#: ishtar_common/forms_common.py:1237 +#: ishtar_common/forms_common.py:1419 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." msgstr "" -#: ishtar_common/forms_common.py:1275 +#: ishtar_common/forms_common.py:1457 msgid "Your password and confirmation password do not match." msgstr "" -#: ishtar_common/forms_common.py:1281 +#: ishtar_common/forms_common.py:1463 msgid "You must provide a correct password." msgstr "" -#: ishtar_common/forms_common.py:1290 +#: ishtar_common/forms_common.py:1470 msgid "This username already exists." msgstr "" -#: ishtar_common/forms_common.py:1322 +#: ishtar_common/forms_common.py:1499 msgid "Choose different name for profiles." msgstr "" -#: ishtar_common/forms_common.py:1339 +#: ishtar_common/forms_common.py:1516 msgid "Send the new password by email?" msgstr "" -#: ishtar_common/forms_common.py:1352 ishtar_common/models.py:3226 -#: ishtar_common/views.py:1344 +#: ishtar_common/forms_common.py:1529 ishtar_common/models.py:3236 +#: ishtar_common/views.py:1345 msgid "Current profile" msgstr "" -#: ishtar_common/forms_common.py:1358 +#: ishtar_common/forms_common.py:1535 msgid "Pin automatically items on creation and modification" msgstr "" -#: ishtar_common/forms_common.py:1363 +#: ishtar_common/forms_common.py:1540 msgid "Duplicate this profile" msgstr "" -#: ishtar_common/forms_common.py:1366 +#: ishtar_common/forms_common.py:1543 msgid "Delete this profile" msgstr "" -#: ishtar_common/forms_common.py:1403 ishtar_common/forms_common.py:1411 +#: ishtar_common/forms_common.py:1580 ishtar_common/forms_common.py:1588 msgid "External source - {}" msgstr "" -#: ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1637 msgid "A profile with the same name exists." msgstr "" -#: ishtar_common/forms_common.py:1493 +#: ishtar_common/forms_common.py:1670 msgid " (duplicate)" msgstr "" -#: ishtar_common/forms_common.py:1522 +#: ishtar_common/forms_common.py:1699 msgid "There are identical towns." msgstr "" -#: ishtar_common/forms_common.py:1609 +#: ishtar_common/forms_common.py:1786 msgid "Only one choice can be checked." msgstr "" -#: ishtar_common/forms_common.py:1659 +#: ishtar_common/forms_common.py:1836 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: ishtar_common/forms_common.py:1684 +#: ishtar_common/forms_common.py:1861 msgid "This value already exist" msgstr "" -#: ishtar_common/forms_common.py:1700 ishtar_common/models.py:3836 -#: ishtar_common/models_imports.py:940 +#: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3850 +#: ishtar_common/models_imports.py:1059 msgid "Document tag" msgstr "" -#: ishtar_common/forms_common.py:1709 +#: ishtar_common/forms_common.py:1886 msgid "Document - General" msgstr "" -#: ishtar_common/forms_common.py:1730 ishtar_common/forms_common.py:2138 -#: ishtar_common/forms_common.py:2344 ishtar_common/models.py:4306 +#: ishtar_common/forms_common.py:1907 ishtar_common/forms_common.py:2315 +#: ishtar_common/forms_common.py:2520 ishtar_common/models.py:4320 msgid "Medium" msgstr "" -#: ishtar_common/forms_common.py:1733 ishtar_common/forms_common.py:1922 -#: ishtar_common/forms_common.py:2137 ishtar_common/forms_common.py:2343 -#: ishtar_common/models.py:4313 ishtar_common/models_imports.py:936 -#: ishtar_common/models_imports.py:938 +#: ishtar_common/forms_common.py:1910 ishtar_common/forms_common.py:2099 +#: ishtar_common/forms_common.py:2314 ishtar_common/forms_common.py:2519 +#: ishtar_common/models.py:4327 ishtar_common/models_imports.py:1055 +#: ishtar_common/models_imports.py:1057 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "" -#: ishtar_common/forms_common.py:1735 ishtar_common/forms_common.py:2139 -#: ishtar_common/forms_common.py:2345 ishtar_common/models.py:4318 +#: ishtar_common/forms_common.py:1912 ishtar_common/forms_common.py:2316 +#: ishtar_common/forms_common.py:2521 ishtar_common/models.py:4332 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" -#: ishtar_common/forms_common.py:1753 ishtar_common/forms_common.py:1924 -#: ishtar_common/forms_common.py:2571 ishtar_common/forms_common.py:2572 -#: ishtar_common/models.py:3697 ishtar_common/models.py:3963 -#: ishtar_common/models.py:4320 +#: ishtar_common/forms_common.py:1930 ishtar_common/forms_common.py:2101 +#: ishtar_common/forms_common.py:2747 ishtar_common/forms_common.py:2748 +#: ishtar_common/models.py:3711 ishtar_common/models.py:3977 +#: ishtar_common/models.py:4334 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "" -#: ishtar_common/forms_common.py:1759 ishtar_common/forms_common.py:2143 -#: ishtar_common/models.py:4262 +#: ishtar_common/forms_common.py:1936 ishtar_common/forms_common.py:2320 +#: ishtar_common/models.py:4276 msgid "Publisher" msgstr "" -#: ishtar_common/forms_common.py:1783 ishtar_common/forms_common.py:2165 -#: ishtar_common/models.py:4269 +#: ishtar_common/forms_common.py:1960 ishtar_common/forms_common.py:2342 +#: ishtar_common/models.py:4283 msgid "Year of publication" msgstr "" -#: ishtar_common/forms_common.py:1788 +#: ishtar_common/forms_common.py:1965 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "" -#: ishtar_common/forms_common.py:1791 ishtar_common/forms_common.py:2346 -#: ishtar_common/models.py:4274 +#: ishtar_common/forms_common.py:1968 ishtar_common/forms_common.py:2522 +#: ishtar_common/models.py:4288 msgid "Tags" msgstr "" -#: ishtar_common/forms_common.py:1797 ishtar_common/forms_common.py:2166 -#: ishtar_common/models.py:982 ishtar_common/models.py:4277 -#: ishtar_common/models_imports.py:941 overload_translation/models.py:11 +#: ishtar_common/forms_common.py:1974 ishtar_common/forms_common.py:2343 +#: ishtar_common/models.py:993 ishtar_common/models.py:4291 +#: ishtar_common/models_imports.py:1060 overload_translation/models.py:11 msgid "Language" msgstr "" -#: ishtar_common/forms_common.py:1800 ishtar_common/forms_common.py:2168 -#: ishtar_common/models.py:4282 +#: ishtar_common/forms_common.py:1977 ishtar_common/forms_common.py:2345 +#: ishtar_common/models.py:4296 msgid "ISSN" msgstr "" -#: ishtar_common/forms_common.py:1806 ishtar_common/forms_common.py:2167 -#: ishtar_common/models.py:4283 +#: ishtar_common/forms_common.py:1983 ishtar_common/forms_common.py:2344 +#: ishtar_common/models.py:4297 msgid "ISBN" msgstr "" -#: ishtar_common/forms_common.py:1812 ishtar_common/forms_common.py:1927 -#: ishtar_common/forms_common.py:2177 ishtar_common/models.py:4286 -#: ishtar_common/models.py:5354 +#: ishtar_common/forms_common.py:1989 ishtar_common/forms_common.py:2104 +#: ishtar_common/forms_common.py:2354 ishtar_common/models.py:4300 +#: ishtar_common/models.py:5368 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 +#: ishtar_common/templates/ishtar/import_table.html:2 #: ishtar_common/templates/ishtar/sheet_document.html:93 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:2 +#: ishtar_common/views.py:2239 msgid "Source" msgstr "" -#: ishtar_common/forms_common.py:1815 ishtar_common/forms_common.py:2183 -#: ishtar_common/models.py:4293 +#: ishtar_common/forms_common.py:1992 ishtar_common/forms_common.py:2360 +#: ishtar_common/models.py:4307 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:1820 ishtar_common/models.py:4299 +#: ishtar_common/forms_common.py:1997 ishtar_common/models.py:4313 msgid "Source - page range" msgstr "" -#: ishtar_common/forms_common.py:1824 +#: ishtar_common/forms_common.py:2001 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:1830 ishtar_common/models.py:4330 +#: ishtar_common/forms_common.py:2007 ishtar_common/models.py:4344 msgid "Numerical ressource (web address)" msgstr "" -#: ishtar_common/forms_common.py:1833 +#: ishtar_common/forms_common.py:2010 msgid "Image" msgstr "" -#: ishtar_common/forms_common.py:1841 +#: ishtar_common/forms_common.py:2018 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:1858 ishtar_common/models.py:4333 +#: ishtar_common/forms_common.py:2035 ishtar_common/models.py:4347 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:1864 ishtar_common/models.py:4339 +#: ishtar_common/forms_common.py:2041 ishtar_common/models.py:4353 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:1871 ishtar_common/models.py:4353 +#: ishtar_common/forms_common.py:2048 ishtar_common/models.py:4367 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2173 -#: ishtar_common/models.py:4355 +#: ishtar_common/forms_common.py:2050 ishtar_common/forms_common.py:2350 +#: ishtar_common/models.py:4369 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" -#: ishtar_common/forms_common.py:1920 ishtar_common/forms_common.py:2743 +#: ishtar_common/forms_common.py:2097 ishtar_common/forms_common.py:2933 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "" -#: ishtar_common/forms_common.py:1926 +#: ishtar_common/forms_common.py:2103 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "" -#: ishtar_common/forms_common.py:1929 +#: ishtar_common/forms_common.py:2106 msgid "Advanced" msgstr "" -#: ishtar_common/forms_common.py:1976 +#: ishtar_common/forms_common.py:2153 msgid "Incorrect page range." msgstr "" -#: ishtar_common/forms_common.py:2063 +#: ishtar_common/forms_common.py:2240 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." msgstr "" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2249 msgid "A document has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2115 +#: ishtar_common/forms_common.py:2292 msgid "Document - 001 - Search" msgstr "" -#: ishtar_common/forms_common.py:2128 ishtar_common/forms_common.py:2338 -#: ishtar_common/forms_common.py:2507 ishtar_common/forms_common.py:2558 -#: ishtar_common/models.py:3696 +#: ishtar_common/forms_common.py:2305 ishtar_common/forms_common.py:2514 +#: ishtar_common/forms_common.py:2683 ishtar_common/forms_common.py:2734 +#: ishtar_common/models.py:3710 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2318 msgid "Tag" msgstr "" -#: ishtar_common/forms_common.py:2169 ishtar_common/models.py:4272 +#: ishtar_common/forms_common.py:2346 ishtar_common/models.py:4286 msgid "License" msgstr "" -#: ishtar_common/forms_common.py:2172 +#: ishtar_common/forms_common.py:2349 msgid "Additional informations" msgstr "" -#: ishtar_common/forms_common.py:2174 +#: ishtar_common/forms_common.py:2351 msgid "Has a file?" msgstr "" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2362 msgid "Warehouse - Container" msgstr "" -#: ishtar_common/forms_common.py:2193 +#: ishtar_common/forms_common.py:2370 msgid "Warehouse - Reference container" msgstr "" -#: ishtar_common/forms_common.py:2210 +#: ishtar_common/forms_common.py:2387 msgid "Operation - type" msgstr "" -#: ishtar_common/forms_common.py:2223 +#: ishtar_common/forms_common.py:2399 msgid "Basket - Finds" msgstr "" -#: ishtar_common/forms_common.py:2238 +#: ishtar_common/forms_common.py:2414 msgid "Find - denomination" msgstr "" -#: ishtar_common/forms_common.py:2250 ishtar_common/forms_common.py:2262 +#: ishtar_common/forms_common.py:2426 ishtar_common/forms_common.py:2438 msgid "Receipt date before" msgstr "" -#: ishtar_common/forms_common.py:2253 ishtar_common/forms_common.py:2265 +#: ishtar_common/forms_common.py:2429 ishtar_common/forms_common.py:2441 msgid "Receipt date after" msgstr "" -#: ishtar_common/forms_common.py:2256 +#: ishtar_common/forms_common.py:2432 msgid "Creation date before" msgstr "" -#: ishtar_common/forms_common.py:2259 +#: ishtar_common/forms_common.py:2435 msgid "Creation date after" msgstr "" -#: ishtar_common/forms_common.py:2288 ishtar_common/forms_common.py:2303 +#: ishtar_common/forms_common.py:2464 ishtar_common/forms_common.py:2479 msgid "Document search" msgstr "" -#: ishtar_common/forms_common.py:2322 +#: ishtar_common/forms_common.py:2498 msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2336 ishtar_common/models_imports.py:933 -#: ishtar_common/models_imports.py:934 +#: ishtar_common/forms_common.py:2512 ishtar_common/models_imports.py:1052 +#: ishtar_common/models_imports.py:1053 msgid "Source type" msgstr "" -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2543 msgid "Edit duplicated item" msgstr "" -#: ishtar_common/forms_common.py:2441 +#: ishtar_common/forms_common.py:2617 msgid "current and reference containers" msgstr "" -#: ishtar_common/forms_common.py:2480 -#: ishtar_common/templates/ishtar/import_table.html:33 +#: ishtar_common/forms_common.py:2656 +#: ishtar_common/templates/ishtar/import_table.html:58 msgid "Action" msgstr "" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Lock" msgstr "" -#: ishtar_common/forms_common.py:2480 +#: ishtar_common/forms_common.py:2656 msgid "Unlock" msgstr "" -#: ishtar_common/forms_common.py:2498 +#: ishtar_common/forms_common.py:2674 msgid "Would you like to delete this documentation?" msgstr "" -#: ishtar_common/forms_common.py:2518 ishtar_common/models.py:3666 -#: ishtar_common/models.py:3688 ishtar_common/models_imports.py:935 +#: ishtar_common/forms_common.py:2694 ishtar_common/models.py:3680 +#: ishtar_common/models.py:3702 ishtar_common/models_imports.py:1054 msgid "Author type" msgstr "" -#: ishtar_common/forms_common.py:2535 +#: ishtar_common/forms_common.py:2711 msgid "This author already exist." msgstr "" -#: ishtar_common/forms_common.py:2547 +#: ishtar_common/forms_common.py:2723 msgid "Author selection" msgstr "" -#: ishtar_common/forms_common.py:2565 +#: ishtar_common/forms_common.py:2741 msgid "There are identical authors." msgstr "" -#: ishtar_common/forms_common.py:2578 ishtar_common/forms_common.py:2643 -#: ishtar_common/models.py:960 +#: ishtar_common/forms_common.py:2754 ishtar_common/forms_common.py:2819 +#: ishtar_common/models.py:971 msgid "Query" msgstr "" -#: ishtar_common/forms_common.py:2582 ishtar_common/models.py:967 +#: ishtar_common/forms_common.py:2758 ishtar_common/models.py:978 msgid "Is an alert" msgstr "" -#: ishtar_common/forms_common.py:2604 +#: ishtar_common/forms_common.py:2780 msgid "A label is required for a new search query." msgstr "" -#: ishtar_common/forms_common.py:2608 +#: ishtar_common/forms_common.py:2784 msgid "Select the search query to update" msgstr "" -#: ishtar_common/forms_common.py:2615 ishtar_common/forms_common.py:2636 +#: ishtar_common/forms_common.py:2791 ishtar_common/forms_common.py:2812 msgid "Query does not exist." msgstr "" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2847 msgid "Geo item" msgstr "" -#: ishtar_common/forms_common.py:2672 +#: ishtar_common/forms_common.py:2848 msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2689 ishtar_common/models_common.py:2373 +#: ishtar_common/forms_common.py:2865 ishtar_common/models_common.py:2183 msgid "Import key" msgstr "" -#: ishtar_common/forms_common.py:2692 +#: ishtar_common/forms_common.py:2869 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2700 ishtar_common/models_common.py:2388 +#: ishtar_common/forms_common.py:2880 ishtar_common/models_common.py:2198 #: 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:2703 ishtar_common/models_common.py:2380 +#: ishtar_common/forms_common.py:2883 ishtar_common/models_common.py:2190 #: 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:2706 ishtar_common/models_common.py:2396 +#: ishtar_common/forms_common.py:2886 ishtar_common/models_common.py:2206 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" -#: ishtar_common/forms_common.py:2709 ishtar_common/forms_common.py:2746 -#: ishtar_common/models_common.py:2362 +#: ishtar_common/forms_common.py:2889 ishtar_common/forms_common.py:2937 +#: ishtar_common/models_common.py:2172 msgid "Buffer" msgstr "" -#: ishtar_common/forms_common.py:2713 +#: ishtar_common/forms_common.py:2894 msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2717 ishtar_common/models_common.py:2409 -#: ishtar_common/models_common.py:4305 +#: ishtar_common/forms_common.py:2898 ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:4113 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:2721 ishtar_common/models_common.py:2412 -#: ishtar_common/models_common.py:4308 +#: ishtar_common/forms_common.py:2903 ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:4116 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:2725 ishtar_common/models_common.py:2415 -#: ishtar_common/models_common.py:4311 +#: ishtar_common/forms_common.py:2908 ishtar_common/models_common.py:2225 +#: ishtar_common/models_common.py:4119 msgid "Estimated error for Z" msgstr "" -#: ishtar_common/forms_common.py:2744 +#: ishtar_common/forms_common.py:2935 msgid "Metadata" msgstr "" -#: ishtar_common/forms_common.py:2745 ishtar_common/models.py:2375 -#: ishtar_common/models_common.py:2174 ishtar_common/models_common.py:2232 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2281 -#: ishtar_common/models_common.py:2298 ishtar_common/models_common.py:2311 -#: ishtar_common/models_common.py:2440 ishtar_common/models_common.py:3531 +#: ishtar_common/forms_common.py:2936 ishtar_common/models.py:2385 +#: ishtar_common/models_common.py:1984 ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2074 ishtar_common/models_common.py:2091 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2121 +#: ishtar_common/models_common.py:2250 ishtar_common/models_common.py:3339 msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2927 +#: ishtar_common/forms_common.py:3133 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2932 +#: ishtar_common/forms_common.py:3137 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2937 +#: ishtar_common/forms_common.py:3140 msgid "A value is expected for Z." msgstr "" -#: ishtar_common/forms_common.py:2956 +#: ishtar_common/forms_common.py:3158 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2996 +#: ishtar_common/forms_common.py:3198 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2998 +#: ishtar_common/forms_common.py:3200 msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:2999 ishtar_common/models_common.py:2331 -#: ishtar_common/models_common.py:4320 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2141 +#: ishtar_common/models_common.py:4128 msgid "Point" msgstr "" -#: ishtar_common/forms_common.py:3000 +#: ishtar_common/forms_common.py:3202 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:3001 +#: ishtar_common/forms_common.py:3203 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:3002 +#: ishtar_common/forms_common.py:3204 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:3003 +#: ishtar_common/forms_common.py:3205 msgid "Multi-polygons" msgstr "" @@ -9191,12 +9418,12 @@ msgstr "" msgid "Home" msgstr "" -#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2517 -#: ishtar_common/models.py:2619 ishtar_common/models.py:2673 -#: ishtar_common/models.py:2747 ishtar_common/models.py:2921 -#: ishtar_common/models.py:3200 ishtar_common/models.py:3212 -#: ishtar_common/models.py:3249 ishtar_common/models.py:3453 -#: ishtar_common/models.py:3669 ishtar_common/models.py:3705 +#: ishtar_common/ishtar_menu.py:34 ishtar_common/models.py:2527 +#: ishtar_common/models.py:2629 ishtar_common/models.py:2683 +#: ishtar_common/models.py:2757 ishtar_common/models.py:2931 +#: ishtar_common/models.py:3210 ishtar_common/models.py:3222 +#: ishtar_common/models.py:3259 ishtar_common/models.py:3463 +#: ishtar_common/models.py:3683 ishtar_common/models.py:3719 msgid "Directory" msgstr "" @@ -9204,22 +9431,23 @@ msgstr "" msgid "Addition/modification" msgstr "" -#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:201 -#: ishtar_common/models_imports.py:449 ishtar_common/models_imports.py:507 -#: ishtar_common/models_imports.py:614 ishtar_common/models_imports.py:668 -#: ishtar_common/models_imports.py:688 ishtar_common/models_imports.py:717 -#: ishtar_common/models_imports.py:771 ishtar_common/models_imports.py:831 -#: ishtar_common/models_imports.py:874 ishtar_common/models_imports.py:1053 -#: ishtar_common/models_imports.py:1313 ishtar_common/models_imports.py:1314 -#: ishtar_common/models_imports.py:1971 +#: ishtar_common/ishtar_menu.py:161 ishtar_common/models_imports.py:220 +#: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:555 +#: ishtar_common/models_imports.py:623 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:787 ishtar_common/models_imports.py:807 +#: ishtar_common/models_imports.py:836 ishtar_common/models_imports.py:890 +#: ishtar_common/models_imports.py:950 ishtar_common/models_imports.py:993 +#: ishtar_common/models_imports.py:1187 ishtar_common/models_imports.py:1523 +#: ishtar_common/models_imports.py:1948 ishtar_common/models_imports.py:2820 +#: ishtar_common/models_imports.py:2848 msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1519 +#: ishtar_common/ishtar_menu.py:165 ishtar_common/views.py:1586 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:1999 +#: ishtar_common/ishtar_menu.py:171 ishtar_common/views.py:2115 msgid "Old imports" msgstr "" @@ -9227,96 +9455,96 @@ msgstr "" msgid "Documentation / Images" msgstr "" -#: ishtar_common/models.py:390 +#: ishtar_common/models.py:399 msgid "Not a valid item." msgstr "" -#: ishtar_common/models.py:405 +#: ishtar_common/models.py:414 msgid "A selected item is not a valid item." msgstr "" -#: ishtar_common/models.py:415 +#: ishtar_common/models.py:424 msgid "This item already exists." msgstr "" -#: ishtar_common/models.py:579 +#: ishtar_common/models.py:590 msgid "Generated relation image (SVG)" msgstr "" -#: ishtar_common/models.py:586 +#: ishtar_common/models.py:597 msgid "Generated relation image (PNG)" msgstr "" -#: ishtar_common/models.py:593 +#: ishtar_common/models.py:604 msgid "Generated relation image (DOT)" msgstr "" -#: ishtar_common/models.py:600 +#: ishtar_common/models.py:611 msgid "Generated above relation image (SVG)" msgstr "" -#: ishtar_common/models.py:607 +#: ishtar_common/models.py:618 msgid "Generated above relation image (DOT)" msgstr "" -#: ishtar_common/models.py:614 +#: ishtar_common/models.py:625 msgid "Generated above relation image (PNG)" msgstr "" -#: ishtar_common/models.py:621 +#: ishtar_common/models.py:632 msgid "Generated below relation image (SVG)" msgstr "" -#: ishtar_common/models.py:628 +#: ishtar_common/models.py:639 msgid "Generated below relation image (DOT)" msgstr "" -#: ishtar_common/models.py:635 +#: ishtar_common/models.py:646 msgid "Generated below relation image (PNG)" msgstr "" -#: ishtar_common/models.py:677 +#: ishtar_common/models.py:688 msgid "Custom data - Menu" msgstr "" -#: ishtar_common/models.py:678 +#: ishtar_common/models.py:689 msgid "Custom data - Menus" msgstr "" -#: ishtar_common/models.py:681 ishtar_common/models.py:745 -#: ishtar_common/models.py:1663 ishtar_common/models.py:1815 +#: ishtar_common/models.py:692 ishtar_common/models.py:756 +#: ishtar_common/models.py:1673 ishtar_common/models.py:1825 msgid "Custom data / custom forms" msgstr "" -#: ishtar_common/models.py:691 +#: ishtar_common/models.py:702 msgid "Text" msgstr "" -#: ishtar_common/models.py:692 +#: ishtar_common/models.py:703 msgid "Long text" msgstr "" -#: ishtar_common/models.py:693 ishtar_common/models_imports.py:993 +#: ishtar_common/models.py:704 ishtar_common/models_imports.py:1112 msgid "Integer" msgstr "" -#: ishtar_common/models.py:694 +#: ishtar_common/models.py:705 msgid "Boolean" msgstr "" -#: ishtar_common/models.py:695 ishtar_common/models_imports.py:994 +#: ishtar_common/models.py:706 ishtar_common/models_imports.py:1113 msgid "Float" msgstr "" -#: ishtar_common/models.py:697 +#: ishtar_common/models.py:708 msgid "Choices" msgstr "" -#: ishtar_common/models.py:698 +#: ishtar_common/models.py:709 msgid "Multi-choices" msgstr "" -#: ishtar_common/models.py:718 +#: ishtar_common/models.py:729 msgid "" "Value of the key in the JSON schema. For hierarchical key use \"__\" to " "explain it. For instance for the key 'my_subkey' with data such as " @@ -9324,222 +9552,222 @@ msgid "" "my_key__my_subkey." msgstr "" -#: ishtar_common/models.py:725 +#: ishtar_common/models.py:736 msgid "Display" msgstr "" -#: ishtar_common/models.py:730 +#: ishtar_common/models.py:741 msgid "Use in search indexes" msgstr "" -#: ishtar_common/models.py:741 +#: ishtar_common/models.py:752 msgid "Custom data - Field" msgstr "" -#: ishtar_common/models.py:742 +#: ishtar_common/models.py:753 msgid "Custom data - Fields" msgstr "" -#: ishtar_common/models.py:758 +#: ishtar_common/models.py:769 msgid "Content types of the field and of the menu do not match" msgstr "" -#: ishtar_common/models.py:763 +#: ishtar_common/models.py:774 msgid "Above" msgstr "" -#: ishtar_common/models.py:764 +#: ishtar_common/models.py:775 msgid "Below" msgstr "" -#: ishtar_common/models.py:765 +#: ishtar_common/models.py:776 msgid "Equal" msgstr "" -#: ishtar_common/models.py:766 +#: ishtar_common/models.py:777 msgid "Include" msgstr "" -#: ishtar_common/models.py:767 +#: ishtar_common/models.py:778 msgid "Is included" msgstr "" -#: ishtar_common/models.py:773 +#: ishtar_common/models.py:784 msgid "Symmetrical" msgstr "" -#: ishtar_common/models.py:774 +#: ishtar_common/models.py:785 msgid "Tiny label" msgstr "" -#: ishtar_common/models.py:777 +#: ishtar_common/models.py:788 msgid "Inverse relation" msgstr "" -#: ishtar_common/models.py:783 +#: ishtar_common/models.py:794 msgid "Logical relation" msgstr "" -#: ishtar_common/models.py:796 +#: ishtar_common/models.py:807 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: ishtar_common/models.py:970 +#: ishtar_common/models.py:981 msgid "Search query" msgstr "" -#: ishtar_common/models.py:971 +#: ishtar_common/models.py:982 msgid "Search queries" msgstr "" -#: ishtar_common/models.py:979 +#: ishtar_common/models.py:990 msgid "ISO code" msgstr "" -#: ishtar_common/models.py:983 +#: ishtar_common/models.py:994 msgid "Languages" msgstr "" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "Euro" msgstr "" -#: ishtar_common/models.py:987 +#: ishtar_common/models.py:998 msgid "US dollar" msgstr "" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Site" msgstr "" -#: ishtar_common/models.py:989 +#: ishtar_common/models.py:1000 msgid "Archaeological entity" msgstr "" -#: ishtar_common/models.py:993 +#: ishtar_common/models.py:1004 msgid "Site search" msgstr "" -#: ishtar_common/models.py:994 +#: ishtar_common/models.py:1005 msgid "New site" msgstr "" -#: ishtar_common/models.py:995 +#: ishtar_common/models.py:1006 msgid "Site modification" msgstr "" -#: ishtar_common/models.py:997 +#: ishtar_common/models.py:1008 msgid "Site (attached to the operation)" msgstr "" -#: ishtar_common/models.py:998 +#: ishtar_common/models.py:1009 msgid "Site name (attached to the operation)" msgstr "" -#: ishtar_common/models.py:999 +#: ishtar_common/models.py:1010 msgid "Site (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1000 +#: ishtar_common/models.py:1011 msgid "Site name (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1003 +#: ishtar_common/models.py:1014 msgid "Archaeological entity search" msgstr "" -#: ishtar_common/models.py:1004 +#: ishtar_common/models.py:1015 msgid "New archaeological entity" msgstr "" -#: ishtar_common/models.py:1005 +#: ishtar_common/models.py:1016 msgid "Archaeological entity modification" msgstr "" -#: ishtar_common/models.py:1006 +#: ishtar_common/models.py:1017 msgid "Archaeological entity deletion" msgstr "" -#: ishtar_common/models.py:1008 +#: ishtar_common/models.py:1019 msgid "Archaeological entity (attached to the operation)" msgstr "" -#: ishtar_common/models.py:1011 +#: ishtar_common/models.py:1022 msgid "Archaeological entity name (attached to the operation)" msgstr "" -#: ishtar_common/models.py:1014 +#: ishtar_common/models.py:1025 msgid "Archaeological entity (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1017 +#: ishtar_common/models.py:1028 msgid "Archaeological entity name (attached to the context record)" msgstr "" -#: ishtar_common/models.py:1023 +#: ishtar_common/models.py:1034 msgid "name.firstname" msgstr "" -#: ishtar_common/models.py:1024 +#: ishtar_common/models.py:1035 msgid "firstname.name" msgstr "" -#: ishtar_common/models.py:1032 +#: ishtar_common/models.py:1043 msgid "Current active" msgstr "" -#: ishtar_common/models.py:1034 +#: ishtar_common/models.py:1045 msgid "Activate experimental feature" msgstr "" -#: ishtar_common/models.py:1037 +#: ishtar_common/models.py:1048 msgid "Warning name" msgstr "" -#: ishtar_common/models.py:1038 +#: ishtar_common/models.py:1049 msgid "Warning message" msgstr "" -#: ishtar_common/models.py:1039 +#: ishtar_common/models.py:1050 msgid "Footer text" msgstr "" -#: ishtar_common/models.py:1040 ishtar_common/models.py:1640 +#: ishtar_common/models.py:1051 ishtar_common/models.py:1650 msgid "You can use markdown syntax." msgstr "" -#: ishtar_common/models.py:1042 +#: ishtar_common/models.py:1053 msgid "Import - Delete image/document zip on archive" msgstr "" -#: ishtar_common/models.py:1045 +#: ishtar_common/models.py:1056 msgid "Document - Remove redundant association" msgstr "" -#: ishtar_common/models.py:1048 +#: ishtar_common/models.py:1059 msgid "" "For instance, remove operation association of a document also associated to " "a find of this operation. Only manage association of operations, context " "records and finds." msgstr "" -#: ishtar_common/models.py:1055 +#: ishtar_common/models.py:1066 msgid "Container - calculate weight only when all find has a weight" msgstr "" -#: ishtar_common/models.py:1059 +#: ishtar_common/models.py:1070 msgid "Parent relations engine" msgstr "" -#: ishtar_common/models.py:1061 +#: ishtar_common/models.py:1072 msgid "SQL views" msgstr "" -#: ishtar_common/models.py:1062 +#: ishtar_common/models.py:1073 msgid "Cache tables" msgstr "" -#: ishtar_common/models.py:1067 +#: ishtar_common/models.py:1078 msgid "" "If you experience performance problems with complex relations (for instance: " "complex statigraphic relations), set it to \"Cache tables\" in order to use " @@ -9547,600 +9775,600 @@ msgid "" "\"migrate_relations_cache_tables\" manage.py command." msgstr "" -#: ishtar_common/models.py:1075 +#: ishtar_common/models.py:1086 msgid "Alternate configuration" msgstr "" -#: ishtar_common/models.py:1078 +#: ishtar_common/models.py:1089 msgid "Choose an alternate configuration for label, index management" msgstr "" -#: ishtar_common/models.py:1082 +#: ishtar_common/models.py:1093 msgid "Files module" msgstr "" -#: ishtar_common/models.py:1084 +#: ishtar_common/models.py:1095 msgid "Archaeological site module" msgstr "" -#: ishtar_common/models.py:1087 +#: ishtar_common/models.py:1098 msgid "Archaeological site type" msgstr "" -#: ishtar_common/models.py:1092 +#: ishtar_common/models.py:1103 msgid "Context records module" msgstr "" -#: ishtar_common/models.py:1094 +#: ishtar_common/models.py:1105 msgid "Finds module" msgstr "" -#: ishtar_common/models.py:1096 +#: ishtar_common/models.py:1107 msgid "Need context records module" msgstr "" -#: ishtar_common/models.py:1099 +#: ishtar_common/models.py:1110 msgid "Find index is based on" msgstr "" -#: ishtar_common/models.py:1104 +#: ishtar_common/models.py:1115 msgid "" "To prevent irrelevant indexes, change this parameter only if there is no " "find in the database" msgstr "" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Warehouses module" msgstr "" -#: ishtar_common/models.py:1109 +#: ishtar_common/models.py:1120 msgid "Need finds module" msgstr "" -#: ishtar_common/models.py:1111 +#: ishtar_common/models.py:1122 msgid "Preservation module" msgstr "" -#: ishtar_common/models.py:1112 +#: ishtar_common/models.py:1123 msgid "Mapping module" msgstr "" -#: ishtar_common/models.py:1114 +#: ishtar_common/models.py:1125 msgid "Point precision (search and sheets)" msgstr "" -#: ishtar_common/models.py:1118 +#: ishtar_common/models.py:1129 msgid "" "Number of digit to round from the decimal point for coordinates in WGS84 " "(latitude, longitude). Empty value means no round." msgstr "" -#: ishtar_common/models.py:1123 +#: ishtar_common/models.py:1134 msgid "Locate warehouse and containers" msgstr "" -#: ishtar_common/models.py:1126 +#: ishtar_common/models.py:1137 msgid "" "Mapping module must be activated. With many containers and background task " "not activated, activating this option may consume many resources." msgstr "" -#: ishtar_common/models.py:1132 +#: ishtar_common/models.py:1143 msgid "Use town to locate when coordinates are missing" msgstr "" -#: ishtar_common/models.py:1134 +#: ishtar_common/models.py:1145 msgid "Generate relation graph" msgstr "" -#: ishtar_common/models.py:1136 +#: ishtar_common/models.py:1147 msgid "Preventive operator module" msgstr "" -#: ishtar_common/models.py:1138 +#: ishtar_common/models.py:1149 msgid "Underwater module" msgstr "" -#: ishtar_common/models.py:1140 +#: ishtar_common/models.py:1151 msgid "Parcel are mandatory for context records" msgstr "" -#: ishtar_common/models.py:1143 +#: ishtar_common/models.py:1154 msgid "Home page" msgstr "" -#: ishtar_common/models.py:1147 +#: ishtar_common/models.py:1158 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: ishtar_common/models.py:1153 +#: ishtar_common/models.py:1164 msgid "Main operation code prefix" msgstr "" -#: ishtar_common/models.py:1160 +#: ishtar_common/models.py:1171 msgid "Default operation code prefix" msgstr "" -#: ishtar_common/models.py:1167 +#: ishtar_common/models.py:1178 msgid "Operation region code" msgstr "" -#: ishtar_common/models.py:1170 +#: ishtar_common/models.py:1181 msgid "Operation complete identifier" msgstr "" -#: ishtar_common/models.py:1173 +#: ishtar_common/models.py:1185 msgid "Formula to manage operation complete identifier." msgstr "" -#: ishtar_common/models.py:1176 +#: ishtar_common/models.py:1188 msgid "Operation custom index key" msgstr "" -#: ishtar_common/models.py:1180 +#: ishtar_common/models.py:1192 msgid "" "Keys to be used to manage operation custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1185 +#: ishtar_common/models.py:1197 msgid "Operation cached label" msgstr "" -#: ishtar_common/models.py:1189 ishtar_common/models.py:1212 -#: ishtar_common/models.py:1245 ishtar_common/models.py:1264 -#: ishtar_common/models.py:1297 ishtar_common/models.py:1330 -#: ishtar_common/models.py:1363 ishtar_common/models.py:1396 -#: ishtar_common/models.py:1429 ishtar_common/models.py:1462 +#: ishtar_common/models.py:1201 ishtar_common/models.py:1224 +#: ishtar_common/models.py:1257 ishtar_common/models.py:1276 +#: ishtar_common/models.py:1308 ishtar_common/models.py:1341 +#: ishtar_common/models.py:1373 ishtar_common/models.py:1406 +#: ishtar_common/models.py:1439 ishtar_common/models.py:1472 msgid "Formula to manage cached label. If not set a default formula is used." msgstr "" -#: ishtar_common/models.py:1193 +#: ishtar_common/models.py:1205 msgid "Archaeological site complete identifier" msgstr "" -#: ishtar_common/models.py:1196 +#: ishtar_common/models.py:1208 msgid "Formula to manage archaeological site complete identifier." msgstr "" -#: ishtar_common/models.py:1199 +#: ishtar_common/models.py:1211 msgid "Archaeological site custom index key" msgstr "" -#: ishtar_common/models.py:1203 +#: ishtar_common/models.py:1215 msgid "" "Keys to be used to manage archaeological site custom index. Separate keys " "with a semicolon." msgstr "" -#: ishtar_common/models.py:1208 +#: ishtar_common/models.py:1220 msgid "Site cached label" msgstr "" -#: ishtar_common/models.py:1216 +#: ishtar_common/models.py:1228 msgid "File external id" msgstr "" -#: ishtar_common/models.py:1219 +#: ishtar_common/models.py:1231 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1226 +#: ishtar_common/models.py:1238 msgid "Archaeological file complete identifier" msgstr "" -#: ishtar_common/models.py:1229 +#: ishtar_common/models.py:1241 msgid "Formula to manage archaeological file complete identifier." msgstr "" -#: ishtar_common/models.py:1232 +#: ishtar_common/models.py:1244 msgid "Archaeological file custom index key" msgstr "" -#: ishtar_common/models.py:1236 +#: ishtar_common/models.py:1248 msgid "" "Keys to be used to manage archaeological file custom index. Separate keys " "with a semicolon." msgstr "" -#: ishtar_common/models.py:1241 +#: ishtar_common/models.py:1253 msgid "File cached label" msgstr "" -#: ishtar_common/models.py:1249 +#: ishtar_common/models.py:1261 msgid "Parcel external id" msgstr "" -#: ishtar_common/models.py:1253 +#: ishtar_common/models.py:1265 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1260 +#: ishtar_common/models.py:1272 msgid "Parcel cached label" msgstr "" -#: ishtar_common/models.py:1268 +#: ishtar_common/models.py:1280 msgid "Context record external id" msgstr "" -#: ishtar_common/models.py:1271 +#: ishtar_common/models.py:1283 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1278 +#: ishtar_common/models.py:1290 msgid "Context record complete identifier" msgstr "" -#: ishtar_common/models.py:1281 +#: ishtar_common/models.py:1293 msgid "Formula to manage context record complete identifier." msgstr "" -#: ishtar_common/models.py:1284 +#: ishtar_common/models.py:1296 msgid "Context record custom index key" msgstr "" -#: ishtar_common/models.py:1288 +#: ishtar_common/models.py:1300 msgid "" "Keys to be used to manage context record custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1293 +#: ishtar_common/models.py:1305 msgid "Context record cached label" msgstr "" -#: ishtar_common/models.py:1301 +#: ishtar_common/models.py:1312 msgid "Base find external id" msgstr "" -#: ishtar_common/models.py:1304 +#: ishtar_common/models.py:1315 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1311 +#: ishtar_common/models.py:1322 msgid "Base find complete identifier" msgstr "" -#: ishtar_common/models.py:1314 +#: ishtar_common/models.py:1325 msgid "Formula to manage base find complete identifier." msgstr "" -#: ishtar_common/models.py:1317 +#: ishtar_common/models.py:1328 msgid "Base find custom index key" msgstr "" -#: ishtar_common/models.py:1321 +#: ishtar_common/models.py:1332 msgid "" "Keys to be used to manage base find custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1326 +#: ishtar_common/models.py:1337 msgid "Base find cached label" msgstr "" -#: ishtar_common/models.py:1334 +#: ishtar_common/models.py:1345 msgid "Find external id" msgstr "" -#: ishtar_common/models.py:1337 +#: ishtar_common/models.py:1348 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1344 +#: ishtar_common/models.py:1355 msgid "Find complete identifier" msgstr "" -#: ishtar_common/models.py:1347 +#: ishtar_common/models.py:1358 msgid "Formula to manage find complete identifier." msgstr "" -#: ishtar_common/models.py:1350 +#: ishtar_common/models.py:1361 msgid "Find custom index key" msgstr "" -#: ishtar_common/models.py:1354 +#: ishtar_common/models.py:1365 msgid "" "Keys to be used to manage find custom index. Separate keys with a semicolon." msgstr "" -#: ishtar_common/models.py:1359 +#: ishtar_common/models.py:1370 msgid "Find cached label" msgstr "" -#: ishtar_common/models.py:1367 +#: ishtar_common/models.py:1377 msgid "Container external id" msgstr "" -#: ishtar_common/models.py:1370 +#: ishtar_common/models.py:1380 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1377 +#: ishtar_common/models.py:1387 msgid "Container complete identifier" msgstr "" -#: ishtar_common/models.py:1380 +#: ishtar_common/models.py:1390 msgid "Formula to manage container complete identifier." msgstr "" -#: ishtar_common/models.py:1383 +#: ishtar_common/models.py:1393 msgid "Container custom index key" msgstr "" -#: ishtar_common/models.py:1387 +#: ishtar_common/models.py:1397 msgid "" "Keys to be used to manage container custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1392 +#: ishtar_common/models.py:1402 msgid "Container cached label" msgstr "" -#: ishtar_common/models.py:1400 +#: ishtar_common/models.py:1410 msgid "Warehouse external id" msgstr "" -#: ishtar_common/models.py:1403 +#: ishtar_common/models.py:1413 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1410 +#: ishtar_common/models.py:1420 msgid "Warehouse complete identifier" msgstr "" -#: ishtar_common/models.py:1413 +#: ishtar_common/models.py:1423 msgid "Formula to manage warehouse complete identifier." msgstr "" -#: ishtar_common/models.py:1416 +#: ishtar_common/models.py:1426 msgid "Warehouse custom index key" msgstr "" -#: ishtar_common/models.py:1420 +#: ishtar_common/models.py:1430 msgid "" "Keys to be used to manage warehouse custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1425 +#: ishtar_common/models.py:1435 msgid "Warehouse cached label" msgstr "" -#: ishtar_common/models.py:1433 +#: ishtar_common/models.py:1443 msgid "Document external id" msgstr "" -#: ishtar_common/models.py:1436 +#: ishtar_common/models.py:1446 msgid "" "Formula to manage document external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: ishtar_common/models.py:1443 +#: ishtar_common/models.py:1453 msgid "Document complete identifier" msgstr "" -#: ishtar_common/models.py:1446 +#: ishtar_common/models.py:1456 msgid "Formula to manage document complete identifier." msgstr "" -#: ishtar_common/models.py:1449 +#: ishtar_common/models.py:1459 msgid "Document custom index key" msgstr "" -#: ishtar_common/models.py:1453 +#: ishtar_common/models.py:1463 msgid "" "Keys to be used to manage document custom index. Separate keys with a " "semicolon." msgstr "" -#: ishtar_common/models.py:1458 +#: ishtar_common/models.py:1468 msgid "Document cached label" msgstr "" -#: ishtar_common/models.py:1466 +#: ishtar_common/models.py:1476 msgid "Raw name for person" msgstr "" -#: ishtar_common/models.py:1469 +#: ishtar_common/models.py:1479 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: ishtar_common/models.py:1475 +#: ishtar_common/models.py:1485 msgid "Use auto index for finds" msgstr "" -#: ishtar_common/models.py:1477 +#: ishtar_common/models.py:1487 msgid "Currency" msgstr "" -#: ishtar_common/models.py:1480 +#: ishtar_common/models.py:1490 msgid "Naming style for accounts" msgstr "" -#: ishtar_common/models.py:1488 +#: ishtar_common/models.py:1498 msgid "Maps - default zoom" msgstr "" -#: ishtar_common/models.py:1491 +#: ishtar_common/models.py:1501 msgid "Spatial Reference System for display" msgstr "" -#: ishtar_common/models.py:1495 +#: ishtar_common/models.py:1505 msgid "Spatial Reference System used for display when no SRS is defined" msgstr "" -#: ishtar_common/models.py:1502 +#: ishtar_common/models.py:1512 msgid "Spatial Reference System in database" msgstr "" -#: ishtar_common/models.py:1506 +#: ishtar_common/models.py:1516 msgid "" "Set it to the most used spatial reference system. Warning: after change " "launch the migrate_srid script." msgstr "" -#: ishtar_common/models.py:1514 +#: ishtar_common/models.py:1524 msgid "Default language for documentation" msgstr "" -#: ishtar_common/models.py:1518 +#: ishtar_common/models.py:1528 msgid "" "If set, by default the selected language will be set for localized documents." msgstr "" -#: ishtar_common/models.py:1526 +#: ishtar_common/models.py:1536 msgid "Ishtar site profile" msgstr "" -#: ishtar_common/models.py:1527 +#: ishtar_common/models.py:1537 msgid "Ishtar site profiles" msgstr "" -#: ishtar_common/models.py:1529 ishtar_common/models.py:1839 -#: ishtar_common/models.py:2062 ishtar_common/models.py:5109 -#: ishtar_common/models.py:5139 ishtar_common/models_imports.py:123 +#: ishtar_common/models.py:1539 ishtar_common/models.py:1849 +#: ishtar_common/models.py:2072 ishtar_common/models.py:5123 +#: ishtar_common/models.py:5153 ishtar_common/models_imports.py:132 msgid "General settings" msgstr "" -#: ishtar_common/models.py:1632 +#: ishtar_common/models.py:1642 msgid "Enable this form" msgstr "" -#: ishtar_common/models.py:1635 +#: ishtar_common/models.py:1645 msgid "" "Disable with caution: disabling a form with mandatory fields may lead to " "database errors." msgstr "" -#: ishtar_common/models.py:1639 +#: ishtar_common/models.py:1649 msgid "Header text" msgstr "" -#: ishtar_common/models.py:1642 +#: ishtar_common/models.py:1652 msgid "Apply to all" msgstr "" -#: ishtar_common/models.py:1645 +#: ishtar_common/models.py:1655 msgid "" "Apply this form to all users. If set to True, selecting user and user type " "is useless." msgstr "" -#: ishtar_common/models.py:1651 +#: ishtar_common/models.py:1661 msgid "Deprecated - use profile types" msgstr "" -#: ishtar_common/models.py:1659 +#: ishtar_common/models.py:1669 msgid "Custom form" msgstr "" -#: ishtar_common/models.py:1660 +#: ishtar_common/models.py:1670 msgid "Custom forms" msgstr "" -#: ishtar_common/models.py:1675 ishtar_common/models_imports.py:170 -#: ishtar_common/models_rest.py:116 +#: ishtar_common/models.py:1685 ishtar_common/models_imports.py:178 +#: ishtar_common/models_imports.py:437 ishtar_common/models_rest.py:116 msgid "Users" msgstr "" -#: ishtar_common/models.py:1681 +#: ishtar_common/models.py:1691 msgid "User types" msgstr "" -#: ishtar_common/models.py:1773 +#: ishtar_common/models.py:1783 msgid "Excluded field" msgstr "" -#: ishtar_common/models.py:1774 +#: ishtar_common/models.py:1784 msgid "Excluded fields" msgstr "" -#: ishtar_common/models.py:1808 +#: ishtar_common/models.py:1818 #: ishtar_common/templates/blocks/form_flex_snippet.html:18 #: ishtar_common/templates/blocks/table_form_snippet.html:9 msgid "Help" msgstr "" -#: ishtar_common/models.py:1812 +#: ishtar_common/models.py:1822 msgid "Custom forms - Json data field" msgstr "" -#: ishtar_common/models.py:1813 +#: ishtar_common/models.py:1823 msgid "Custom forms - Json data fields" msgstr "" -#: ishtar_common/models.py:1828 +#: ishtar_common/models.py:1838 msgid "Variable name" msgstr "" -#: ishtar_common/models.py:1830 +#: ishtar_common/models.py:1840 msgid "Description of the variable" msgstr "" -#: ishtar_common/models.py:1836 +#: ishtar_common/models.py:1846 msgid "Global variable" msgstr "" -#: ishtar_common/models.py:1837 +#: ishtar_common/models.py:1847 msgid "Global variables" msgstr "" -#: ishtar_common/models.py:1868 +#: ishtar_common/models.py:1878 msgid "Model name" msgstr "" -#: ishtar_common/models.py:1869 +#: ishtar_common/models.py:1879 msgid "Associated primary key" msgstr "" -#: ishtar_common/models.py:1875 +#: ishtar_common/models.py:1885 msgid "Cache for stats" msgstr "" -#: ishtar_common/models.py:1876 +#: ishtar_common/models.py:1886 msgid "Caches for stats" msgstr "" -#: ishtar_common/models.py:2028 +#: ishtar_common/models.py:2038 msgid "Base template for labels" msgstr "" -#: ishtar_common/models.py:2035 +#: ishtar_common/models.py:2045 msgid "Labels: targets for labels in the LibreOffice file" msgstr "" -#: ishtar_common/models.py:2039 +#: ishtar_common/models.py:2049 msgid "" "Each target is separated by a semi-colon. The first target is the name of " "the object including the data in base template. Following targets will be " @@ -10148,1318 +10376,1400 @@ msgid "" "Cadre3;Cadre4;Cadre5;Cadre6\" for a sheet with 6 labels." msgstr "" -#: ishtar_common/models.py:2048 +#: ishtar_common/models.py:2058 msgid "Used for labels" msgstr "" -#: ishtar_common/models.py:2050 +#: ishtar_common/models.py:2060 msgid "Number of label per page" msgstr "" -#: ishtar_common/models.py:2053 +#: ishtar_common/models.py:2063 msgid "Only relevant for label template" msgstr "" -#: ishtar_common/models.py:2059 +#: ishtar_common/models.py:2069 msgid "Document template" msgstr "" -#: ishtar_common/models.py:2060 +#: ishtar_common/models.py:2070 msgid "Document templates" msgstr "" -#: ishtar_common/models.py:2073 +#: ishtar_common/models.py:2083 msgid "For label template, you must provide number of label per page." msgstr "" -#: ishtar_common/models.py:2355 +#: ishtar_common/models.py:2365 msgid "Only four level of parent are managed." msgstr "" -#: ishtar_common/models.py:2412 +#: ishtar_common/models.py:2422 msgid "Communal area boundaries" msgstr "" -#: ishtar_common/models.py:2463 +#: ishtar_common/models.py:2473 msgid "Male" msgstr "" -#: ishtar_common/models.py:2464 +#: ishtar_common/models.py:2474 msgid "Female" msgstr "" -#: ishtar_common/models.py:2465 +#: ishtar_common/models.py:2475 msgid "Neutral" msgstr "" -#: ishtar_common/models.py:2515 +#: ishtar_common/models.py:2525 msgid "Organization types" msgstr "" -#: ishtar_common/models.py:2525 +#: ishtar_common/models.py:2535 msgid "Error: planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2533 ishtar_common/models.py:2709 +#: ishtar_common/models.py:2543 ishtar_common/models.py:2719 msgid "Error: general_contractor type is missing" msgstr "" -#: ishtar_common/models.py:2571 +#: ishtar_common/models.py:2581 msgctxt "key for text search" msgid "precise-town" msgstr "" -#: ishtar_common/models.py:2609 +#: ishtar_common/models.py:2619 msgid "Organizations" msgstr "" -#: ishtar_common/models.py:2638 +#: ishtar_common/models.py:2648 msgid "unknown organization" msgstr "" -#: ishtar_common/models.py:2687 +#: ishtar_common/models.py:2697 msgid "/" msgstr "" -#: ishtar_common/models.py:2693 +#: ishtar_common/models.py:2703 msgid "Error: sra_agent and head_scientist types are missing" msgstr "" -#: ishtar_common/models.py:2701 +#: ishtar_common/models.py:2711 msgid "Error: sra_agent type is missing" msgstr "" -#: ishtar_common/models.py:2717 +#: ishtar_common/models.py:2727 msgid "Error: responsible_planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2729 +#: ishtar_common/models.py:2739 msgid "Error: publisher type is missing" msgstr "" -#: ishtar_common/models.py:2737 +#: ishtar_common/models.py:2747 msgid "Error: operator type is missing" msgstr "" -#: ishtar_common/models.py:2741 ishtar_common/models.py:2755 +#: ishtar_common/models.py:2751 ishtar_common/models.py:2765 msgid "Long title" msgstr "" -#: ishtar_common/models.py:2744 ishtar_common/models_imports.py:987 +#: ishtar_common/models.py:2754 ishtar_common/models_imports.py:1106 msgid "Title type" msgstr "" -#: ishtar_common/models.py:2745 +#: ishtar_common/models.py:2755 msgid "Title types" msgstr "" -#: ishtar_common/models.py:2772 +#: ishtar_common/models.py:2782 msgid "Mr" msgstr "" -#: ishtar_common/models.py:2773 +#: ishtar_common/models.py:2783 msgid "Miss" msgstr "" -#: ishtar_common/models.py:2774 +#: ishtar_common/models.py:2784 msgid "Mr and Mrs" msgstr "" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2785 msgid "Mrs" msgstr "" -#: ishtar_common/models.py:2776 +#: ishtar_common/models.py:2786 msgid "Doctor" msgstr "" -#: ishtar_common/models.py:2824 ishtar_common/models.py:3411 +#: ishtar_common/models.py:2834 ishtar_common/models.py:3421 msgctxt "key for text search" msgid "surname" msgstr "" -#: ishtar_common/models.py:2827 ishtar_common/models.py:3415 +#: ishtar_common/models.py:2837 ishtar_common/models.py:3425 msgctxt "key for text search" msgid "email" msgstr "" -#: ishtar_common/models.py:2830 ishtar_common/models.py:3999 +#: ishtar_common/models.py:2840 ishtar_common/models.py:4013 msgctxt "key for text search" msgid "title" msgstr "" -#: ishtar_common/models.py:2833 +#: ishtar_common/models.py:2843 msgctxt "key for text search" msgid "salutation" msgstr "" -#: ishtar_common/models.py:2840 ishtar_common/models.py:3423 +#: ishtar_common/models.py:2850 ishtar_common/models.py:3433 msgctxt "key for text search" msgid "organization" msgstr "" -#: ishtar_common/models.py:2844 +#: ishtar_common/models.py:2854 msgctxt "key for text search" msgid "has-account" msgstr "" -#: ishtar_common/models.py:2848 +#: ishtar_common/models.py:2858 msgctxt "key for text search" msgid "profile-type" msgstr "" -#: ishtar_common/models.py:2884 +#: ishtar_common/models.py:2894 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." msgstr "" -#: ishtar_common/models.py:2891 +#: ishtar_common/models.py:2901 msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2894 ishtar_common/models.py:3014 +#: ishtar_common/models.py:2904 ishtar_common/models.py:3024 msgid "Types" msgstr "" -#: ishtar_common/models.py:2899 +#: ishtar_common/models.py:2909 msgid "Is attached to" msgstr "" -#: ishtar_common/models.py:2910 +#: ishtar_common/models.py:2920 msgid "Persons" msgstr "" -#: ishtar_common/models.py:3171 +#: ishtar_common/models.py:3181 msgid "Manage account" msgstr "" -#: ishtar_common/models.py:3194 +#: ishtar_common/models.py:3204 msgid "Groups" msgstr "" -#: ishtar_common/models.py:3198 +#: ishtar_common/models.py:3208 msgid "Profile types" msgstr "" -#: ishtar_common/models.py:3210 +#: ishtar_common/models.py:3220 msgid "Profile type summary" msgstr "" -#: ishtar_common/models.py:3211 +#: ishtar_common/models.py:3221 msgid "Profile types summary" msgstr "" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3237 msgid "Show field number" msgstr "" -#: ishtar_common/models.py:3228 +#: ishtar_common/models.py:3238 msgid "Automatically pin" msgstr "" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3239 msgid "Display pin menu" msgstr "" -#: ishtar_common/models.py:3231 +#: ishtar_common/models.py:3241 msgid "Use background tasks" msgstr "" -#: ishtar_common/models.py:3232 +#: ishtar_common/models.py:3242 msgid "" "If set to true, each import, export, document generation is set as a " "background task." msgstr "" -#: ishtar_common/models.py:3236 +#: ishtar_common/models.py:3246 msgid "Send email when the task is finished" msgstr "" -#: ishtar_common/models.py:3246 +#: ishtar_common/models.py:3256 msgid "User profile" msgstr "" -#: ishtar_common/models.py:3247 +#: ishtar_common/models.py:3257 msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3334 ishtar_common/models.py:5116 +#: ishtar_common/models.py:3344 ishtar_common/models.py:5130 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3335 ishtar_common/models.py:5117 +#: ishtar_common/models.py:3345 ishtar_common/models.py:5131 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3336 ishtar_common/models.py:5119 -#: ishtar_common/models_imports.py:1131 +#: ishtar_common/models.py:3346 ishtar_common/models.py:5133 +#: ishtar_common/models_imports.py:1285 ishtar_common/models_imports.py:1299 msgid "Finished" msgstr "" -#: ishtar_common/models.py:3342 +#: ishtar_common/models.py:3352 msgid "Generate label" msgstr "" -#: ishtar_common/models.py:3354 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/models.py:3364 ishtar_common/templates/admin/index.html:56 +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:12 msgid "View" msgstr "" -#: ishtar_common/models.py:3356 +#: ishtar_common/models.py:3366 msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3364 ishtar_common/models.py:5133 -#: ishtar_common/models.py:5292 +#: ishtar_common/models.py:3374 ishtar_common/models.py:5147 +#: ishtar_common/models.py:5306 +#: ishtar_common/templates/ishtar/import_table.html:4 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:4 +#: ishtar_common/views.py:2241 msgid "Result" msgstr "" -#: ishtar_common/models.py:3367 +#: ishtar_common/models.py:3377 msgid "Background task" msgstr "" -#: ishtar_common/models.py:3368 +#: ishtar_common/models.py:3378 msgid "Background tasks" msgstr "" -#: ishtar_common/models.py:3404 +#: ishtar_common/models.py:3414 msgctxt "key for text search" msgid "username" msgstr "" -#: ishtar_common/models.py:3439 +#: ishtar_common/models.py:3449 msgid "Password last update" msgstr "" -#: ishtar_common/models.py:3442 +#: ishtar_common/models.py:3452 msgid "Advanced shortcut menu" msgstr "" -#: ishtar_common/models.py:3445 +#: ishtar_common/models.py:3455 msgid "Latest news version" msgstr "" -#: ishtar_common/models.py:3447 +#: ishtar_common/models.py:3457 msgid "Display news" msgstr "" -#: ishtar_common/models.py:3450 +#: ishtar_common/models.py:3460 msgid "Ishtar user" msgstr "" -#: ishtar_common/models.py:3451 +#: ishtar_common/models.py:3461 msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:3549 +#: ishtar_common/models.py:3563 msgid "Public" msgstr "" -#: ishtar_common/models.py:3667 +#: ishtar_common/models.py:3681 msgid "Author types" msgstr "" -#: ishtar_common/models.py:3752 +#: ishtar_common/models.py:3766 msgid "COInS export - type" msgstr "" -#: ishtar_common/models.py:3755 +#: ishtar_common/models.py:3769 msgid "COInS export - genre" msgstr "" -#: ishtar_common/models.py:3758 +#: ishtar_common/models.py:3772 msgid "Is localized" msgstr "" -#: ishtar_common/models.py:3760 +#: ishtar_common/models.py:3774 msgid "Setting a language for this type of document is relevant" msgstr "" -#: ishtar_common/models.py:3765 +#: ishtar_common/models.py:3779 msgid "Document type" msgstr "" -#: ishtar_common/models.py:3766 +#: ishtar_common/models.py:3780 msgid "Document types" msgstr "" -#: ishtar_common/models.py:3780 ishtar_common/models.py:3808 +#: ishtar_common/models.py:3794 ishtar_common/models.py:3822 msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3784 ishtar_common/models_imports.py:942 -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models.py:3798 ishtar_common/models_imports.py:1061 +#: ishtar_common/models_imports.py:1105 msgid "Support type" msgstr "" -#: ishtar_common/models.py:3785 +#: ishtar_common/models.py:3799 msgid "Support types" msgstr "" -#: ishtar_common/models.py:3795 +#: ishtar_common/models.py:3809 msgid "Iframe template" msgstr "" -#: ishtar_common/models.py:3799 +#: ishtar_common/models.py:3813 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." msgstr "" -#: ishtar_common/models.py:3812 +#: ishtar_common/models.py:3826 msgid "Format type" msgstr "" -#: ishtar_common/models.py:3813 +#: ishtar_common/models.py:3827 msgid "Format types" msgstr "" -#: ishtar_common/models.py:3823 ishtar_common/models_rest.py:109 +#: ishtar_common/models.py:3837 ishtar_common/models_rest.py:109 #: ishtar_common/templates/ishtar/merge_organization.html:11 #: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "" -#: ishtar_common/models.py:3826 ishtar_common/models_imports.py:939 +#: ishtar_common/models.py:3840 ishtar_common/models_imports.py:1058 msgid "License type" msgstr "" -#: ishtar_common/models.py:3827 +#: ishtar_common/models.py:3841 msgid "License types" msgstr "" -#: ishtar_common/models.py:3837 +#: ishtar_common/models.py:3851 msgid "Document tags" msgstr "" -#: ishtar_common/models.py:3964 +#: ishtar_common/models.py:3978 msgid "Identifier" msgstr "" -#: ishtar_common/models.py:3987 +#: ishtar_common/models.py:4001 msgctxt "key for text search" msgid "author" msgstr "" -#: ishtar_common/models.py:3991 +#: ishtar_common/models.py:4005 msgctxt "key for text search" msgid "publisher" msgstr "" -#: ishtar_common/models.py:3995 +#: ishtar_common/models.py:4009 msgctxt "key for text search" msgid "publishing-year" msgstr "" -#: ishtar_common/models.py:4010 +#: ishtar_common/models.py:4024 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: ishtar_common/models.py:4018 +#: ishtar_common/models.py:4032 msgctxt "key for text search" msgid "tag" msgstr "" -#: ishtar_common/models.py:4021 +#: ishtar_common/models.py:4035 msgctxt "key for text search" msgid "format" msgstr "" -#: ishtar_common/models.py:4025 +#: ishtar_common/models.py:4039 msgctxt "key for text search" msgid "medium" msgstr "" -#: ishtar_common/models.py:4029 +#: ishtar_common/models.py:4043 msgctxt "key for text search" msgid "language" msgstr "" -#: ishtar_common/models.py:4033 +#: ishtar_common/models.py:4047 msgctxt "key for text search" msgid "license" msgstr "" -#: ishtar_common/models.py:4037 +#: ishtar_common/models.py:4051 msgctxt "key for text search" msgid "scale" msgstr "" -#: ishtar_common/models.py:4040 +#: ishtar_common/models.py:4054 msgctxt "key for text search" msgid "url" msgstr "" -#: ishtar_common/models.py:4044 +#: ishtar_common/models.py:4058 msgctxt "key for text search" msgid "isbn" msgstr "" -#: ishtar_common/models.py:4047 +#: ishtar_common/models.py:4061 msgctxt "key for text search" msgid "issn" msgstr "" -#: ishtar_common/models.py:4050 +#: ishtar_common/models.py:4064 msgctxt "key for text search" msgid "source" msgstr "" -#: ishtar_common/models.py:4054 +#: ishtar_common/models.py:4068 msgctxt "key for text search" msgid "source-free-input" msgstr "" -#: ishtar_common/models.py:4058 +#: ishtar_common/models.py:4072 msgctxt "key for text search" msgid "warehouse-container" msgstr "" -#: ishtar_common/models.py:4062 +#: ishtar_common/models.py:4076 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "" -#: ishtar_common/models.py:4069 +#: ishtar_common/models.py:4083 msgctxt "key for text search" msgid "additional-information" msgstr "" -#: ishtar_common/models.py:4073 +#: ishtar_common/models.py:4087 msgctxt "key for text search" msgid "has-duplicate" msgstr "" -#: ishtar_common/models.py:4092 +#: ishtar_common/models.py:4106 msgctxt "key for text search" msgid "basket-finds" msgstr "" -#: ishtar_common/models.py:4096 ishtar_common/models.py:4197 +#: ishtar_common/models.py:4110 ishtar_common/models.py:4211 msgctxt "key for text search" msgid "find" msgstr "" -#: ishtar_common/models.py:4116 ishtar_common/models.py:4200 +#: ishtar_common/models.py:4130 ishtar_common/models.py:4214 msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4128 ishtar_common/models_common.py:1967 +#: ishtar_common/models.py:4142 ishtar_common/models_common.py:1777 msgctxt "key for text search" msgid "has-image" msgstr "" -#: ishtar_common/models.py:4131 +#: ishtar_common/models.py:4145 msgctxt "key for text search" msgid "has-file" msgstr "" -#: ishtar_common/models.py:4135 +#: ishtar_common/models.py:4149 msgctxt "key for text search" msgid "receipt-date-before" msgstr "" -#: ishtar_common/models.py:4139 +#: ishtar_common/models.py:4153 msgctxt "key for text search" msgid "receipt-date-after" msgstr "" -#: ishtar_common/models.py:4144 +#: ishtar_common/models.py:4158 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "" -#: ishtar_common/models.py:4149 +#: ishtar_common/models.py:4163 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "" -#: ishtar_common/models.py:4153 +#: ishtar_common/models.py:4167 msgctxt "key for text search" msgid "creation-date-before" msgstr "" -#: ishtar_common/models.py:4157 +#: ishtar_common/models.py:4171 msgctxt "key for text search" msgid "creation-date-after" msgstr "" -#: ishtar_common/models.py:4204 +#: ishtar_common/models.py:4218 msgctxt "key for text search" msgid "treatment" msgstr "" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4222 msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4324 +#: ishtar_common/models.py:4338 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4341 +#: ishtar_common/models.py:4355 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4348 +#: ishtar_common/models.py:4362 msgid "Container reference ID" msgstr "" -#: ishtar_common/models.py:4356 +#: ishtar_common/models.py:4370 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4358 +#: ishtar_common/models.py:4372 msgid "Related" msgstr "" -#: ishtar_common/models.py:4367 +#: ishtar_common/models.py:4381 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4371 +#: ishtar_common/models.py:4385 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4372 +#: ishtar_common/models.py:4386 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4373 +#: ishtar_common/models.py:4387 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4374 +#: ishtar_common/models.py:4388 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4594 +#: ishtar_common/models.py:4608 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4596 +#: ishtar_common/models.py:4610 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:5011 +#: ishtar_common/models.py:5025 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:5015 +#: ishtar_common/models.py:5029 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:5065 +#: ishtar_common/models.py:5079 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:5069 +#: ishtar_common/models.py:5083 msgid "Research" msgstr "" -#: ishtar_common/models.py:5102 +#: ishtar_common/models.py:5116 msgid "Filename" msgstr "" -#: ishtar_common/models.py:5106 +#: ishtar_common/models.py:5120 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:5107 +#: ishtar_common/models.py:5121 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:5118 ishtar_common/models_imports.py:1130 +#: ishtar_common/models.py:5132 ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1298 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:5136 +#: ishtar_common/models.py:5150 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:5137 +#: ishtar_common/models.py:5151 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:5157 +#: ishtar_common/models.py:5171 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5169 +#: ishtar_common/models.py:5183 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5182 +#: ishtar_common/models.py:5196 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5200 +#: ishtar_common/models.py:5214 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5242 ishtar_common/models_imports.py:1121 +#: ishtar_common/models.py:5256 ishtar_common/models_imports.py:1275 +#: ishtar_common/models_imports.py:1292 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 msgid "Created" msgstr "" -#: ishtar_common/models.py:5247 +#: ishtar_common/models.py:5261 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5250 ishtar_common/models_rest.py:66 +#: ishtar_common/models.py:5264 ishtar_common/models_rest.py:66 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5253 +#: ishtar_common/models.py:5267 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5256 +#: ishtar_common/models.py:5270 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5259 +#: ishtar_common/models.py:5273 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5267 +#: ishtar_common/models.py:5281 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5272 +#: ishtar_common/models.py:5286 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5276 +#: ishtar_common/models.py:5290 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5281 +#: ishtar_common/models.py:5295 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5282 +#: ishtar_common/models.py:5296 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5283 +#: ishtar_common/models.py:5297 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5284 +#: ishtar_common/models.py:5298 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5285 +#: ishtar_common/models.py:5299 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5286 +#: ishtar_common/models.py:5300 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5287 +#: ishtar_common/models.py:5301 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5294 +#: ishtar_common/models.py:5308 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5297 +#: ishtar_common/models.py:5311 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5298 +#: ishtar_common/models.py:5312 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5300 ishtar_common/models.py:5360 -#: ishtar_common/templates/ishtar/import_table.html:51 +#: ishtar_common/models.py:5314 ishtar_common/models.py:5374 +#: ishtar_common/templates/ishtar/import_table.html:107 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:69 msgctxt "name" msgid "Archive" msgstr "" -#: ishtar_common/models.py:5310 +#: ishtar_common/models.py:5324 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5322 +#: ishtar_common/models.py:5336 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5334 +#: ishtar_common/models.py:5348 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5338 +#: ishtar_common/models.py:5352 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5347 +#: ishtar_common/models.py:5361 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5349 +#: ishtar_common/models.py:5363 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5352 +#: ishtar_common/models.py:5366 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5357 +#: ishtar_common/models.py:5371 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5358 +#: ishtar_common/models.py:5372 msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:839 +#: ishtar_common/models_common.py:841 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1440 +#: ishtar_common/models_common.py:1085 +msgid "Timestamp geo" +msgstr "" + +#: ishtar_common/models_common.py:1086 +msgid "Timestamp label" +msgstr "" + +#: ishtar_common/models_common.py:1470 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1448 +#: ishtar_common/models_common.py:1478 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1455 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:1485 ishtar_common/models_common.py:2176 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1457 +#: ishtar_common/models_common.py:1487 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1463 +#: ishtar_common/models_common.py:1493 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1483 +#: ishtar_common/models_common.py:1513 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1487 +#: ishtar_common/models_common.py:1517 msgctxt "key for text search" msgid "created-before" msgstr "" -#: ishtar_common/models_common.py:1491 +#: ishtar_common/models_common.py:1521 msgctxt "key for text search" msgid "created-after" msgstr "" -#: ishtar_common/models_common.py:1494 +#: ishtar_common/models_common.py:1524 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1498 +#: ishtar_common/models_common.py:1528 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1501 +#: ishtar_common/models_common.py:1531 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1971 +#: ishtar_common/models_common.py:1781 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1975 +#: ishtar_common/models_common.py:1785 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:2055 +#: ishtar_common/models_common.py:1865 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:2057 +#: ishtar_common/models_common.py:1867 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2220 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2051 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2221 ishtar_common/models_common.py:2241 +#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2051 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2222 +#: ishtar_common/models_common.py:2032 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2223 +#: ishtar_common/models_common.py:2033 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:2036 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2227 +#: ishtar_common/models_common.py:2037 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2258 +#: ishtar_common/models_common.py:2068 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2259 +#: ishtar_common/models_common.py:2069 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2275 +#: ishtar_common/models_common.py:2085 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2086 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2102 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2103 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2305 +#: ishtar_common/models_common.py:2115 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2306 +#: ishtar_common/models_common.py:2116 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2332 +#: ishtar_common/models_common.py:2142 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2333 +#: ishtar_common/models_common.py:2143 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2334 +#: ishtar_common/models_common.py:2144 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2374 +#: ishtar_common/models_common.py:2184 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2381 +#: ishtar_common/models_common.py:2191 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2389 +#: ishtar_common/models_common.py:2199 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2397 +#: ishtar_common/models_common.py:2207 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:4301 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:4109 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2400 ishtar_common/models_common.py:2401 -#: ishtar_common/models_common.py:2402 +#: ishtar_common/models_common.py:2210 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:2212 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2401 ishtar_common/models_common.py:4302 +#: ishtar_common/models_common.py:2211 ishtar_common/models_common.py:4110 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2402 ishtar_common/models_common.py:4303 +#: ishtar_common/models_common.py:2212 ishtar_common/models_common.py:4111 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2405 +#: ishtar_common/models_common.py:2215 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2406 +#: ishtar_common/models_common.py:2216 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2407 +#: ishtar_common/models_common.py:2217 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2419 ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:4123 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2424 ishtar_common/models_common.py:4321 +#: ishtar_common/models_common.py:2234 ishtar_common/models_common.py:4129 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2425 +#: ishtar_common/models_common.py:2235 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:2236 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2427 +#: ishtar_common/models_common.py:2237 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2428 +#: ishtar_common/models_common.py:2238 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2431 ishtar_common/models_common.py:2432 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:2242 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2560 +#: ishtar_common/models_common.py:2370 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:3022 +#: ishtar_common/models_common.py:2832 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:3026 +#: ishtar_common/models_common.py:2836 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:3030 +#: ishtar_common/models_common.py:2840 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:3033 +#: ishtar_common/models_common.py:2843 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:3036 +#: ishtar_common/models_common.py:2846 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:3039 +#: ishtar_common/models_common.py:2849 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:3042 +#: ishtar_common/models_common.py:2852 msgctxt "key for text search" msgid "z-higher" msgstr "" -#: ishtar_common/models_common.py:3046 +#: ishtar_common/models_common.py:2856 msgctxt "key for text search" msgid "z-lower" msgstr "" -#: ishtar_common/models_common.py:3050 +#: ishtar_common/models_common.py:2860 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:3072 +#: ishtar_common/models_common.py:2882 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:3074 +#: ishtar_common/models_common.py:2884 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3273 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3467 +#: ishtar_common/models_common.py:3275 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3487 +#: ishtar_common/models_common.py:3295 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3489 +#: ishtar_common/models_common.py:3297 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3499 +#: ishtar_common/models_common.py:3307 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3503 +#: ishtar_common/models_common.py:3311 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3507 +#: ishtar_common/models_common.py:3315 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3773 +#: ishtar_common/models_common.py:3581 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3805 +#: ishtar_common/models_common.py:3613 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3811 +#: ishtar_common/models_common.py:3619 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3844 +#: ishtar_common/models_common.py:3652 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3881 +#: ishtar_common/models_common.py:3689 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3962 +#: ishtar_common/models_common.py:3770 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3972 +#: ishtar_common/models_common.py:3780 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3990 +#: ishtar_common/models_common.py:3798 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4299 +#: ishtar_common/models_common.py:4107 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4323 +#: ishtar_common/models_common.py:4131 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4326 +#: ishtar_common/models_common.py:4134 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4328 +#: ishtar_common/models_common.py:4136 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4330 +#: ishtar_common/models_common.py:4138 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4337 +#: ishtar_common/models_common.py:4145 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_imports.py:116 +#: ishtar_common/models_imports.py:125 msgid "Class name" msgstr "" -#: ishtar_common/models_imports.py:120 +#: ishtar_common/models_imports.py:129 msgid "Data model" msgstr "" -#: ishtar_common/models_imports.py:121 +#: ishtar_common/models_imports.py:130 msgid "Data models" msgstr "" -#: ishtar_common/models_imports.py:138 +#: ishtar_common/models_imports.py:142 #: ishtar_common/templates/blocks/DataTables-stats.html:32 #: ishtar_common/templates/blocks/DataTables-tabs.html:8 msgid "Table" msgstr "" -#: ishtar_common/models_imports.py:139 +#: ishtar_common/models_imports.py:143 msgid "GIS" msgstr "" -#: ishtar_common/models_imports.py:159 +#: ishtar_common/models_imports.py:163 +msgid "Tab number" +msgstr "" + +#: ishtar_common/models_imports.py:164 +msgid "" +"When using an Excel or Calc file choose the tab number. Keep it to 1 by " +"default." +msgstr "" + +#: ishtar_common/models_imports.py:167 msgid "Layer name" msgstr "" -#: ishtar_common/models_imports.py:163 +#: ishtar_common/models_imports.py:171 msgid "For GIS file with multiple layers" msgstr "" -#: ishtar_common/models_imports.py:166 +#: ishtar_common/models_imports.py:174 msgid "Set as main geometry" msgstr "" -#: ishtar_common/models_imports.py:168 +#: ishtar_common/models_imports.py:176 msgid "Only relevant for GIS files" msgstr "" -#: ishtar_common/models_imports.py:173 +#: ishtar_common/models_imports.py:181 msgid "Associated model" msgstr "" -#: ishtar_common/models_imports.py:181 +#: ishtar_common/models_imports.py:189 msgid "Models that can accept new items" msgstr "" -#: ishtar_common/models_imports.py:183 +#: ishtar_common/models_imports.py:191 msgid "Leave blank for no restrictions" msgstr "" -#: ishtar_common/models_imports.py:186 +#: ishtar_common/models_imports.py:194 msgid "Can be exported" msgstr "" -#: ishtar_common/models_imports.py:188 +#: ishtar_common/models_imports.py:195 +msgid "Can be import" +msgstr "" + +#: ishtar_common/models_imports.py:196 +msgid "Archive required" +msgstr "" + +#: ishtar_common/models_imports.py:198 msgid "Unicity keys (separator \";\")" msgstr "" -#: ishtar_common/models_imports.py:189 +#: ishtar_common/models_imports.py:199 msgid "" "Mandatory for update importer. Set to key that identify items without " "ambiguity. Warning: __ is not supported, only use level 1 key." msgstr "" -#: ishtar_common/models_imports.py:198 +#: ishtar_common/models_imports.py:205 +msgid "Pre-import form message" +msgstr "" + +#: ishtar_common/models_imports.py:208 +msgid "Error messages to ignore" +msgstr "" + +#: ishtar_common/models_imports.py:209 +msgid "" +"If an error is encountered with the following character strings, the error " +"is not reported in the error file. Each message is separated with a line " +"break." +msgstr "" + +#: ishtar_common/models_imports.py:217 msgid "Importer - Type" msgstr "" -#: ishtar_common/models_imports.py:199 +#: ishtar_common/models_imports.py:218 msgid "Importer - Types" msgstr "" -#: ishtar_common/models_imports.py:223 ishtar_common/models_rest.py:277 +#: ishtar_common/models_imports.py:250 ishtar_common/models_rest.py:277 msgid "List types" msgstr "" -#: ishtar_common/models_imports.py:402 ishtar_common/models_imports.py:419 +#: ishtar_common/models_imports.py:440 +msgid "Importer - Group" +msgstr "" + +#: ishtar_common/models_imports.py:441 +msgid "Importer - Groups" +msgstr "" + +#: ishtar_common/models_imports.py:475 +msgid "Importer - Group <-> Importer" +msgstr "" + +#: ishtar_common/models_imports.py:496 ishtar_common/models_imports.py:513 msgid "" "Importer configuration error: \"{}\" is not available for \"{}\". Check your " "default and column configuration" msgstr "" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:539 +msgid "" +"The target of the default values. Can be set to empty with \"-\". Use the " +"\"__\" notation to pass between models." +msgstr "" + +#: ishtar_common/models_imports.py:543 +msgid "Required fields" +msgstr "" + +#: ishtar_common/models_imports.py:545 +msgid "" +"Theses defaults values only apply if the designated fields are not empty. " +"Use the \"__\" notation to pass between models.Leave empty to always apply." +msgstr "" + +#: ishtar_common/models_imports.py:552 msgid "Importer - Default" msgstr "" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:553 msgid "Importer - Defaults" msgstr "" -#: ishtar_common/models_imports.py:504 +#: ishtar_common/models_imports.py:620 msgid "Importer - Default value" msgstr "" -#: ishtar_common/models_imports.py:505 +#: ishtar_common/models_imports.py:621 msgid "Importer - Default values" msgstr "" -#: ishtar_common/models_imports.py:580 +#: ishtar_common/models_imports.py:697 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "" -#: ishtar_common/models_imports.py:596 +#: ishtar_common/models_imports.py:698 +msgid "" +"Column number in the table. Put 0 or negative number for pre-importer field." +msgstr "" + +#: ishtar_common/models_imports.py:715 msgid "Required" msgstr "" -#: ishtar_common/models_imports.py:598 +#: ishtar_common/models_imports.py:717 msgid "Export field name" msgstr "" -#: ishtar_common/models_imports.py:603 +#: ishtar_common/models_imports.py:722 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: ishtar_common/models_imports.py:610 +#: ishtar_common/models_imports.py:729 msgid "Importer - Column" msgstr "" -#: ishtar_common/models_imports.py:611 +#: ishtar_common/models_imports.py:730 msgid "Importer - Columns" msgstr "" -#: ishtar_common/models_imports.py:654 +#: ishtar_common/models_imports.py:773 msgid "Field name" msgstr "" -#: ishtar_common/models_imports.py:656 ishtar_common/models_imports.py:759 +#: ishtar_common/models_imports.py:775 ishtar_common/models_imports.py:878 msgid "Force creation of new items" msgstr "" -#: ishtar_common/models_imports.py:657 ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:776 ishtar_common/models_imports.py:879 msgid "Concatenate with existing" msgstr "" -#: ishtar_common/models_imports.py:659 ishtar_common/models_imports.py:762 +#: ishtar_common/models_imports.py:778 ishtar_common/models_imports.py:881 msgid "Concatenate character" msgstr "" -#: ishtar_common/models_imports.py:664 +#: ishtar_common/models_imports.py:783 msgid "Importer - Duplicate field" msgstr "" -#: ishtar_common/models_imports.py:665 +#: ishtar_common/models_imports.py:784 msgid "Importer - Duplicate fields" msgstr "" -#: ishtar_common/models_imports.py:682 +#: ishtar_common/models_imports.py:801 msgid "Regular expression" msgstr "" -#: ishtar_common/models_imports.py:686 +#: ishtar_common/models_imports.py:805 msgid "Importer - Regular expression" msgstr "" -#: ishtar_common/models_imports.py:687 +#: ishtar_common/models_imports.py:806 msgid "Importer - Regular expressions" msgstr "" -#: ishtar_common/models_imports.py:702 +#: ishtar_common/models_imports.py:821 msgid "Format string" msgstr "" -#: ishtar_common/models_imports.py:705 +#: ishtar_common/models_imports.py:824 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " @@ -11467,394 +11777,448 @@ msgid "" "a string." msgstr "" -#: ishtar_common/models_imports.py:715 +#: ishtar_common/models_imports.py:834 msgid "Importer - Value format" msgstr "" -#: ishtar_common/models_imports.py:716 +#: ishtar_common/models_imports.py:835 msgid "Importer - Value formats" msgstr "" -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:848 msgid "The string provided generate an error. Fix it." msgstr "" -#: ishtar_common/models_imports.py:768 +#: ishtar_common/models_imports.py:887 msgid "Importer - Target" msgstr "" -#: ishtar_common/models_imports.py:769 +#: ishtar_common/models_imports.py:888 msgid "Importer - Targets" msgstr "" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:607 -#: ishtar_common/views_item.py:1425 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:639 +#: ishtar_common/views_item.py:1471 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:810 ishtar_common/views_item.py:1427 +#: ishtar_common/models_imports.py:929 ishtar_common/views_item.py:1473 msgid "False" msgstr "" -#: ishtar_common/models_imports.py:822 +#: ishtar_common/models_imports.py:941 msgid "All users can use it" msgstr "" -#: ishtar_common/models_imports.py:824 +#: ishtar_common/models_imports.py:943 msgid "All users can modify it" msgstr "" -#: ishtar_common/models_imports.py:829 +#: ishtar_common/models_imports.py:948 msgid "Importer - Target key group" msgstr "" -#: ishtar_common/models_imports.py:830 +#: ishtar_common/models_imports.py:949 msgid "Importer - Target key groups" msgstr "" -#: ishtar_common/models_imports.py:853 +#: ishtar_common/models_imports.py:972 msgid "Is set" msgstr "" -#: ishtar_common/models_imports.py:871 +#: ishtar_common/models_imports.py:990 msgid "Importer - Target key" msgstr "" -#: ishtar_common/models_imports.py:872 +#: ishtar_common/models_imports.py:991 msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:1065 msgid "Period" msgstr "" -#: ishtar_common/models_imports.py:947 +#: ishtar_common/models_imports.py:1066 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:952 +#: ishtar_common/models_imports.py:1071 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:1076 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:958 +#: ishtar_common/models_imports.py:1077 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:1080 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:969 +#: ishtar_common/models_imports.py:1088 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:979 +#: ishtar_common/models_imports.py:1098 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:1102 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:1104 msgid "Spatial reference system" msgstr "" -#: ishtar_common/models_imports.py:995 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:1114 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:999 +#: ishtar_common/models_imports.py:1118 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:1000 +#: ishtar_common/models_imports.py:1119 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1120 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:1002 +#: ishtar_common/models_imports.py:1121 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:1003 +#: ishtar_common/models_imports.py:1122 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:1004 +#: ishtar_common/models_imports.py:1123 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:1023 +#: ishtar_common/models_imports.py:1142 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1143 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:1025 +#: ishtar_common/models_imports.py:1144 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:1042 +#: ishtar_common/models_imports.py:1174 +msgid "Formater type" +msgstr "" + +#: ishtar_common/models_imports.py:1176 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:1044 +#: ishtar_common/models_imports.py:1178 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:1049 +#: ishtar_common/models_imports.py:1183 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:1050 +#: ishtar_common/models_imports.py:1184 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:1122 +#: ishtar_common/models_imports.py:1276 ishtar_common/models_imports.py:1293 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:1123 +#: ishtar_common/models_imports.py:1277 ishtar_common/models_imports.py:1294 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:1124 +#: ishtar_common/models_imports.py:1278 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1279 ishtar_common/models_imports.py:1295 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1280 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:1127 +#: ishtar_common/models_imports.py:1281 ishtar_common/models_imports.py:1296 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:1128 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1297 msgid "Post-processing in progress" msgstr "" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1283 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1286 ishtar_common/models_imports.py:1300 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:1201 -msgid "Importer type" -msgstr "" - -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1370 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:1211 -msgid "Associated images (zip file)" +#: ishtar_common/models_imports.py:1378 +msgid "Associated documents (zip file)" msgstr "" -#: ishtar_common/models_imports.py:1224 -msgid "If a group is selected, target key saved in this group will be used." +#: ishtar_common/models_imports.py:1386 +msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:1228 +#: ishtar_common/models_imports.py:1394 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:1229 +#: ishtar_common/models_imports.py:1395 msgid "Only required for CSV file" msgstr "" -#: ishtar_common/models_imports.py:1232 +#: ishtar_common/models_imports.py:1398 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:1237 +#: ishtar_common/models_imports.py:1403 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1408 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:1244 +#: ishtar_common/models_imports.py:1410 msgid "" "Number of header lines in your file (can be 0 and should be 0 for geopackage " "or Shapefile)." msgstr "" -#: ishtar_common/models_imports.py:1247 +#: ishtar_common/models_imports.py:1508 +msgid "Importer group type" +msgstr "" + +#: ishtar_common/models_imports.py:1509 +msgid "Current import" +msgstr "" + +#: ishtar_common/models_imports.py:1515 +msgid "Import - Group" +msgstr "" + +#: ishtar_common/models_imports.py:1516 +msgid "Import - Groups" +msgstr "" + +#: ishtar_common/models_imports.py:1593 ishtar_common/models_imports.py:2245 +msgid "Analyse" +msgstr "" + +#: ishtar_common/models_imports.py:1595 ishtar_common/models_imports.py:1599 +#: ishtar_common/models_imports.py:2247 ishtar_common/models_imports.py:2257 +msgid "Re-analyse" +msgstr "" + +#: ishtar_common/models_imports.py:1600 ishtar_common/models_imports.py:2258 +msgid "Re-import" +msgstr "" + +#: ishtar_common/models_imports.py:1601 ishtar_common/models_imports.py:2265 +msgid "Archive" +msgstr "" + +#: ishtar_common/models_imports.py:1604 ishtar_common/models_imports.py:2268 +msgid "Unarchive" +msgstr "" + +#: ishtar_common/models_imports.py:1606 ishtar_common/models_imports.py:2272 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 +#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 +#: ishtar_common/templates/ishtar/form_delete.html:11 +#: ishtar_common/views.py:2782 ishtar_common/widgets.py:453 +#: ishtar_common/widgets.py:489 +msgid "Delete" +msgstr "" + +#: ishtar_common/models_imports.py:1864 +msgid "Importer type" +msgstr "" + +#: ishtar_common/models_imports.py:1872 +msgid "If a group is selected, target key saved in this group will be used." +msgstr "" + +#: ishtar_common/models_imports.py:1876 +msgid "Imported values" +msgstr "" + +#: ishtar_common/models_imports.py:1884 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1892 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1263 +#: ishtar_common/models_imports.py:1900 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1271 -msgid "Archive file" -msgstr "" - -#: ishtar_common/models_imports.py:1282 +#: ishtar_common/models_imports.py:1911 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1284 +#: ishtar_common/models_imports.py:1913 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1293 +#: ishtar_common/models_imports.py:1916 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1295 +#: ishtar_common/models_imports.py:1918 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1296 +#: ishtar_common/models_imports.py:1919 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1298 +#: ishtar_common/models_imports.py:1921 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1303 +#: ishtar_common/models_imports.py:1926 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1305 +#: ishtar_common/models_imports.py:1928 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1312 -msgid "Import" +#: ishtar_common/models_imports.py:1934 +#: ishtar_common/templates/ishtar/import_table.html:76 +msgid "Group" msgstr "" -#: ishtar_common/models_imports.py:1355 ishtar_common/models_imports.py:1499 -msgid "Error in the CSV file." +#: ishtar_common/models_imports.py:1937 +msgid "Next import" msgstr "" -#: ishtar_common/models_imports.py:1424 -msgid "Analyse" +#: ishtar_common/models_imports.py:1940 +msgid "Import - Import" msgstr "" -#: ishtar_common/models_imports.py:1426 ishtar_common/models_imports.py:1435 -msgid "Re-analyse" +#: ishtar_common/models_imports.py:1941 +msgid "Import - Imports" +msgstr "" + +#: ishtar_common/models_imports.py:2174 ishtar_common/models_imports.py:2322 +msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1430 +#: ishtar_common/models_imports.py:2252 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1431 ishtar_common/models_imports.py:1440 +#: ishtar_common/models_imports.py:2253 ishtar_common/models_imports.py:2262 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1433 ishtar_common/models_imports.py:1442 +#: ishtar_common/models_imports.py:2255 ishtar_common/models_imports.py:2264 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1436 -msgid "Re-import" -msgstr "" - -#: ishtar_common/models_imports.py:1439 +#: ishtar_common/models_imports.py:2261 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1443 -msgid "Archive" -msgstr "" - -#: ishtar_common/models_imports.py:1446 -msgid "Unarchive" -msgstr "" - -#: ishtar_common/models_imports.py:1448 +#: ishtar_common/models_imports.py:2270 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:20 msgid "Edit" msgstr "" -#: ishtar_common/models_imports.py:1449 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 -#: ishtar_common/templates/ishtar/blocks/window_nav.html:72 -#: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2519 ishtar_common/widgets.py:453 -#: ishtar_common/widgets.py:489 -msgid "Delete" -msgstr "" - -#: ishtar_common/models_imports.py:1543 ishtar_common/models_imports.py:1546 -#: ishtar_common/models_imports.py:1608 +#: ishtar_common/models_imports.py:2366 ishtar_common/models_imports.py:2369 +#: ishtar_common/models_imports.py:2431 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:1556 +#: ishtar_common/models_imports.py:2379 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:2401 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1605 +#: ishtar_common/models_imports.py:2428 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1644 +#: ishtar_common/models_imports.py:2469 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1712 +#: ishtar_common/models_imports.py:2537 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1743 +#: ishtar_common/models_imports.py:2568 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1779 +#: ishtar_common/models_imports.py:2604 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1787 +#: ishtar_common/models_imports.py:2612 msgid "Import {} finished with no errors" msgstr "" -#: ishtar_common/models_imports.py:1958 +#: ishtar_common/models_imports.py:2778 +msgid "Ignored" +msgstr "" + +#: ishtar_common/models_imports.py:2781 ishtar_common/models_imports.py:2782 +msgid "Import - Ignored error" +msgstr "" + +#: ishtar_common/models_imports.py:2817 +msgid "Import - Pre-import value" +msgstr "" + +#: ishtar_common/models_imports.py:2818 +msgid "Import - Pre-import values" +msgstr "" + +#: ishtar_common/models_imports.py:2835 msgid "Specific key to an import" msgstr "" -#: ishtar_common/models_imports.py:1969 -msgid "Importer - Item key" +#: ishtar_common/models_imports.py:2846 +msgid "Import - Item key" msgstr "" -#: ishtar_common/models_imports.py:1970 -msgid "Imports - Item keys" +#: ishtar_common/models_imports.py:2847 +msgid "Import - Item keys" msgstr "" #: ishtar_common/models_rest.py:49 ishtar_common/models_rest.py:63 @@ -12066,15 +12430,15 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1757 -#: ishtar_common/views.py:1761 +#: ishtar_common/templates/ishtar/changelog.html:14 ishtar_common/views.py:1873 +#: ishtar_common/views.py:1877 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1764 -#: ishtar_common/views.py:1766 +#: ishtar_common/templates/ishtar/changelog.html:8 ishtar_common/views.py:1880 +#: ishtar_common/views.py:1882 msgid "Next" msgstr "" @@ -12234,7 +12598,6 @@ msgstr "" #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 -#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "" @@ -12349,8 +12712,8 @@ msgstr "" msgid ", " msgstr "" -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2346 -#: ishtar_common/utils.py:2354 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2636 +#: ishtar_common/utils.py:2644 msgid "." msgstr "" @@ -12428,6 +12791,10 @@ msgid "" "a free software under AGPL v3 license." msgstr "" +#: ishtar_common/templates/ishtar/blocks/import_table_buttons_view.html:15 +msgid "Download" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:5 msgctxt "Sheet" msgid "Creation" @@ -12438,6 +12805,14 @@ msgctxt "Sheet" msgid "Modification" msgstr "" +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:23 +msgid "Imports (creation)" +msgstr "" + +#: ishtar_common/templates/ishtar/blocks/sheet_creation_section.html:32 +msgid "Imports (update)" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "" @@ -12474,6 +12849,10 @@ msgstr "" msgid "Generate image" msgstr "" +#: ishtar_common/templates/ishtar/blocks/view_import_csv.html:19 +msgid "Ignore" +msgstr "" + #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:78 msgid "Support" msgstr "" @@ -12540,7 +12919,7 @@ msgid "Link" msgstr "" #: ishtar_common/templates/ishtar/changelog.html:5 -#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1238 +#: ishtar_common/templates/navbar.html:37 ishtar_common/views.py:1239 msgid "Changelog" msgstr "" @@ -12555,7 +12934,7 @@ msgstr "" #: ishtar_common/templates/ishtar/forms/search_query.html:77 #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 -#: ishtar_common/templates/ishtar/import_list.html:38 +#: ishtar_common/templates/ishtar/import_list.html:41 #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 @@ -12606,7 +12985,7 @@ 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 +#: ishtar_common/templates/ishtar/import_delete.html:28 msgid "Are you sure to want to delete this import?" msgstr "" @@ -12734,6 +13113,10 @@ msgstr "" msgid "import (GIS)" msgstr "" +#: ishtar_common/templates/ishtar/import_list.html:27 +msgid "import (group)" +msgstr "" + #: ishtar_common/templates/ishtar/import_step_by_step.html:14 msgid "Add/modified" msgstr "" @@ -12755,7 +13138,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1600 +#: ishtar_common/views.py:1716 msgid "Import step by step" msgstr "" @@ -12768,7 +13151,9 @@ msgid "Column" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:77 -#: ishtar_common/templates/ishtar/import_table.html:35 +#: ishtar_common/templates/ishtar/import_table.html:5 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:5 +#: ishtar_common/views.py:2240 msgid "Error" msgstr "" @@ -12830,7 +13215,6 @@ msgid "Objects matched with no changes" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:263 -#: ishtar_common/templates/ishtar/import_table.html:49 msgid "Source file" msgstr "" @@ -12852,45 +13236,46 @@ msgid "" "modification before import." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:23 -msgid "No pending imports." +#: ishtar_common/templates/ishtar/import_table.html:3 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:3 +msgid "Media" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:29 -msgctxt "file" -msgid "File" +#: ishtar_common/templates/ishtar/import_table.html:6 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:6 +#: ishtar_common/views.py:2242 +msgid "Match" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:30 -msgid "Media" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgid "No pending imports." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:32 +#: ishtar_common/templates/ishtar/import_table.html:57 msgid "Status" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:34 -msgid "Unmatched items" +#: ishtar_common/templates/ishtar/import_table.html:59 +msgctxt "file" +msgid "Files" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:36 -msgid "Control" +#: ishtar_common/templates/ishtar/import_table.html:60 +msgid "Pré-import form / matching" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:37 -#: ishtar_common/templates/ishtar/import_table.html:77 -msgid "Match" +#: ishtar_common/templates/ishtar/import_table.html:61 +msgid "Diagnostic files" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:56 -msgid "Media file" +#: ishtar_common/templates/ishtar/import_table.html:119 +#: ishtar_common/templates/ishtar/import_table.html:192 +msgid "Pre-import values" msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:81 -#: ishtar_common/templates/ishtar/import_table.html:84 -#: ishtar_common/templates/ishtar/import_table.html:87 -msgctxt "not a directory" -msgid "File" +#: ishtar_common/templates/ishtar/import_table.html:126 +#: ishtar_common/templates/ishtar/import_table.html:199 +msgid "Make match" msgstr "" #: ishtar_common/templates/ishtar/manage_basket.html:9 @@ -12960,6 +13345,26 @@ msgstr "" msgid "Other" msgstr "" +#: ishtar_common/templates/ishtar/sheet_import.html:4 +msgid "Import" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:32 +msgid "Updated" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:98 +msgid "Associated imports" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_import_gen.html:106 +msgid "Pre-import values " +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_importgroup.html:4 +msgid "Import group" +msgstr "" + #: ishtar_common/templates/ishtar/sheet_organization.html:21 msgid "Person in the organization" msgstr "" @@ -13504,47 +13909,47 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:200 ishtar_common/views.py:125 +#: ishtar_common/utils.py:207 ishtar_common/views.py:125 msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:692 +#: ishtar_common/utils.py:968 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:770 +#: ishtar_common/utils.py:1046 msgid "Information" msgstr "" -#: ishtar_common/utils.py:771 +#: ishtar_common/utils.py:1047 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1637 +#: ishtar_common/utils.py:1927 msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/utils.py:2323 +#: ishtar_common/utils.py:2613 msgid "uppercase letter" msgstr "" -#: ishtar_common/utils.py:2324 +#: ishtar_common/utils.py:2614 msgid "lowercase letter" msgstr "" -#: ishtar_common/utils.py:2325 +#: ishtar_common/utils.py:2615 msgid "number" msgstr "" -#: ishtar_common/utils.py:2326 +#: ishtar_common/utils.py:2616 msgid "punctuation sign" msgstr "" -#: ishtar_common/utils.py:2345 +#: ishtar_common/utils.py:2635 msgid "This password must contain one of this character: " msgstr "" -#: ishtar_common/utils.py:2351 +#: ishtar_common/utils.py:2641 msgid "Your password must contain each of these characters: " msgstr "" @@ -13592,128 +13997,136 @@ msgstr "" msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:1104 ishtar_common/views_item.py:177 +#: ishtar_common/views.py:1105 ishtar_common/views_item.py:177 #: ishtar_common/views_item.py:218 ishtar_common/views_item.py:235 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1471 +#: ishtar_common/views.py:1490 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1491 -msgid "Edit import" +#: ishtar_common/views.py:1515 +msgid "Import: edit (table)" msgstr "" -#: ishtar_common/views.py:1513 +#: ishtar_common/views.py:1522 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1949 +#: ishtar_common/views.py:1529 +msgid "Import: create (group)" +msgstr "" + +#: ishtar_common/views.py:1535 +msgid "Import: pre-form" +msgstr "" + +#: ishtar_common/views.py:2065 msgid "Col. " msgstr "" -#: ishtar_common/views.py:1956 ishtar_common/views.py:1971 +#: ishtar_common/views.py:2072 ishtar_common/views.py:2087 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:2013 +#: ishtar_common/views.py:2173 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:2049 +#: ishtar_common/views.py:2211 ishtar_common/views.py:2222 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2087 +#: ishtar_common/views.py:2350 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2111 +#: ishtar_common/views.py:2374 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2119 +#: ishtar_common/views.py:2382 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2129 +#: ishtar_common/views.py:2392 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2169 ishtar_common/views.py:2184 +#: ishtar_common/views.py:2432 ishtar_common/views.py:2447 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2198 +#: ishtar_common/views.py:2461 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2211 +#: ishtar_common/views.py:2474 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2231 +#: ishtar_common/views.py:2494 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2299 +#: ishtar_common/views.py:2562 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2327 +#: ishtar_common/views.py:2590 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2352 +#: ishtar_common/views.py:2615 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2389 +#: ishtar_common/views.py:2652 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2495 +#: ishtar_common/views.py:2758 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2518 +#: ishtar_common/views.py:2781 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2561 +#: ishtar_common/views.py:2824 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2562 +#: ishtar_common/views.py:2825 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2567 +#: ishtar_common/views.py:2830 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2568 +#: ishtar_common/views.py:2831 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:2687 +#: ishtar_common/views.py:2950 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2803 ishtar_common/views.py:2898 +#: ishtar_common/views.py:3066 ishtar_common/views.py:3161 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2935 ishtar_common/views.py:2986 +#: ishtar_common/views.py:3198 ishtar_common/views.py:3249 msgid "Main geo item for" msgstr "" -#: ishtar_common/views.py:2946 +#: ishtar_common/views.py:3209 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2999 +#: ishtar_common/views.py:3262 msgid "Delete geographic item" msgstr "" @@ -13727,7 +14140,7 @@ msgstr "" msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:923 +#: ishtar_common/views_item.py:955 msgctxt "key for text search" msgid "today" msgstr "" |