diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-24 16:18:46 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-24 16:22:52 +0200 |
commit | 0663c1251d225a4c40ed93645f3bd8f16ae2acb3 (patch) | |
tree | 07615b01bde96b937b7e99a4faa713fe666563ee /locale | |
parent | 8ca8b9b52fd84384c1dd53041710c3721681c346 (diff) | |
download | Ishtar-0663c1251d225a4c40ed93645f3bd8f16ae2acb3.tar.bz2 Ishtar-0663c1251d225a4c40ed93645f3bd8f16ae2acb3.zip |
✨ criteria search: adapt searches for relative search (dates and numbers)
Diffstat (limited to 'locale')
-rw-r--r-- | locale/de/LC_MESSAGES/django.po | 3621 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 3617 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 4057 | ||||
-rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 3617 |
4 files changed, 7039 insertions, 7873 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 50f9c3f46..6cee2b740 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-21 15:37+0200\n" +"POT-Creation-Date: 2024-06-24 16:21+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -21,27 +21,27 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:735 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2770 +#: archaeological_finds/models_finds.py:2745 #: 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:1256 +#: archaeological_operations/forms.py:1249 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2535 -#: archaeological_operations/models.py:2553 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2868 -#: archaeological_operations/models.py:3157 +#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2532 +#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:3132 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 +#: archaeological_warehouse/models.py:903 ishtar_common/forms_common.py:2523 #: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 @@ -60,111 +60,103 @@ msgstr "" msgid "Dating - precise" msgstr "" -#: archaeological_context_records/forms.py:97 -msgid "Dating - start date before" +#: archaeological_context_records/forms.py:96 +msgid "Dating - start date" msgstr "" -#: archaeological_context_records/forms.py:100 -msgid "Dating - start date after" -msgstr "" - -#: archaeological_context_records/forms.py:102 -msgid "Dating - end date before" -msgstr "" - -#: archaeological_context_records/forms.py:103 -msgid "Dating - end date after" +#: archaeological_context_records/forms.py:97 +msgid "Dating - end date" msgstr "" -#: archaeological_context_records/forms.py:105 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "" -#: archaeological_context_records/forms.py:107 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "" -#: archaeological_context_records/forms.py:138 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "" -#: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 +#: archaeological_finds/forms.py:1718 archaeological_finds/forms.py:2450 #: 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_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1440 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 msgid "Full text search" msgstr "" -#: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:571 -#: archaeological_context_records/forms.py:625 -#: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:617 +#: archaeological_context_records/models.py:747 +#: archaeological_context_records/models.py:1385 msgid "ID" msgstr "" -#: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1766 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1747 msgid "Code PATRIARCHE" msgstr "" -#: archaeological_context_records/forms.py:151 +#: archaeological_context_records/forms.py:143 #, fuzzy #| msgid "email address" msgid "Operation - name" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:152 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2533 #, fuzzy #| msgid "email address" msgid "Operation - year" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:154 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "" -#: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:732 -#: archaeological_context_records/models.py:747 -#: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:724 +#: archaeological_context_records/models.py:741 +#: archaeological_operations/forms.py:551 +#: archaeological_operations/models.py:567 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "" -#: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1819 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1806 msgid "Search within related operations" msgstr "" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:723 +#: archaeological_context_records/forms.py:159 +#: archaeological_context_records/forms.py:715 msgid "Unit type" msgstr "" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:521 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:831 ishtar_common/admin.py:766 +#: archaeological_context_records/forms.py:160 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:524 +#: archaeological_context_records/models.py:825 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:523 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:824 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/models.py:523 +#: archaeological_context_records/models.py:818 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 #: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:147 @@ -181,66 +173,66 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:171 -#: archaeological_context_records/models.py:787 +#: archaeological_context_records/forms.py:163 +#: archaeological_context_records/models.py:781 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 -#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2097 -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/models.py:500 +#: archaeological_finds/forms.py:1884 archaeological_finds/models_finds.py:2072 +#: archaeological_operations/forms.py:1237 +#: archaeological_operations/models.py:501 msgid "Cultural attribution" msgstr "" -#: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:573 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/forms.py:164 +#: archaeological_context_records/forms.py:289 +#: archaeological_context_records/forms.py:565 +#: archaeological_context_records/forms.py:618 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:719 +#: archaeological_context_records/models.py:1387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1084 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:3181 -#: archaeological_operations/models.py:3475 +#: archaeological_operations/forms.py:1077 +#: archaeological_operations/forms.py:1454 +#: archaeological_operations/models.py:3156 +#: archaeological_operations/models.py:3450 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" -#: archaeological_context_records/forms.py:173 -#: archaeological_operations/forms.py:579 +#: archaeological_context_records/forms.py:165 +#: archaeological_operations/forms.py:575 msgid "Has finds" msgstr "" -#: archaeological_context_records/forms.py:175 -#: archaeological_operations/forms.py:543 +#: archaeological_context_records/forms.py:167 +#: archaeological_operations/forms.py:541 msgid "Search within relations" msgstr "" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:317 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:836 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:309 +#: archaeological_context_records/models.py:525 +#: archaeological_context_records/models.py:830 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:211 -#: archaeological_context_records/forms.py:232 +#: archaeological_context_records/forms.py:203 +#: archaeological_context_records/forms.py:224 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:281 +#: archaeological_context_records/forms.py:273 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 -#: archaeological_operations/forms.py:689 -#: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1344 -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:708 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1497 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -255,57 +247,57 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:282 +#: archaeological_context_records/forms.py:274 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:298 -#: archaeological_context_records/forms.py:563 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:725 -#: archaeological_context_records/models.py:515 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:733 +#: archaeological_context_records/forms.py:290 +#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:619 +#: archaeological_context_records/forms.py:717 +#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:508 +#: archaeological_context_records/models.py:727 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1056 -#: archaeological_operations/models.py:3162 +#: archaeological_operations/forms.py:1049 +#: archaeological_operations/models.py:3137 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4188 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:303 -#: archaeological_context_records/forms.py:568 +#: archaeological_context_records/forms.py:295 +#: archaeological_context_records/forms.py:560 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:574 -#: archaeological_context_records/forms.py:629 +#: archaeological_context_records/forms.py:300 +#: archaeological_context_records/forms.py:566 +#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:528 -#: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:1386 msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:310 -#: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/forms.py:302 +#: archaeological_context_records/models.py:748 +#: archaeological_context_records/models.py:1388 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:432 archaeological_finds/forms.py:437 #: archaeological_finds/forms.py:595 archaeological_finds/forms.py:756 #: archaeological_finds/forms.py:758 archaeological_finds/forms.py:986 -#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1833 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1820 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:556 -#: archaeological_finds/models_finds.py:2039 -#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_finds.py:2014 +#: archaeological_finds/models_treatments.py:263 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -321,109 +313,109 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/forms.py:304 +#: archaeological_context_records/models.py:778 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:314 -#: archaeological_context_records/models.py:755 -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/models.py:749 +#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1881 +#: archaeological_finds/models_finds.py:2151 #: archaeological_finds/templates/ishtar/sheet_find.html:194 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:143 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/forms.py:317 #: archaeological_files/forms.py:308 archaeological_files/forms.py:818 -#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 +#: archaeological_files/models.py:662 archaeological_operations/forms.py:737 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:752 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:753 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:333 -#: archaeological_context_records/models.py:760 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:754 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:334 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:755 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:762 +#: archaeological_context_records/forms.py:327 +#: archaeological_context_records/models.py:756 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/models.py:758 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/models.py:750 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:343 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/models.py:751 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:625 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/models_treatments.py:265 -#: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1350 +#: archaeological_finds/forms_treatments.py:763 +#: archaeological_finds/models_treatments.py:266 +#: archaeological_finds/models_treatments.py:1140 +#: archaeological_operations/models.py:1329 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 -#: ishtar_common/forms.py:1055 ishtar_common/forms.py:1056 +#: ishtar_common/forms.py:1047 ishtar_common/forms.py:1048 #: na_app/templates/ishtar/sheet_operation.html:204 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:346 +#: archaeological_context_records/forms.py:338 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:352 -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/models.py:762 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:226 -#: archaeological_finds/models_treatments.py:760 +#: archaeological_finds/models_treatments.py:227 +#: archaeological_finds/models_treatments.py:761 #: archaeological_warehouse/forms.py:744 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:438 +#: archaeological_context_records/forms.py:430 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:443 +#: archaeological_context_records/forms.py:435 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:448 -#: archaeological_context_records/forms.py:470 -#: archaeological_context_records/models.py:165 +#: archaeological_context_records/forms.py:440 +#: archaeological_context_records/forms.py:462 +#: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 -#: archaeological_finds/models_finds.py:2094 +#: archaeological_finds/models_finds.py:2069 #: archaeological_finds/templates/ishtar/sheet_find.html:249 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:197 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -434,13 +426,13 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:109 -#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:522 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 -#: archaeological_operations/forms.py:841 +#: archaeological_operations/forms.py:834 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 @@ -456,17 +448,17 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:782 archaeological_files/models.py:76 -#: archaeological_files/models.py:730 +#: archaeological_files/models.py:731 #: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3624 -#: archaeological_finds/models_treatments.py:264 -#: archaeological_finds/models_treatments.py:758 +#: archaeological_finds/forms_treatments.py:760 +#: archaeological_finds/models_finds.py:3598 +#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:395 #: archaeological_finds/templates/ishtar/sheet_find.html:433 #: archaeological_finds/templates/ishtar/sheet_find.html:471 @@ -474,10 +466,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:497 -#: archaeological_operations/forms.py:790 +#: archaeological_operations/forms.py:538 +#: archaeological_operations/forms.py:783 #: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3479 +#: archaeological_operations/models.py:1330 +#: archaeological_operations/models.py:3454 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -502,12 +495,12 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:457 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:787 archaeological_files/models.py:77 -#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 -#: archaeological_finds/models_finds.py:3625 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_files/models.py:732 archaeological_finds/forms.py:1569 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_treatments.py:760 #: archaeological_finds/templates/ishtar/sheet_find.html:396 #: archaeological_finds/templates/ishtar/sheet_find.html:434 #: archaeological_finds/templates/ishtar/sheet_find.html:472 @@ -518,7 +511,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:498 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:536 #: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3480 +#: archaeological_operations/models.py:3455 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -549,7 +542,7 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -562,7 +555,7 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:459 +#: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -576,7 +569,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:460 +#: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -584,27 +577,27 @@ msgstr "" msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:463 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:483 +#: archaeological_context_records/forms.py:475 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:276 -#: archaeological_context_records/models.py:1522 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1516 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 -#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2762 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:2737 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1704 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 #: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:501 +#: archaeological_context_records/forms.py:493 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -616,110 +609,110 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:494 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:508 -#: archaeological_context_records/forms.py:519 -#: archaeological_context_records/models.py:785 +#: archaeological_context_records/forms.py:500 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:779 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/forms.py:501 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:517 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:526 -#: archaeological_context_records/models.py:790 +#: archaeological_context_records/forms.py:518 +#: archaeological_context_records/models.py:784 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/models.py:793 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:528 -#: archaeological_context_records/models.py:805 +#: archaeological_context_records/forms.py:520 +#: archaeological_context_records/models.py:799 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/models.py:814 +#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/models.py:808 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:1150 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1870 +#: archaeological_context_records/forms.py:523 +#: archaeological_operations/forms.py:1143 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/forms.py:1851 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:535 +#: archaeological_context_records/forms.py:527 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:548 -#: archaeological_operations/forms.py:624 -#: archaeological_operations/forms.py:637 +#: archaeological_context_records/forms.py:540 +#: archaeological_operations/forms.py:617 +#: archaeological_operations/forms.py:630 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:545 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:551 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:661 +#: archaeological_context_records/forms.py:653 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1817 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:691 +#: archaeological_context_records/forms.py:683 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:711 -#: archaeological_context_records/models.py:1283 -#: archaeological_context_records/models.py:1322 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/forms.py:703 +#: archaeological_context_records/models.py:1277 +#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1384 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:715 +#: archaeological_context_records/forms.py:707 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:740 +#: archaeological_context_records/forms.py:732 #, fuzzy #| msgid "email address" msgid "Associated parcel" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:765 +#: archaeological_context_records/forms.py:757 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:784 +#: archaeological_context_records/forms.py:776 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -827,45 +820,35 @@ msgstr "" #: archaeological_context_records/models.py:139 msgctxt "key for text search" -msgid "datings-start-before" +msgid "datings-start" msgstr "" #: archaeological_context_records/models.py:143 msgctxt "key for text search" -msgid "datings-start-after" +msgid "datings-end" msgstr "" #: archaeological_context_records/models.py:147 msgctxt "key for text search" -msgid "datings-end-before" -msgstr "" - -#: archaeological_context_records/models.py:151 -msgctxt "key for text search" -msgid "datings-end-after" -msgstr "" - -#: archaeological_context_records/models.py:155 -msgctxt "key for text search" msgid "datings-type" msgstr "" -#: archaeological_context_records/models.py:159 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "" -#: archaeological_context_records/models.py:166 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "" -#: archaeological_context_records/models.py:282 +#: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:615 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2347 +#: archaeological_finds/models_finds.py:2322 +#: archaeological_finds/models_finds.py:3560 #: archaeological_finds/models_finds.py:3586 -#: archaeological_finds/models_finds.py:3612 -#: archaeological_finds/models_treatments.py:740 +#: archaeological_finds/models_treatments.py:741 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -877,8 +860,8 @@ msgstr "" msgid "Find" msgstr "" -#: archaeological_context_records/models.py:307 -#: archaeological_context_records/models.py:330 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 #: archaeological_files/models.py:75 archaeological_files/models.py:105 #: archaeological_files/models.py:159 archaeological_files/models.py:175 #: archaeological_files/models.py:235 archaeological_finds/models_finds.py:106 @@ -887,202 +870,202 @@ msgstr "" #: archaeological_finds/models_finds.py:260 #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 -#: archaeological_finds/models_finds.py:2030 +#: archaeological_finds/models_finds.py:2005 #: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:752 +#: archaeological_finds/models_treatments.py:753 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3506 +#: archaeological_operations/models.py:3481 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 #: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 -#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 -#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2152 ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2182 ishtar_common/models_imports.py:474 msgid "Order" msgstr "" -#: archaeological_context_records/models.py:310 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "" -#: archaeological_context_records/models.py:317 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "" -#: archaeological_context_records/models.py:318 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "" -#: archaeological_context_records/models.py:333 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "" -#: archaeological_context_records/models.py:334 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "" -#: archaeological_context_records/models.py:347 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "" -#: archaeological_context_records/models.py:348 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "" -#: archaeological_context_records/models.py:361 +#: archaeological_context_records/models.py:353 msgid "Excavation technique type" msgstr "" -#: archaeological_context_records/models.py:362 +#: archaeological_context_records/models.py:354 msgid "Excavation technique types" msgstr "" -#: archaeological_context_records/models.py:372 +#: archaeological_context_records/models.py:364 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "" -#: archaeological_context_records/models.py:373 +#: archaeological_context_records/models.py:365 msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:507 -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:1389 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1144 -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1359 +#: archaeological_operations/forms.py:1137 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1352 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:993 -#: archaeological_operations/models.py:1080 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1391 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:501 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:510 -#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:504 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:505 #: archaeological_finds/models_finds.py:1152 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:514 +#: archaeological_context_records/models.py:506 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:509 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:526 #: archaeological_finds/models_finds.py:1216 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:998 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:527 #: archaeological_finds/models_finds.py:1217 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:998 +#: archaeological_operations/models.py:999 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:569 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:572 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1308 -#: archaeological_operations/models.py:378 -#: archaeological_operations/models.py:1144 +#: archaeological_files/models.py:491 archaeological_finds/models_finds.py:1318 +#: archaeological_operations/models.py:379 +#: archaeological_operations/models.py:1138 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4447 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:581 ishtar_common/models.py:4407 +#: archaeological_context_records/models.py:575 ishtar_common/models.py:4407 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:584 -#: archaeological_finds/models_finds.py:1689 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:578 +#: archaeological_finds/models_finds.py:1676 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:588 -#: archaeological_operations/models.py:1140 -#: archaeological_operations/models.py:2699 +#: archaeological_context_records/models.py:582 +#: archaeological_operations/models.py:1134 +#: archaeological_operations/models.py:2678 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:592 -#: archaeological_finds/models_finds.py:1316 +#: archaeological_context_records/models.py:586 +#: archaeological_finds/models_finds.py:1326 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:596 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1422 -#: archaeological_finds/models_finds.py:1941 -#: archaeological_operations/models.py:413 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4398 +#: archaeological_context_records/models.py:590 +#: archaeological_context_records/models.py:661 +#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:441 ishtar_common/models.py:4398 #: ishtar_common/models.py:4521 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:600 -#: archaeological_context_records/models.py:670 -#: archaeological_finds/models_finds.py:1332 -#: archaeological_operations/models.py:1235 -#: archaeological_operations/models.py:1312 -#: archaeological_warehouse/models.py:988 ishtar_common/models.py:4439 +#: archaeological_context_records/models.py:594 +#: archaeological_context_records/models.py:664 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_operations/models.py:1222 +#: archaeological_operations/models.py:1291 +#: archaeological_warehouse/models.py:989 ishtar_common/models.py:4439 #: ishtar_common/models.py:4530 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:605 +#: archaeological_context_records/models.py:599 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1359 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:372 -#: archaeological_operations/models.py:1190 +#: archaeological_context_records/models.py:603 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1184 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1091,84 +1074,84 @@ msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:613 +#: archaeological_context_records/models.py:607 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:616 +#: archaeological_context_records/models.py:610 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:619 +#: archaeological_context_records/models.py:613 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:623 -#: archaeological_files/models.py:493 archaeological_operations/models.py:1150 -#: archaeological_operations/models.py:2717 +#: archaeological_context_records/models.py:617 +#: archaeological_files/models.py:494 archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:2696 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:627 -#: archaeological_operations/models.py:1263 +#: archaeological_context_records/models.py:621 +#: archaeological_operations/models.py:1246 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:630 +#: archaeological_context_records/models.py:624 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:634 +#: archaeological_context_records/models.py:628 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1657 -#: archaeological_operations/models.py:429 +#: archaeological_context_records/models.py:632 +#: archaeological_finds/models_finds.py:1644 +#: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_context_records/models.py:685 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_operations/models.py:459 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_operations/models.py:460 +#: archaeological_operations/models.py:1274 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:692 -#: archaeological_finds/models_finds.py:1893 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:686 +#: archaeological_finds/models_finds.py:1868 +#: archaeological_operations/models.py:467 +#: archaeological_operations/models.py:1267 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1104 ishtar_common/models.py:2644 +#: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2644 #: ishtar_common/models.py:2925 ishtar_common/models.py:4547 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1063 +#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:1057 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 -#: archaeological_finds/models_finds.py:1910 -#: archaeological_finds/models_finds.py:2664 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:1885 +#: archaeological_finds/models_finds.py:2639 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:484 -#: archaeological_operations/models.py:664 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2024 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:485 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:2003 #: archaeological_operations/views.py:904 #: archaeological_operations/views.py:919 #: archaeological_operations/views.py:926 @@ -1179,73 +1162,73 @@ msgstr "" msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:719 -#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:2024 -#: archaeological_finds/models_treatments.py:259 -#: archaeological_operations/models.py:3170 +#: archaeological_context_records/models.py:713 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:551 +#: archaeological_finds/models_finds.py:1999 +#: archaeological_finds/models_treatments.py:260 +#: archaeological_operations/models.py:3145 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4582 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_operations/models.py:3173 +#: archaeological_context_records/models.py:715 +#: archaeological_files/models.py:566 archaeological_finds/models_finds.py:553 +#: archaeological_finds/models_finds.py:2001 +#: archaeological_operations/models.py:3148 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1188 +#: archaeological_warehouse/models.py:1189 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:766 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3383 +#: archaeological_context_records/models.py:760 +#: archaeological_operations/models.py:1383 ishtar_common/models_common.py:3372 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:765 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:775 +#: archaeological_context_records/models.py:769 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:788 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:802 +#: archaeological_context_records/models.py:796 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:809 +#: archaeological_context_records/models.py:803 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:817 +#: archaeological_context_records/models.py:811 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:845 +#: archaeological_context_records/models.py:839 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2301 -#: archaeological_finds/models_treatments.py:279 -#: archaeological_finds/models_treatments.py:1162 +#: archaeological_files/models.py:752 archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:1158 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:534 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2917 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1457 +#: archaeological_operations/models.py:2892 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1193 +#: archaeological_warehouse/models.py:1194 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1254,7 +1237,7 @@ msgstr "" #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 #: ishtar_common/models.py:4145 ishtar_common/models.py:4722 -#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3400 #: 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 @@ -1270,131 +1253,131 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:852 -#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2307 -#: archaeological_finds/models_treatments.py:285 -#: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:540 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2924 +#: archaeological_context_records/models.py:846 +#: archaeological_files/models.py:758 archaeological_finds/models_finds.py:2282 +#: archaeological_finds/models_treatments.py:286 +#: archaeological_finds/models_treatments.py:1165 +#: archaeological_operations/models.py:541 +#: archaeological_operations/models.py:1463 +#: archaeological_operations/models.py:2899 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3417 +#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2427 +#: ishtar_common/models_common.py:3406 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:857 -#: archaeological_finds/models_finds.py:2319 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:851 +#: archaeological_finds/models_finds.py:2294 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:1554 msgid "Cached periods label" msgstr "" +#: archaeological_context_records/models.py:854 #: archaeological_context_records/models.py:860 -#: archaeological_context_records/models.py:866 -#: archaeological_finds/models_finds.py:2322 -#: archaeological_finds/models_finds.py:2328 -#: archaeological_finds/models_finds.py:2334 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:560 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 +#: archaeological_finds/models_finds.py:2297 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:561 +#: archaeological_operations/models.py:1545 +#: archaeological_operations/models.py:1551 +#: archaeological_operations/models.py:1557 +#: archaeological_operations/models.py:1563 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4364 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:863 +#: archaeological_context_records/models.py:857 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:870 -#: archaeological_context_records/models.py:871 +#: archaeological_context_records/models.py:864 +#: archaeological_context_records/models.py:865 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:564 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:892 +#: archaeological_context_records/models.py:886 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:927 -#: archaeological_finds/models_finds.py:2536 +#: archaeological_context_records/models.py:921 +#: archaeological_finds/models_finds.py:2511 #, fuzzy #| msgid "email address" msgid "List of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1051 +#: archaeological_context_records/models.py:1045 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1053 +#: archaeological_context_records/models.py:1047 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1237 +#: archaeological_context_records/models.py:1231 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1284 +#: archaeological_context_records/models.py:1278 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1311 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1312 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1313 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1314 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1315 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1317 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1318 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1319 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1320 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1327 +#: archaeological_context_records/models.py:1321 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1330 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1337 +#: archaeological_context_records/models.py:1331 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/models.py:1522 msgid "Context record parent" msgstr "" @@ -1449,7 +1432,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 -#: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 +#: archaeological_finds/forms.py:2247 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 #: archaeological_finds/models_finds.py:240 @@ -1468,9 +1451,9 @@ msgstr "" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2348 -#: archaeological_finds/models_finds.py:2359 -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:2323 +#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:3607 #: 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 @@ -1541,7 +1524,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4376 +#: ishtar_common/models_common.py:4367 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1625,7 +1608,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:219 +#: archaeological_finds/models_treatments.py:220 #: archaeological_finds/templates/ishtar/sheet_find.html:391 #: archaeological_finds/templates/ishtar/sheet_find.html:429 #: archaeological_finds/templates/ishtar/sheet_find.html:467 @@ -1637,8 +1620,8 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 #: ishtar_common/models.py:5493 ishtar_common/models.py:5630 -#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 -#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2028 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1733,7 +1716,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:255 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:1981 msgid "Add context record" msgstr "" @@ -1768,28 +1751,28 @@ msgstr "" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 #: archaeological_files/forms.py:237 archaeological_files/forms.py:663 #: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 -#: archaeological_files/models.py:403 archaeological_files/models.py:554 +#: archaeological_files/models.py:403 archaeological_files/models.py:555 #: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_finds/forms.py:1746 +#: archaeological_finds/forms.py:1733 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:644 -#: archaeological_finds/forms_treatments.py:726 -#: archaeological_finds/forms_treatments.py:840 +#: archaeological_finds/forms_treatments.py:716 +#: archaeological_finds/forms_treatments.py:830 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:204 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:205 +#: archaeological_finds/models_treatments.py:1102 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1451 -#: archaeological_operations/forms.py:1768 -#: archaeological_operations/models.py:989 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2667 -#: archaeological_operations/models.py:2896 -#: archaeological_operations/models.py:3160 +#: archaeological_operations/forms.py:728 +#: archaeological_operations/forms.py:1444 +#: archaeological_operations/forms.py:1749 +#: archaeological_operations/models.py:990 +#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:2646 +#: archaeological_operations/models.py:2871 +#: archaeological_operations/models.py:3135 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 @@ -1797,27 +1780,27 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:669 archaeological_files/models.py:556 +#: archaeological_files/forms.py:669 archaeological_files/models.py:557 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 -#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 -#: archaeological_operations/forms.py:1239 -#: archaeological_operations/forms.py:1356 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/forms.py:1530 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2899 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1134 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:2874 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1392 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1464 -#: archaeological_operations/models.py:2539 ishtar_common/models_common.py:2058 -#: ishtar_common/models_common.py:3391 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/models.py:2518 ishtar_common/models_common.py:2051 +#: ishtar_common/models_common.py:3380 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1828,7 +1811,7 @@ msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 #: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:569 msgid "File type" msgstr "" @@ -1843,41 +1826,41 @@ msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 #: archaeological_files/forms.py:529 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:617 +#: archaeological_files/models.py:408 archaeological_files/models.py:618 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:104 archaeological_files/forms.py:467 -#: archaeological_files/forms.py:531 archaeological_files/models.py:622 +#: archaeological_files/forms.py:531 archaeological_files/models.py:623 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:660 -#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_files/models.py:671 archaeological_finds/forms.py:799 #: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 -#: archaeological_finds/forms.py:2585 +#: archaeological_finds/forms.py:2501 #: archaeological_finds/forms_treatments.py:195 -#: archaeological_finds/forms_treatments.py:765 -#: archaeological_finds/models_treatments.py:261 -#: archaeological_finds/models_treatments.py:1158 -#: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1247 -#: archaeological_operations/forms.py:1370 -#: archaeological_operations/forms.py:1467 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2913 +#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_treatments.py:1154 +#: archaeological_operations/forms.py:542 +#: archaeological_operations/forms.py:742 +#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1363 +#: archaeological_operations/forms.py:1460 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1452 +#: archaeological_operations/models.py:2888 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 +#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 #: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 +#: ishtar_common/models_common.py:2279 ishtar_common/models_imports.py:890 #: 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 @@ -1893,7 +1876,7 @@ msgstr "" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:581 msgid "General contractor" msgstr "" @@ -1902,16 +1885,14 @@ msgid "Organization of general contractor" msgstr "" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 -#: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:557 ishtar_common/forms.py:955 msgid "Created by" msgstr "" #: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 -#: archaeological_finds/forms_treatments.py:864 -#: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1475 +#: archaeological_finds/forms_treatments.py:854 +#: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "" @@ -1923,10 +1904,10 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/forms.py:218 archaeological_files/models.py:638 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1146 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2164 +#: archaeological_finds/models_treatments.py:1142 +#: archaeological_operations/models.py:1328 ishtar_common/forms_common.py:2164 #: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1934,9 +1915,9 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:639 -#: archaeological_finds/forms_treatments.py:768 -#: archaeological_finds/models_treatments.py:1148 +#: archaeological_files/models.py:640 +#: archaeological_finds/forms_treatments.py:758 +#: archaeological_finds/models_treatments.py:1144 #: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 @@ -1972,22 +1953,22 @@ msgid "Planning name" msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:470 archaeological_files/models.py:634 -#: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1054 -#: archaeological_operations/forms.py:1070 -#: archaeological_operations/forms.py:1075 -#: archaeological_operations/forms.py:1406 +#: archaeological_files/models.py:471 archaeological_files/models.py:635 +#: archaeological_operations/forms.py:722 +#: archaeological_operations/forms.py:1047 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1068 +#: archaeological_operations/forms.py:1399 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1079 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2908 +#: archaeological_operations/models.py:504 +#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1388 +#: archaeological_operations/models.py:2883 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3425 +#: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 @@ -1996,8 +1977,8 @@ msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/models.py:673 archaeological_operations/models.py:2902 -#: ishtar_common/models_common.py:2059 +#: archaeological_files/models.py:674 archaeological_operations/models.py:2877 +#: ishtar_common/models_common.py:2052 msgid "Departments" msgstr "" @@ -2006,7 +1987,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:665 +#: archaeological_files/models.py:666 msgid "Locality" msgstr "" @@ -2020,7 +2001,7 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 msgid "Postal code" msgstr "" @@ -2029,7 +2010,7 @@ msgid "Surfaces" msgstr "" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:808 archaeological_files/models.py:663 +#: archaeological_files/forms.py:808 archaeological_files/models.py:664 msgid "Total developed surface (m2)" msgstr "" @@ -2037,7 +2018,7 @@ msgstr "" #: 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:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 +#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2071,7 +2052,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:470 archaeological_files/models.py:641 +#: archaeological_files/forms.py:470 archaeological_files/models.py:642 msgid "Date of planning service file" msgstr "" @@ -2084,7 +2065,7 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:515 archaeological_files/models.py:601 +#: archaeological_files/forms.py:515 archaeological_files/models.py:602 msgid "Responsible for planning service" msgstr "" @@ -2097,12 +2078,12 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:592 archaeological_files/models.py:697 +#: archaeological_files/forms.py:592 archaeological_files/models.py:698 #: archaeological_operations/forms.py:525 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:595 archaeological_files/models.py:681 +#: archaeological_files/forms.py:595 archaeological_files/models.py:682 msgid "Requested operation type" msgstr "" @@ -2110,16 +2091,16 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/forms.py:612 archaeological_files/models.py:701 #: archaeological_files/templates/ishtar/sheet_file.html:170 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:621 archaeological_files/models.py:703 +#: archaeological_files/forms.py:621 archaeological_files/models.py:704 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:622 archaeological_files/models.py:705 +#: archaeological_files/forms.py:622 archaeological_files/models.py:706 msgid "Protected area" msgstr "" @@ -2136,11 +2117,11 @@ msgstr "" msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:653 archaeological_files/models.py:645 +#: archaeological_files/forms.py:653 archaeological_files/models.py:646 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/forms.py:661 archaeological_files/models.py:660 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" @@ -2170,27 +2151,27 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:767 archaeological_files/models.py:722 +#: archaeological_files/forms.py:767 archaeological_files/models.py:723 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:772 archaeological_files/models.py:725 +#: archaeological_files/forms.py:772 archaeological_files/models.py:726 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:777 archaeological_files/models.py:728 +#: archaeological_files/forms.py:777 archaeological_files/models.py:729 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:792 archaeological_files/models.py:732 +#: archaeological_files/forms.py:792 archaeological_files/models.py:733 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:797 archaeological_files/models.py:733 +#: archaeological_files/forms.py:797 archaeological_files/models.py:734 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:802 archaeological_files/models.py:735 +#: archaeological_files/forms.py:802 archaeological_files/models.py:736 msgid "Execution report date" msgstr "" @@ -2215,7 +2196,7 @@ msgid "Days" msgstr "" #: archaeological_files/forms.py:889 archaeological_files/models.py:116 -#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/models.py:1434 archaeological_files/models.py:1453 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" @@ -2223,7 +2204,7 @@ msgstr "" #: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:718 +#: archaeological_files/models.py:206 archaeological_files/models.py:719 msgid "Price agreement" msgstr "" @@ -2262,18 +2243,18 @@ msgstr "" #: archaeological_finds/forms_treatments.py:566 #: archaeological_finds/forms_treatments.py:628 #: archaeological_finds/forms_treatments.py:645 -#: archaeological_finds/forms_treatments.py:799 -#: archaeological_finds/forms_treatments.py:841 -#: archaeological_finds/forms_treatments.py:908 -#: archaeological_finds/models_treatments.py:205 -#: archaeological_finds/models_treatments.py:1107 +#: archaeological_finds/forms_treatments.py:789 +#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:898 +#: archaeological_finds/models_treatments.py:206 +#: archaeological_finds/models_treatments.py:1103 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1452 -#: archaeological_operations/forms.py:1585 -#: archaeological_operations/models.py:2838 +#: archaeological_operations/forms.py:1445 +#: archaeological_operations/forms.py:1566 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1174 +#: archaeological_warehouse/models.py:1175 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 #: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2287,12 +2268,12 @@ msgstr "" #: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 -#: archaeological_finds/forms_treatments.py:842 -#: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1458 -#: archaeological_operations/forms.py:1519 -#: archaeological_operations/models.py:2569 -#: archaeological_operations/models.py:2828 +#: archaeological_finds/forms_treatments.py:832 +#: archaeological_finds/forms_treatments.py:887 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1500 +#: archaeological_operations/models.py:2548 +#: archaeological_operations/models.py:2803 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" @@ -2303,31 +2284,31 @@ msgstr "" #: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 -#: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1459 -#: archaeological_operations/forms.py:1655 +#: archaeological_finds/forms_treatments.py:833 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1636 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 -#: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1465 -#: archaeological_operations/forms.py:1526 -#: archaeological_operations/models.py:2897 +#: archaeological_finds/forms_treatments.py:834 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1507 +#: archaeological_operations/models.py:2872 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" #: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 -#: archaeological_finds/forms_treatments.py:850 +#: archaeological_finds/forms_treatments.py:840 msgid "Signature date before" msgstr "" #: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 -#: archaeological_finds/forms_treatments.py:848 +#: archaeological_finds/forms_treatments.py:838 msgid "Signature date after" msgstr "" @@ -2355,15 +2336,15 @@ msgstr "" msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:782 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:953 -#: archaeological_operations/models.py:2033 -#: archaeological_operations/models.py:2552 -#: archaeological_operations/models.py:2668 -#: archaeological_operations/models.py:2876 +#: archaeological_operations/forms.py:674 +#: archaeological_operations/forms.py:946 +#: archaeological_operations/models.py:2012 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2647 +#: archaeological_operations/models.py:2851 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "" @@ -2376,10 +2357,10 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3615 +#: archaeological_finds/models_finds.py:3589 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2933 +#: archaeological_operations/models.py:1699 +#: archaeological_operations/models.py:2908 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2387,8 +2368,8 @@ msgstr "" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 #: archaeological_files/models.py:254 archaeological_files/models.py:349 -#: archaeological_files/models.py:369 archaeological_files/models.py:1439 -#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 +#: archaeological_files/models.py:369 archaeological_files/models.py:1440 +#: archaeological_files/models.py:1459 archaeological_files/models.py:1486 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5432 @@ -2587,7 +2568,7 @@ msgstr "" #: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 +#: archaeological_operations/models.py:991 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" @@ -2595,7 +2576,7 @@ msgstr "" #: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:991 +#: archaeological_operations/models.py:992 msgid "Extended area" msgstr "" @@ -2607,7 +2588,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/models_common.py:2024 ishtar_common/models_common.py:2040 #: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -2632,41 +2613,41 @@ msgstr "" msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1312 +#: archaeological_files/models.py:482 archaeological_finds/models_finds.py:1322 #: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1059 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1131 -#: archaeological_operations/models.py:2692 +#: archaeological_finds/models_treatments.py:1066 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:2671 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:483 -#: archaeological_finds/models_treatments.py:1056 -#: archaeological_operations/models.py:362 -#: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 +#: archaeological_files/models.py:484 +#: archaeological_finds/models_treatments.py:1063 +#: archaeological_operations/models.py:363 +#: archaeological_warehouse/models.py:959 ishtar_common/models.py:4317 msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:486 +#: archaeological_files/models.py:487 #: archaeological_finds/models_treatments.py:155 -#: archaeological_operations/models.py:368 +#: archaeological_operations/models.py:369 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:498 archaeological_operations/models.py:1155 +#: archaeological_files/models.py:499 archaeological_operations/models.py:1149 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:502 -#: archaeological_finds/models_treatments.py:1053 -#: archaeological_operations/models.py:365 -#: archaeological_operations/models.py:1159 +#: archaeological_files/models.py:503 +#: archaeological_finds/models_treatments.py:1060 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:1153 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2626 #: ishtar_common/models.py:2888 ishtar_common/models.py:3694 @@ -2674,85 +2655,85 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:505 +#: archaeological_files/models.py:506 #: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1062 -#: archaeological_operations/models.py:1165 -#: archaeological_operations/models.py:2703 +#: archaeological_finds/models_treatments.py:1069 +#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:2682 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 -#: archaeological_warehouse/models.py:954 ishtar_common/models.py:2629 +#: archaeological_warehouse/models.py:955 ishtar_common/models.py:2629 #: ishtar_common/models.py:2904 ishtar_common/models.py:3705 #: ishtar_common/models.py:4313 msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:508 +#: archaeological_files/models.py:509 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:511 +#: archaeological_files/models.py:512 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:517 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:522 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1518 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:1210 -#: archaeological_operations/models.py:2813 -#: archaeological_warehouse/models.py:971 ishtar_common/models.py:4388 +#: archaeological_files/models.py:526 archaeological_finds/models_finds.py:1520 +#: archaeological_operations/models.py:385 +#: archaeological_operations/models.py:1197 +#: archaeological_operations/models.py:2788 +#: archaeological_warehouse/models.py:972 ishtar_common/models.py:4388 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1677 -#: archaeological_finds/models_treatments.py:1065 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:1664 +#: archaeological_finds/models_treatments.py:1072 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:532 archaeological_operations/models.py:2748 +#: archaeological_files/models.py:533 archaeological_operations/models.py:2723 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2752 +#: archaeological_files/models.py:538 archaeological_operations/models.py:2727 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:559 -#: archaeological_finds/models_treatments.py:1109 +#: archaeological_files/models.py:560 +#: archaeological_finds/models_treatments.py:1105 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:567 +#: archaeological_files/models.py:568 #: archaeological_finds/forms_treatments.py:642 -#: archaeological_finds/forms_treatments.py:724 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:714 +#: archaeological_finds/models_treatments.py:1110 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1355 -#: archaeological_operations/forms.py:1824 -#: archaeological_operations/models.py:494 +#: archaeological_operations/forms.py:1133 +#: archaeological_operations/forms.py:1231 +#: archaeological_operations/forms.py:1348 +#: archaeological_operations/forms.py:1805 +#: archaeological_operations/models.py:495 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 @@ -2767,8 +2748,8 @@ msgstr "" #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 #: ishtar_common/models.py:3639 ishtar_common/models.py:5468 -#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 -#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 +#: ishtar_common/models_common.py:2247 ishtar_common/models_common.py:3371 +#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2795,8 +2776,8 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:572 -#: archaeological_finds/models_treatments.py:1123 +#: archaeological_files/models.py:573 +#: archaeological_finds/models_treatments.py:1119 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 @@ -2808,38 +2789,38 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:587 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:592 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:605 +#: archaeological_files/models.py:606 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:613 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:628 msgid "Main town" msgstr "" -#: archaeological_files/models.py:666 +#: archaeological_files/models.py:667 msgid "Main address" msgstr "" -#: archaeological_files/models.py:668 +#: archaeological_files/models.py:669 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:687 +#: archaeological_files/models.py:688 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 -#: archaeological_finds/models_treatments.py:252 +#: archaeological_finds/models_treatments.py:253 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:748 ishtar_common/forms_common.py:1022 #: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1246 @@ -2852,128 +2833,128 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:737 +#: archaeological_files/models.py:738 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:741 +#: archaeological_files/models.py:742 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:747 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:762 +#: archaeological_files/models.py:763 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:782 +#: archaeological_files/models.py:783 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:809 +#: archaeological_files/models.py:810 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1062 +#: archaeological_files/models.py:1063 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1068 +#: archaeological_files/models.py:1069 msgid "No town" msgstr "" -#: archaeological_files/models.py:1277 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1278 archaeological_operations/models.py:1959 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1279 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1280 archaeological_operations/models.py:1961 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1289 +#: archaeological_files/models.py:1290 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1291 +#: archaeological_files/models.py:1292 msgid "plan" msgstr "" -#: archaeological_files/models.py:1300 -#: archaeological_finds/models_treatments.py:409 -#: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:2013 +#: archaeological_files/models.py:1301 +#: archaeological_finds/models_treatments.py:410 +#: archaeological_finds/models_treatments.py:1226 +#: archaeological_operations/models.py:1992 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1302 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:2015 +#: archaeological_files/models.py:1303 +#: archaeological_finds/models_treatments.py:412 +#: archaeological_finds/models_treatments.py:1228 +#: archaeological_operations/models.py:1994 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1311 +#: archaeological_files/models.py:1312 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1313 +#: archaeological_files/models.py:1314 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1388 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3147 +#: archaeological_files/models.py:1389 archaeological_operations/models.py:1372 +#: archaeological_operations/models.py:3122 msgid "File" msgstr "" -#: archaeological_files/models.py:1407 +#: archaeological_files/models.py:1408 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 +#: archaeological_files/models.py:1410 archaeological_files/models.py:1476 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1411 +#: archaeological_files/models.py:1412 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 +#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1437 +#: archaeological_files/models.py:1438 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1438 +#: archaeological_files/models.py:1439 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1456 +#: archaeological_files/models.py:1457 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1457 +#: archaeological_files/models.py:1458 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1473 +#: archaeological_files/models.py:1474 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1477 +#: archaeological_files/models.py:1478 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1483 +#: archaeological_files/models.py:1484 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1484 +#: archaeological_files/models.py:1485 msgid "Equipment requirements" msgstr "" @@ -3057,7 +3038,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2934 +#: archaeological_operations/models.py:2909 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3075,8 +3056,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 -#: archaeological_operations/models.py:2666 -#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2645 +#: archaeological_operations/models.py:2944 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 @@ -3088,7 +3069,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 -#: archaeological_finds/forms_treatments.py:735 +#: archaeological_finds/forms_treatments.py:725 #: archaeological_finds/models_treatments.py:131 #: archaeological_finds/templates/ishtar/sheet_find.html:390 #: archaeological_finds/templates/ishtar/sheet_find.html:428 @@ -3102,7 +3083,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: archaeological_warehouse/models.py:336 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 #: cd17_app/templates/ishtar/sheet_find.html:392 #: cd17_app/templates/ishtar/sheet_find.html:430 #: cd17_app/templates/ishtar/sheet_find.html:468 @@ -3146,8 +3127,9 @@ msgid "Type" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_operations/forms.py:791 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/forms.py:539 +#: archaeological_operations/forms.py:784 +#: archaeological_operations/models.py:1332 msgid "Excavation end date" msgstr "" @@ -3320,71 +3302,71 @@ msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:752 #: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1357 -#: archaeological_finds/forms.py:1734 archaeological_finds/forms.py:2471 +#: archaeological_finds/forms.py:1721 archaeological_finds/forms.py:2387 #: archaeological_finds/models_finds.py:550 -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2006 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1021 -#: archaeological_finds/models_finds.py:2034 +#: archaeological_finds/models_finds.py:2009 msgid "Museum ID prefix" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1022 -#: archaeological_finds/forms.py:1736 archaeological_finds/models_finds.py:2035 +#: archaeological_finds/forms.py:1723 archaeological_finds/models_finds.py:2010 msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1023 -#: archaeological_finds/models_finds.py:2036 +#: archaeological_finds/models_finds.py:2011 msgid "Museum ID suffix" msgstr "" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2037 +#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2012 msgid "Comment on museum ID" msgstr "" #: archaeological_finds/forms.py:363 archaeological_finds/forms.py:754 #: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1359 -#: archaeological_finds/forms.py:1735 archaeological_finds/forms.py:2538 -#: archaeological_finds/models_finds.py:2032 ishtar_common/forms_common.py:1410 +#: archaeological_finds/forms.py:1722 archaeological_finds/forms.py:2454 +#: archaeological_finds/models_finds.py:2007 ishtar_common/forms_common.py:1410 #: ishtar_common/models.py:3278 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1017 -#: archaeological_finds/forms.py:1738 archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:1725 archaeological_finds/models_finds.py:2153 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1741 archaeological_finds/models_finds.py:2038 +#: archaeological_finds/forms.py:1728 archaeological_finds/models_finds.py:2013 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1025 -#: archaeological_finds/forms.py:1740 archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:1727 archaeological_finds/models_finds.py:2004 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2228 +#: archaeological_finds/models_finds.py:2203 msgid "Presence of inventory marking" msgstr "" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1075 -#: archaeological_finds/models_finds.py:2232 +#: archaeological_finds/models_finds.py:2207 msgid "Type of marking" msgstr "" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1026 -#: archaeological_finds/forms.py:2063 archaeological_finds/models_finds.py:2175 +#: archaeological_finds/forms.py:1979 archaeological_finds/models_finds.py:2150 msgid "Marking details" msgstr "" #: archaeological_finds/forms.py:380 archaeological_finds/forms.py:990 -#: archaeological_finds/forms.py:1664 archaeological_finds/models_finds.py:429 +#: archaeological_finds/forms.py:1651 archaeological_finds/models_finds.py:429 #: archaeological_finds/models_finds.py:444 #: archaeological_finds/models_finds.py:459 #: archaeological_finds/models_finds.py:474 @@ -3394,56 +3376,56 @@ msgid "Museum" msgstr "" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1036 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/models_finds.py:2174 msgid "Owner institution" msgstr "" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1042 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2179 msgid "Assigned institution" msgstr "" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2184 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2186 msgid "Depositor inventory number" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1053 -#: archaeological_finds/models_finds.py:2214 +#: archaeological_finds/models_finds.py:2189 msgid "Collections entry mode" msgstr "" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1055 -#: archaeological_finds/models_finds.py:2216 +#: archaeological_finds/models_finds.py:2191 msgid "Comment on museum entry mode" msgstr "" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1058 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2192 msgid "Museum entry date (exact or start)" msgstr "" #: archaeological_finds/forms.py:399 archaeological_finds/forms.py:1061 -#: archaeological_finds/models_finds.py:2218 +#: archaeological_finds/models_finds.py:2193 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2194 msgid "Comment on museum entry date" msgstr "" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1064 -#: archaeological_finds/models_finds.py:2223 +#: archaeological_finds/models_finds.py:2198 msgid "Donor, testator or vendor" msgstr "" #: archaeological_finds/forms.py:411 archaeological_finds/forms.py:1077 -#: archaeological_finds/models_finds.py:2192 -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2214 msgid "Collection" msgstr "" @@ -3452,41 +3434,41 @@ msgid "Former collections" msgstr "" #: archaeological_finds/forms.py:416 archaeological_finds/forms.py:1084 -#: archaeological_finds/models_finds.py:2247 +#: archaeological_finds/models_finds.py:2222 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2251 +#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2226 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2253 +#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2228 msgid "Comment on conformity" msgstr "" #: archaeological_finds/forms.py:425 archaeological_finds/forms.py:1085 -#: archaeological_finds/models_finds.py:2257 +#: archaeological_finds/models_finds.py:2232 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2259 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2234 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2260 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2235 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2254 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2229 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2273 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:442 archaeological_finds/forms.py:761 -#: archaeological_finds/forms.py:1848 archaeological_finds/models_finds.py:2115 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2090 msgid "Is complete?" msgstr "" @@ -3494,23 +3476,23 @@ msgstr "" #: archaeological_finds/forms.py:1097 archaeological_finds/models_finds.py:96 #: archaeological_finds/models_finds.py:1168 #: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:2021 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:447 archaeological_finds/forms.py:767 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2050 +#: archaeological_finds/forms.py:1838 archaeological_finds/models_finds.py:2025 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "" #: archaeological_finds/forms.py:450 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2058 +#: archaeological_finds/forms.py:1841 archaeological_finds/models_finds.py:2033 msgid "Technical processes" msgstr "" -#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1866 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1847 +#: archaeological_finds/models_finds.py:2038 msgid "Comment on the material" msgstr "" @@ -3518,85 +3500,85 @@ msgstr "" #: archaeological_finds/forms.py:1104 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2117 +#: archaeological_finds/models_finds.py:2092 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:461 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1854 archaeological_finds/models_finds.py:2096 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:464 archaeological_finds/forms.py:1108 -#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2129 +#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2104 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:468 archaeological_finds/forms.py:1112 -#: archaeological_finds/forms.py:1882 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2110 msgid "Technical areas" msgstr "" #: archaeological_finds/forms.py:471 archaeological_finds/forms.py:776 -#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1888 -#: archaeological_finds/forms.py:2477 archaeological_finds/models_finds.py:2070 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:2393 archaeological_finds/models_finds.py:2045 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:473 archaeological_finds/forms.py:778 -#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1871 +#: archaeological_finds/models_finds.py:2047 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:475 archaeological_finds/forms.py:780 -#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1892 -#: archaeological_finds/models_finds.py:2261 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1873 +#: archaeological_finds/models_finds.py:2236 msgid "Inventory quantity" msgstr "" #: archaeological_finds/forms.py:476 archaeological_finds/forms.py:781 -#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1893 -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1874 +#: archaeological_finds/models_finds.py:2237 msgid "Observed quantity" msgstr "" #: archaeological_finds/forms.py:478 archaeological_finds/forms.py:783 -#: archaeological_finds/models_finds.py:2075 +#: archaeological_finds/models_finds.py:2050 msgid "Comment on quantity" msgstr "" #: archaeological_finds/forms.py:482 archaeological_finds/forms.py:787 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:2040 +#: archaeological_finds/forms.py:1877 archaeological_finds/models_finds.py:2015 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:790 -#: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2016 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:488 archaeological_finds/forms.py:793 -#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1895 -#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1876 +#: archaeological_finds/models_finds.py:2018 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:491 archaeological_finds/forms.py:796 -#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1899 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1880 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2128 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:499 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1905 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1886 +#: archaeological_finds/models_finds.py:2152 msgid "Comment on dating" msgstr "" #: archaeological_finds/forms.py:502 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1621 #: archaeological_finds/templates/ishtar/sheet_find.html:198 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:177 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -3608,43 +3590,44 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:806 -#: archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:2132 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:807 -#: archaeological_finds/models_finds.py:2158 +#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:2133 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:808 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:2134 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:811 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2137 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:809 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:2135 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:519 archaeological_finds/forms.py:810 -#: archaeological_finds/models_finds.py:2161 +#: archaeological_finds/forms.py:1893 archaeological_finds/models_finds.py:2136 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:523 archaeological_finds/forms.py:812 -#: archaeological_finds/forms.py:2475 archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:1894 archaeological_finds/forms.py:2391 +#: archaeological_finds/models_finds.py:2040 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "" #: archaeological_finds/forms.py:525 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2392 #: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:186 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3656,31 +3639,35 @@ msgid "Weight (g)" msgstr "" #: archaeological_finds/forms.py:528 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:1897 msgid "Clutter long side (cm)" msgstr "" #: archaeological_finds/forms.py:533 archaeological_finds/forms.py:818 +#: archaeological_finds/forms.py:1901 msgid "Clutter short side (cm)" msgstr "" #: archaeological_finds/forms.py:538 archaeological_finds/forms.py:821 +#: archaeological_finds/forms.py:1905 msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:543 archaeological_finds/forms.py:824 -#: archaeological_finds/forms.py:1976 archaeological_finds/models_finds.py:2173 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:2148 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:547 archaeological_finds/forms.py:828 -#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1981 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1913 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2182 +#: archaeological_finds/models_finds.py:2157 msgid "Check" msgstr "" #: archaeological_finds/forms.py:549 archaeological_finds/forms.py:830 -#: archaeological_finds/forms.py:1141 archaeological_finds/models_finds.py:2187 +#: archaeological_finds/forms.py:1141 archaeological_finds/forms.py:1914 +#: archaeological_finds/models_finds.py:2162 msgid "Check date" msgstr "" @@ -3699,25 +3686,27 @@ msgid "Comment on the circumstances of discovery" msgstr "" #: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1019 -#: archaeological_finds/forms.py:1739 archaeological_finds/models_finds.py:555 +#: archaeological_finds/forms.py:1726 archaeological_finds/models_finds.py:555 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:709 archaeological_finds/models_finds.py:568 +#: archaeological_finds/forms.py:709 archaeological_finds/forms.py:1823 +#: archaeological_finds/models_finds.py:568 #: archaeological_finds/templates/ishtar/sheet_basefind.html:32 #: man_app/templates/ishtar/sheet_basefind.html:29 #: sra_idf_app/templates/ishtar/sheet_basefind.html:32 msgid "Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/forms.py:712 archaeological_finds/models_finds.py:571 +#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1826 +#: archaeological_finds/models_finds.py:571 #: archaeological_finds/templates/ishtar/sheet_basefind.html:34 #: man_app/templates/ishtar/sheet_basefind.html:31 #: sra_idf_app/templates/ishtar/sheet_basefind.html:34 msgid "Discovery date (end)" msgstr "" -#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1847 +#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1828 #: archaeological_finds/models_finds.py:575 msgid "Batch/object" msgstr "" @@ -3726,12 +3715,12 @@ msgstr "" msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1979 +#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1911 #: archaeological_finds/models_finds.py:583 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2468 +#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2384 msgid "Resulting find" msgstr "" @@ -3739,7 +3728,7 @@ msgstr "" msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2399 msgid "Resulting finds" msgstr "" @@ -3783,7 +3772,7 @@ msgid "Datation" msgstr "" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 -#: archaeological_finds/forms.py:1651 +#: archaeological_finds/forms.py:1638 #: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3795,22 +3784,22 @@ msgid "Preservation" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 -#: archaeological_finds/forms.py:1990 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/forms.py:1919 archaeological_finds/models_finds.py:1213 +#: archaeological_finds/models_finds.py:2255 #: archaeological_warehouse/forms.py:593 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1991 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2284 +#: archaeological_finds/forms.py:1920 archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2259 #: archaeological_warehouse/forms.py:594 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 -#: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/forms.py:1917 archaeological_finds/models_finds.py:1208 +#: archaeological_finds/models_finds.py:2242 #: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3818,34 +3807,34 @@ msgid "Conservatory states" msgstr "" #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1523 -#: archaeological_finds/forms.py:1995 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2290 +#: archaeological_finds/forms.py:1924 archaeological_finds/models_finds.py:1215 +#: archaeological_finds/models_finds.py:2265 #: archaeological_warehouse/forms.py:598 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1487 -#: archaeological_finds/forms.py:1986 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2141 +#: archaeological_finds/forms.py:1915 archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:2116 #: archaeological_warehouse/forms.py:590 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1493 -#: archaeological_finds/forms.py:1987 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:1916 archaeological_finds/models_finds.py:1210 +#: archaeological_finds/models_finds.py:2122 #: archaeological_warehouse/forms.py:591 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:1144 archaeological_finds/forms.py:1528 -#: archaeological_finds/models_finds.py:2296 +#: archaeological_finds/forms.py:1928 archaeological_finds/models_finds.py:2271 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:1146 archaeological_finds/forms.py:1526 -#: archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2295 +#: archaeological_finds/forms.py:1927 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2270 msgid "Insurance value" msgstr "" @@ -3866,12 +3855,12 @@ msgstr "" msgid "Update" msgstr "" -#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1826 -#: archaeological_finds/forms.py:2687 archaeological_finds/forms.py:2692 -#: archaeological_finds/forms.py:2709 archaeological_finds/forms.py:2714 +#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1813 +#: archaeological_finds/forms.py:2603 archaeological_finds/forms.py:2608 +#: archaeological_finds/forms.py:2625 archaeological_finds/forms.py:2630 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:930 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1892 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3889,24 +3878,24 @@ msgstr "" msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2583 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2499 #: ishtar_common/models.py:1084 ishtar_common/models.py:2079 #: ishtar_common/models.py:3838 ishtar_common/models_imports.py:158 #: ishtar_common/models_imports.py:437 ishtar_common/models_imports.py:825 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2584 +#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2500 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2589 -#: archaeological_finds/forms.py:2631 ishtar_common/models.py:3851 +#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2505 +#: archaeological_finds/forms.py:2547 ishtar_common/models.py:3851 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2596 -#: archaeological_finds/forms.py:2638 ishtar_common/models.py:3857 +#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2512 +#: archaeological_finds/forms.py:2554 ishtar_common/models.py:3857 msgid "Shared (read/edit) with" msgstr "" @@ -3914,19 +3903,20 @@ msgstr "" msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1922 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2275 +#: archaeological_finds/models_finds.py:2250 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1525 archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:1525 archaeological_finds/forms.py:1926 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2163 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1989 -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1918 +#: archaeological_finds/models_finds.py:2246 msgid "Conservatory comment" msgstr "" @@ -3946,113 +3936,97 @@ msgstr "" msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1737 archaeological_finds/models_finds.py:2337 +#: archaeological_finds/forms.py:1724 archaeological_finds/models_finds.py:2312 msgid "Complete museum ID" msgstr "" -#: archaeological_finds/forms.py:1743 archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1730 archaeological_finds/models_finds.py:1148 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1744 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1731 archaeological_finds/models_finds.py:1149 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1748 +#: archaeological_finds/forms.py:1735 #, fuzzy #| msgid "email address" msgid "Operation - number (index by year)" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1751 +#: archaeological_finds/forms.py:1738 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1754 +#: archaeological_finds/forms.py:1741 #, fuzzy #| msgid "email address" msgid "Operation - Type" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1757 +#: archaeological_finds/forms.py:1744 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1760 +#: archaeological_finds/forms.py:1747 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1758 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1774 +#: archaeological_finds/forms.py:1761 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1778 +#: archaeological_finds/forms.py:1765 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1781 +#: archaeological_finds/forms.py:1768 #, fuzzy #| msgid "email address" msgid "Operation - Remains" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 +#: archaeological_finds/forms.py:1771 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1239 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1787 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1774 archaeological_warehouse/forms.py:537 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1795 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1782 archaeological_warehouse/forms.py:545 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1798 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1785 archaeological_warehouse/forms.py:548 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1806 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1793 archaeological_warehouse/forms.py:556 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1809 +#: archaeological_finds/forms.py:1796 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1822 +#: archaeological_finds/forms.py:1809 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1834 +#: archaeological_finds/forms.py:1821 msgid "Base find - Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:1836 -msgid "Discovery date (exact or beginning) after" -msgstr "" - -#: archaeological_finds/forms.py:1839 -msgid "Discovery date (exact or beginning) before" -msgstr "" - -#: archaeological_finds/forms.py:1842 -msgid "Discovery date (end) after" -msgstr "" - -#: archaeological_finds/forms.py:1845 -msgid "Discovery date (end) before" -msgstr "" - -#: archaeological_finds/forms.py:1850 archaeological_finds/forms.py:2474 +#: archaeological_finds/forms.py:1831 archaeological_finds/forms.py:2390 #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -4062,7 +4036,7 @@ msgstr "" msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1868 archaeological_finds/models_finds.py:275 +#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 @@ -4071,244 +4045,120 @@ msgstr "" msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1908 -msgid "Length - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1911 -msgid "Length - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1914 -msgid "Width - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1917 -msgid "Width - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1920 -msgid "Height - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1923 -msgid "Height - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1926 -msgid "Thickness - lower than (cm)" +#: archaeological_finds/forms.py:1895 +msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1929 -msgid "Thickness - higher than (cm)" +#: archaeological_finds/forms.py:1930 +msgid "Loan?" msgstr "" #: archaeological_finds/forms.py:1932 -msgid "Diameter - lower than (cm)" +msgid "Treatment file end date" msgstr "" #: archaeological_finds/forms.py:1935 -msgid "Diameter - higher than (cm)" +msgid "Treatment end date" msgstr "" #: archaeological_finds/forms.py:1938 -msgid "Circumference - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1941 -msgid "Circumference - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1944 -msgid "Volume - lower than (l)" -msgstr "" - -#: archaeological_finds/forms.py:1945 -msgid "Volume - higher than (l)" -msgstr "" - -#: archaeological_finds/forms.py:1947 -msgid "Weight - lower than (g)" -msgstr "" - -#: archaeological_finds/forms.py:1950 -msgid "Weight - higher than (g)" -msgstr "" - -#: archaeological_finds/forms.py:1953 -msgid "Clutter long side - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1957 -msgid "Clutter long side - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1961 -msgid "Clutter short side - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1965 -msgid "Clutter short side - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1969 -msgid "Clutter height - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1973 -msgid "Clutter height - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1982 -msgid "Check date after" -msgstr "" - -#: archaeological_finds/forms.py:1984 -msgid "Check date before" -msgstr "" - -#: archaeological_finds/forms.py:1997 -msgid "Estimated value - higher than" -msgstr "" - -#: archaeological_finds/forms.py:1998 -msgid "Estimated value - lower than" -msgstr "" - -#: archaeological_finds/forms.py:1999 -msgid "Insurance value - higher than" -msgstr "" - -#: archaeological_finds/forms.py:2000 -msgid "Insurance value - lower than" -msgstr "" - -#: archaeological_finds/forms.py:2002 -msgid "Appraisal date after" -msgstr "" - -#: archaeological_finds/forms.py:2005 -msgid "Appraisal date before" -msgstr "" - -#: archaeological_finds/forms.py:2008 -msgid "Loan?" -msgstr "" - -#: archaeological_finds/forms.py:2010 -msgid "Treatment file end date before" -msgstr "" - -#: archaeological_finds/forms.py:2013 -msgid "Treatment end date before" -msgstr "" - -#: archaeological_finds/forms.py:2016 msgid "Museum - Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1940 msgid "Museum - Owner institution" msgstr "" -#: archaeological_finds/forms.py:2024 +#: archaeological_finds/forms.py:1946 msgid "Museum - Assigned institution" msgstr "" -#: archaeological_finds/forms.py:2030 +#: archaeological_finds/forms.py:1952 msgid "Museum - Custodian institution" msgstr "" -#: archaeological_finds/forms.py:2035 +#: archaeological_finds/forms.py:1957 msgid "Museum - Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:2036 +#: archaeological_finds/forms.py:1958 msgid "Museum - Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:2037 +#: archaeological_finds/forms.py:1959 msgid "Museum - Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:2039 -msgid "Museum - Entry date (exact or start) - before" -msgstr "" - -#: archaeological_finds/forms.py:2042 -msgid "Museum - Entry date (exact or start) - after" -msgstr "" - -#: archaeological_finds/forms.py:2045 -msgid "Museum - Entry date end - before" +#: archaeological_finds/forms.py:1961 +msgid "Museum - Entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:2048 -msgid "Museum - Entry date end - after" +#: archaeological_finds/forms.py:1964 +msgid "Museum - Entry date end" msgstr "" -#: archaeological_finds/forms.py:2050 +#: archaeological_finds/forms.py:1966 msgid "Museum - Comment on entry date" msgstr "" -#: archaeological_finds/forms.py:2052 +#: archaeological_finds/forms.py:1968 msgid "Museum - Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:2058 +#: archaeological_finds/forms.py:1974 msgid "Museum - Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:2061 +#: archaeological_finds/forms.py:1977 msgid "Museum - Type of marking" msgstr "" -#: archaeological_finds/forms.py:2065 +#: archaeological_finds/forms.py:1981 msgid "Museum - Collection" msgstr "" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:1984 msgid "Museum - Former collection" msgstr "" -#: archaeological_finds/forms.py:2073 +#: archaeological_finds/forms.py:1989 msgid "Museum - Inventory entry year - before" msgstr "" -#: archaeological_finds/forms.py:2074 +#: archaeological_finds/forms.py:1990 msgid "Museum - Inventory entry year - after" msgstr "" -#: archaeological_finds/forms.py:2076 +#: archaeological_finds/forms.py:1992 msgid "Museum - Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:2078 +#: archaeological_finds/forms.py:1994 msgid "Museum - Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:2079 +#: archaeological_finds/forms.py:1995 msgid "Museum - Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:2081 +#: archaeological_finds/forms.py:1997 msgid "Museum - Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:2084 +#: archaeological_finds/forms.py:2000 msgid "Museum - Date of allocation - before" msgstr "" -#: archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2003 msgid "Museum - Date of allocation - after" msgstr "" -#: archaeological_finds/forms.py:2089 +#: archaeological_finds/forms.py:2005 msgid "Museum - Purchase price" msgstr "" -#: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2109 +#: archaeological_finds/forms.py:2076 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2084 #: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4320,11 +4170,11 @@ msgstr "" msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:2167 +#: archaeological_finds/forms.py:2083 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 +#: archaeological_finds/forms.py:2102 archaeological_finds/models_finds.py:1164 #: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4336,50 +4186,50 @@ msgstr "" msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:2193 +#: archaeological_finds/forms.py:2109 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2234 -#: archaeological_finds/forms.py:2290 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2129 archaeological_finds/forms.py:2150 +#: archaeological_finds/forms.py:2206 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 -#: archaeological_finds/models_treatments.py:399 +#: archaeological_finds/forms.py:2245 archaeological_finds/forms.py:2408 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:2352 +#: archaeological_finds/forms.py:2268 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:2473 +#: archaeological_finds/forms.py:2389 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2488 +#: archaeological_finds/forms.py:2404 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2531 +#: archaeological_finds/forms.py:2447 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2543 archaeological_finds/forms.py:2561 +#: archaeological_finds/forms.py:2459 archaeological_finds/forms.py:2477 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2578 +#: archaeological_finds/forms.py:2494 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2581 +#: archaeological_finds/forms.py:2497 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:200 +#: archaeological_finds/models_treatments.py:201 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 #: archaeological_finds/templates/ishtar/sheet_find.html:389 #: archaeological_finds/templates/ishtar/sheet_find.html:427 @@ -4393,7 +4243,7 @@ msgstr "" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 +#: ishtar_common/models_common.py:2023 ishtar_common/models_common.py:2039 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4410,11 +4260,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2623 archaeological_finds/forms.py:2678 +#: archaeological_finds/forms.py:2539 archaeological_finds/forms.py:2594 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2670 +#: archaeological_finds/forms.py:2586 msgid "Another basket already exists with this name." msgstr "" @@ -4424,14 +4274,14 @@ msgstr "" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:203 msgid "Other ref." msgstr "" #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 #: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:244 +#: archaeological_finds/models_treatments.py:245 msgid "Scientific monitoring manager" msgstr "" @@ -4440,8 +4290,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:582 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:215 -#: archaeological_finds/models_treatments.py:757 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:758 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "" @@ -4457,12 +4307,12 @@ msgstr "" #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:292 -#: archaeological_finds/models_treatments.py:746 +#: archaeological_finds/models_treatments.py:293 +#: archaeological_finds/models_treatments.py:747 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2555 -#: archaeological_operations/models.py:2892 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2867 ishtar_common/views.py:511 msgid "Treatment" msgstr "" @@ -4472,9 +4322,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:163 #: archaeological_finds/forms_treatments.py:433 -#: archaeological_finds/forms_treatments.py:737 +#: archaeological_finds/forms_treatments.py:727 #: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:236 +#: archaeological_finds/models_treatments.py:237 msgid "Responsible" msgstr "" @@ -4483,7 +4333,7 @@ msgid "Destination container (relevant for treatment that change location)" msgstr "" #: archaeological_finds/forms_treatments.py:191 -#: archaeological_finds/models_treatments.py:263 +#: archaeological_finds/models_treatments.py:264 msgid "Goal" msgstr "" @@ -4545,7 +4395,7 @@ msgid "Another treatment with this index exists for {}." msgstr "" #: archaeological_finds/forms_treatments.py:378 -#: archaeological_finds/models_treatments.py:212 +#: archaeological_finds/models_treatments.py:213 msgid "Associated request" msgstr "" @@ -4554,13 +4404,13 @@ msgid "Treatment - 010 - Request choice" msgstr "" #: archaeological_finds/forms_treatments.py:384 -#: archaeological_finds/forms_treatments.py:715 +#: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1183 -#: archaeological_finds/models_treatments.py:1203 +#: archaeological_finds/models_treatments.py:1179 +#: archaeological_finds/models_treatments.py:1199 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2884 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2533 +#: archaeological_operations/models.py:2859 ishtar_common/views.py:510 msgid "Treatment request" msgstr "" @@ -4575,10 +4425,10 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:2101 -#: archaeological_finds/models_finds.py:3593 -#: archaeological_finds/models_treatments.py:269 -#: archaeological_finds/models_treatments.py:761 +#: archaeological_finds/models_finds.py:2076 +#: archaeological_finds/models_finds.py:3567 +#: archaeological_finds/models_treatments.py:270 +#: archaeological_finds/models_treatments.py:762 #: archaeological_finds/templates/ishtar/sheet_find.html:394 #: archaeological_finds/templates/ishtar/sheet_find.html:432 #: archaeological_finds/templates/ishtar/sheet_find.html:470 @@ -4586,8 +4436,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 #: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1212 -#: archaeological_warehouse/models.py:2061 +#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:2062 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4674,14 +4524,14 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 +#: archaeological_finds/forms_treatments.py:721 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" #: archaeological_finds/forms_treatments.py:655 -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1131 +#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/models_treatments.py:1127 #: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 @@ -4694,8 +4544,8 @@ msgid "Applicant" msgstr "" #: archaeological_finds/forms_treatments.py:661 -#: archaeological_finds/forms_treatments.py:749 -#: archaeological_finds/models_treatments.py:1139 +#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/models_treatments.py:1135 #: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 @@ -4707,86 +4557,72 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:670 -msgid "Exhibition started before" -msgstr "" - -#: archaeological_finds/forms_treatments.py:673 -msgid "Exhibition started after" -msgstr "" - -#: archaeological_finds/forms_treatments.py:676 -msgid "Exhibition ended before" +#: archaeological_finds/forms_treatments.py:669 +#: archaeological_finds/forms_treatments.py:752 +#: archaeological_finds/models_treatments.py:1148 +msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:679 -msgid "Exhibition ended after" +#: archaeological_finds/forms_treatments.py:670 +#: archaeological_finds/forms_treatments.py:754 +#: archaeological_finds/models_treatments.py:1151 +msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:690 -#: archaeological_finds/forms_treatments.py:702 +#: archaeological_finds/forms_treatments.py:680 +#: archaeological_finds/forms_treatments.py:692 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/forms_treatments.py:723 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/forms_treatments.py:745 msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:759 -#: archaeological_finds/models_treatments.py:1150 +#: archaeological_finds/forms_treatments.py:749 +#: archaeological_finds/models_treatments.py:1146 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:762 -#: archaeological_finds/models_treatments.py:1152 -msgid "Exhibition start date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:764 -#: archaeological_finds/models_treatments.py:1155 -msgid "Exhibition end date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:822 +#: archaeological_finds/forms_treatments.py:812 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:818 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:829 +#: archaeological_finds/forms_treatments.py:819 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:853 +#: archaeological_finds/forms_treatments.py:843 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:855 +#: archaeological_finds/forms_treatments.py:845 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:857 +#: archaeological_finds/forms_treatments.py:847 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:859 +#: archaeological_finds/forms_treatments.py:849 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:861 -#: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/models_treatments.py:1117 +#: archaeological_finds/forms_treatments.py:851 +#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1113 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:895 +#: archaeological_finds/forms_treatments.py:885 msgid "Treatment request - Administrative act - General" msgstr "" @@ -4807,9 +4643,9 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:91 -#: archaeological_operations/models.py:2559 +#: archaeological_operations/models.py:2538 #: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1158 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4052 msgid "Code" msgstr "" @@ -4893,17 +4729,17 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:379 +#: archaeological_finds/models_treatments.py:380 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2313 +#: archaeological_finds/models_finds.py:2288 #: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:293 -#: archaeological_finds/models_treatments.py:305 -#: archaeological_finds/models_treatments.py:1006 -#: archaeological_finds/models_treatments.py:1196 +#: archaeological_finds/models_treatments.py:294 +#: archaeological_finds/models_treatments.py:306 +#: archaeological_finds/models_treatments.py:1007 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -5081,7 +4917,7 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2341 ishtar_common/models.py:4709 +#: archaeological_finds/models_finds.py:2316 ishtar_common/models.py:4709 #: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "" @@ -5095,7 +4931,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:622 -#: archaeological_finds/models_finds.py:2022 +#: archaeological_finds/models_finds.py:1997 msgid "Base find" msgstr "" @@ -5133,7 +4969,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1927 +#: archaeological_warehouse/models.py:1928 msgid "Add treatment" msgstr "" @@ -5175,12 +5011,12 @@ msgstr "" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1705 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:988 -#: archaeological_operations/models.py:1078 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5379 +#: archaeological_operations/forms.py:715 +#: archaeological_operations/forms.py:1686 +#: archaeological_operations/forms.py:1754 +#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1380 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" @@ -5189,669 +5025,624 @@ msgstr "" msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1294 +#: archaeological_finds/models_finds.py:1304 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1298 +#: archaeological_finds/models_finds.py:1308 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1302 +#: archaeological_finds/models_finds.py:1312 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1315 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1320 archaeological_finds/tests.py:1537 -#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:984 +#: archaeological_finds/models_finds.py:1330 archaeological_finds/tests.py:1537 +#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:4403 +#: archaeological_finds/models_finds.py:1334 ishtar_common/models.py:4403 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_operations/models.py:381 -#: archaeological_operations/models.py:1147 ishtar_common/models.py:4452 +#: archaeological_finds/models_finds.py:1338 +#: archaeological_operations/models.py:382 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4452 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1337 -#: archaeological_warehouse/models.py:993 +#: archaeological_finds/models_finds.py:1347 +#: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1950 -#: archaeological_warehouse/models.py:998 +#: archaeological_finds/models_finds.py:1352 +#: archaeological_finds/models_finds.py:1925 +#: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1347 -#: archaeological_warehouse/models.py:1003 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1351 -#: archaeological_finds/models_finds.py:1945 -#: archaeological_warehouse/models.py:1007 ishtar_common/models.py:4411 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_finds/models_finds.py:1920 +#: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4411 #: ishtar_common/models.py:4525 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1355 +#: archaeological_finds/models_finds.py:1365 msgctxt "key for text search" msgid "discovery-comment" msgstr "" -#: archaeological_finds/models_finds.py:1363 +#: archaeological_finds/models_finds.py:1373 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1367 archaeological_finds/tests.py:1444 -#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1019 +#: archaeological_finds/models_finds.py:1377 archaeological_finds/tests.py:1444 +#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1372 -#: archaeological_warehouse/models.py:1023 +#: archaeological_finds/models_finds.py:1382 +#: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1380 archaeological_finds/tests.py:1691 -#: archaeological_warehouse/models.py:1031 +#: archaeological_finds/models_finds.py:1390 archaeological_finds/tests.py:1691 +#: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1384 -#: archaeological_warehouse/models.py:1035 +#: archaeological_finds/models_finds.py:1394 +#: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1388 -#: archaeological_warehouse/models.py:1039 +#: archaeological_finds/models_finds.py:1398 +#: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1392 archaeological_finds/tests.py:1586 +#: archaeological_finds/models_finds.py:1402 archaeological_finds/tests.py:1586 #: ishtar_common/models.py:4325 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1395 +#: archaeological_finds/models_finds.py:1405 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1403 ishtar_common/models.py:4434 +#: archaeological_finds/models_finds.py:1413 ishtar_common/models.py:4434 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1407 -#: archaeological_finds/models_finds.py:1948 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1417 +#: archaeological_finds/models_finds.py:1923 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1421 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1425 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1429 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1430 -#: ishtar_common/models_common.py:1578 +#: archaeological_finds/models_finds.py:1440 +#: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1433 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1443 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1435 +#: archaeological_finds/models_finds.py:1445 msgctxt "key for text search" -msgid "treatment-file-end-date-before" +msgid "treatment-file-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1449 msgctxt "key for text search" -msgid "treatment-end-date-before" +msgid "treatment-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1453 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1450 +#: archaeological_finds/models_finds.py:1460 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1453 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1457 +#: archaeological_finds/models_finds.py:1467 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1470 msgctxt "key for text search" msgid "complete-museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1463 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1467 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1470 -msgctxt "key for text search" -msgid "discovery-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1474 -msgctxt "key for text search" -msgid "discovery-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" -msgid "discovery-date-taq-before" +msgid "discovery-date" msgstr "" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1484 msgctxt "key for text search" -msgid "discovery-date-taq-after" +msgid "discovery-date-taq" msgstr "" -#: archaeological_finds/models_finds.py:1486 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1491 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1493 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1497 +#: archaeological_finds/models_finds.py:1499 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1500 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1504 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1512 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1523 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1525 +#: archaeological_finds/models_finds.py:1527 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1531 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1533 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1538 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1541 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1544 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1557 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1560 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1564 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1572 msgctxt "key for text search" -msgid "length-higher" +msgid "length" msgstr "" -#: archaeological_finds/models_finds.py:1573 +#: archaeological_finds/models_finds.py:1575 msgctxt "key for text search" -msgid "width-higher" +msgid "width" msgstr "" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1578 msgctxt "key for text search" -msgid "height-higher" +msgid "height" msgstr "" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" -msgid "thickness-higher" +msgid "thickness" msgstr "" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" -msgid "diameter-higher" +msgid "diameter" msgstr "" -#: archaeological_finds/models_finds.py:1585 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" -msgid "circumference-higher" +msgid "circumference" msgstr "" -#: archaeological_finds/models_finds.py:1589 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" -msgid "volume-higher" +msgid "volume" msgstr "" -#: archaeological_finds/models_finds.py:1592 +#: archaeological_finds/models_finds.py:1594 msgctxt "key for text search" -msgid "weight-higher" +msgid "weight" msgstr "" -#: archaeological_finds/models_finds.py:1595 +#: archaeological_finds/models_finds.py:1597 msgctxt "key for text search" -msgid "clutter-long-side-higher" +msgid "clutter-long-side" msgstr "" -#: archaeological_finds/models_finds.py:1599 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" -msgid "clutter-short-side-higher" +msgid "clutter-short-side" msgstr "" -#: archaeological_finds/models_finds.py:1603 +#: archaeological_finds/models_finds.py:1605 msgctxt "key for text search" -msgid "clutter-height-higher" +msgid "clutter-height" msgstr "" -#: archaeological_finds/models_finds.py:1607 +#: archaeological_finds/models_finds.py:1609 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1611 +#: archaeological_finds/models_finds.py:1613 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1615 -msgctxt "key for text search" -msgid "check-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1618 +#: archaeological_finds/models_finds.py:1617 msgctxt "key for text search" -msgid "check-date-after" +msgid "check-date" msgstr "" -#: archaeological_finds/models_finds.py:1621 -#: archaeological_warehouse/models.py:1043 +#: archaeological_finds/models_finds.py:1620 +#: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1625 -#: archaeological_warehouse/models.py:1047 +#: archaeological_finds/models_finds.py:1624 +#: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1629 -#: archaeological_warehouse/models.py:1051 +#: archaeological_finds/models_finds.py:1628 +#: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1633 +#: archaeological_finds/models_finds.py:1632 msgctxt "key for text search" -msgid "estimated-value-higher" +msgid "estimated-value" msgstr "" -#: archaeological_finds/models_finds.py:1637 +#: archaeological_finds/models_finds.py:1636 msgctxt "key for text search" -msgid "estimated-value-lower" +msgid "insurance-value" msgstr "" -#: archaeological_finds/models_finds.py:1641 +#: archaeological_finds/models_finds.py:1640 msgctxt "key for text search" -msgid "insurance-value-higher" +msgid "appraisal-date" msgstr "" -#: archaeological_finds/models_finds.py:1645 -msgctxt "key for text search" -msgid "insurance-value-lower" -msgstr "" - -#: archaeological_finds/models_finds.py:1649 -msgctxt "key for text search" -msgid "appraisal-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1653 -msgctxt "key for text search" -msgid "appraisal-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1661 +#: archaeological_finds/models_finds.py:1648 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1665 +#: archaeological_finds/models_finds.py:1652 msgctxt "key for text search" msgid "technical-area" msgstr "" -#: archaeological_finds/models_finds.py:1669 +#: archaeological_finds/models_finds.py:1656 msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1673 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1660 archaeological_finds/tests.py:1631 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-address" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:1681 -#: archaeological_operations/models.py:1177 +#: archaeological_finds/models_finds.py:1668 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1685 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1182 +#: archaeological_finds/models_finds.py:1672 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1176 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1680 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-remain" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1684 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1688 msgctxt "key for text search" msgid "museum-id-comment" msgstr "" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1692 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1697 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "" -#: archaeological_finds/models_finds.py:1715 +#: archaeological_finds/models_finds.py:1702 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "" -#: archaeological_finds/models_finds.py:1720 +#: archaeological_finds/models_finds.py:1707 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "" -#: archaeological_finds/models_finds.py:1724 +#: archaeological_finds/models_finds.py:1711 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1715 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "" -#: archaeological_finds/models_finds.py:1732 -msgctxt "key for text search" -msgid "museum-entry-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1736 -msgctxt "key for text search" -msgid "museum-entry-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1740 +#: archaeological_finds/models_finds.py:1719 msgctxt "key for text search" -msgid "museum-entry-date-end-before" +msgid "museum-entry-date" msgstr "" -#: archaeological_finds/models_finds.py:1744 +#: archaeological_finds/models_finds.py:1723 msgctxt "key for text search" -msgid "museum-entry-date-end-after" +msgid "museum-entry-date-end" msgstr "" -#: archaeological_finds/models_finds.py:1748 +#: archaeological_finds/models_finds.py:1727 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "" -#: archaeological_finds/models_finds.py:1752 +#: archaeological_finds/models_finds.py:1731 msgctxt "key for text search" msgid "museum-donor" msgstr "" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1736 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "" -#: archaeological_finds/models_finds.py:1761 +#: archaeological_finds/models_finds.py:1740 msgctxt "key for text search" msgid "museum-marking-type" msgstr "" -#: archaeological_finds/models_finds.py:1765 +#: archaeological_finds/models_finds.py:1744 msgctxt "key for text search" msgid "museum-collection" msgstr "" -#: archaeological_finds/models_finds.py:1770 +#: archaeological_finds/models_finds.py:1749 msgctxt "key for text search" msgid "museum-former-collection" msgstr "" -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1754 msgctxt "key for text search" msgid "museum-inventory-entry-year-before" msgstr "" -#: archaeological_finds/models_finds.py:1779 +#: archaeological_finds/models_finds.py:1758 msgctxt "key for text search" msgid "museum-inventory-entry-year-after" msgstr "" -#: archaeological_finds/models_finds.py:1783 +#: archaeological_finds/models_finds.py:1762 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "" -#: archaeological_finds/models_finds.py:1788 +#: archaeological_finds/models_finds.py:1767 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "" -#: archaeological_finds/models_finds.py:1792 +#: archaeological_finds/models_finds.py:1771 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "" -#: archaeological_finds/models_finds.py:1796 +#: archaeological_finds/models_finds.py:1775 msgctxt "key for text search" msgid "museum-original-repro" msgstr "" -#: archaeological_finds/models_finds.py:1801 +#: archaeological_finds/models_finds.py:1780 msgctxt "key for text search" -msgid "museum-allocation-date-before" +msgid "museum-allocation-date" msgstr "" -#: archaeological_finds/models_finds.py:1805 -msgctxt "key for text search" -msgid "museum-allocation-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1784 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "" -#: archaeological_finds/models_finds.py:1813 +#: archaeological_finds/models_finds.py:1788 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/models_finds.py:1792 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1924 -#: archaeological_finds/models_finds.py:2699 +#: archaeological_finds/models_finds.py:1899 +#: archaeological_finds/models_finds.py:2674 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 @@ -5861,19 +5652,19 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:1907 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:2066 +#: archaeological_finds/models_finds.py:2041 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:2068 +#: archaeological_finds/models_finds.py:2043 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:2083 +#: archaeological_finds/models_finds.py:2058 #: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5884,7 +5675,7 @@ msgstr "" msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2090 +#: archaeological_finds/models_finds.py:2065 #: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5895,87 +5686,87 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2139 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2142 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2170 +#: archaeological_finds/models_finds.py:2145 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2168 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/models_finds.py:2219 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2316 +#: archaeological_finds/models_finds.py:2291 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2325 +#: archaeological_finds/models_finds.py:2300 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2331 +#: archaeological_finds/models_finds.py:2306 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2371 +#: archaeological_finds/models_finds.py:2346 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2537 +#: archaeological_finds/models_finds.py:2512 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2538 +#: archaeological_finds/models_finds.py:2513 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2539 +#: archaeological_finds/models_finds.py:2514 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2540 +#: archaeological_finds/models_finds.py:2515 #, fuzzy #| msgid "email address" msgid "Complete ID of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2541 +#: archaeological_finds/models_finds.py:2516 #, fuzzy #| msgid "email address" msgid "Label of associated context records" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2672 +#: archaeological_finds/models_finds.py:2647 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2680 +#: archaeological_finds/models_finds.py:2655 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2688 +#: archaeological_finds/models_finds.py:2663 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3167 +#: archaeological_finds/models_finds.py:3141 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3173 +#: archaeological_finds/models_finds.py:3147 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3620 ishtar_common/forms_common.py:128 +#: archaeological_finds/models_finds.py:3594 ishtar_common/forms_common.py:128 #: ishtar_common/forms_common.py:1425 ishtar_common/forms_common.py:2860 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2979 #: ishtar_common/models.py:3298 ishtar_common/models.py:3396 @@ -5985,11 +5776,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3628 +#: archaeological_finds/models_finds.py:3602 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3629 +#: archaeological_finds/models_finds.py:3603 msgid "Properties" msgstr "" @@ -6019,9 +5810,9 @@ msgid "label" msgstr "" #: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2694 -#: archaeological_warehouse/models.py:968 +#: archaeological_finds/models_treatments.py:1067 +#: archaeological_operations/models.py:2673 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "" @@ -6031,40 +5822,40 @@ msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:223 +#: archaeological_finds/models_treatments.py:224 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:231 +#: archaeological_finds/models_treatments.py:232 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:274 +#: archaeological_finds/models_treatments.py:275 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:276 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:277 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:278 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:312 +#: archaeological_finds/models_treatments.py:313 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:389 +#: archaeological_finds/models_treatments.py:390 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:762 +#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/templates/ishtar/sheet_find.html:393 #: archaeological_finds/templates/ishtar/sheet_find.html:431 #: archaeological_finds/templates/ishtar/sheet_find.html:469 @@ -6089,65 +5880,60 @@ msgstr "" msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 +#: archaeological_finds/models_treatments.py:765 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:988 +#: archaeological_finds/models_treatments.py:989 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1005 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1069 +#: archaeological_finds/models_treatments.py:1076 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1074 +#: archaeological_finds/models_treatments.py:1081 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1079 -msgctxt "key for text search" -msgid "exhibition-start-before" -msgstr "" - -#: archaeological_finds/models_treatments.py:1083 +#: archaeological_finds/models_treatments.py:1086 msgctxt "key for text search" -msgid "exhibition-start-after" +msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1090 msgctxt "key for text search" -msgid "exhibition-end-before" +msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1094 msgctxt "key for text search" -msgid "exhibition-end-after" +msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1112 -#: archaeological_operations/forms.py:1139 -#: archaeological_operations/forms.py:1236 -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/models.py:492 +#: archaeological_finds/models_treatments.py:1108 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1804 +#: archaeological_operations/models.py:493 #: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2151 #: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 #: ishtar_common/models.py:2410 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "" -#: archaeological_finds/models_treatments.py:1184 +#: archaeological_finds/models_treatments.py:1180 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 @@ -6158,7 +5944,7 @@ msgstr "" msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1252 +#: archaeological_finds/models_treatments.py:1248 msgid "Add associated treatment" msgstr "" @@ -6520,13 +6306,13 @@ msgstr "" msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1665 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 msgid "The division {} {} do not exist for the location {}." msgstr "" #: archaeological_finds/tests.py:1773 archaeological_finds/tests.py:1799 #: archaeological_finds/tests.py:1809 archaeological_operations/tests.py:3170 -#: ishtar_common/forms.py:1223 ishtar_common/forms.py:1302 +#: ishtar_common/forms.py:1215 ishtar_common/forms.py:1294 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:660 ishtar_common/views_item.py:932 @@ -6535,8 +6321,8 @@ msgid "Yes" msgstr "" #: archaeological_finds/tests.py:1774 archaeological_finds/tests.py:1800 -#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1224 -#: ishtar_common/forms.py:1304 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1296 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:504 msgid "No" msgstr "" @@ -6633,10 +6419,10 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1081 -#: archaeological_operations/forms.py:1097 -#: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/forms.py:1074 +#: archaeological_operations/forms.py:1090 +#: archaeological_operations/forms.py:1096 +#: archaeological_operations/models.py:3157 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 #: sra_idf_app/templates/ishtar/sheet_operation.html:523 @@ -6644,20 +6430,20 @@ msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3164 +#: archaeological_operations/models.py:3139 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3166 +#: archaeological_operations/models.py:3141 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3168 -#: archaeological_operations/models.py:3196 -#: archaeological_operations/models.py:3264 +#: archaeological_operations/models.py:3143 +#: archaeological_operations/models.py:3171 +#: archaeological_operations/models.py:3239 msgid "Public domain" msgstr "" @@ -6714,27 +6500,27 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:949 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2049 +#: archaeological_operations/forms.py:942 +#: archaeological_operations/models.py:1368 +#: archaeological_operations/models.py:2028 msgid "Yearly index" msgstr "" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:740 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/forms.py:733 +#: archaeological_operations/models.py:1411 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/forms.py:714 +#: archaeological_operations/models.py:1510 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:726 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/forms.py:719 +#: archaeological_operations/models.py:1451 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "" @@ -6744,490 +6530,467 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2835 +#: archaeological_operations/forms.py:770 +#: archaeological_operations/models.py:1357 +#: archaeological_operations/models.py:2810 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1709 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:759 +#: archaeological_operations/forms.py:1690 +#: archaeological_operations/models.py:1350 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:534 -#: archaeological_operations/forms.py:774 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/forms.py:767 +#: archaeological_operations/models.py:1448 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1147 -#: archaeological_operations/forms.py:1242 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1856 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:497 -#: archaeological_operations/models.py:992 -#: archaeological_operations/models.py:1081 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/models.py:498 +#: archaeological_operations/models.py:993 +#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1385 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" -#: archaeological_operations/forms.py:538 -msgid "Started before" -msgstr "" - -#: archaeological_operations/forms.py:539 -msgid "Started after" -msgstr "" - -#: archaeological_operations/forms.py:540 -msgid "Ended before" -msgstr "" - -#: archaeological_operations/forms.py:541 -msgid "Ended after" -msgstr "" - -#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:543 msgid "Abstract (full text search)" msgstr "" -#: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:833 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:1454 msgid "Comment about scientific documentation" msgstr "" -#: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:835 -#: archaeological_operations/models.py:994 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/forms.py:546 +#: archaeological_operations/forms.py:828 +#: archaeological_operations/models.py:995 +#: archaeological_operations/models.py:1489 msgid "Record quality" msgstr "" -#: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/forms.py:547 +#: archaeological_operations/forms.py:788 +#: archaeological_operations/models.py:1406 msgid "Report processing" msgstr "" -#: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:748 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/forms.py:549 +#: archaeological_operations/forms.py:741 +#: archaeological_operations/models.py:1480 msgid "Virtual operation" msgstr "" -#: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:570 +#: archaeological_operations/forms.py:811 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:996 +#: archaeological_operations/models.py:1500 msgid "Documentation provided" msgstr "" -#: archaeological_operations/forms.py:574 -#: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:572 +#: archaeological_operations/forms.py:813 +#: archaeological_operations/forms.py:1702 +#: archaeological_operations/models.py:1495 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "" -#: archaeological_operations/forms.py:576 -msgid "Documentation deadline before" -msgstr "" - -#: archaeological_operations/forms.py:578 -msgid "Documentation deadline after" +#: archaeological_operations/forms.py:574 +msgid "Documentation deadline" msgstr "" -#: archaeological_operations/forms.py:581 -#: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1724 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:577 +#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:1506 msgid "Finds provided" msgstr "" -#: archaeological_operations/forms.py:583 -#: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1728 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:579 +#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:1709 +#: archaeological_operations/models.py:1502 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "" -#: archaeological_operations/forms.py:585 -msgid "Finds deadline before" +#: archaeological_operations/forms.py:580 +msgid "Finds deadline" msgstr "" -#: archaeological_operations/forms.py:587 -msgid "Finds deadline after" -msgstr "" - -#: archaeological_operations/forms.py:677 +#: archaeological_operations/forms.py:670 msgid "Associated file" msgstr "" -#: archaeological_operations/forms.py:690 +#: archaeological_operations/forms.py:683 msgid "Operation - 010 - General" msgstr "" -#: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1771 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:717 +#: archaeological_operations/forms.py:1752 +#: archaeological_operations/models.py:1450 msgid "Generic name" msgstr "" -#: archaeological_operations/forms.py:751 +#: archaeological_operations/forms.py:744 msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:746 +#: archaeological_operations/models.py:1341 +#: archaeological_operations/models.py:2828 msgid "Head scientist" msgstr "" -#: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1369 -#: archaeological_operations/forms.py:1731 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:515 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1712 +#: archaeological_operations/forms.py:1845 +#: archaeological_operations/models.py:516 +#: archaeological_operations/models.py:1364 msgid "Collaborators" msgstr "" -#: archaeological_operations/forms.py:789 +#: archaeological_operations/forms.py:782 msgid "Dates / Administrative" msgstr "" -#: archaeological_operations/forms.py:793 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/forms.py:786 +#: archaeological_operations/models.py:1335 msgid "Report delivery date" msgstr "" -#: archaeological_operations/forms.py:815 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/forms.py:808 +#: archaeological_operations/models.py:1497 msgid "Deadline for submission of the documentation" msgstr "" -#: archaeological_operations/forms.py:823 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/forms.py:816 +#: archaeological_operations/models.py:1504 msgid "Deadline for submission of the finds" msgstr "" -#: archaeological_operations/forms.py:831 +#: archaeological_operations/forms.py:824 msgid "Scientific" msgstr "" -#: archaeological_operations/forms.py:838 +#: archaeological_operations/forms.py:831 #: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "" -#: archaeological_operations/forms.py:844 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/forms.py:837 +#: archaeological_operations/models.py:1494 msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:904 +#: archaeological_operations/forms.py:897 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:909 +#: archaeological_operations/forms.py:902 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:932 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d or empty the yearly index field." msgstr "" -#: archaeological_operations/forms.py:943 +#: archaeological_operations/forms.py:936 #, fuzzy #| msgid "email address" msgid "Bad operation index" msgstr "E-Mail-Adresse" -#: archaeological_operations/forms.py:984 +#: archaeological_operations/forms.py:977 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:985 +#: archaeological_operations/forms.py:978 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:994 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/forms.py:987 +#: archaeological_operations/models.py:1513 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:997 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/forms.py:990 +#: archaeological_operations/models.py:1515 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:1003 +#: archaeological_operations/forms.py:996 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/forms.py:1002 +#: archaeological_operations/models.py:1527 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:1015 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/forms.py:1008 +#: archaeological_operations/models.py:1535 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1013 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1014 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1024 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/forms.py:1017 +#: archaeological_operations/models.py:1390 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/forms.py:1018 +#: archaeological_operations/models.py:1394 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1027 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/forms.py:1020 +#: archaeological_operations/models.py:1398 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1029 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/forms.py:1022 +#: archaeological_operations/models.py:1402 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1039 +#: archaeological_operations/forms.py:1032 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1040 +#: archaeological_operations/forms.py:1033 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1045 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:1422 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1047 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/forms.py:1040 +#: archaeological_operations/models.py:1426 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/forms.py:1043 +#: archaeological_operations/models.py:1429 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1071 +#: archaeological_operations/forms.py:1064 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1076 +#: archaeological_operations/forms.py:1069 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1098 +#: archaeological_operations/forms.py:1091 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1105 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1172 -#: archaeological_operations/forms.py:1400 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1165 +#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1824 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1209 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1214 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1230 +#: archaeological_operations/forms.py:1223 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1250 +#: archaeological_operations/forms.py:1243 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1373 -#: archaeological_operations/models.py:507 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1366 +#: archaeological_operations/models.py:508 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/models.py:510 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/models.py:511 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1414 +#: archaeological_operations/models.py:528 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1271 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:530 +#: archaeological_operations/forms.py:1264 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/models.py:531 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1273 -#: archaeological_operations/forms.py:1425 -#: archaeological_operations/models.py:519 +#: archaeological_operations/forms.py:1266 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/models.py:520 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1276 -#: archaeological_operations/forms.py:1433 -#: archaeological_operations/models.py:521 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:522 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/models.py:523 +#: archaeological_operations/forms.py:1272 +#: archaeological_operations/forms.py:1420 +#: archaeological_operations/models.py:524 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1281 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/models.py:524 +#: archaeological_operations/forms.py:1274 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/models.py:525 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1283 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/models.py:525 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1424 +#: archaeological_operations/models.py:526 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1338 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1400 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1416 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1410 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1496 +#: archaeological_operations/forms.py:1461 +#: archaeological_operations/forms.py:1509 +#: archaeological_operations/models.py:2870 +msgid "Signature date" +msgstr "" + +#: archaeological_operations/forms.py:1477 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1511 -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1680 +#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1594 +#: archaeological_operations/forms.py:1661 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:2860 +#: archaeological_operations/forms.py:1502 +#: archaeological_operations/models.py:2835 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1528 -#: archaeological_operations/models.py:2895 -msgid "Signature date" -msgstr "" - -#: archaeological_operations/forms.py:1539 +#: archaeological_operations/forms.py:1520 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1554 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1558 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1590 +#: archaeological_operations/forms.py:1571 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1576 ishtar_common/forms.py:1338 #: ishtar_common/models.py:2082 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1604 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1622 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1624 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1664 +#: archaeological_operations/forms.py:1645 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1666 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1798 +#: archaeological_operations/forms.py:1779 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1854 +#: archaeological_operations/forms.py:1835 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7275,328 +7038,310 @@ msgstr "" msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:375 -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:1181 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:387 +#: archaeological_operations/models.py:388 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:390 +#: archaeological_operations/models.py:391 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:394 +#: archaeological_operations/models.py:395 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:399 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:403 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:407 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:409 +#: archaeological_operations/models.py:410 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:418 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:421 +#: archaeological_operations/models.py:422 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:426 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:476 +#: archaeological_operations/models.py:477 #, fuzzy #| msgid "email address" msgid "Create associated operation" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:1548 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1560 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:567 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:568 +#: archaeological_operations/models.py:1469 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 #: na_app/templates/ishtar/sheet_operation.html:332 #: sra_idf_app/templates/ishtar/sheet_operation.html:354 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:587 +#: archaeological_operations/models.py:588 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:639 +#: archaeological_operations/models.py:640 msgid "Create an operation associated to this site" msgstr "" -#: archaeological_operations/models.py:641 +#: archaeological_operations/models.py:642 msgid "ope." msgstr "" -#: archaeological_operations/models.py:651 +#: archaeological_operations/models.py:652 msgid "Create a cluster operation for site associated to many operations" msgstr "" -#: archaeological_operations/models.py:653 +#: archaeological_operations/models.py:654 msgid "top ope." msgstr "" -#: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 +#: archaeological_operations/models.py:807 ishtar_common/forms.py:1214 #: ishtar_common/models.py:5507 ishtar_common/models.py:5668 -#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1794 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1801 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:808 +#: archaeological_operations/models.py:809 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1060 +#: archaeological_operations/models.py:1054 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1061 +#: archaeological_operations/models.py:1055 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1062 +#: archaeological_operations/models.py:1056 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1063 +#: archaeological_operations/models.py:1057 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1064 +#: archaeological_operations/models.py:1058 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1065 +#: archaeological_operations/models.py:1059 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1066 +#: archaeological_operations/models.py:1060 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1067 +#: archaeological_operations/models.py:1061 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1068 +#: archaeological_operations/models.py:1062 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1069 +#: archaeological_operations/models.py:1063 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1070 +#: archaeological_operations/models.py:1064 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1065 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1070 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "yearly-index" msgstr "" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1130 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-old-code" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1162 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1169 +#: archaeological_operations/models.py:1163 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1166 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1193 -msgctxt "key for text search" -msgid "start-before" -msgstr "" - -#: archaeological_operations/models.py:1196 -msgctxt "key for text search" -msgid "start-after" -msgstr "" - -#: archaeological_operations/models.py:1199 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" -msgid "end-before" +msgid "start" msgstr "" -#: archaeological_operations/models.py:1203 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" -msgid "end-after" +msgid "end" msgstr "" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1194 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1213 +#: archaeological_operations/models.py:1200 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operator-reference" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1216 +#: archaeological_operations/models.py:1203 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1219 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1223 +#: archaeological_operations/models.py:1210 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1214 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1218 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1240 +#: archaeological_operations/models.py:1227 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "" -#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1231 msgctxt "key for text search" msgid "documentation-provided" msgstr "" -#: archaeological_operations/models.py:1248 -msgctxt "key for text search" -msgid "documentation-deadline-before" -msgstr "" - -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1235 +#, fuzzy +#| msgid "email address" msgctxt "key for text search" -msgid "documentation-deadline-after" -msgstr "" +msgid "documentation-deadline" +msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1239 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1243 msgctxt "key for text search" msgid "finds-provided" msgstr "" -#: archaeological_operations/models.py:1267 +#: archaeological_operations/models.py:1250 msgctxt "key for text search" -msgid "finds-deadline-before" +msgid "finds-deadline" msgstr "" -#: archaeological_operations/models.py:1271 -msgctxt "key for text search" -msgid "finds-deadline-after" -msgstr "" - -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1254 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4430 +#: archaeological_operations/models.py:1292 ishtar_common/models.py:4430 #: ishtar_common/models.py:4528 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1475 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1483 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1519 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1542 #, fuzzy #| msgid "email address" msgid "Cached label" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:1570 #: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 #: ishtar_common/templates/ishtar/sheet_document.html:125 @@ -7604,288 +7349,283 @@ msgstr "E-Mail-Adresse" msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1610 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1611 msgid "List of containers with finds related to this operation" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1612 msgid "List of containers with documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1613 msgid "List of containers with finds or documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1730 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1825 #, fuzzy #| msgid "email address" msgid "No associated town" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1840 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:1983 msgid "context record" msgstr "" -#: archaeological_operations/models.py:2034 +#: archaeological_operations/models.py:2013 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:2082 -#: archaeological_operations/models.py:3085 +#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:3060 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2143 +#: archaeological_operations/models.py:2122 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2153 +#: archaeological_operations/models.py:2132 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2161 +#: archaeological_operations/models.py:2140 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2169 +#: archaeological_operations/models.py:2148 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2223 +#: archaeological_operations/models.py:2202 #: 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:2284 -#: archaeological_operations/models.py:2363 +#: archaeological_operations/models.py:2263 +#: archaeological_operations/models.py:2342 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2328 +#: archaeological_operations/models.py:2307 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2373 +#: archaeological_operations/models.py:2352 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2465 +#: archaeological_operations/models.py:2444 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2466 +#: archaeological_operations/models.py:2445 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2491 +#: archaeological_operations/models.py:2470 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2492 +#: archaeological_operations/models.py:2471 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2558 +#: archaeological_operations/models.py:2537 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2542 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2545 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2570 +#: archaeological_operations/models.py:2549 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2696 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2685 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2709 -#: archaeological_warehouse/models.py:974 +#: archaeological_operations/models.py:2688 +#: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2692 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2704 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2729 +#: archaeological_operations/models.py:2708 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2733 +#: archaeological_operations/models.py:2712 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2736 +#: archaeological_operations/models.py:2715 msgctxt "key for text search" -msgid "signature-before" +msgid "signature" msgstr "" -#: archaeological_operations/models.py:2740 -msgctxt "key for text search" -msgid "signature-after" -msgstr "" - -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2719 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2731 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2760 +#: archaeological_operations/models.py:2735 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2763 +#: archaeological_operations/models.py:2738 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2767 +#: archaeological_operations/models.py:2742 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2746 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2750 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2779 +#: archaeological_operations/models.py:2754 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2783 +#: archaeological_operations/models.py:2758 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2761 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2789 +#: archaeological_operations/models.py:2764 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2768 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2797 +#: archaeological_operations/models.py:2772 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2776 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2780 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2809 +#: archaeological_operations/models.py:2784 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:2818 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2905 +#: archaeological_operations/models.py:2880 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2911 +#: archaeological_operations/models.py:2886 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:3175 +#: archaeological_operations/models.py:3150 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3177 ishtar_common/models.py:2669 +#: archaeological_operations/models.py:3152 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 -#: ishtar_common/models_common.py:4369 +#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 +#: ishtar_common/models_common.py:4360 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3469 ishtar_common/models.py:3846 +#: archaeological_operations/models.py:3444 ishtar_common/models.py:3846 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3484 +#: archaeological_operations/models.py:3459 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3485 +#: archaeological_operations/models.py:3460 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3507 ishtar_common/models.py:5375 +#: archaeological_operations/models.py:3482 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3510 +#: archaeological_operations/models.py:3485 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3511 +#: archaeological_operations/models.py:3486 msgid "Operation types old" msgstr "" @@ -8165,7 +7905,7 @@ msgstr "" #: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 -#: archaeological_warehouse/models.py:934 +#: archaeological_warehouse/models.py:935 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 @@ -8235,25 +7975,25 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 -#: ishtar_common/models_common.py:3853 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 +#: ishtar_common/models_common.py:3842 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:251 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" @@ -8262,7 +8002,7 @@ msgstr "" #: archaeological_warehouse/forms.py:253 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8285,14 +8025,14 @@ msgid "Container - 010 - General" msgstr "" #: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1185 +#: archaeological_warehouse/models.py:1186 msgid "Old reference" msgstr "" #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 -#: archaeological_warehouse/models.py:904 -#: archaeological_warehouse/models.py:1153 +#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:1154 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 @@ -8304,12 +8044,12 @@ msgid "Current location (warehouse)" msgstr "" #: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1168 +#: archaeological_warehouse/models.py:1169 msgid "Parent container" msgstr "" #: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:752 -#: archaeological_warehouse/models.py:1144 +#: archaeological_warehouse/models.py:1145 msgid "Responsibility" msgstr "" @@ -8318,7 +8058,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "" #: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/models.py:1176 msgid "Measured weight (g)" msgstr "" @@ -8428,7 +8168,7 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:1214 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8474,7 +8214,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1624 +#: archaeological_warehouse/models.py:1625 msgid "No value" msgstr "" @@ -8525,7 +8265,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1139 +#: archaeological_warehouse/models.py:1140 msgid "Deprecated - do not use" msgstr "" @@ -8533,168 +8273,168 @@ msgstr "" msgid "Container parent" msgstr "" -#: archaeological_warehouse/models.py:898 -#: archaeological_warehouse/models.py:1129 +#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:1130 msgid "Location (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:900 msgid "Responsibility (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:931 +#: archaeological_warehouse/models.py:932 msgid "Location - index" msgstr "" -#: archaeological_warehouse/models.py:932 +#: archaeological_warehouse/models.py:933 msgid "Precise localisation" msgstr "" -#: archaeological_warehouse/models.py:950 +#: archaeological_warehouse/models.py:951 msgctxt "key for text search" msgid "responsibility" msgstr "" -#: archaeological_warehouse/models.py:961 +#: archaeological_warehouse/models.py:962 msgctxt "key for text search" msgid "code" msgstr "" -#: archaeological_warehouse/models.py:964 +#: archaeological_warehouse/models.py:965 msgctxt "key for text search" msgid "old-reference" msgstr "" -#: archaeological_warehouse/models.py:979 +#: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "operation-scientist" msgstr "" -#: archaeological_warehouse/models.py:1011 +#: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:1015 ishtar_common/models.py:4426 +#: archaeological_warehouse/models.py:1016 ishtar_common/models.py:4426 msgctxt "key for text search" msgid "find-denomination" msgstr "" -#: archaeological_warehouse/models.py:1027 +#: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "preservation" msgstr "" -#: archaeological_warehouse/models.py:1055 +#: archaeological_warehouse/models.py:1056 msgctxt "key for text search" msgid "find-description" msgstr "" -#: archaeological_warehouse/models.py:1058 +#: archaeological_warehouse/models.py:1059 msgctxt "key for text search" msgid "empty" msgstr "" -#: archaeological_warehouse/models.py:1061 +#: archaeological_warehouse/models.py:1062 msgctxt "key for text search" msgid "parent-container" msgstr "" -#: archaeological_warehouse/models.py:1065 +#: archaeological_warehouse/models.py:1066 msgctxt "key for text search" msgid "contain-containers" msgstr "" -#: archaeological_warehouse/models.py:1069 +#: archaeological_warehouse/models.py:1070 msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1148 +#: archaeological_warehouse/models.py:1149 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1157 +#: archaeological_warehouse/models.py:1158 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1161 +#: archaeological_warehouse/models.py:1162 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1164 +#: archaeological_warehouse/models.py:1165 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1177 +#: archaeological_warehouse/models.py:1178 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1180 +#: archaeological_warehouse/models.py:1181 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1183 +#: archaeological_warehouse/models.py:1184 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1385 +#: archaeological_warehouse/models.py:1386 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1389 +#: archaeological_warehouse/models.py:1390 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1809 +#: archaeological_warehouse/models.py:1810 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1816 +#: archaeological_warehouse/models.py:1817 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1820 +#: archaeological_warehouse/models.py:1821 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1822 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1823 #, fuzzy #| msgid "email address" msgid "List of associated finds" msgstr "E-Mail-Adresse" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1824 #, fuzzy #| msgid "email address" msgid "List of documents contained in this container" msgstr "E-Mail-Adresse" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1825 msgid "List of documents whose reference container is this container" msgstr "" -#: archaeological_warehouse/models.py:2066 +#: archaeological_warehouse/models.py:2067 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:2073 +#: archaeological_warehouse/models.py:2074 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2075 msgid "Container localisations" msgstr "" @@ -8924,12 +8664,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1612 +#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1619 msgid "True" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1614 +#: ishtar_common/views_item.py:1621 msgid "False" msgstr "" @@ -9639,7 +9379,7 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: ishtar_common/forms.py:451 ishtar_common/forms.py:1077 +#: ishtar_common/forms.py:451 ishtar_common/forms.py:1069 msgid "You should select an item." msgstr "" @@ -9651,93 +9391,83 @@ msgstr "" msgid "There are identical items." msgstr "" -#: ishtar_common/forms.py:962 -msgid "Created before" +#: ishtar_common/forms.py:962 ishtar_common/models.py:5607 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1299 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 +msgid "Created" msgstr "" #: ishtar_common/forms.py:965 -msgid "Created after" -msgstr "" - -#: ishtar_common/forms.py:968 msgid "Last modified by" msgstr "" -#: ishtar_common/forms.py:975 -msgid "Modified before" -msgstr "" - -#: ishtar_common/forms.py:978 -msgid "Modified after" +#: ishtar_common/forms.py:972 +msgid "Modified" msgstr "" -#: ishtar_common/forms.py:980 +#: ishtar_common/forms.py:974 msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:1009 +#: ishtar_common/forms.py:1001 msgid "Imported from" msgstr "" -#: ishtar_common/forms.py:1029 ishtar_common/forms_common.py:2496 +#: ishtar_common/forms.py:1021 ishtar_common/forms_common.py:2496 msgid "Has an image?" msgstr "" -#: ishtar_common/forms.py:1031 +#: ishtar_common/forms.py:1023 msgid "Has an attached file?" msgstr "" -#: ishtar_common/forms.py:1034 +#: ishtar_common/forms.py:1026 #, fuzzy #| msgid "email address" msgid "Has a web address?" msgstr "E-Mail-Adresse" -#: ishtar_common/forms.py:1036 +#: ishtar_common/forms.py:1028 msgid "Document - Type" msgstr "" -#: ishtar_common/forms.py:1079 +#: ishtar_common/forms.py:1071 msgid "Add a new item" msgstr "" -#: ishtar_common/forms.py:1267 +#: ishtar_common/forms.py:1259 msgid " - append to existing" msgstr "" -#: ishtar_common/forms.py:1270 +#: ishtar_common/forms.py:1262 msgid " - replace" msgstr "" -#: ishtar_common/forms.py:1300 +#: ishtar_common/forms.py:1292 msgid "Set to null" msgstr "" -#: ishtar_common/forms.py:1369 +#: ishtar_common/forms.py:1361 msgid "Geo - Name" msgstr "" -#: ishtar_common/forms.py:1370 +#: ishtar_common/forms.py:1362 msgid "Geo - Data type" msgstr "" -#: ishtar_common/forms.py:1371 +#: ishtar_common/forms.py:1363 msgid "Geo - Origin" msgstr "" -#: ishtar_common/forms.py:1372 +#: ishtar_common/forms.py:1364 msgid "Geo - Provider" msgstr "" -#: ishtar_common/forms.py:1373 -msgid "Geo - Z - higher than" +#: ishtar_common/forms.py:1365 +msgid "Geo - Z" msgstr "" -#: ishtar_common/forms.py:1374 -msgid "Geo - Z - lower than" -msgstr "" - -#: ishtar_common/forms.py:1375 +#: ishtar_common/forms.py:1366 msgid "Geo - Comment" msgstr "" @@ -9902,8 +9632,8 @@ msgstr "" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 -#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 +#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 msgid "Email" msgstr "E-Mail-Adresse" @@ -9977,12 +9707,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 -#: ishtar_common/models_common.py:3697 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 +#: ishtar_common/models_common.py:3686 msgid "Phone description 2" msgstr "" @@ -9990,11 +9720,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 msgid "Phone 3" msgstr "" @@ -10002,23 +9732,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 msgid "Other address: country" msgstr "" @@ -10477,7 +10207,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2253 msgid "Import key" msgstr "" @@ -10487,26 +10217,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2268 #: 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:3053 ishtar_common/models_common.py:2267 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2260 #: 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:3056 ishtar_common/models_common.py:2283 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2276 #: 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:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2249 +#: ishtar_common/models_common.py:2242 msgid "Buffer" msgstr "" @@ -10514,18 +10244,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:4194 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 -#: ishtar_common/models_common.py:4206 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:4197 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 -#: ishtar_common/models_common.py:4209 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2295 +#: ishtar_common/models_common.py:4200 msgid "Estimated error for Z" msgstr "" @@ -10534,10 +10264,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 -#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 -#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 +#: ishtar_common/models_common.py:2054 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2161 +#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:2191 +#: ishtar_common/models_common.py:2320 ishtar_common/models_common.py:3418 msgid "Geography" msgstr "" @@ -10565,8 +10295,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 -#: ishtar_common/models_common.py:4218 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:4209 msgid "Point" msgstr "" @@ -12212,7 +11942,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1839 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12396,12 +12126,6 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 -#: ishtar_common/models_imports.py:1299 -#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 -msgid "Created" -msgstr "" - #: ishtar_common/models.py:5612 msgid "Filter on" msgstr "" @@ -12531,389 +12255,374 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1142 #, fuzzy #| msgid "email address" msgid "Created by imports" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:1143 +#: ishtar_common/models_common.py:1144 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1144 +#: ishtar_common/models_common.py:1145 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1147 +#: ishtar_common/models_common.py:1148 #, fuzzy #| msgid "email address" msgid "Updated by imports" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:1152 +#: ishtar_common/models_common.py:1153 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1539 +#: ishtar_common/models_common.py:1540 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1547 +#: ishtar_common/models_common.py:1548 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 +#: ishtar_common/models_common.py:1555 ishtar_common/models_common.py:2246 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1556 +#: ishtar_common/models_common.py:1557 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1562 +#: ishtar_common/models_common.py:1563 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1581 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1585 msgctxt "key for text search" -msgid "created-before" +msgid "created" msgstr "" -#: ishtar_common/models_common.py:1590 +#: ishtar_common/models_common.py:1589 msgctxt "key for text search" -msgid "created-after" +msgid "modified" msgstr "" #: ishtar_common/models_common.py:1593 msgctxt "key for text search" -msgid "modified-before" -msgstr "" - -#: ishtar_common/models_common.py:1597 -msgctxt "key for text search" -msgid "modified-after" -msgstr "" - -#: ishtar_common/models_common.py:1600 -msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1850 +#: ishtar_common/models_common.py:1843 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1854 +#: ishtar_common/models_common.py:1847 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:1858 +#: ishtar_common/models_common.py:1851 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:1942 +#: ishtar_common/models_common.py:1935 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:1944 +#: ishtar_common/models_common.py:1937 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2100 ishtar_common/models_common.py:2121 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2101 ishtar_common/models_common.py:2121 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2109 +#: ishtar_common/models_common.py:2102 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2110 +#: ishtar_common/models_common.py:2103 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2106 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2107 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2138 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2146 +#: ishtar_common/models_common.py:2139 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2162 +#: ishtar_common/models_common.py:2155 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2163 +#: ishtar_common/models_common.py:2156 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:2172 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2180 +#: ishtar_common/models_common.py:2173 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2192 +#: ishtar_common/models_common.py:2185 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2193 +#: ishtar_common/models_common.py:2186 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:2212 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2220 +#: ishtar_common/models_common.py:2213 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2221 +#: ishtar_common/models_common.py:2214 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2261 +#: ishtar_common/models_common.py:2254 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2261 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2269 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2284 +#: ishtar_common/models_common.py:2277 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:4190 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2282 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 +#: ishtar_common/models_common.py:2281 ishtar_common/models_common.py:4191 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:2282 ishtar_common/models_common.py:4192 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2285 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2286 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2294 +#: ishtar_common/models_common.py:2287 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:2299 ishtar_common/models_common.py:4204 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 +#: ishtar_common/models_common.py:2304 ishtar_common/models_common.py:4210 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2312 +#: ishtar_common/models_common.py:2305 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2313 +#: ishtar_common/models_common.py:2306 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2314 +#: ishtar_common/models_common.py:2307 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2315 +#: ishtar_common/models_common.py:2308 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:2312 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2448 +#: ishtar_common/models_common.py:2441 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2905 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2916 +#: ishtar_common/models_common.py:2909 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2920 +#: ishtar_common/models_common.py:2913 #, fuzzy #| msgid "username" msgctxt "key for text search" msgid "geo-name" msgstr "Benutzername" -#: ishtar_common/models_common.py:2923 +#: ishtar_common/models_common.py:2916 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2926 +#: ishtar_common/models_common.py:2919 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2922 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2932 -msgctxt "key for text search" -msgid "z-higher" -msgstr "" - -#: ishtar_common/models_common.py:2936 +#: ishtar_common/models_common.py:2925 msgctxt "key for text search" -msgid "z-lower" +msgid "z" msgstr "" -#: ishtar_common/models_common.py:2940 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2966 +#: ishtar_common/models_common.py:2955 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2968 +#: ishtar_common/models_common.py:2957 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3363 +#: ishtar_common/models_common.py:3352 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3365 +#: ishtar_common/models_common.py:3354 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3385 +#: ishtar_common/models_common.py:3374 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3387 +#: ishtar_common/models_common.py:3376 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3397 +#: ishtar_common/models_common.py:3386 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3401 +#: ishtar_common/models_common.py:3390 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3405 +#: ishtar_common/models_common.py:3394 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3671 +#: ishtar_common/models_common.py:3660 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3703 +#: ishtar_common/models_common.py:3692 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3709 +#: ishtar_common/models_common.py:3698 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3742 +#: ishtar_common/models_common.py:3731 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3779 +#: ishtar_common/models_common.py:3768 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3860 +#: ishtar_common/models_common.py:3849 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3870 +#: ishtar_common/models_common.py:3859 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3888 +#: ishtar_common/models_common.py:3877 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4221 +#: ishtar_common/models_common.py:4212 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4215 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4226 +#: ishtar_common/models_common.py:4217 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4228 +#: ishtar_common/models_common.py:4219 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4235 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon source item" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 88c6d0a6d..0c649d865 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-21 15:37+0200\n" +"POT-Creation-Date: 2024-06-24 16:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -20,27 +20,27 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:735 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2770 +#: archaeological_finds/models_finds.py:2745 #: 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:1256 +#: archaeological_operations/forms.py:1249 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2535 -#: archaeological_operations/models.py:2553 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2868 -#: archaeological_operations/models.py:3157 +#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2532 +#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:3132 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 +#: archaeological_warehouse/models.py:903 ishtar_common/forms_common.py:2523 #: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 @@ -59,107 +59,99 @@ msgstr "" msgid "Dating - precise" msgstr "" -#: archaeological_context_records/forms.py:97 -msgid "Dating - start date before" -msgstr "" - -#: archaeological_context_records/forms.py:100 -msgid "Dating - start date after" +#: archaeological_context_records/forms.py:96 +msgid "Dating - start date" msgstr "" -#: archaeological_context_records/forms.py:102 -msgid "Dating - end date before" -msgstr "" - -#: archaeological_context_records/forms.py:103 -msgid "Dating - end date after" +#: archaeological_context_records/forms.py:97 +msgid "Dating - end date" msgstr "" -#: archaeological_context_records/forms.py:105 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "" -#: archaeological_context_records/forms.py:107 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "" -#: archaeological_context_records/forms.py:138 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "" -#: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 +#: archaeological_finds/forms.py:1718 archaeological_finds/forms.py:2450 #: 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_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1440 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 msgid "Full text search" msgstr "" -#: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:571 -#: archaeological_context_records/forms.py:625 -#: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:617 +#: archaeological_context_records/models.py:747 +#: archaeological_context_records/models.py:1385 msgid "ID" msgstr "" -#: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1766 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1747 msgid "Code PATRIARCHE" msgstr "" -#: archaeological_context_records/forms.py:151 +#: archaeological_context_records/forms.py:143 msgid "Operation - name" msgstr "" -#: archaeological_context_records/forms.py:152 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2533 msgid "Operation - year" msgstr "" -#: archaeological_context_records/forms.py:154 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "" -#: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:732 -#: archaeological_context_records/models.py:747 -#: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:724 +#: archaeological_context_records/models.py:741 +#: archaeological_operations/forms.py:551 +#: archaeological_operations/models.py:567 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "" -#: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1819 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1806 msgid "Search within related operations" msgstr "" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:723 +#: archaeological_context_records/forms.py:159 +#: archaeological_context_records/forms.py:715 msgid "Unit type" msgstr "" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:521 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:831 ishtar_common/admin.py:766 +#: archaeological_context_records/forms.py:160 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:524 +#: archaeological_context_records/models.py:825 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:523 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:824 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/models.py:523 +#: archaeological_context_records/models.py:818 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 #: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:147 @@ -176,66 +168,66 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:171 -#: archaeological_context_records/models.py:787 +#: archaeological_context_records/forms.py:163 +#: archaeological_context_records/models.py:781 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 -#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2097 -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/models.py:500 +#: archaeological_finds/forms.py:1884 archaeological_finds/models_finds.py:2072 +#: archaeological_operations/forms.py:1237 +#: archaeological_operations/models.py:501 msgid "Cultural attribution" msgstr "" -#: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:573 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/forms.py:164 +#: archaeological_context_records/forms.py:289 +#: archaeological_context_records/forms.py:565 +#: archaeological_context_records/forms.py:618 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:719 +#: archaeological_context_records/models.py:1387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1084 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:3181 -#: archaeological_operations/models.py:3475 +#: archaeological_operations/forms.py:1077 +#: archaeological_operations/forms.py:1454 +#: archaeological_operations/models.py:3156 +#: archaeological_operations/models.py:3450 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" -#: archaeological_context_records/forms.py:173 -#: archaeological_operations/forms.py:579 +#: archaeological_context_records/forms.py:165 +#: archaeological_operations/forms.py:575 msgid "Has finds" msgstr "" -#: archaeological_context_records/forms.py:175 -#: archaeological_operations/forms.py:543 +#: archaeological_context_records/forms.py:167 +#: archaeological_operations/forms.py:541 msgid "Search within relations" msgstr "" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:317 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:836 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:309 +#: archaeological_context_records/models.py:525 +#: archaeological_context_records/models.py:830 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:211 -#: archaeological_context_records/forms.py:232 +#: archaeological_context_records/forms.py:203 +#: archaeological_context_records/forms.py:224 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:281 +#: archaeological_context_records/forms.py:273 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 -#: archaeological_operations/forms.py:689 -#: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1344 -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:708 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1497 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -250,57 +242,57 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:282 +#: archaeological_context_records/forms.py:274 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:298 -#: archaeological_context_records/forms.py:563 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:725 -#: archaeological_context_records/models.py:515 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:733 +#: archaeological_context_records/forms.py:290 +#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:619 +#: archaeological_context_records/forms.py:717 +#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:508 +#: archaeological_context_records/models.py:727 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1056 -#: archaeological_operations/models.py:3162 +#: archaeological_operations/forms.py:1049 +#: archaeological_operations/models.py:3137 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4188 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:303 -#: archaeological_context_records/forms.py:568 +#: archaeological_context_records/forms.py:295 +#: archaeological_context_records/forms.py:560 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:574 -#: archaeological_context_records/forms.py:629 +#: archaeological_context_records/forms.py:300 +#: archaeological_context_records/forms.py:566 +#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:528 -#: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:1386 msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:310 -#: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/forms.py:302 +#: archaeological_context_records/models.py:748 +#: archaeological_context_records/models.py:1388 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:432 archaeological_finds/forms.py:437 #: archaeological_finds/forms.py:595 archaeological_finds/forms.py:756 #: archaeological_finds/forms.py:758 archaeological_finds/forms.py:986 -#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1833 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1820 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:556 -#: archaeological_finds/models_finds.py:2039 -#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_finds.py:2014 +#: archaeological_finds/models_treatments.py:263 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -316,109 +308,109 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/forms.py:304 +#: archaeological_context_records/models.py:778 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:314 -#: archaeological_context_records/models.py:755 -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/models.py:749 +#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1881 +#: archaeological_finds/models_finds.py:2151 #: archaeological_finds/templates/ishtar/sheet_find.html:194 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:143 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/forms.py:317 #: archaeological_files/forms.py:308 archaeological_files/forms.py:818 -#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 +#: archaeological_files/models.py:662 archaeological_operations/forms.py:737 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:752 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:753 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:333 -#: archaeological_context_records/models.py:760 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:754 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:334 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:755 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:762 +#: archaeological_context_records/forms.py:327 +#: archaeological_context_records/models.py:756 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/models.py:758 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/models.py:750 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:343 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/models.py:751 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:625 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/models_treatments.py:265 -#: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1350 +#: archaeological_finds/forms_treatments.py:763 +#: archaeological_finds/models_treatments.py:266 +#: archaeological_finds/models_treatments.py:1140 +#: archaeological_operations/models.py:1329 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 -#: ishtar_common/forms.py:1055 ishtar_common/forms.py:1056 +#: ishtar_common/forms.py:1047 ishtar_common/forms.py:1048 #: na_app/templates/ishtar/sheet_operation.html:204 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:346 +#: archaeological_context_records/forms.py:338 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:352 -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/models.py:762 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:226 -#: archaeological_finds/models_treatments.py:760 +#: archaeological_finds/models_treatments.py:227 +#: archaeological_finds/models_treatments.py:761 #: archaeological_warehouse/forms.py:744 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:438 +#: archaeological_context_records/forms.py:430 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:443 +#: archaeological_context_records/forms.py:435 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:448 -#: archaeological_context_records/forms.py:470 -#: archaeological_context_records/models.py:165 +#: archaeological_context_records/forms.py:440 +#: archaeological_context_records/forms.py:462 +#: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 -#: archaeological_finds/models_finds.py:2094 +#: archaeological_finds/models_finds.py:2069 #: archaeological_finds/templates/ishtar/sheet_find.html:249 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:197 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -429,13 +421,13 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:109 -#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:522 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 -#: archaeological_operations/forms.py:841 +#: archaeological_operations/forms.py:834 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 @@ -451,17 +443,17 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:782 archaeological_files/models.py:76 -#: archaeological_files/models.py:730 +#: archaeological_files/models.py:731 #: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3624 -#: archaeological_finds/models_treatments.py:264 -#: archaeological_finds/models_treatments.py:758 +#: archaeological_finds/forms_treatments.py:760 +#: archaeological_finds/models_finds.py:3598 +#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:395 #: archaeological_finds/templates/ishtar/sheet_find.html:433 #: archaeological_finds/templates/ishtar/sheet_find.html:471 @@ -469,10 +461,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:497 -#: archaeological_operations/forms.py:790 +#: archaeological_operations/forms.py:538 +#: archaeological_operations/forms.py:783 #: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3479 +#: archaeological_operations/models.py:1330 +#: archaeological_operations/models.py:3454 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -497,12 +490,12 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:457 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:787 archaeological_files/models.py:77 -#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 -#: archaeological_finds/models_finds.py:3625 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_files/models.py:732 archaeological_finds/forms.py:1569 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_treatments.py:760 #: archaeological_finds/templates/ishtar/sheet_find.html:396 #: archaeological_finds/templates/ishtar/sheet_find.html:434 #: archaeological_finds/templates/ishtar/sheet_find.html:472 @@ -513,7 +506,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:498 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:536 #: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3480 +#: archaeological_operations/models.py:3455 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -544,7 +537,7 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -557,7 +550,7 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:459 +#: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -571,7 +564,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:460 +#: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -579,27 +572,27 @@ msgstr "" msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:463 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:483 +#: archaeological_context_records/forms.py:475 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:276 -#: archaeological_context_records/models.py:1522 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1516 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 -#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2762 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:2737 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1704 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 #: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:501 +#: archaeological_context_records/forms.py:493 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -611,108 +604,108 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:494 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:508 -#: archaeological_context_records/forms.py:519 -#: archaeological_context_records/models.py:785 +#: archaeological_context_records/forms.py:500 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:779 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/forms.py:501 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:517 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:526 -#: archaeological_context_records/models.py:790 +#: archaeological_context_records/forms.py:518 +#: archaeological_context_records/models.py:784 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/models.py:793 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:528 -#: archaeological_context_records/models.py:805 +#: archaeological_context_records/forms.py:520 +#: archaeological_context_records/models.py:799 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/models.py:814 +#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/models.py:808 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:1150 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1870 +#: archaeological_context_records/forms.py:523 +#: archaeological_operations/forms.py:1143 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/forms.py:1851 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:535 +#: archaeological_context_records/forms.py:527 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:548 -#: archaeological_operations/forms.py:624 -#: archaeological_operations/forms.py:637 +#: archaeological_context_records/forms.py:540 +#: archaeological_operations/forms.py:617 +#: archaeological_operations/forms.py:630 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:545 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:551 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:661 +#: archaeological_context_records/forms.py:653 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1817 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:691 +#: archaeological_context_records/forms.py:683 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:711 -#: archaeological_context_records/models.py:1283 -#: archaeological_context_records/models.py:1322 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/forms.py:703 +#: archaeological_context_records/models.py:1277 +#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1384 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:715 +#: archaeological_context_records/forms.py:707 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:740 +#: archaeological_context_records/forms.py:732 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:765 +#: archaeological_context_records/forms.py:757 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:784 +#: archaeological_context_records/forms.py:776 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -820,45 +813,35 @@ msgstr "" #: archaeological_context_records/models.py:139 msgctxt "key for text search" -msgid "datings-start-before" +msgid "datings-start" msgstr "" #: archaeological_context_records/models.py:143 msgctxt "key for text search" -msgid "datings-start-after" +msgid "datings-end" msgstr "" #: archaeological_context_records/models.py:147 msgctxt "key for text search" -msgid "datings-end-before" -msgstr "" - -#: archaeological_context_records/models.py:151 -msgctxt "key for text search" -msgid "datings-end-after" -msgstr "" - -#: archaeological_context_records/models.py:155 -msgctxt "key for text search" msgid "datings-type" msgstr "" -#: archaeological_context_records/models.py:159 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "" -#: archaeological_context_records/models.py:166 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "" -#: archaeological_context_records/models.py:282 +#: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:615 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2347 +#: archaeological_finds/models_finds.py:2322 +#: archaeological_finds/models_finds.py:3560 #: archaeological_finds/models_finds.py:3586 -#: archaeological_finds/models_finds.py:3612 -#: archaeological_finds/models_treatments.py:740 +#: archaeological_finds/models_treatments.py:741 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -870,8 +853,8 @@ msgstr "" msgid "Find" msgstr "" -#: archaeological_context_records/models.py:307 -#: archaeological_context_records/models.py:330 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 #: archaeological_files/models.py:75 archaeological_files/models.py:105 #: archaeological_files/models.py:159 archaeological_files/models.py:175 #: archaeological_files/models.py:235 archaeological_finds/models_finds.py:106 @@ -880,202 +863,202 @@ msgstr "" #: archaeological_finds/models_finds.py:260 #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 -#: archaeological_finds/models_finds.py:2030 +#: archaeological_finds/models_finds.py:2005 #: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:752 +#: archaeological_finds/models_treatments.py:753 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3506 +#: archaeological_operations/models.py:3481 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 #: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 -#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 -#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2152 ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2182 ishtar_common/models_imports.py:474 msgid "Order" msgstr "" -#: archaeological_context_records/models.py:310 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "" -#: archaeological_context_records/models.py:317 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "" -#: archaeological_context_records/models.py:318 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "" -#: archaeological_context_records/models.py:333 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "" -#: archaeological_context_records/models.py:334 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "" -#: archaeological_context_records/models.py:347 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "" -#: archaeological_context_records/models.py:348 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "" -#: archaeological_context_records/models.py:361 +#: archaeological_context_records/models.py:353 msgid "Excavation technique type" msgstr "" -#: archaeological_context_records/models.py:362 +#: archaeological_context_records/models.py:354 msgid "Excavation technique types" msgstr "" -#: archaeological_context_records/models.py:372 +#: archaeological_context_records/models.py:364 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "" -#: archaeological_context_records/models.py:373 +#: archaeological_context_records/models.py:365 msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:507 -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:1389 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1144 -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1359 +#: archaeological_operations/forms.py:1137 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1352 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:993 -#: archaeological_operations/models.py:1080 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1391 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:501 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:510 -#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:504 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:505 #: archaeological_finds/models_finds.py:1152 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:514 +#: archaeological_context_records/models.py:506 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:509 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:526 #: archaeological_finds/models_finds.py:1216 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:998 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:527 #: archaeological_finds/models_finds.py:1217 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:998 +#: archaeological_operations/models.py:999 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:569 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:572 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1308 -#: archaeological_operations/models.py:378 -#: archaeological_operations/models.py:1144 +#: archaeological_files/models.py:491 archaeological_finds/models_finds.py:1318 +#: archaeological_operations/models.py:379 +#: archaeological_operations/models.py:1138 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4447 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:581 ishtar_common/models.py:4407 +#: archaeological_context_records/models.py:575 ishtar_common/models.py:4407 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:584 -#: archaeological_finds/models_finds.py:1689 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:578 +#: archaeological_finds/models_finds.py:1676 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:588 -#: archaeological_operations/models.py:1140 -#: archaeological_operations/models.py:2699 +#: archaeological_context_records/models.py:582 +#: archaeological_operations/models.py:1134 +#: archaeological_operations/models.py:2678 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:592 -#: archaeological_finds/models_finds.py:1316 +#: archaeological_context_records/models.py:586 +#: archaeological_finds/models_finds.py:1326 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:596 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1422 -#: archaeological_finds/models_finds.py:1941 -#: archaeological_operations/models.py:413 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4398 +#: archaeological_context_records/models.py:590 +#: archaeological_context_records/models.py:661 +#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:441 ishtar_common/models.py:4398 #: ishtar_common/models.py:4521 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:600 -#: archaeological_context_records/models.py:670 -#: archaeological_finds/models_finds.py:1332 -#: archaeological_operations/models.py:1235 -#: archaeological_operations/models.py:1312 -#: archaeological_warehouse/models.py:988 ishtar_common/models.py:4439 +#: archaeological_context_records/models.py:594 +#: archaeological_context_records/models.py:664 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_operations/models.py:1222 +#: archaeological_operations/models.py:1291 +#: archaeological_warehouse/models.py:989 ishtar_common/models.py:4439 #: ishtar_common/models.py:4530 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:605 +#: archaeological_context_records/models.py:599 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1359 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:372 -#: archaeological_operations/models.py:1190 +#: archaeological_context_records/models.py:603 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1184 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1084,84 +1067,84 @@ msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:613 +#: archaeological_context_records/models.py:607 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:616 +#: archaeological_context_records/models.py:610 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:619 +#: archaeological_context_records/models.py:613 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:623 -#: archaeological_files/models.py:493 archaeological_operations/models.py:1150 -#: archaeological_operations/models.py:2717 +#: archaeological_context_records/models.py:617 +#: archaeological_files/models.py:494 archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:2696 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:627 -#: archaeological_operations/models.py:1263 +#: archaeological_context_records/models.py:621 +#: archaeological_operations/models.py:1246 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:630 +#: archaeological_context_records/models.py:624 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:634 +#: archaeological_context_records/models.py:628 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1657 -#: archaeological_operations/models.py:429 +#: archaeological_context_records/models.py:632 +#: archaeological_finds/models_finds.py:1644 +#: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_context_records/models.py:685 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_operations/models.py:459 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_operations/models.py:460 +#: archaeological_operations/models.py:1274 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:692 -#: archaeological_finds/models_finds.py:1893 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:686 +#: archaeological_finds/models_finds.py:1868 +#: archaeological_operations/models.py:467 +#: archaeological_operations/models.py:1267 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1104 ishtar_common/models.py:2644 +#: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2644 #: ishtar_common/models.py:2925 ishtar_common/models.py:4547 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1063 +#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:1057 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 -#: archaeological_finds/models_finds.py:1910 -#: archaeological_finds/models_finds.py:2664 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:1885 +#: archaeological_finds/models_finds.py:2639 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:484 -#: archaeological_operations/models.py:664 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2024 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:485 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:2003 #: archaeological_operations/views.py:904 #: archaeological_operations/views.py:919 #: archaeological_operations/views.py:926 @@ -1172,73 +1155,73 @@ msgstr "" msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:719 -#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:2024 -#: archaeological_finds/models_treatments.py:259 -#: archaeological_operations/models.py:3170 +#: archaeological_context_records/models.py:713 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:551 +#: archaeological_finds/models_finds.py:1999 +#: archaeological_finds/models_treatments.py:260 +#: archaeological_operations/models.py:3145 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4582 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_operations/models.py:3173 +#: archaeological_context_records/models.py:715 +#: archaeological_files/models.py:566 archaeological_finds/models_finds.py:553 +#: archaeological_finds/models_finds.py:2001 +#: archaeological_operations/models.py:3148 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1188 +#: archaeological_warehouse/models.py:1189 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:766 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3383 +#: archaeological_context_records/models.py:760 +#: archaeological_operations/models.py:1383 ishtar_common/models_common.py:3372 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:765 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:775 +#: archaeological_context_records/models.py:769 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:788 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:802 +#: archaeological_context_records/models.py:796 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:809 +#: archaeological_context_records/models.py:803 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:817 +#: archaeological_context_records/models.py:811 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:845 +#: archaeological_context_records/models.py:839 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2301 -#: archaeological_finds/models_treatments.py:279 -#: archaeological_finds/models_treatments.py:1162 +#: archaeological_files/models.py:752 archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:1158 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:534 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2917 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1457 +#: archaeological_operations/models.py:2892 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1193 +#: archaeological_warehouse/models.py:1194 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1247,7 +1230,7 @@ msgstr "" #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 #: ishtar_common/models.py:4145 ishtar_common/models.py:4722 -#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3400 #: 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 @@ -1263,129 +1246,129 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:852 -#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2307 -#: archaeological_finds/models_treatments.py:285 -#: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:540 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2924 +#: archaeological_context_records/models.py:846 +#: archaeological_files/models.py:758 archaeological_finds/models_finds.py:2282 +#: archaeological_finds/models_treatments.py:286 +#: archaeological_finds/models_treatments.py:1165 +#: archaeological_operations/models.py:541 +#: archaeological_operations/models.py:1463 +#: archaeological_operations/models.py:2899 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3417 +#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2427 +#: ishtar_common/models_common.py:3406 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:857 -#: archaeological_finds/models_finds.py:2319 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:851 +#: archaeological_finds/models_finds.py:2294 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:1554 msgid "Cached periods label" msgstr "" +#: archaeological_context_records/models.py:854 #: archaeological_context_records/models.py:860 -#: archaeological_context_records/models.py:866 -#: archaeological_finds/models_finds.py:2322 -#: archaeological_finds/models_finds.py:2328 -#: archaeological_finds/models_finds.py:2334 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:560 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 +#: archaeological_finds/models_finds.py:2297 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:561 +#: archaeological_operations/models.py:1545 +#: archaeological_operations/models.py:1551 +#: archaeological_operations/models.py:1557 +#: archaeological_operations/models.py:1563 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4364 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:863 +#: archaeological_context_records/models.py:857 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:870 -#: archaeological_context_records/models.py:871 +#: archaeological_context_records/models.py:864 +#: archaeological_context_records/models.py:865 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:564 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:892 +#: archaeological_context_records/models.py:886 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:927 -#: archaeological_finds/models_finds.py:2536 +#: archaeological_context_records/models.py:921 +#: archaeological_finds/models_finds.py:2511 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1051 +#: archaeological_context_records/models.py:1045 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1053 +#: archaeological_context_records/models.py:1047 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1237 +#: archaeological_context_records/models.py:1231 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1284 +#: archaeological_context_records/models.py:1278 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1311 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1312 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1313 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1314 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1315 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1317 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1318 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1319 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1320 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1327 +#: archaeological_context_records/models.py:1321 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1330 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1337 +#: archaeological_context_records/models.py:1331 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/models.py:1522 msgid "Context record parent" msgstr "" @@ -1440,7 +1423,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 -#: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 +#: archaeological_finds/forms.py:2247 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 #: archaeological_finds/models_finds.py:240 @@ -1459,9 +1442,9 @@ msgstr "" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2348 -#: archaeological_finds/models_finds.py:2359 -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:2323 +#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:3607 #: 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 @@ -1532,7 +1515,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4376 +#: ishtar_common/models_common.py:4367 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1616,7 +1599,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:219 +#: archaeological_finds/models_treatments.py:220 #: archaeological_finds/templates/ishtar/sheet_find.html:391 #: archaeological_finds/templates/ishtar/sheet_find.html:429 #: archaeological_finds/templates/ishtar/sheet_find.html:467 @@ -1628,8 +1611,8 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 #: ishtar_common/models.py:5493 ishtar_common/models.py:5630 -#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 -#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2028 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1722,7 +1705,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:255 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:1981 msgid "Add context record" msgstr "" @@ -1757,28 +1740,28 @@ msgstr "" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 #: archaeological_files/forms.py:237 archaeological_files/forms.py:663 #: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 -#: archaeological_files/models.py:403 archaeological_files/models.py:554 +#: archaeological_files/models.py:403 archaeological_files/models.py:555 #: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_finds/forms.py:1746 +#: archaeological_finds/forms.py:1733 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:644 -#: archaeological_finds/forms_treatments.py:726 -#: archaeological_finds/forms_treatments.py:840 +#: archaeological_finds/forms_treatments.py:716 +#: archaeological_finds/forms_treatments.py:830 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:204 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:205 +#: archaeological_finds/models_treatments.py:1102 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1451 -#: archaeological_operations/forms.py:1768 -#: archaeological_operations/models.py:989 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2667 -#: archaeological_operations/models.py:2896 -#: archaeological_operations/models.py:3160 +#: archaeological_operations/forms.py:728 +#: archaeological_operations/forms.py:1444 +#: archaeological_operations/forms.py:1749 +#: archaeological_operations/models.py:990 +#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:2646 +#: archaeological_operations/models.py:2871 +#: archaeological_operations/models.py:3135 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 @@ -1786,27 +1769,27 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:669 archaeological_files/models.py:556 +#: archaeological_files/forms.py:669 archaeological_files/models.py:557 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 -#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 -#: archaeological_operations/forms.py:1239 -#: archaeological_operations/forms.py:1356 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/forms.py:1530 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2899 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1134 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:2874 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1392 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1464 -#: archaeological_operations/models.py:2539 ishtar_common/models_common.py:2058 -#: ishtar_common/models_common.py:3391 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/models.py:2518 ishtar_common/models_common.py:2051 +#: ishtar_common/models_common.py:3380 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1817,7 +1800,7 @@ msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 #: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:569 msgid "File type" msgstr "" @@ -1832,41 +1815,41 @@ msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 #: archaeological_files/forms.py:529 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:617 +#: archaeological_files/models.py:408 archaeological_files/models.py:618 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:104 archaeological_files/forms.py:467 -#: archaeological_files/forms.py:531 archaeological_files/models.py:622 +#: archaeological_files/forms.py:531 archaeological_files/models.py:623 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:660 -#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_files/models.py:671 archaeological_finds/forms.py:799 #: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 -#: archaeological_finds/forms.py:2585 +#: archaeological_finds/forms.py:2501 #: archaeological_finds/forms_treatments.py:195 -#: archaeological_finds/forms_treatments.py:765 -#: archaeological_finds/models_treatments.py:261 -#: archaeological_finds/models_treatments.py:1158 -#: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1247 -#: archaeological_operations/forms.py:1370 -#: archaeological_operations/forms.py:1467 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2913 +#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_treatments.py:1154 +#: archaeological_operations/forms.py:542 +#: archaeological_operations/forms.py:742 +#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1363 +#: archaeological_operations/forms.py:1460 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1452 +#: archaeological_operations/models.py:2888 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 +#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 #: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 +#: ishtar_common/models_common.py:2279 ishtar_common/models_imports.py:890 #: 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 @@ -1882,7 +1865,7 @@ msgstr "" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:581 msgid "General contractor" msgstr "" @@ -1891,16 +1874,14 @@ msgid "Organization of general contractor" msgstr "" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 -#: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:557 ishtar_common/forms.py:955 msgid "Created by" msgstr "" #: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 -#: archaeological_finds/forms_treatments.py:864 -#: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1475 +#: archaeological_finds/forms_treatments.py:854 +#: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "" @@ -1912,10 +1893,10 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/forms.py:218 archaeological_files/models.py:638 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1146 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2164 +#: archaeological_finds/models_treatments.py:1142 +#: archaeological_operations/models.py:1328 ishtar_common/forms_common.py:2164 #: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1923,9 +1904,9 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:639 -#: archaeological_finds/forms_treatments.py:768 -#: archaeological_finds/models_treatments.py:1148 +#: archaeological_files/models.py:640 +#: archaeological_finds/forms_treatments.py:758 +#: archaeological_finds/models_treatments.py:1144 #: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 @@ -1961,22 +1942,22 @@ msgid "Planning name" msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:470 archaeological_files/models.py:634 -#: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1054 -#: archaeological_operations/forms.py:1070 -#: archaeological_operations/forms.py:1075 -#: archaeological_operations/forms.py:1406 +#: archaeological_files/models.py:471 archaeological_files/models.py:635 +#: archaeological_operations/forms.py:722 +#: archaeological_operations/forms.py:1047 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1068 +#: archaeological_operations/forms.py:1399 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1079 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2908 +#: archaeological_operations/models.py:504 +#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1388 +#: archaeological_operations/models.py:2883 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3425 +#: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 @@ -1985,8 +1966,8 @@ msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/models.py:673 archaeological_operations/models.py:2902 -#: ishtar_common/models_common.py:2059 +#: archaeological_files/models.py:674 archaeological_operations/models.py:2877 +#: ishtar_common/models_common.py:2052 msgid "Departments" msgstr "" @@ -1995,7 +1976,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:665 +#: archaeological_files/models.py:666 msgid "Locality" msgstr "" @@ -2009,7 +1990,7 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 msgid "Postal code" msgstr "" @@ -2018,7 +1999,7 @@ msgid "Surfaces" msgstr "" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:808 archaeological_files/models.py:663 +#: archaeological_files/forms.py:808 archaeological_files/models.py:664 msgid "Total developed surface (m2)" msgstr "" @@ -2026,7 +2007,7 @@ msgstr "" #: 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:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 +#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2060,7 +2041,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:470 archaeological_files/models.py:641 +#: archaeological_files/forms.py:470 archaeological_files/models.py:642 msgid "Date of planning service file" msgstr "" @@ -2073,7 +2054,7 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:515 archaeological_files/models.py:601 +#: archaeological_files/forms.py:515 archaeological_files/models.py:602 msgid "Responsible for planning service" msgstr "" @@ -2086,12 +2067,12 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:592 archaeological_files/models.py:697 +#: archaeological_files/forms.py:592 archaeological_files/models.py:698 #: archaeological_operations/forms.py:525 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:595 archaeological_files/models.py:681 +#: archaeological_files/forms.py:595 archaeological_files/models.py:682 msgid "Requested operation type" msgstr "" @@ -2099,16 +2080,16 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/forms.py:612 archaeological_files/models.py:701 #: archaeological_files/templates/ishtar/sheet_file.html:170 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:621 archaeological_files/models.py:703 +#: archaeological_files/forms.py:621 archaeological_files/models.py:704 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:622 archaeological_files/models.py:705 +#: archaeological_files/forms.py:622 archaeological_files/models.py:706 msgid "Protected area" msgstr "" @@ -2125,11 +2106,11 @@ msgstr "" msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:653 archaeological_files/models.py:645 +#: archaeological_files/forms.py:653 archaeological_files/models.py:646 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/forms.py:661 archaeological_files/models.py:660 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" @@ -2159,27 +2140,27 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:767 archaeological_files/models.py:722 +#: archaeological_files/forms.py:767 archaeological_files/models.py:723 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:772 archaeological_files/models.py:725 +#: archaeological_files/forms.py:772 archaeological_files/models.py:726 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:777 archaeological_files/models.py:728 +#: archaeological_files/forms.py:777 archaeological_files/models.py:729 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:792 archaeological_files/models.py:732 +#: archaeological_files/forms.py:792 archaeological_files/models.py:733 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:797 archaeological_files/models.py:733 +#: archaeological_files/forms.py:797 archaeological_files/models.py:734 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:802 archaeological_files/models.py:735 +#: archaeological_files/forms.py:802 archaeological_files/models.py:736 msgid "Execution report date" msgstr "" @@ -2204,7 +2185,7 @@ msgid "Days" msgstr "" #: archaeological_files/forms.py:889 archaeological_files/models.py:116 -#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/models.py:1434 archaeological_files/models.py:1453 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" @@ -2212,7 +2193,7 @@ msgstr "" #: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:718 +#: archaeological_files/models.py:206 archaeological_files/models.py:719 msgid "Price agreement" msgstr "" @@ -2251,18 +2232,18 @@ msgstr "" #: archaeological_finds/forms_treatments.py:566 #: archaeological_finds/forms_treatments.py:628 #: archaeological_finds/forms_treatments.py:645 -#: archaeological_finds/forms_treatments.py:799 -#: archaeological_finds/forms_treatments.py:841 -#: archaeological_finds/forms_treatments.py:908 -#: archaeological_finds/models_treatments.py:205 -#: archaeological_finds/models_treatments.py:1107 +#: archaeological_finds/forms_treatments.py:789 +#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:898 +#: archaeological_finds/models_treatments.py:206 +#: archaeological_finds/models_treatments.py:1103 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1452 -#: archaeological_operations/forms.py:1585 -#: archaeological_operations/models.py:2838 +#: archaeological_operations/forms.py:1445 +#: archaeological_operations/forms.py:1566 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1174 +#: archaeological_warehouse/models.py:1175 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 #: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2276,12 +2257,12 @@ msgstr "" #: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 -#: archaeological_finds/forms_treatments.py:842 -#: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1458 -#: archaeological_operations/forms.py:1519 -#: archaeological_operations/models.py:2569 -#: archaeological_operations/models.py:2828 +#: archaeological_finds/forms_treatments.py:832 +#: archaeological_finds/forms_treatments.py:887 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1500 +#: archaeological_operations/models.py:2548 +#: archaeological_operations/models.py:2803 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" @@ -2292,31 +2273,31 @@ msgstr "" #: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 -#: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1459 -#: archaeological_operations/forms.py:1655 +#: archaeological_finds/forms_treatments.py:833 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1636 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 -#: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1465 -#: archaeological_operations/forms.py:1526 -#: archaeological_operations/models.py:2897 +#: archaeological_finds/forms_treatments.py:834 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1507 +#: archaeological_operations/models.py:2872 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" #: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 -#: archaeological_finds/forms_treatments.py:850 +#: archaeological_finds/forms_treatments.py:840 msgid "Signature date before" msgstr "" #: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 -#: archaeological_finds/forms_treatments.py:848 +#: archaeological_finds/forms_treatments.py:838 msgid "Signature date after" msgstr "" @@ -2344,15 +2325,15 @@ msgstr "" msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:782 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:953 -#: archaeological_operations/models.py:2033 -#: archaeological_operations/models.py:2552 -#: archaeological_operations/models.py:2668 -#: archaeological_operations/models.py:2876 +#: archaeological_operations/forms.py:674 +#: archaeological_operations/forms.py:946 +#: archaeological_operations/models.py:2012 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2647 +#: archaeological_operations/models.py:2851 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "" @@ -2365,10 +2346,10 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3615 +#: archaeological_finds/models_finds.py:3589 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2933 +#: archaeological_operations/models.py:1699 +#: archaeological_operations/models.py:2908 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2376,8 +2357,8 @@ msgstr "" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 #: archaeological_files/models.py:254 archaeological_files/models.py:349 -#: archaeological_files/models.py:369 archaeological_files/models.py:1439 -#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 +#: archaeological_files/models.py:369 archaeological_files/models.py:1440 +#: archaeological_files/models.py:1459 archaeological_files/models.py:1486 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5432 @@ -2576,7 +2557,7 @@ msgstr "" #: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 +#: archaeological_operations/models.py:991 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" @@ -2584,7 +2565,7 @@ msgstr "" #: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:991 +#: archaeological_operations/models.py:992 msgid "Extended area" msgstr "" @@ -2596,7 +2577,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/models_common.py:2024 ishtar_common/models_common.py:2040 #: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -2621,41 +2602,41 @@ msgstr "" msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1312 +#: archaeological_files/models.py:482 archaeological_finds/models_finds.py:1322 #: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1059 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1131 -#: archaeological_operations/models.py:2692 +#: archaeological_finds/models_treatments.py:1066 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:2671 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:483 -#: archaeological_finds/models_treatments.py:1056 -#: archaeological_operations/models.py:362 -#: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 +#: archaeological_files/models.py:484 +#: archaeological_finds/models_treatments.py:1063 +#: archaeological_operations/models.py:363 +#: archaeological_warehouse/models.py:959 ishtar_common/models.py:4317 msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:486 +#: archaeological_files/models.py:487 #: archaeological_finds/models_treatments.py:155 -#: archaeological_operations/models.py:368 +#: archaeological_operations/models.py:369 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:498 archaeological_operations/models.py:1155 +#: archaeological_files/models.py:499 archaeological_operations/models.py:1149 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:502 -#: archaeological_finds/models_treatments.py:1053 -#: archaeological_operations/models.py:365 -#: archaeological_operations/models.py:1159 +#: archaeological_files/models.py:503 +#: archaeological_finds/models_treatments.py:1060 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:1153 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2626 #: ishtar_common/models.py:2888 ishtar_common/models.py:3694 @@ -2663,85 +2644,85 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:505 +#: archaeological_files/models.py:506 #: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1062 -#: archaeological_operations/models.py:1165 -#: archaeological_operations/models.py:2703 +#: archaeological_finds/models_treatments.py:1069 +#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:2682 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 -#: archaeological_warehouse/models.py:954 ishtar_common/models.py:2629 +#: archaeological_warehouse/models.py:955 ishtar_common/models.py:2629 #: ishtar_common/models.py:2904 ishtar_common/models.py:3705 #: ishtar_common/models.py:4313 msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:508 +#: archaeological_files/models.py:509 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:511 +#: archaeological_files/models.py:512 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:517 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:522 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1518 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:1210 -#: archaeological_operations/models.py:2813 -#: archaeological_warehouse/models.py:971 ishtar_common/models.py:4388 +#: archaeological_files/models.py:526 archaeological_finds/models_finds.py:1520 +#: archaeological_operations/models.py:385 +#: archaeological_operations/models.py:1197 +#: archaeological_operations/models.py:2788 +#: archaeological_warehouse/models.py:972 ishtar_common/models.py:4388 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1677 -#: archaeological_finds/models_treatments.py:1065 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:1664 +#: archaeological_finds/models_treatments.py:1072 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:532 archaeological_operations/models.py:2748 +#: archaeological_files/models.py:533 archaeological_operations/models.py:2723 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2752 +#: archaeological_files/models.py:538 archaeological_operations/models.py:2727 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:559 -#: archaeological_finds/models_treatments.py:1109 +#: archaeological_files/models.py:560 +#: archaeological_finds/models_treatments.py:1105 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:567 +#: archaeological_files/models.py:568 #: archaeological_finds/forms_treatments.py:642 -#: archaeological_finds/forms_treatments.py:724 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:714 +#: archaeological_finds/models_treatments.py:1110 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1355 -#: archaeological_operations/forms.py:1824 -#: archaeological_operations/models.py:494 +#: archaeological_operations/forms.py:1133 +#: archaeological_operations/forms.py:1231 +#: archaeological_operations/forms.py:1348 +#: archaeological_operations/forms.py:1805 +#: archaeological_operations/models.py:495 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 @@ -2756,8 +2737,8 @@ msgstr "" #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 #: ishtar_common/models.py:3639 ishtar_common/models.py:5468 -#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 -#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 +#: ishtar_common/models_common.py:2247 ishtar_common/models_common.py:3371 +#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2784,8 +2765,8 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:572 -#: archaeological_finds/models_treatments.py:1123 +#: archaeological_files/models.py:573 +#: archaeological_finds/models_treatments.py:1119 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 @@ -2797,38 +2778,38 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:587 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:592 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:605 +#: archaeological_files/models.py:606 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:613 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:628 msgid "Main town" msgstr "" -#: archaeological_files/models.py:666 +#: archaeological_files/models.py:667 msgid "Main address" msgstr "" -#: archaeological_files/models.py:668 +#: archaeological_files/models.py:669 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:687 +#: archaeological_files/models.py:688 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 -#: archaeological_finds/models_treatments.py:252 +#: archaeological_finds/models_treatments.py:253 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:748 ishtar_common/forms_common.py:1022 #: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1246 @@ -2841,128 +2822,128 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:737 +#: archaeological_files/models.py:738 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:741 +#: archaeological_files/models.py:742 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:747 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:762 +#: archaeological_files/models.py:763 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:782 +#: archaeological_files/models.py:783 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:809 +#: archaeological_files/models.py:810 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1062 +#: archaeological_files/models.py:1063 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1068 +#: archaeological_files/models.py:1069 msgid "No town" msgstr "" -#: archaeological_files/models.py:1277 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1278 archaeological_operations/models.py:1959 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1279 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1280 archaeological_operations/models.py:1961 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1289 +#: archaeological_files/models.py:1290 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1291 +#: archaeological_files/models.py:1292 msgid "plan" msgstr "" -#: archaeological_files/models.py:1300 -#: archaeological_finds/models_treatments.py:409 -#: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:2013 +#: archaeological_files/models.py:1301 +#: archaeological_finds/models_treatments.py:410 +#: archaeological_finds/models_treatments.py:1226 +#: archaeological_operations/models.py:1992 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1302 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:2015 +#: archaeological_files/models.py:1303 +#: archaeological_finds/models_treatments.py:412 +#: archaeological_finds/models_treatments.py:1228 +#: archaeological_operations/models.py:1994 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1311 +#: archaeological_files/models.py:1312 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1313 +#: archaeological_files/models.py:1314 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1388 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3147 +#: archaeological_files/models.py:1389 archaeological_operations/models.py:1372 +#: archaeological_operations/models.py:3122 msgid "File" msgstr "" -#: archaeological_files/models.py:1407 +#: archaeological_files/models.py:1408 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 +#: archaeological_files/models.py:1410 archaeological_files/models.py:1476 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1411 +#: archaeological_files/models.py:1412 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 +#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1437 +#: archaeological_files/models.py:1438 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1438 +#: archaeological_files/models.py:1439 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1456 +#: archaeological_files/models.py:1457 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1457 +#: archaeological_files/models.py:1458 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1473 +#: archaeological_files/models.py:1474 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1477 +#: archaeological_files/models.py:1478 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1483 +#: archaeological_files/models.py:1484 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1484 +#: archaeological_files/models.py:1485 msgid "Equipment requirements" msgstr "" @@ -3046,7 +3027,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2934 +#: archaeological_operations/models.py:2909 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3064,8 +3045,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 -#: archaeological_operations/models.py:2666 -#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2645 +#: archaeological_operations/models.py:2944 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 @@ -3077,7 +3058,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 -#: archaeological_finds/forms_treatments.py:735 +#: archaeological_finds/forms_treatments.py:725 #: archaeological_finds/models_treatments.py:131 #: archaeological_finds/templates/ishtar/sheet_find.html:390 #: archaeological_finds/templates/ishtar/sheet_find.html:428 @@ -3091,7 +3072,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: archaeological_warehouse/models.py:336 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 #: cd17_app/templates/ishtar/sheet_find.html:392 #: cd17_app/templates/ishtar/sheet_find.html:430 #: cd17_app/templates/ishtar/sheet_find.html:468 @@ -3135,8 +3116,9 @@ msgid "Type" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_operations/forms.py:791 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/forms.py:539 +#: archaeological_operations/forms.py:784 +#: archaeological_operations/models.py:1332 msgid "Excavation end date" msgstr "" @@ -3309,71 +3291,71 @@ msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:752 #: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1357 -#: archaeological_finds/forms.py:1734 archaeological_finds/forms.py:2471 +#: archaeological_finds/forms.py:1721 archaeological_finds/forms.py:2387 #: archaeological_finds/models_finds.py:550 -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2006 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1021 -#: archaeological_finds/models_finds.py:2034 +#: archaeological_finds/models_finds.py:2009 msgid "Museum ID prefix" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1022 -#: archaeological_finds/forms.py:1736 archaeological_finds/models_finds.py:2035 +#: archaeological_finds/forms.py:1723 archaeological_finds/models_finds.py:2010 msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1023 -#: archaeological_finds/models_finds.py:2036 +#: archaeological_finds/models_finds.py:2011 msgid "Museum ID suffix" msgstr "" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2037 +#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2012 msgid "Comment on museum ID" msgstr "" #: archaeological_finds/forms.py:363 archaeological_finds/forms.py:754 #: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1359 -#: archaeological_finds/forms.py:1735 archaeological_finds/forms.py:2538 -#: archaeological_finds/models_finds.py:2032 ishtar_common/forms_common.py:1410 +#: archaeological_finds/forms.py:1722 archaeological_finds/forms.py:2454 +#: archaeological_finds/models_finds.py:2007 ishtar_common/forms_common.py:1410 #: ishtar_common/models.py:3278 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1017 -#: archaeological_finds/forms.py:1738 archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:1725 archaeological_finds/models_finds.py:2153 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1741 archaeological_finds/models_finds.py:2038 +#: archaeological_finds/forms.py:1728 archaeological_finds/models_finds.py:2013 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1025 -#: archaeological_finds/forms.py:1740 archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:1727 archaeological_finds/models_finds.py:2004 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2228 +#: archaeological_finds/models_finds.py:2203 msgid "Presence of inventory marking" msgstr "" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1075 -#: archaeological_finds/models_finds.py:2232 +#: archaeological_finds/models_finds.py:2207 msgid "Type of marking" msgstr "" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1026 -#: archaeological_finds/forms.py:2063 archaeological_finds/models_finds.py:2175 +#: archaeological_finds/forms.py:1979 archaeological_finds/models_finds.py:2150 msgid "Marking details" msgstr "" #: archaeological_finds/forms.py:380 archaeological_finds/forms.py:990 -#: archaeological_finds/forms.py:1664 archaeological_finds/models_finds.py:429 +#: archaeological_finds/forms.py:1651 archaeological_finds/models_finds.py:429 #: archaeological_finds/models_finds.py:444 #: archaeological_finds/models_finds.py:459 #: archaeological_finds/models_finds.py:474 @@ -3383,56 +3365,56 @@ msgid "Museum" msgstr "" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1036 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/models_finds.py:2174 msgid "Owner institution" msgstr "" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1042 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2179 msgid "Assigned institution" msgstr "" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2184 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2186 msgid "Depositor inventory number" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1053 -#: archaeological_finds/models_finds.py:2214 +#: archaeological_finds/models_finds.py:2189 msgid "Collections entry mode" msgstr "" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1055 -#: archaeological_finds/models_finds.py:2216 +#: archaeological_finds/models_finds.py:2191 msgid "Comment on museum entry mode" msgstr "" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1058 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2192 msgid "Museum entry date (exact or start)" msgstr "" #: archaeological_finds/forms.py:399 archaeological_finds/forms.py:1061 -#: archaeological_finds/models_finds.py:2218 +#: archaeological_finds/models_finds.py:2193 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2194 msgid "Comment on museum entry date" msgstr "" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1064 -#: archaeological_finds/models_finds.py:2223 +#: archaeological_finds/models_finds.py:2198 msgid "Donor, testator or vendor" msgstr "" #: archaeological_finds/forms.py:411 archaeological_finds/forms.py:1077 -#: archaeological_finds/models_finds.py:2192 -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2214 msgid "Collection" msgstr "" @@ -3441,41 +3423,41 @@ msgid "Former collections" msgstr "" #: archaeological_finds/forms.py:416 archaeological_finds/forms.py:1084 -#: archaeological_finds/models_finds.py:2247 +#: archaeological_finds/models_finds.py:2222 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2251 +#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2226 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2253 +#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2228 msgid "Comment on conformity" msgstr "" #: archaeological_finds/forms.py:425 archaeological_finds/forms.py:1085 -#: archaeological_finds/models_finds.py:2257 +#: archaeological_finds/models_finds.py:2232 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2259 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2234 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2260 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2235 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2254 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2229 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2273 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:442 archaeological_finds/forms.py:761 -#: archaeological_finds/forms.py:1848 archaeological_finds/models_finds.py:2115 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2090 msgid "Is complete?" msgstr "" @@ -3483,23 +3465,23 @@ msgstr "" #: archaeological_finds/forms.py:1097 archaeological_finds/models_finds.py:96 #: archaeological_finds/models_finds.py:1168 #: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:2021 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:447 archaeological_finds/forms.py:767 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2050 +#: archaeological_finds/forms.py:1838 archaeological_finds/models_finds.py:2025 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "" #: archaeological_finds/forms.py:450 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2058 +#: archaeological_finds/forms.py:1841 archaeological_finds/models_finds.py:2033 msgid "Technical processes" msgstr "" -#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1866 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1847 +#: archaeological_finds/models_finds.py:2038 msgid "Comment on the material" msgstr "" @@ -3507,85 +3489,85 @@ msgstr "" #: archaeological_finds/forms.py:1104 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2117 +#: archaeological_finds/models_finds.py:2092 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:461 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1854 archaeological_finds/models_finds.py:2096 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:464 archaeological_finds/forms.py:1108 -#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2129 +#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2104 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:468 archaeological_finds/forms.py:1112 -#: archaeological_finds/forms.py:1882 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2110 msgid "Technical areas" msgstr "" #: archaeological_finds/forms.py:471 archaeological_finds/forms.py:776 -#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1888 -#: archaeological_finds/forms.py:2477 archaeological_finds/models_finds.py:2070 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:2393 archaeological_finds/models_finds.py:2045 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:473 archaeological_finds/forms.py:778 -#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1871 +#: archaeological_finds/models_finds.py:2047 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:475 archaeological_finds/forms.py:780 -#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1892 -#: archaeological_finds/models_finds.py:2261 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1873 +#: archaeological_finds/models_finds.py:2236 msgid "Inventory quantity" msgstr "" #: archaeological_finds/forms.py:476 archaeological_finds/forms.py:781 -#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1893 -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1874 +#: archaeological_finds/models_finds.py:2237 msgid "Observed quantity" msgstr "" #: archaeological_finds/forms.py:478 archaeological_finds/forms.py:783 -#: archaeological_finds/models_finds.py:2075 +#: archaeological_finds/models_finds.py:2050 msgid "Comment on quantity" msgstr "" #: archaeological_finds/forms.py:482 archaeological_finds/forms.py:787 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:2040 +#: archaeological_finds/forms.py:1877 archaeological_finds/models_finds.py:2015 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:790 -#: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2016 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:488 archaeological_finds/forms.py:793 -#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1895 -#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1876 +#: archaeological_finds/models_finds.py:2018 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:491 archaeological_finds/forms.py:796 -#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1899 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1880 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2128 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:499 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1905 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1886 +#: archaeological_finds/models_finds.py:2152 msgid "Comment on dating" msgstr "" #: archaeological_finds/forms.py:502 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1621 #: archaeological_finds/templates/ishtar/sheet_find.html:198 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:177 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -3597,43 +3579,44 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:806 -#: archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:2132 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:807 -#: archaeological_finds/models_finds.py:2158 +#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:2133 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:808 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:2134 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:811 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2137 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:809 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:2135 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:519 archaeological_finds/forms.py:810 -#: archaeological_finds/models_finds.py:2161 +#: archaeological_finds/forms.py:1893 archaeological_finds/models_finds.py:2136 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:523 archaeological_finds/forms.py:812 -#: archaeological_finds/forms.py:2475 archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:1894 archaeological_finds/forms.py:2391 +#: archaeological_finds/models_finds.py:2040 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "" #: archaeological_finds/forms.py:525 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2392 #: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:186 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3645,31 +3628,35 @@ msgid "Weight (g)" msgstr "" #: archaeological_finds/forms.py:528 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:1897 msgid "Clutter long side (cm)" msgstr "" #: archaeological_finds/forms.py:533 archaeological_finds/forms.py:818 +#: archaeological_finds/forms.py:1901 msgid "Clutter short side (cm)" msgstr "" #: archaeological_finds/forms.py:538 archaeological_finds/forms.py:821 +#: archaeological_finds/forms.py:1905 msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:543 archaeological_finds/forms.py:824 -#: archaeological_finds/forms.py:1976 archaeological_finds/models_finds.py:2173 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:2148 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:547 archaeological_finds/forms.py:828 -#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1981 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1913 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2182 +#: archaeological_finds/models_finds.py:2157 msgid "Check" msgstr "" #: archaeological_finds/forms.py:549 archaeological_finds/forms.py:830 -#: archaeological_finds/forms.py:1141 archaeological_finds/models_finds.py:2187 +#: archaeological_finds/forms.py:1141 archaeological_finds/forms.py:1914 +#: archaeological_finds/models_finds.py:2162 msgid "Check date" msgstr "" @@ -3688,25 +3675,27 @@ msgid "Comment on the circumstances of discovery" msgstr "" #: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1019 -#: archaeological_finds/forms.py:1739 archaeological_finds/models_finds.py:555 +#: archaeological_finds/forms.py:1726 archaeological_finds/models_finds.py:555 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:709 archaeological_finds/models_finds.py:568 +#: archaeological_finds/forms.py:709 archaeological_finds/forms.py:1823 +#: archaeological_finds/models_finds.py:568 #: archaeological_finds/templates/ishtar/sheet_basefind.html:32 #: man_app/templates/ishtar/sheet_basefind.html:29 #: sra_idf_app/templates/ishtar/sheet_basefind.html:32 msgid "Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/forms.py:712 archaeological_finds/models_finds.py:571 +#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1826 +#: archaeological_finds/models_finds.py:571 #: archaeological_finds/templates/ishtar/sheet_basefind.html:34 #: man_app/templates/ishtar/sheet_basefind.html:31 #: sra_idf_app/templates/ishtar/sheet_basefind.html:34 msgid "Discovery date (end)" msgstr "" -#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1847 +#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1828 #: archaeological_finds/models_finds.py:575 msgid "Batch/object" msgstr "" @@ -3715,12 +3704,12 @@ msgstr "" msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1979 +#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1911 #: archaeological_finds/models_finds.py:583 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2468 +#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2384 msgid "Resulting find" msgstr "" @@ -3728,7 +3717,7 @@ msgstr "" msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2399 msgid "Resulting finds" msgstr "" @@ -3772,7 +3761,7 @@ msgid "Datation" msgstr "" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 -#: archaeological_finds/forms.py:1651 +#: archaeological_finds/forms.py:1638 #: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3784,22 +3773,22 @@ msgid "Preservation" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 -#: archaeological_finds/forms.py:1990 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/forms.py:1919 archaeological_finds/models_finds.py:1213 +#: archaeological_finds/models_finds.py:2255 #: archaeological_warehouse/forms.py:593 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1991 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2284 +#: archaeological_finds/forms.py:1920 archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2259 #: archaeological_warehouse/forms.py:594 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 -#: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/forms.py:1917 archaeological_finds/models_finds.py:1208 +#: archaeological_finds/models_finds.py:2242 #: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3807,34 +3796,34 @@ msgid "Conservatory states" msgstr "" #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1523 -#: archaeological_finds/forms.py:1995 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2290 +#: archaeological_finds/forms.py:1924 archaeological_finds/models_finds.py:1215 +#: archaeological_finds/models_finds.py:2265 #: archaeological_warehouse/forms.py:598 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1487 -#: archaeological_finds/forms.py:1986 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2141 +#: archaeological_finds/forms.py:1915 archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:2116 #: archaeological_warehouse/forms.py:590 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1493 -#: archaeological_finds/forms.py:1987 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:1916 archaeological_finds/models_finds.py:1210 +#: archaeological_finds/models_finds.py:2122 #: archaeological_warehouse/forms.py:591 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:1144 archaeological_finds/forms.py:1528 -#: archaeological_finds/models_finds.py:2296 +#: archaeological_finds/forms.py:1928 archaeological_finds/models_finds.py:2271 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:1146 archaeological_finds/forms.py:1526 -#: archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2295 +#: archaeological_finds/forms.py:1927 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2270 msgid "Insurance value" msgstr "" @@ -3855,12 +3844,12 @@ msgstr "" msgid "Update" msgstr "" -#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1826 -#: archaeological_finds/forms.py:2687 archaeological_finds/forms.py:2692 -#: archaeological_finds/forms.py:2709 archaeological_finds/forms.py:2714 +#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1813 +#: archaeological_finds/forms.py:2603 archaeological_finds/forms.py:2608 +#: archaeological_finds/forms.py:2625 archaeological_finds/forms.py:2630 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:930 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1892 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3878,24 +3867,24 @@ msgstr "" msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2583 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2499 #: ishtar_common/models.py:1084 ishtar_common/models.py:2079 #: ishtar_common/models.py:3838 ishtar_common/models_imports.py:158 #: ishtar_common/models_imports.py:437 ishtar_common/models_imports.py:825 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2584 +#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2500 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2589 -#: archaeological_finds/forms.py:2631 ishtar_common/models.py:3851 +#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2505 +#: archaeological_finds/forms.py:2547 ishtar_common/models.py:3851 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2596 -#: archaeological_finds/forms.py:2638 ishtar_common/models.py:3857 +#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2512 +#: archaeological_finds/forms.py:2554 ishtar_common/models.py:3857 msgid "Shared (read/edit) with" msgstr "" @@ -3903,19 +3892,20 @@ msgstr "" msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1922 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2275 +#: archaeological_finds/models_finds.py:2250 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1525 archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:1525 archaeological_finds/forms.py:1926 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2163 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1989 -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1918 +#: archaeological_finds/models_finds.py:2246 msgid "Conservatory comment" msgstr "" @@ -3935,107 +3925,91 @@ msgstr "" msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1737 archaeological_finds/models_finds.py:2337 +#: archaeological_finds/forms.py:1724 archaeological_finds/models_finds.py:2312 msgid "Complete museum ID" msgstr "" -#: archaeological_finds/forms.py:1743 archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1730 archaeological_finds/models_finds.py:1148 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1744 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1731 archaeological_finds/models_finds.py:1149 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1748 +#: archaeological_finds/forms.py:1735 msgid "Operation - number (index by year)" msgstr "" -#: archaeological_finds/forms.py:1751 +#: archaeological_finds/forms.py:1738 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1754 +#: archaeological_finds/forms.py:1741 msgid "Operation - Type" msgstr "" -#: archaeological_finds/forms.py:1757 +#: archaeological_finds/forms.py:1744 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1760 +#: archaeological_finds/forms.py:1747 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1758 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1774 +#: archaeological_finds/forms.py:1761 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1778 +#: archaeological_finds/forms.py:1765 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1781 +#: archaeological_finds/forms.py:1768 msgid "Operation - Remains" msgstr "" -#: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 +#: archaeological_finds/forms.py:1771 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1239 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1787 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1774 archaeological_warehouse/forms.py:537 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1795 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1782 archaeological_warehouse/forms.py:545 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1798 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1785 archaeological_warehouse/forms.py:548 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1806 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1793 archaeological_warehouse/forms.py:556 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1809 +#: archaeological_finds/forms.py:1796 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1822 +#: archaeological_finds/forms.py:1809 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1834 +#: archaeological_finds/forms.py:1821 msgid "Base find - Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:1836 -msgid "Discovery date (exact or beginning) after" -msgstr "" - -#: archaeological_finds/forms.py:1839 -msgid "Discovery date (exact or beginning) before" -msgstr "" - -#: archaeological_finds/forms.py:1842 -msgid "Discovery date (end) after" -msgstr "" - -#: archaeological_finds/forms.py:1845 -msgid "Discovery date (end) before" -msgstr "" - -#: archaeological_finds/forms.py:1850 archaeological_finds/forms.py:2474 +#: archaeological_finds/forms.py:1831 archaeological_finds/forms.py:2390 #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -4045,7 +4019,7 @@ msgstr "" msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1868 archaeological_finds/models_finds.py:275 +#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 @@ -4054,244 +4028,120 @@ msgstr "" msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1908 -msgid "Length - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1911 -msgid "Length - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1914 -msgid "Width - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1917 -msgid "Width - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1920 -msgid "Height - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1923 -msgid "Height - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1926 -msgid "Thickness - lower than (cm)" +#: archaeological_finds/forms.py:1895 +msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1929 -msgid "Thickness - higher than (cm)" +#: archaeological_finds/forms.py:1930 +msgid "Loan?" msgstr "" #: archaeological_finds/forms.py:1932 -msgid "Diameter - lower than (cm)" +msgid "Treatment file end date" msgstr "" #: archaeological_finds/forms.py:1935 -msgid "Diameter - higher than (cm)" +msgid "Treatment end date" msgstr "" #: archaeological_finds/forms.py:1938 -msgid "Circumference - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1941 -msgid "Circumference - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1944 -msgid "Volume - lower than (l)" -msgstr "" - -#: archaeological_finds/forms.py:1945 -msgid "Volume - higher than (l)" -msgstr "" - -#: archaeological_finds/forms.py:1947 -msgid "Weight - lower than (g)" -msgstr "" - -#: archaeological_finds/forms.py:1950 -msgid "Weight - higher than (g)" -msgstr "" - -#: archaeological_finds/forms.py:1953 -msgid "Clutter long side - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1957 -msgid "Clutter long side - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1961 -msgid "Clutter short side - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1965 -msgid "Clutter short side - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1969 -msgid "Clutter height - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1973 -msgid "Clutter height - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1982 -msgid "Check date after" -msgstr "" - -#: archaeological_finds/forms.py:1984 -msgid "Check date before" -msgstr "" - -#: archaeological_finds/forms.py:1997 -msgid "Estimated value - higher than" -msgstr "" - -#: archaeological_finds/forms.py:1998 -msgid "Estimated value - lower than" -msgstr "" - -#: archaeological_finds/forms.py:1999 -msgid "Insurance value - higher than" -msgstr "" - -#: archaeological_finds/forms.py:2000 -msgid "Insurance value - lower than" -msgstr "" - -#: archaeological_finds/forms.py:2002 -msgid "Appraisal date after" -msgstr "" - -#: archaeological_finds/forms.py:2005 -msgid "Appraisal date before" -msgstr "" - -#: archaeological_finds/forms.py:2008 -msgid "Loan?" -msgstr "" - -#: archaeological_finds/forms.py:2010 -msgid "Treatment file end date before" -msgstr "" - -#: archaeological_finds/forms.py:2013 -msgid "Treatment end date before" -msgstr "" - -#: archaeological_finds/forms.py:2016 msgid "Museum - Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1940 msgid "Museum - Owner institution" msgstr "" -#: archaeological_finds/forms.py:2024 +#: archaeological_finds/forms.py:1946 msgid "Museum - Assigned institution" msgstr "" -#: archaeological_finds/forms.py:2030 +#: archaeological_finds/forms.py:1952 msgid "Museum - Custodian institution" msgstr "" -#: archaeological_finds/forms.py:2035 +#: archaeological_finds/forms.py:1957 msgid "Museum - Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:2036 +#: archaeological_finds/forms.py:1958 msgid "Museum - Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:2037 +#: archaeological_finds/forms.py:1959 msgid "Museum - Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:2039 -msgid "Museum - Entry date (exact or start) - before" -msgstr "" - -#: archaeological_finds/forms.py:2042 -msgid "Museum - Entry date (exact or start) - after" -msgstr "" - -#: archaeological_finds/forms.py:2045 -msgid "Museum - Entry date end - before" +#: archaeological_finds/forms.py:1961 +msgid "Museum - Entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:2048 -msgid "Museum - Entry date end - after" +#: archaeological_finds/forms.py:1964 +msgid "Museum - Entry date end" msgstr "" -#: archaeological_finds/forms.py:2050 +#: archaeological_finds/forms.py:1966 msgid "Museum - Comment on entry date" msgstr "" -#: archaeological_finds/forms.py:2052 +#: archaeological_finds/forms.py:1968 msgid "Museum - Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:2058 +#: archaeological_finds/forms.py:1974 msgid "Museum - Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:2061 +#: archaeological_finds/forms.py:1977 msgid "Museum - Type of marking" msgstr "" -#: archaeological_finds/forms.py:2065 +#: archaeological_finds/forms.py:1981 msgid "Museum - Collection" msgstr "" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:1984 msgid "Museum - Former collection" msgstr "" -#: archaeological_finds/forms.py:2073 +#: archaeological_finds/forms.py:1989 msgid "Museum - Inventory entry year - before" msgstr "" -#: archaeological_finds/forms.py:2074 +#: archaeological_finds/forms.py:1990 msgid "Museum - Inventory entry year - after" msgstr "" -#: archaeological_finds/forms.py:2076 +#: archaeological_finds/forms.py:1992 msgid "Museum - Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:2078 +#: archaeological_finds/forms.py:1994 msgid "Museum - Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:2079 +#: archaeological_finds/forms.py:1995 msgid "Museum - Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:2081 +#: archaeological_finds/forms.py:1997 msgid "Museum - Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:2084 +#: archaeological_finds/forms.py:2000 msgid "Museum - Date of allocation - before" msgstr "" -#: archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2003 msgid "Museum - Date of allocation - after" msgstr "" -#: archaeological_finds/forms.py:2089 +#: archaeological_finds/forms.py:2005 msgid "Museum - Purchase price" msgstr "" -#: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2109 +#: archaeological_finds/forms.py:2076 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2084 #: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4303,11 +4153,11 @@ msgstr "" msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:2167 +#: archaeological_finds/forms.py:2083 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 +#: archaeological_finds/forms.py:2102 archaeological_finds/models_finds.py:1164 #: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4319,50 +4169,50 @@ msgstr "" msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:2193 +#: archaeological_finds/forms.py:2109 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2234 -#: archaeological_finds/forms.py:2290 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2129 archaeological_finds/forms.py:2150 +#: archaeological_finds/forms.py:2206 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 -#: archaeological_finds/models_treatments.py:399 +#: archaeological_finds/forms.py:2245 archaeological_finds/forms.py:2408 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:2352 +#: archaeological_finds/forms.py:2268 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:2473 +#: archaeological_finds/forms.py:2389 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2488 +#: archaeological_finds/forms.py:2404 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2531 +#: archaeological_finds/forms.py:2447 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2543 archaeological_finds/forms.py:2561 +#: archaeological_finds/forms.py:2459 archaeological_finds/forms.py:2477 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2578 +#: archaeological_finds/forms.py:2494 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2581 +#: archaeological_finds/forms.py:2497 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:200 +#: archaeological_finds/models_treatments.py:201 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 #: archaeological_finds/templates/ishtar/sheet_find.html:389 #: archaeological_finds/templates/ishtar/sheet_find.html:427 @@ -4376,7 +4226,7 @@ msgstr "" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 +#: ishtar_common/models_common.py:2023 ishtar_common/models_common.py:2039 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4393,11 +4243,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2623 archaeological_finds/forms.py:2678 +#: archaeological_finds/forms.py:2539 archaeological_finds/forms.py:2594 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2670 +#: archaeological_finds/forms.py:2586 msgid "Another basket already exists with this name." msgstr "" @@ -4407,14 +4257,14 @@ msgstr "" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:203 msgid "Other ref." msgstr "" #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 #: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:244 +#: archaeological_finds/models_treatments.py:245 msgid "Scientific monitoring manager" msgstr "" @@ -4423,8 +4273,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:582 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:215 -#: archaeological_finds/models_treatments.py:757 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:758 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "" @@ -4440,12 +4290,12 @@ msgstr "" #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:292 -#: archaeological_finds/models_treatments.py:746 +#: archaeological_finds/models_treatments.py:293 +#: archaeological_finds/models_treatments.py:747 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2555 -#: archaeological_operations/models.py:2892 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2867 ishtar_common/views.py:511 msgid "Treatment" msgstr "" @@ -4455,9 +4305,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:163 #: archaeological_finds/forms_treatments.py:433 -#: archaeological_finds/forms_treatments.py:737 +#: archaeological_finds/forms_treatments.py:727 #: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:236 +#: archaeological_finds/models_treatments.py:237 msgid "Responsible" msgstr "" @@ -4466,7 +4316,7 @@ msgid "Destination container (relevant for treatment that change location)" msgstr "" #: archaeological_finds/forms_treatments.py:191 -#: archaeological_finds/models_treatments.py:263 +#: archaeological_finds/models_treatments.py:264 msgid "Goal" msgstr "" @@ -4528,7 +4378,7 @@ msgid "Another treatment with this index exists for {}." msgstr "" #: archaeological_finds/forms_treatments.py:378 -#: archaeological_finds/models_treatments.py:212 +#: archaeological_finds/models_treatments.py:213 msgid "Associated request" msgstr "" @@ -4537,13 +4387,13 @@ msgid "Treatment - 010 - Request choice" msgstr "" #: archaeological_finds/forms_treatments.py:384 -#: archaeological_finds/forms_treatments.py:715 +#: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1183 -#: archaeological_finds/models_treatments.py:1203 +#: archaeological_finds/models_treatments.py:1179 +#: archaeological_finds/models_treatments.py:1199 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2884 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2533 +#: archaeological_operations/models.py:2859 ishtar_common/views.py:510 msgid "Treatment request" msgstr "" @@ -4558,10 +4408,10 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:2101 -#: archaeological_finds/models_finds.py:3593 -#: archaeological_finds/models_treatments.py:269 -#: archaeological_finds/models_treatments.py:761 +#: archaeological_finds/models_finds.py:2076 +#: archaeological_finds/models_finds.py:3567 +#: archaeological_finds/models_treatments.py:270 +#: archaeological_finds/models_treatments.py:762 #: archaeological_finds/templates/ishtar/sheet_find.html:394 #: archaeological_finds/templates/ishtar/sheet_find.html:432 #: archaeological_finds/templates/ishtar/sheet_find.html:470 @@ -4569,8 +4419,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 #: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1212 -#: archaeological_warehouse/models.py:2061 +#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:2062 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4657,14 +4507,14 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 +#: archaeological_finds/forms_treatments.py:721 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" #: archaeological_finds/forms_treatments.py:655 -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1131 +#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/models_treatments.py:1127 #: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 @@ -4677,8 +4527,8 @@ msgid "Applicant" msgstr "" #: archaeological_finds/forms_treatments.py:661 -#: archaeological_finds/forms_treatments.py:749 -#: archaeological_finds/models_treatments.py:1139 +#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/models_treatments.py:1135 #: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 @@ -4690,86 +4540,72 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:670 -msgid "Exhibition started before" -msgstr "" - -#: archaeological_finds/forms_treatments.py:673 -msgid "Exhibition started after" -msgstr "" - -#: archaeological_finds/forms_treatments.py:676 -msgid "Exhibition ended before" +#: archaeological_finds/forms_treatments.py:669 +#: archaeological_finds/forms_treatments.py:752 +#: archaeological_finds/models_treatments.py:1148 +msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:679 -msgid "Exhibition ended after" +#: archaeological_finds/forms_treatments.py:670 +#: archaeological_finds/forms_treatments.py:754 +#: archaeological_finds/models_treatments.py:1151 +msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:690 -#: archaeological_finds/forms_treatments.py:702 +#: archaeological_finds/forms_treatments.py:680 +#: archaeological_finds/forms_treatments.py:692 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/forms_treatments.py:723 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/forms_treatments.py:745 msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:759 -#: archaeological_finds/models_treatments.py:1150 +#: archaeological_finds/forms_treatments.py:749 +#: archaeological_finds/models_treatments.py:1146 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:762 -#: archaeological_finds/models_treatments.py:1152 -msgid "Exhibition start date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:764 -#: archaeological_finds/models_treatments.py:1155 -msgid "Exhibition end date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:822 +#: archaeological_finds/forms_treatments.py:812 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:818 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:829 +#: archaeological_finds/forms_treatments.py:819 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:853 +#: archaeological_finds/forms_treatments.py:843 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:855 +#: archaeological_finds/forms_treatments.py:845 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:857 +#: archaeological_finds/forms_treatments.py:847 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:859 +#: archaeological_finds/forms_treatments.py:849 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:861 -#: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/models_treatments.py:1117 +#: archaeological_finds/forms_treatments.py:851 +#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1113 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:895 +#: archaeological_finds/forms_treatments.py:885 msgid "Treatment request - Administrative act - General" msgstr "" @@ -4790,9 +4626,9 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:91 -#: archaeological_operations/models.py:2559 +#: archaeological_operations/models.py:2538 #: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1158 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4052 msgid "Code" msgstr "" @@ -4876,17 +4712,17 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:379 +#: archaeological_finds/models_treatments.py:380 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2313 +#: archaeological_finds/models_finds.py:2288 #: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:293 -#: archaeological_finds/models_treatments.py:305 -#: archaeological_finds/models_treatments.py:1006 -#: archaeological_finds/models_treatments.py:1196 +#: archaeological_finds/models_treatments.py:294 +#: archaeological_finds/models_treatments.py:306 +#: archaeological_finds/models_treatments.py:1007 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -5064,7 +4900,7 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2341 ishtar_common/models.py:4709 +#: archaeological_finds/models_finds.py:2316 ishtar_common/models.py:4709 #: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "" @@ -5078,7 +4914,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:622 -#: archaeological_finds/models_finds.py:2022 +#: archaeological_finds/models_finds.py:1997 msgid "Base find" msgstr "" @@ -5114,7 +4950,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1927 +#: archaeological_warehouse/models.py:1928 msgid "Add treatment" msgstr "" @@ -5156,12 +4992,12 @@ msgstr "" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1705 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:988 -#: archaeological_operations/models.py:1078 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5379 +#: archaeological_operations/forms.py:715 +#: archaeological_operations/forms.py:1686 +#: archaeological_operations/forms.py:1754 +#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1380 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" @@ -5170,665 +5006,620 @@ msgstr "" msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1294 +#: archaeological_finds/models_finds.py:1304 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1298 +#: archaeological_finds/models_finds.py:1308 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1302 +#: archaeological_finds/models_finds.py:1312 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1315 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1320 archaeological_finds/tests.py:1537 -#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:984 +#: archaeological_finds/models_finds.py:1330 archaeological_finds/tests.py:1537 +#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:4403 +#: archaeological_finds/models_finds.py:1334 ishtar_common/models.py:4403 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_operations/models.py:381 -#: archaeological_operations/models.py:1147 ishtar_common/models.py:4452 +#: archaeological_finds/models_finds.py:1338 +#: archaeological_operations/models.py:382 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4452 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1337 -#: archaeological_warehouse/models.py:993 +#: archaeological_finds/models_finds.py:1347 +#: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1950 -#: archaeological_warehouse/models.py:998 +#: archaeological_finds/models_finds.py:1352 +#: archaeological_finds/models_finds.py:1925 +#: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1347 -#: archaeological_warehouse/models.py:1003 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1351 -#: archaeological_finds/models_finds.py:1945 -#: archaeological_warehouse/models.py:1007 ishtar_common/models.py:4411 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_finds/models_finds.py:1920 +#: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4411 #: ishtar_common/models.py:4525 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1355 +#: archaeological_finds/models_finds.py:1365 msgctxt "key for text search" msgid "discovery-comment" msgstr "" -#: archaeological_finds/models_finds.py:1363 +#: archaeological_finds/models_finds.py:1373 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1367 archaeological_finds/tests.py:1444 -#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1019 +#: archaeological_finds/models_finds.py:1377 archaeological_finds/tests.py:1444 +#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1372 -#: archaeological_warehouse/models.py:1023 +#: archaeological_finds/models_finds.py:1382 +#: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1380 archaeological_finds/tests.py:1691 -#: archaeological_warehouse/models.py:1031 +#: archaeological_finds/models_finds.py:1390 archaeological_finds/tests.py:1691 +#: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1384 -#: archaeological_warehouse/models.py:1035 +#: archaeological_finds/models_finds.py:1394 +#: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1388 -#: archaeological_warehouse/models.py:1039 +#: archaeological_finds/models_finds.py:1398 +#: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1392 archaeological_finds/tests.py:1586 +#: archaeological_finds/models_finds.py:1402 archaeological_finds/tests.py:1586 #: ishtar_common/models.py:4325 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1395 +#: archaeological_finds/models_finds.py:1405 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1403 ishtar_common/models.py:4434 +#: archaeological_finds/models_finds.py:1413 ishtar_common/models.py:4434 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1407 -#: archaeological_finds/models_finds.py:1948 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1417 +#: archaeological_finds/models_finds.py:1923 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1421 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1425 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1429 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1430 -#: ishtar_common/models_common.py:1578 +#: archaeological_finds/models_finds.py:1440 +#: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1433 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1443 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1435 +#: archaeological_finds/models_finds.py:1445 msgctxt "key for text search" -msgid "treatment-file-end-date-before" +msgid "treatment-file-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1449 msgctxt "key for text search" -msgid "treatment-end-date-before" +msgid "treatment-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1453 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1450 +#: archaeological_finds/models_finds.py:1460 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1453 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1457 +#: archaeological_finds/models_finds.py:1467 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1470 msgctxt "key for text search" msgid "complete-museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1463 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1467 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1470 -msgctxt "key for text search" -msgid "discovery-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1474 -msgctxt "key for text search" -msgid "discovery-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" -msgid "discovery-date-taq-before" +msgid "discovery-date" msgstr "" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1484 msgctxt "key for text search" -msgid "discovery-date-taq-after" +msgid "discovery-date-taq" msgstr "" -#: archaeological_finds/models_finds.py:1486 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1491 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1493 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1497 +#: archaeological_finds/models_finds.py:1499 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1500 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1504 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1512 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1523 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1525 +#: archaeological_finds/models_finds.py:1527 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1531 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1533 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1538 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1541 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1544 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1557 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1560 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1564 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1572 msgctxt "key for text search" -msgid "length-higher" +msgid "length" msgstr "" -#: archaeological_finds/models_finds.py:1573 +#: archaeological_finds/models_finds.py:1575 msgctxt "key for text search" -msgid "width-higher" +msgid "width" msgstr "" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1578 msgctxt "key for text search" -msgid "height-higher" +msgid "height" msgstr "" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" -msgid "thickness-higher" +msgid "thickness" msgstr "" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" -msgid "diameter-higher" +msgid "diameter" msgstr "" -#: archaeological_finds/models_finds.py:1585 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" -msgid "circumference-higher" +msgid "circumference" msgstr "" -#: archaeological_finds/models_finds.py:1589 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" -msgid "volume-higher" +msgid "volume" msgstr "" -#: archaeological_finds/models_finds.py:1592 +#: archaeological_finds/models_finds.py:1594 msgctxt "key for text search" -msgid "weight-higher" +msgid "weight" msgstr "" -#: archaeological_finds/models_finds.py:1595 +#: archaeological_finds/models_finds.py:1597 msgctxt "key for text search" -msgid "clutter-long-side-higher" +msgid "clutter-long-side" msgstr "" -#: archaeological_finds/models_finds.py:1599 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" -msgid "clutter-short-side-higher" +msgid "clutter-short-side" msgstr "" -#: archaeological_finds/models_finds.py:1603 +#: archaeological_finds/models_finds.py:1605 msgctxt "key for text search" -msgid "clutter-height-higher" +msgid "clutter-height" msgstr "" -#: archaeological_finds/models_finds.py:1607 +#: archaeological_finds/models_finds.py:1609 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1611 +#: archaeological_finds/models_finds.py:1613 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1615 +#: archaeological_finds/models_finds.py:1617 msgctxt "key for text search" -msgid "check-date-before" +msgid "check-date" msgstr "" -#: archaeological_finds/models_finds.py:1618 -msgctxt "key for text search" -msgid "check-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1621 -#: archaeological_warehouse/models.py:1043 +#: archaeological_finds/models_finds.py:1620 +#: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1625 -#: archaeological_warehouse/models.py:1047 +#: archaeological_finds/models_finds.py:1624 +#: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1629 -#: archaeological_warehouse/models.py:1051 +#: archaeological_finds/models_finds.py:1628 +#: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1633 -msgctxt "key for text search" -msgid "estimated-value-higher" -msgstr "" - -#: archaeological_finds/models_finds.py:1637 -msgctxt "key for text search" -msgid "estimated-value-lower" -msgstr "" - -#: archaeological_finds/models_finds.py:1641 -msgctxt "key for text search" -msgid "insurance-value-higher" -msgstr "" - -#: archaeological_finds/models_finds.py:1645 +#: archaeological_finds/models_finds.py:1632 msgctxt "key for text search" -msgid "insurance-value-lower" +msgid "estimated-value" msgstr "" -#: archaeological_finds/models_finds.py:1649 +#: archaeological_finds/models_finds.py:1636 msgctxt "key for text search" -msgid "appraisal-date-before" +msgid "insurance-value" msgstr "" -#: archaeological_finds/models_finds.py:1653 +#: archaeological_finds/models_finds.py:1640 msgctxt "key for text search" -msgid "appraisal-date-after" +msgid "appraisal-date" msgstr "" -#: archaeological_finds/models_finds.py:1661 +#: archaeological_finds/models_finds.py:1648 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1665 +#: archaeological_finds/models_finds.py:1652 msgctxt "key for text search" msgid "technical-area" msgstr "" -#: archaeological_finds/models_finds.py:1669 +#: archaeological_finds/models_finds.py:1656 msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1673 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1660 archaeological_finds/tests.py:1631 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1681 -#: archaeological_operations/models.py:1177 +#: archaeological_finds/models_finds.py:1668 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1685 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1182 +#: archaeological_finds/models_finds.py:1672 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1176 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1680 msgctxt "key for text search" msgid "operation-remain" msgstr "" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1684 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1688 msgctxt "key for text search" msgid "museum-id-comment" msgstr "" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1692 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1697 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "" -#: archaeological_finds/models_finds.py:1715 +#: archaeological_finds/models_finds.py:1702 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "" -#: archaeological_finds/models_finds.py:1720 +#: archaeological_finds/models_finds.py:1707 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "" -#: archaeological_finds/models_finds.py:1724 +#: archaeological_finds/models_finds.py:1711 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1715 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "" -#: archaeological_finds/models_finds.py:1732 -msgctxt "key for text search" -msgid "museum-entry-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1736 -msgctxt "key for text search" -msgid "museum-entry-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1740 +#: archaeological_finds/models_finds.py:1719 msgctxt "key for text search" -msgid "museum-entry-date-end-before" +msgid "museum-entry-date" msgstr "" -#: archaeological_finds/models_finds.py:1744 +#: archaeological_finds/models_finds.py:1723 msgctxt "key for text search" -msgid "museum-entry-date-end-after" +msgid "museum-entry-date-end" msgstr "" -#: archaeological_finds/models_finds.py:1748 +#: archaeological_finds/models_finds.py:1727 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "" -#: archaeological_finds/models_finds.py:1752 +#: archaeological_finds/models_finds.py:1731 msgctxt "key for text search" msgid "museum-donor" msgstr "" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1736 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "" -#: archaeological_finds/models_finds.py:1761 +#: archaeological_finds/models_finds.py:1740 msgctxt "key for text search" msgid "museum-marking-type" msgstr "" -#: archaeological_finds/models_finds.py:1765 +#: archaeological_finds/models_finds.py:1744 msgctxt "key for text search" msgid "museum-collection" msgstr "" -#: archaeological_finds/models_finds.py:1770 +#: archaeological_finds/models_finds.py:1749 msgctxt "key for text search" msgid "museum-former-collection" msgstr "" -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1754 msgctxt "key for text search" msgid "museum-inventory-entry-year-before" msgstr "" -#: archaeological_finds/models_finds.py:1779 +#: archaeological_finds/models_finds.py:1758 msgctxt "key for text search" msgid "museum-inventory-entry-year-after" msgstr "" -#: archaeological_finds/models_finds.py:1783 +#: archaeological_finds/models_finds.py:1762 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "" -#: archaeological_finds/models_finds.py:1788 +#: archaeological_finds/models_finds.py:1767 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "" -#: archaeological_finds/models_finds.py:1792 +#: archaeological_finds/models_finds.py:1771 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "" -#: archaeological_finds/models_finds.py:1796 +#: archaeological_finds/models_finds.py:1775 msgctxt "key for text search" msgid "museum-original-repro" msgstr "" -#: archaeological_finds/models_finds.py:1801 -msgctxt "key for text search" -msgid "museum-allocation-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1805 +#: archaeological_finds/models_finds.py:1780 msgctxt "key for text search" -msgid "museum-allocation-date-after" +msgid "museum-allocation-date" msgstr "" -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1784 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "" -#: archaeological_finds/models_finds.py:1813 +#: archaeological_finds/models_finds.py:1788 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/models_finds.py:1792 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1924 -#: archaeological_finds/models_finds.py:2699 +#: archaeological_finds/models_finds.py:1899 +#: archaeological_finds/models_finds.py:2674 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 @@ -5838,19 +5629,19 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:1907 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:2066 +#: archaeological_finds/models_finds.py:2041 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:2068 +#: archaeological_finds/models_finds.py:2043 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:2083 +#: archaeological_finds/models_finds.py:2058 #: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5861,7 +5652,7 @@ msgstr "" msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2090 +#: archaeological_finds/models_finds.py:2065 #: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5872,83 +5663,83 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2139 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2142 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2170 +#: archaeological_finds/models_finds.py:2145 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2168 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/models_finds.py:2219 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2316 +#: archaeological_finds/models_finds.py:2291 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2325 +#: archaeological_finds/models_finds.py:2300 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2331 +#: archaeological_finds/models_finds.py:2306 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2371 +#: archaeological_finds/models_finds.py:2346 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2537 +#: archaeological_finds/models_finds.py:2512 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2538 +#: archaeological_finds/models_finds.py:2513 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2539 +#: archaeological_finds/models_finds.py:2514 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2540 +#: archaeological_finds/models_finds.py:2515 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2541 +#: archaeological_finds/models_finds.py:2516 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2672 +#: archaeological_finds/models_finds.py:2647 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2680 +#: archaeological_finds/models_finds.py:2655 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2688 +#: archaeological_finds/models_finds.py:2663 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3167 +#: archaeological_finds/models_finds.py:3141 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3173 +#: archaeological_finds/models_finds.py:3147 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3620 ishtar_common/forms_common.py:128 +#: archaeological_finds/models_finds.py:3594 ishtar_common/forms_common.py:128 #: ishtar_common/forms_common.py:1425 ishtar_common/forms_common.py:2860 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2979 #: ishtar_common/models.py:3298 ishtar_common/models.py:3396 @@ -5958,11 +5749,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3628 +#: archaeological_finds/models_finds.py:3602 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3629 +#: archaeological_finds/models_finds.py:3603 msgid "Properties" msgstr "" @@ -5992,9 +5783,9 @@ msgid "label" msgstr "" #: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2694 -#: archaeological_warehouse/models.py:968 +#: archaeological_finds/models_treatments.py:1067 +#: archaeological_operations/models.py:2673 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "" @@ -6004,40 +5795,40 @@ msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:223 +#: archaeological_finds/models_treatments.py:224 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:231 +#: archaeological_finds/models_treatments.py:232 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:274 +#: archaeological_finds/models_treatments.py:275 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:276 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:277 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:278 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:312 +#: archaeological_finds/models_treatments.py:313 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:389 +#: archaeological_finds/models_treatments.py:390 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:762 +#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/templates/ishtar/sheet_find.html:393 #: archaeological_finds/templates/ishtar/sheet_find.html:431 #: archaeological_finds/templates/ishtar/sheet_find.html:469 @@ -6062,65 +5853,60 @@ msgstr "" msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 +#: archaeological_finds/models_treatments.py:765 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:988 +#: archaeological_finds/models_treatments.py:989 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1005 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1069 +#: archaeological_finds/models_treatments.py:1076 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1074 +#: archaeological_finds/models_treatments.py:1081 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1079 -msgctxt "key for text search" -msgid "exhibition-start-before" -msgstr "" - -#: archaeological_finds/models_treatments.py:1083 +#: archaeological_finds/models_treatments.py:1086 msgctxt "key for text search" -msgid "exhibition-start-after" +msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1090 msgctxt "key for text search" -msgid "exhibition-end-before" +msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1094 msgctxt "key for text search" -msgid "exhibition-end-after" +msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1112 -#: archaeological_operations/forms.py:1139 -#: archaeological_operations/forms.py:1236 -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/models.py:492 +#: archaeological_finds/models_treatments.py:1108 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1804 +#: archaeological_operations/models.py:493 #: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2151 #: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 #: ishtar_common/models.py:2410 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "" -#: archaeological_finds/models_treatments.py:1184 +#: archaeological_finds/models_treatments.py:1180 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 @@ -6131,7 +5917,7 @@ msgstr "" msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1252 +#: archaeological_finds/models_treatments.py:1248 msgid "Add associated treatment" msgstr "" @@ -6493,13 +6279,13 @@ msgstr "" msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1665 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 msgid "The division {} {} do not exist for the location {}." msgstr "" #: archaeological_finds/tests.py:1773 archaeological_finds/tests.py:1799 #: archaeological_finds/tests.py:1809 archaeological_operations/tests.py:3170 -#: ishtar_common/forms.py:1223 ishtar_common/forms.py:1302 +#: ishtar_common/forms.py:1215 ishtar_common/forms.py:1294 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:660 ishtar_common/views_item.py:932 @@ -6508,8 +6294,8 @@ msgid "Yes" msgstr "" #: archaeological_finds/tests.py:1774 archaeological_finds/tests.py:1800 -#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1224 -#: ishtar_common/forms.py:1304 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1296 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:504 msgid "No" msgstr "" @@ -6606,10 +6392,10 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1081 -#: archaeological_operations/forms.py:1097 -#: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/forms.py:1074 +#: archaeological_operations/forms.py:1090 +#: archaeological_operations/forms.py:1096 +#: archaeological_operations/models.py:3157 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 #: sra_idf_app/templates/ishtar/sheet_operation.html:523 @@ -6617,20 +6403,20 @@ msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3164 +#: archaeological_operations/models.py:3139 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3166 +#: archaeological_operations/models.py:3141 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3168 -#: archaeological_operations/models.py:3196 -#: archaeological_operations/models.py:3264 +#: archaeological_operations/models.py:3143 +#: archaeological_operations/models.py:3171 +#: archaeological_operations/models.py:3239 msgid "Public domain" msgstr "" @@ -6687,27 +6473,27 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:949 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2049 +#: archaeological_operations/forms.py:942 +#: archaeological_operations/models.py:1368 +#: archaeological_operations/models.py:2028 msgid "Yearly index" msgstr "" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:740 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/forms.py:733 +#: archaeological_operations/models.py:1411 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/forms.py:714 +#: archaeological_operations/models.py:1510 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:726 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/forms.py:719 +#: archaeological_operations/models.py:1451 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "" @@ -6717,488 +6503,465 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2835 +#: archaeological_operations/forms.py:770 +#: archaeological_operations/models.py:1357 +#: archaeological_operations/models.py:2810 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1709 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:759 +#: archaeological_operations/forms.py:1690 +#: archaeological_operations/models.py:1350 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:534 -#: archaeological_operations/forms.py:774 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/forms.py:767 +#: archaeological_operations/models.py:1448 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1147 -#: archaeological_operations/forms.py:1242 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1856 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:497 -#: archaeological_operations/models.py:992 -#: archaeological_operations/models.py:1081 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/models.py:498 +#: archaeological_operations/models.py:993 +#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1385 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" -#: archaeological_operations/forms.py:538 -msgid "Started before" -msgstr "" - -#: archaeological_operations/forms.py:539 -msgid "Started after" -msgstr "" - -#: archaeological_operations/forms.py:540 -msgid "Ended before" -msgstr "" - -#: archaeological_operations/forms.py:541 -msgid "Ended after" -msgstr "" - -#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:543 msgid "Abstract (full text search)" msgstr "" -#: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:833 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:1454 msgid "Comment about scientific documentation" msgstr "" -#: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:835 -#: archaeological_operations/models.py:994 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/forms.py:546 +#: archaeological_operations/forms.py:828 +#: archaeological_operations/models.py:995 +#: archaeological_operations/models.py:1489 msgid "Record quality" msgstr "" -#: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/forms.py:547 +#: archaeological_operations/forms.py:788 +#: archaeological_operations/models.py:1406 msgid "Report processing" msgstr "" -#: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:748 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/forms.py:549 +#: archaeological_operations/forms.py:741 +#: archaeological_operations/models.py:1480 msgid "Virtual operation" msgstr "" -#: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:570 +#: archaeological_operations/forms.py:811 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:996 +#: archaeological_operations/models.py:1500 msgid "Documentation provided" msgstr "" -#: archaeological_operations/forms.py:574 -#: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:572 +#: archaeological_operations/forms.py:813 +#: archaeological_operations/forms.py:1702 +#: archaeological_operations/models.py:1495 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "" -#: archaeological_operations/forms.py:576 -msgid "Documentation deadline before" -msgstr "" - -#: archaeological_operations/forms.py:578 -msgid "Documentation deadline after" +#: archaeological_operations/forms.py:574 +msgid "Documentation deadline" msgstr "" -#: archaeological_operations/forms.py:581 -#: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1724 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:577 +#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:1506 msgid "Finds provided" msgstr "" -#: archaeological_operations/forms.py:583 -#: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1728 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:579 +#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:1709 +#: archaeological_operations/models.py:1502 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "" -#: archaeological_operations/forms.py:585 -msgid "Finds deadline before" -msgstr "" - -#: archaeological_operations/forms.py:587 -msgid "Finds deadline after" +#: archaeological_operations/forms.py:580 +msgid "Finds deadline" msgstr "" -#: archaeological_operations/forms.py:677 +#: archaeological_operations/forms.py:670 msgid "Associated file" msgstr "" -#: archaeological_operations/forms.py:690 +#: archaeological_operations/forms.py:683 msgid "Operation - 010 - General" msgstr "" -#: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1771 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:717 +#: archaeological_operations/forms.py:1752 +#: archaeological_operations/models.py:1450 msgid "Generic name" msgstr "" -#: archaeological_operations/forms.py:751 +#: archaeological_operations/forms.py:744 msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:746 +#: archaeological_operations/models.py:1341 +#: archaeological_operations/models.py:2828 msgid "Head scientist" msgstr "" -#: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1369 -#: archaeological_operations/forms.py:1731 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:515 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1712 +#: archaeological_operations/forms.py:1845 +#: archaeological_operations/models.py:516 +#: archaeological_operations/models.py:1364 msgid "Collaborators" msgstr "" -#: archaeological_operations/forms.py:789 +#: archaeological_operations/forms.py:782 msgid "Dates / Administrative" msgstr "" -#: archaeological_operations/forms.py:793 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/forms.py:786 +#: archaeological_operations/models.py:1335 msgid "Report delivery date" msgstr "" -#: archaeological_operations/forms.py:815 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/forms.py:808 +#: archaeological_operations/models.py:1497 msgid "Deadline for submission of the documentation" msgstr "" -#: archaeological_operations/forms.py:823 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/forms.py:816 +#: archaeological_operations/models.py:1504 msgid "Deadline for submission of the finds" msgstr "" -#: archaeological_operations/forms.py:831 +#: archaeological_operations/forms.py:824 msgid "Scientific" msgstr "" -#: archaeological_operations/forms.py:838 +#: archaeological_operations/forms.py:831 #: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "" -#: archaeological_operations/forms.py:844 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/forms.py:837 +#: archaeological_operations/models.py:1494 msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:904 +#: archaeological_operations/forms.py:897 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:909 +#: archaeological_operations/forms.py:902 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:932 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d or empty the yearly index field." msgstr "" -#: archaeological_operations/forms.py:943 +#: archaeological_operations/forms.py:936 msgid "Bad operation index" msgstr "" -#: archaeological_operations/forms.py:984 +#: archaeological_operations/forms.py:977 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:985 +#: archaeological_operations/forms.py:978 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:994 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/forms.py:987 +#: archaeological_operations/models.py:1513 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:997 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/forms.py:990 +#: archaeological_operations/models.py:1515 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:1003 +#: archaeological_operations/forms.py:996 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/forms.py:1002 +#: archaeological_operations/models.py:1527 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:1015 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/forms.py:1008 +#: archaeological_operations/models.py:1535 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1013 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1014 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1024 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/forms.py:1017 +#: archaeological_operations/models.py:1390 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/forms.py:1018 +#: archaeological_operations/models.py:1394 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1027 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/forms.py:1020 +#: archaeological_operations/models.py:1398 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1029 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/forms.py:1022 +#: archaeological_operations/models.py:1402 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1039 +#: archaeological_operations/forms.py:1032 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1040 +#: archaeological_operations/forms.py:1033 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1045 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:1422 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1047 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/forms.py:1040 +#: archaeological_operations/models.py:1426 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/forms.py:1043 +#: archaeological_operations/models.py:1429 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1071 +#: archaeological_operations/forms.py:1064 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1076 +#: archaeological_operations/forms.py:1069 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1098 +#: archaeological_operations/forms.py:1091 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1105 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1172 -#: archaeological_operations/forms.py:1400 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1165 +#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1824 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1209 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1214 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1230 +#: archaeological_operations/forms.py:1223 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1250 +#: archaeological_operations/forms.py:1243 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1373 -#: archaeological_operations/models.py:507 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1366 +#: archaeological_operations/models.py:508 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/models.py:510 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/models.py:511 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1414 +#: archaeological_operations/models.py:528 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1271 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:530 +#: archaeological_operations/forms.py:1264 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/models.py:531 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1273 -#: archaeological_operations/forms.py:1425 -#: archaeological_operations/models.py:519 +#: archaeological_operations/forms.py:1266 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/models.py:520 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1276 -#: archaeological_operations/forms.py:1433 -#: archaeological_operations/models.py:521 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:522 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/models.py:523 +#: archaeological_operations/forms.py:1272 +#: archaeological_operations/forms.py:1420 +#: archaeological_operations/models.py:524 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1281 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/models.py:524 +#: archaeological_operations/forms.py:1274 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/models.py:525 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1283 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/models.py:525 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1424 +#: archaeological_operations/models.py:526 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1338 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1400 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1416 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1410 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1496 +#: archaeological_operations/forms.py:1461 +#: archaeological_operations/forms.py:1509 +#: archaeological_operations/models.py:2870 +msgid "Signature date" +msgstr "" + +#: archaeological_operations/forms.py:1477 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1511 -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1680 +#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1594 +#: archaeological_operations/forms.py:1661 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:2860 +#: archaeological_operations/forms.py:1502 +#: archaeological_operations/models.py:2835 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1528 -#: archaeological_operations/models.py:2895 -msgid "Signature date" -msgstr "" - -#: archaeological_operations/forms.py:1539 +#: archaeological_operations/forms.py:1520 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1554 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1558 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1590 +#: archaeological_operations/forms.py:1571 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1576 ishtar_common/forms.py:1338 #: ishtar_common/models.py:2082 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1604 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1622 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1624 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1664 +#: archaeological_operations/forms.py:1645 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1666 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1798 +#: archaeological_operations/forms.py:1779 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1854 +#: archaeological_operations/forms.py:1835 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7246,320 +7009,300 @@ msgstr "" msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:375 -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:1181 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:387 +#: archaeological_operations/models.py:388 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:390 +#: archaeological_operations/models.py:391 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:394 +#: archaeological_operations/models.py:395 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:399 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:403 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:407 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:409 +#: archaeological_operations/models.py:410 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:418 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:421 +#: archaeological_operations/models.py:422 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:426 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:476 +#: archaeological_operations/models.py:477 msgid "Create associated operation" msgstr "" -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:1548 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1560 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:567 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:568 +#: archaeological_operations/models.py:1469 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 #: na_app/templates/ishtar/sheet_operation.html:332 #: sra_idf_app/templates/ishtar/sheet_operation.html:354 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:587 +#: archaeological_operations/models.py:588 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:639 +#: archaeological_operations/models.py:640 msgid "Create an operation associated to this site" msgstr "" -#: archaeological_operations/models.py:641 +#: archaeological_operations/models.py:642 msgid "ope." msgstr "" -#: archaeological_operations/models.py:651 +#: archaeological_operations/models.py:652 msgid "Create a cluster operation for site associated to many operations" msgstr "" -#: archaeological_operations/models.py:653 +#: archaeological_operations/models.py:654 msgid "top ope." msgstr "" -#: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 +#: archaeological_operations/models.py:807 ishtar_common/forms.py:1214 #: ishtar_common/models.py:5507 ishtar_common/models.py:5668 -#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1794 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1801 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:808 +#: archaeological_operations/models.py:809 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1060 +#: archaeological_operations/models.py:1054 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1061 +#: archaeological_operations/models.py:1055 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1062 +#: archaeological_operations/models.py:1056 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1063 +#: archaeological_operations/models.py:1057 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1064 +#: archaeological_operations/models.py:1058 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1065 +#: archaeological_operations/models.py:1059 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1066 +#: archaeological_operations/models.py:1060 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1067 +#: archaeological_operations/models.py:1061 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1068 +#: archaeological_operations/models.py:1062 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1069 +#: archaeological_operations/models.py:1063 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1070 +#: archaeological_operations/models.py:1064 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1065 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1070 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "yearly-index" msgstr "" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1130 msgctxt "key for text search" msgid "operation-old-code" msgstr "" -#: archaeological_operations/models.py:1162 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1169 +#: archaeological_operations/models.py:1163 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1166 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1193 -msgctxt "key for text search" -msgid "start-before" -msgstr "" - -#: archaeological_operations/models.py:1196 -msgctxt "key for text search" -msgid "start-after" -msgstr "" - -#: archaeological_operations/models.py:1199 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" -msgid "end-before" +msgid "start" msgstr "" -#: archaeological_operations/models.py:1203 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" -msgid "end-after" +msgid "end" msgstr "" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1194 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1213 +#: archaeological_operations/models.py:1200 msgctxt "key for text search" msgid "operator-reference" msgstr "" -#: archaeological_operations/models.py:1216 +#: archaeological_operations/models.py:1203 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1219 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1223 +#: archaeological_operations/models.py:1210 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1214 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1218 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1240 +#: archaeological_operations/models.py:1227 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "" -#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1231 msgctxt "key for text search" msgid "documentation-provided" msgstr "" -#: archaeological_operations/models.py:1248 -msgctxt "key for text search" -msgid "documentation-deadline-before" -msgstr "" - -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1235 msgctxt "key for text search" -msgid "documentation-deadline-after" +msgid "documentation-deadline" msgstr "" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1239 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1243 msgctxt "key for text search" msgid "finds-provided" msgstr "" -#: archaeological_operations/models.py:1267 -msgctxt "key for text search" -msgid "finds-deadline-before" -msgstr "" - -#: archaeological_operations/models.py:1271 +#: archaeological_operations/models.py:1250 msgctxt "key for text search" -msgid "finds-deadline-after" +msgid "finds-deadline" msgstr "" -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1254 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4430 +#: archaeological_operations/models.py:1292 ishtar_common/models.py:4430 #: ishtar_common/models.py:4528 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1475 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1483 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1519 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1542 msgid "Cached label" msgstr "" -#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:1570 #: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 #: ishtar_common/templates/ishtar/sheet_document.html:125 @@ -7567,286 +7310,281 @@ msgstr "" msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1610 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1611 msgid "List of containers with finds related to this operation" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1612 msgid "List of containers with documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1613 msgid "List of containers with finds or documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1730 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1825 msgid "No associated town" msgstr "" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1840 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:1983 msgid "context record" msgstr "" -#: archaeological_operations/models.py:2034 +#: archaeological_operations/models.py:2013 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:2082 -#: archaeological_operations/models.py:3085 +#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:3060 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2143 +#: archaeological_operations/models.py:2122 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2153 +#: archaeological_operations/models.py:2132 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2161 +#: archaeological_operations/models.py:2140 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2169 +#: archaeological_operations/models.py:2148 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2223 +#: archaeological_operations/models.py:2202 #: 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:2284 -#: archaeological_operations/models.py:2363 +#: archaeological_operations/models.py:2263 +#: archaeological_operations/models.py:2342 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2328 +#: archaeological_operations/models.py:2307 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2373 +#: archaeological_operations/models.py:2352 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2465 +#: archaeological_operations/models.py:2444 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2466 +#: archaeological_operations/models.py:2445 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2491 +#: archaeological_operations/models.py:2470 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2492 +#: archaeological_operations/models.py:2471 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2558 +#: archaeological_operations/models.py:2537 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2542 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2545 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2570 +#: archaeological_operations/models.py:2549 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2696 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2685 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2709 -#: archaeological_warehouse/models.py:974 +#: archaeological_operations/models.py:2688 +#: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2692 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2704 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2729 +#: archaeological_operations/models.py:2708 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2733 +#: archaeological_operations/models.py:2712 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2736 -msgctxt "key for text search" -msgid "signature-before" -msgstr "" - -#: archaeological_operations/models.py:2740 +#: archaeological_operations/models.py:2715 msgctxt "key for text search" -msgid "signature-after" +msgid "signature" msgstr "" -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2719 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2731 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2760 +#: archaeological_operations/models.py:2735 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2763 +#: archaeological_operations/models.py:2738 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2767 +#: archaeological_operations/models.py:2742 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2746 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2750 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2779 +#: archaeological_operations/models.py:2754 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2783 +#: archaeological_operations/models.py:2758 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2761 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2789 +#: archaeological_operations/models.py:2764 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2768 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2797 +#: archaeological_operations/models.py:2772 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2776 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2780 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2809 +#: archaeological_operations/models.py:2784 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:2818 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2905 +#: archaeological_operations/models.py:2880 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2911 +#: archaeological_operations/models.py:2886 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:3175 +#: archaeological_operations/models.py:3150 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3177 ishtar_common/models.py:2669 +#: archaeological_operations/models.py:3152 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 -#: ishtar_common/models_common.py:4369 +#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 +#: ishtar_common/models_common.py:4360 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3469 ishtar_common/models.py:3846 +#: archaeological_operations/models.py:3444 ishtar_common/models.py:3846 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3484 +#: archaeological_operations/models.py:3459 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3485 +#: archaeological_operations/models.py:3460 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3507 ishtar_common/models.py:5375 +#: archaeological_operations/models.py:3482 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3510 +#: archaeological_operations/models.py:3485 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3511 +#: archaeological_operations/models.py:3486 msgid "Operation types old" msgstr "" @@ -8126,7 +7864,7 @@ msgstr "" #: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 -#: archaeological_warehouse/models.py:934 +#: archaeological_warehouse/models.py:935 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 @@ -8196,25 +7934,25 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 -#: ishtar_common/models_common.py:3853 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 +#: ishtar_common/models_common.py:3842 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:251 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" @@ -8223,7 +7961,7 @@ msgstr "" #: archaeological_warehouse/forms.py:253 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8246,14 +7984,14 @@ msgid "Container - 010 - General" msgstr "" #: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1185 +#: archaeological_warehouse/models.py:1186 msgid "Old reference" msgstr "" #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 -#: archaeological_warehouse/models.py:904 -#: archaeological_warehouse/models.py:1153 +#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:1154 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 @@ -8265,12 +8003,12 @@ msgid "Current location (warehouse)" msgstr "" #: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1168 +#: archaeological_warehouse/models.py:1169 msgid "Parent container" msgstr "" #: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:752 -#: archaeological_warehouse/models.py:1144 +#: archaeological_warehouse/models.py:1145 msgid "Responsibility" msgstr "" @@ -8279,7 +8017,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "" #: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/models.py:1176 msgid "Measured weight (g)" msgstr "" @@ -8389,7 +8127,7 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:1214 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8435,7 +8173,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1624 +#: archaeological_warehouse/models.py:1625 msgid "No value" msgstr "" @@ -8486,7 +8224,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1139 +#: archaeological_warehouse/models.py:1140 msgid "Deprecated - do not use" msgstr "" @@ -8494,164 +8232,164 @@ msgstr "" msgid "Container parent" msgstr "" -#: archaeological_warehouse/models.py:898 -#: archaeological_warehouse/models.py:1129 +#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:1130 msgid "Location (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:900 msgid "Responsibility (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:931 +#: archaeological_warehouse/models.py:932 msgid "Location - index" msgstr "" -#: archaeological_warehouse/models.py:932 +#: archaeological_warehouse/models.py:933 msgid "Precise localisation" msgstr "" -#: archaeological_warehouse/models.py:950 +#: archaeological_warehouse/models.py:951 msgctxt "key for text search" msgid "responsibility" msgstr "" -#: archaeological_warehouse/models.py:961 +#: archaeological_warehouse/models.py:962 msgctxt "key for text search" msgid "code" msgstr "" -#: archaeological_warehouse/models.py:964 +#: archaeological_warehouse/models.py:965 msgctxt "key for text search" msgid "old-reference" msgstr "" -#: archaeological_warehouse/models.py:979 +#: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "operation-scientist" msgstr "" -#: archaeological_warehouse/models.py:1011 +#: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:1015 ishtar_common/models.py:4426 +#: archaeological_warehouse/models.py:1016 ishtar_common/models.py:4426 msgctxt "key for text search" msgid "find-denomination" msgstr "" -#: archaeological_warehouse/models.py:1027 +#: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "preservation" msgstr "" -#: archaeological_warehouse/models.py:1055 +#: archaeological_warehouse/models.py:1056 msgctxt "key for text search" msgid "find-description" msgstr "" -#: archaeological_warehouse/models.py:1058 +#: archaeological_warehouse/models.py:1059 msgctxt "key for text search" msgid "empty" msgstr "" -#: archaeological_warehouse/models.py:1061 +#: archaeological_warehouse/models.py:1062 msgctxt "key for text search" msgid "parent-container" msgstr "" -#: archaeological_warehouse/models.py:1065 +#: archaeological_warehouse/models.py:1066 msgctxt "key for text search" msgid "contain-containers" msgstr "" -#: archaeological_warehouse/models.py:1069 +#: archaeological_warehouse/models.py:1070 msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1148 +#: archaeological_warehouse/models.py:1149 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1157 +#: archaeological_warehouse/models.py:1158 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1161 +#: archaeological_warehouse/models.py:1162 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1164 +#: archaeological_warehouse/models.py:1165 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1177 +#: archaeological_warehouse/models.py:1178 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1180 +#: archaeological_warehouse/models.py:1181 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1183 +#: archaeological_warehouse/models.py:1184 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1385 +#: archaeological_warehouse/models.py:1386 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1389 +#: archaeological_warehouse/models.py:1390 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1809 +#: archaeological_warehouse/models.py:1810 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1816 +#: archaeological_warehouse/models.py:1817 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1820 +#: archaeological_warehouse/models.py:1821 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1822 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1823 msgid "List of associated finds" msgstr "" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1824 msgid "List of documents contained in this container" msgstr "" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1825 msgid "List of documents whose reference container is this container" msgstr "" -#: archaeological_warehouse/models.py:2066 +#: archaeological_warehouse/models.py:2067 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:2073 +#: archaeological_warehouse/models.py:2074 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2075 msgid "Container localisations" msgstr "" @@ -8881,12 +8619,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1612 +#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1619 msgid "True" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1614 +#: ishtar_common/views_item.py:1621 msgid "False" msgstr "" @@ -9594,7 +9332,7 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: ishtar_common/forms.py:451 ishtar_common/forms.py:1077 +#: ishtar_common/forms.py:451 ishtar_common/forms.py:1069 msgid "You should select an item." msgstr "" @@ -9606,91 +9344,81 @@ msgstr "" msgid "There are identical items." msgstr "" -#: ishtar_common/forms.py:962 -msgid "Created before" +#: ishtar_common/forms.py:962 ishtar_common/models.py:5607 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1299 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 +msgid "Created" msgstr "" #: ishtar_common/forms.py:965 -msgid "Created after" -msgstr "" - -#: ishtar_common/forms.py:968 msgid "Last modified by" msgstr "" -#: ishtar_common/forms.py:975 -msgid "Modified before" +#: ishtar_common/forms.py:972 +msgid "Modified" msgstr "" -#: ishtar_common/forms.py:978 -msgid "Modified after" -msgstr "" - -#: ishtar_common/forms.py:980 +#: ishtar_common/forms.py:974 msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:1009 +#: ishtar_common/forms.py:1001 msgid "Imported from" msgstr "" -#: ishtar_common/forms.py:1029 ishtar_common/forms_common.py:2496 +#: ishtar_common/forms.py:1021 ishtar_common/forms_common.py:2496 msgid "Has an image?" msgstr "" -#: ishtar_common/forms.py:1031 +#: ishtar_common/forms.py:1023 msgid "Has an attached file?" msgstr "" -#: ishtar_common/forms.py:1034 +#: ishtar_common/forms.py:1026 msgid "Has a web address?" msgstr "" -#: ishtar_common/forms.py:1036 +#: ishtar_common/forms.py:1028 msgid "Document - Type" msgstr "" -#: ishtar_common/forms.py:1079 +#: ishtar_common/forms.py:1071 msgid "Add a new item" msgstr "" -#: ishtar_common/forms.py:1267 +#: ishtar_common/forms.py:1259 msgid " - append to existing" msgstr "" -#: ishtar_common/forms.py:1270 +#: ishtar_common/forms.py:1262 msgid " - replace" msgstr "" -#: ishtar_common/forms.py:1300 +#: ishtar_common/forms.py:1292 msgid "Set to null" msgstr "" -#: ishtar_common/forms.py:1369 +#: ishtar_common/forms.py:1361 msgid "Geo - Name" msgstr "" -#: ishtar_common/forms.py:1370 +#: ishtar_common/forms.py:1362 msgid "Geo - Data type" msgstr "" -#: ishtar_common/forms.py:1371 +#: ishtar_common/forms.py:1363 msgid "Geo - Origin" msgstr "" -#: ishtar_common/forms.py:1372 +#: ishtar_common/forms.py:1364 msgid "Geo - Provider" msgstr "" -#: ishtar_common/forms.py:1373 -msgid "Geo - Z - higher than" -msgstr "" - -#: ishtar_common/forms.py:1374 -msgid "Geo - Z - lower than" +#: ishtar_common/forms.py:1365 +msgid "Geo - Z" msgstr "" -#: ishtar_common/forms.py:1375 +#: ishtar_common/forms.py:1366 msgid "Geo - Comment" msgstr "" @@ -9851,8 +9579,8 @@ msgstr "" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 -#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 +#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 msgid "Email" msgstr "" @@ -9926,12 +9654,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 -#: ishtar_common/models_common.py:3697 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 +#: ishtar_common/models_common.py:3686 msgid "Phone description 2" msgstr "" @@ -9939,11 +9667,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 msgid "Phone 3" msgstr "" @@ -9951,23 +9679,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 msgid "Other address: country" msgstr "" @@ -10418,7 +10146,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2253 msgid "Import key" msgstr "" @@ -10428,26 +10156,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2268 #: 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:3053 ishtar_common/models_common.py:2267 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2260 #: 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:3056 ishtar_common/models_common.py:2283 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2276 #: 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:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2249 +#: ishtar_common/models_common.py:2242 msgid "Buffer" msgstr "" @@ -10455,18 +10183,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:4194 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 -#: ishtar_common/models_common.py:4206 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:4197 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 -#: ishtar_common/models_common.py:4209 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2295 +#: ishtar_common/models_common.py:4200 msgid "Estimated error for Z" msgstr "" @@ -10475,10 +10203,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 -#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 -#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 +#: ishtar_common/models_common.py:2054 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2161 +#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:2191 +#: ishtar_common/models_common.py:2320 ishtar_common/models_common.py:3418 msgid "Geography" msgstr "" @@ -10506,8 +10234,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 -#: ishtar_common/models_common.py:4218 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:4209 msgid "Point" msgstr "" @@ -12149,7 +11877,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1839 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12331,12 +12059,6 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 -#: ishtar_common/models_imports.py:1299 -#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 -msgid "Created" -msgstr "" - #: ishtar_common/models.py:5612 msgid "Filter on" msgstr "" @@ -12466,381 +12188,366 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1142 msgid "Created by imports" msgstr "" -#: ishtar_common/models_common.py:1143 +#: ishtar_common/models_common.py:1144 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1144 +#: ishtar_common/models_common.py:1145 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1147 +#: ishtar_common/models_common.py:1148 msgid "Updated by imports" msgstr "" -#: ishtar_common/models_common.py:1152 +#: ishtar_common/models_common.py:1153 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1539 +#: ishtar_common/models_common.py:1540 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1547 +#: ishtar_common/models_common.py:1548 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 +#: ishtar_common/models_common.py:1555 ishtar_common/models_common.py:2246 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1556 +#: ishtar_common/models_common.py:1557 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1562 +#: ishtar_common/models_common.py:1563 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1581 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1585 msgctxt "key for text search" -msgid "created-before" +msgid "created" msgstr "" -#: ishtar_common/models_common.py:1590 +#: ishtar_common/models_common.py:1589 msgctxt "key for text search" -msgid "created-after" +msgid "modified" msgstr "" #: ishtar_common/models_common.py:1593 msgctxt "key for text search" -msgid "modified-before" -msgstr "" - -#: ishtar_common/models_common.py:1597 -msgctxt "key for text search" -msgid "modified-after" -msgstr "" - -#: ishtar_common/models_common.py:1600 -msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1850 +#: ishtar_common/models_common.py:1843 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1854 +#: ishtar_common/models_common.py:1847 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:1858 +#: ishtar_common/models_common.py:1851 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:1942 +#: ishtar_common/models_common.py:1935 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:1944 +#: ishtar_common/models_common.py:1937 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2100 ishtar_common/models_common.py:2121 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2101 ishtar_common/models_common.py:2121 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2109 +#: ishtar_common/models_common.py:2102 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2110 +#: ishtar_common/models_common.py:2103 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2106 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2107 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2138 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2146 +#: ishtar_common/models_common.py:2139 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2162 +#: ishtar_common/models_common.py:2155 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2163 +#: ishtar_common/models_common.py:2156 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:2172 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2180 +#: ishtar_common/models_common.py:2173 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2192 +#: ishtar_common/models_common.py:2185 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2193 +#: ishtar_common/models_common.py:2186 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:2212 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2220 +#: ishtar_common/models_common.py:2213 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2221 +#: ishtar_common/models_common.py:2214 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2261 +#: ishtar_common/models_common.py:2254 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2261 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2269 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2284 +#: ishtar_common/models_common.py:2277 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:4190 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2282 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 +#: ishtar_common/models_common.py:2281 ishtar_common/models_common.py:4191 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:2282 ishtar_common/models_common.py:4192 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2285 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2286 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2294 +#: ishtar_common/models_common.py:2287 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:2299 ishtar_common/models_common.py:4204 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 +#: ishtar_common/models_common.py:2304 ishtar_common/models_common.py:4210 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2312 +#: ishtar_common/models_common.py:2305 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2313 +#: ishtar_common/models_common.py:2306 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2314 +#: ishtar_common/models_common.py:2307 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2315 +#: ishtar_common/models_common.py:2308 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:2312 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2448 +#: ishtar_common/models_common.py:2441 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2905 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2916 +#: ishtar_common/models_common.py:2909 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2920 +#: ishtar_common/models_common.py:2913 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:2923 +#: ishtar_common/models_common.py:2916 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2926 +#: ishtar_common/models_common.py:2919 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2922 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:2925 msgctxt "key for text search" -msgid "z-higher" +msgid "z" msgstr "" -#: ishtar_common/models_common.py:2936 -msgctxt "key for text search" -msgid "z-lower" -msgstr "" - -#: ishtar_common/models_common.py:2940 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2966 +#: ishtar_common/models_common.py:2955 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2968 +#: ishtar_common/models_common.py:2957 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3363 +#: ishtar_common/models_common.py:3352 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3365 +#: ishtar_common/models_common.py:3354 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3385 +#: ishtar_common/models_common.py:3374 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3387 +#: ishtar_common/models_common.py:3376 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3397 +#: ishtar_common/models_common.py:3386 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3401 +#: ishtar_common/models_common.py:3390 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3405 +#: ishtar_common/models_common.py:3394 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3671 +#: ishtar_common/models_common.py:3660 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3703 +#: ishtar_common/models_common.py:3692 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3709 +#: ishtar_common/models_common.py:3698 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3742 +#: ishtar_common/models_common.py:3731 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3779 +#: ishtar_common/models_common.py:3768 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3860 +#: ishtar_common/models_common.py:3849 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3870 +#: ishtar_common/models_common.py:3859 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3888 +#: ishtar_common/models_common.py:3877 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4221 +#: ishtar_common/models_common.py:4212 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4215 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4226 +#: ishtar_common/models_common.py:4217 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4228 +#: ishtar_common/models_common.py:4219 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4235 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon source item" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c4446a246..d8b729367 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-21 15:37+0200\n" +"POT-Creation-Date: 2024-06-24 16:21+0200\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -21,27 +21,27 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:735 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2770 +#: archaeological_finds/models_finds.py:2745 #: 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:1256 +#: archaeological_operations/forms.py:1249 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2535 -#: archaeological_operations/models.py:2553 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2868 -#: archaeological_operations/models.py:3157 +#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2532 +#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:3132 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 +#: archaeological_warehouse/models.py:903 ishtar_common/forms_common.py:2523 #: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 @@ -60,107 +60,99 @@ msgstr "Datation - période" msgid "Dating - precise" msgstr "Datation - datation précise" -#: archaeological_context_records/forms.py:97 -msgid "Dating - start date before" -msgstr "Datation - date de début avant" - -#: archaeological_context_records/forms.py:100 -msgid "Dating - start date after" -msgstr "Datation - date de début après" +#: archaeological_context_records/forms.py:96 +msgid "Dating - start date" +msgstr "Datation - date de début" -#: archaeological_context_records/forms.py:102 -msgid "Dating - end date before" -msgstr "Datation - date de fin avant" - -#: archaeological_context_records/forms.py:103 -msgid "Dating - end date after" -msgstr "Datation - date de fin après" +#: archaeological_context_records/forms.py:97 +msgid "Dating - end date" +msgstr "Datation - date de fin" -#: archaeological_context_records/forms.py:105 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "Datation - type de datation" -#: archaeological_context_records/forms.py:107 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "Datation - qualité de datation" -#: archaeological_context_records/forms.py:138 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "Unité d'enregistrement - 001 - Recherche" -#: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 +#: archaeological_finds/forms.py:1718 archaeological_finds/forms.py:2450 #: 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_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1440 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 msgid "Full text search" msgstr "Recherche en texte intégral" -#: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:571 -#: archaeological_context_records/forms.py:625 -#: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:617 +#: archaeological_context_records/models.py:747 +#: archaeological_context_records/models.py:1385 msgid "ID" msgstr "Identifiant" -#: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1766 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1747 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: archaeological_context_records/forms.py:151 +#: archaeological_context_records/forms.py:143 msgid "Operation - name" msgstr "Opération - nom" -#: archaeological_context_records/forms.py:152 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2533 msgid "Operation - year" msgstr "Opération - année" -#: archaeological_context_records/forms.py:154 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" -#: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:732 -#: archaeological_context_records/models.py:747 -#: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:724 +#: archaeological_context_records/models.py:741 +#: archaeological_operations/forms.py:551 +#: archaeological_operations/models.py:567 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "Entité archéologique" -#: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1819 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1806 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:723 +#: archaeological_context_records/forms.py:159 +#: archaeological_context_records/forms.py:715 msgid "Unit type" msgstr "Type d'unité" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:521 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:831 ishtar_common/admin.py:766 +#: archaeological_context_records/forms.py:160 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:524 +#: archaeological_context_records/models.py:825 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 msgid "Activity" msgstr "Activité" -#: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:523 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:824 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/models.py:523 +#: archaeological_context_records/models.py:818 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 #: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:147 @@ -177,66 +169,66 @@ msgstr "Activité" msgid "Identification" msgstr "Identification" -#: archaeological_context_records/forms.py:171 -#: archaeological_context_records/models.py:787 +#: archaeological_context_records/forms.py:163 +#: archaeological_context_records/models.py:781 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 -#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2097 -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/models.py:500 +#: archaeological_finds/forms.py:1884 archaeological_finds/models_finds.py:2072 +#: archaeological_operations/forms.py:1237 +#: archaeological_operations/models.py:501 msgid "Cultural attribution" msgstr "Attribution culturelle" -#: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:573 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/forms.py:164 +#: archaeological_context_records/forms.py:289 +#: archaeological_context_records/forms.py:565 +#: archaeological_context_records/forms.py:618 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:719 +#: archaeological_context_records/models.py:1387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1084 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:3181 -#: archaeological_operations/models.py:3475 +#: archaeological_operations/forms.py:1077 +#: archaeological_operations/forms.py:1454 +#: archaeological_operations/models.py:3156 +#: archaeological_operations/models.py:3450 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" -#: archaeological_context_records/forms.py:173 -#: archaeological_operations/forms.py:579 +#: archaeological_context_records/forms.py:165 +#: archaeological_operations/forms.py:575 msgid "Has finds" msgstr "A du mobilier rattaché" -#: archaeological_context_records/forms.py:175 -#: archaeological_operations/forms.py:543 +#: archaeological_context_records/forms.py:167 +#: archaeological_operations/forms.py:541 msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:317 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:836 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:309 +#: archaeological_context_records/models.py:525 +#: archaeological_context_records/models.py:830 msgid "Excavation techniques" msgstr "Méthodes de fouille" -#: archaeological_context_records/forms.py:211 -#: archaeological_context_records/forms.py:232 +#: archaeological_context_records/forms.py:203 +#: archaeological_context_records/forms.py:224 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" -#: archaeological_context_records/forms.py:281 +#: archaeological_context_records/forms.py:273 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 -#: archaeological_operations/forms.py:689 -#: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1344 -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:708 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1497 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -251,57 +243,57 @@ msgstr "Rechercher une Unité d'Enregistrement" msgid "General" msgstr "Général" -#: archaeological_context_records/forms.py:282 +#: archaeological_context_records/forms.py:274 msgid "Context record - 020 - General" msgstr "Unité d'enregistrement - 020 - Général" -#: archaeological_context_records/forms.py:298 -#: archaeological_context_records/forms.py:563 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:725 -#: archaeological_context_records/models.py:515 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:733 +#: archaeological_context_records/forms.py:290 +#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:619 +#: archaeological_context_records/forms.py:717 +#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:508 +#: archaeological_context_records/models.py:727 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1056 -#: archaeological_operations/models.py:3162 +#: archaeological_operations/forms.py:1049 +#: archaeological_operations/models.py:3137 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4188 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "Commune" -#: archaeological_context_records/forms.py:303 -#: archaeological_context_records/forms.py:568 +#: archaeological_context_records/forms.py:295 +#: archaeological_context_records/forms.py:560 msgid "Only the items associated to the operation can be selected." msgstr "Seuls les éléments associés à l'opération peuvent être sélectionnés." -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:574 -#: archaeological_context_records/forms.py:629 +#: archaeological_context_records/forms.py:300 +#: archaeological_context_records/forms.py:566 +#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:528 -#: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:1386 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" -#: archaeological_context_records/forms.py:310 -#: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/forms.py:302 +#: archaeological_context_records/models.py:748 +#: archaeological_context_records/models.py:1388 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:432 archaeological_finds/forms.py:437 #: archaeological_finds/forms.py:595 archaeological_finds/forms.py:756 #: archaeological_finds/forms.py:758 archaeological_finds/forms.py:986 -#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1833 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1820 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:556 -#: archaeological_finds/models_finds.py:2039 -#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_finds.py:2014 +#: archaeological_finds/models_treatments.py:263 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -317,109 +309,109 @@ msgstr "Type d'Unité d'Enregistrement" msgid "Description" msgstr "Description" -#: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/forms.py:304 +#: archaeological_context_records/models.py:778 msgid "Filling" msgstr "Remplissage" -#: archaeological_context_records/forms.py:314 -#: archaeological_context_records/models.py:755 -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/models.py:749 +#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1881 +#: archaeological_finds/models_finds.py:2151 #: archaeological_finds/templates/ishtar/sheet_find.html:194 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:143 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "Commentaire général" -#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/forms.py:317 #: archaeological_files/forms.py:308 archaeological_files/forms.py:818 -#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 +#: archaeological_files/models.py:662 archaeological_operations/forms.py:737 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:752 msgid "Length (m)" msgstr "Taille (m)" -#: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:753 msgid "Width (m)" msgstr "Largeur (m)" -#: archaeological_context_records/forms.py:333 -#: archaeological_context_records/models.py:760 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:754 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: archaeological_context_records/forms.py:334 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:755 msgid "Diameter (m)" msgstr "Diamètre (m)" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:762 +#: archaeological_context_records/forms.py:327 +#: archaeological_context_records/models.py:756 msgid "Depth (m)" msgstr "Profondeur (m)" -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/models.py:758 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition (m)" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/models.py:750 msgid "Opening date" msgstr "Date d'ouverture" -#: archaeological_context_records/forms.py:343 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/models.py:751 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:625 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/models_treatments.py:265 -#: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1350 +#: archaeological_finds/forms_treatments.py:763 +#: archaeological_finds/models_treatments.py:266 +#: archaeological_finds/models_treatments.py:1140 +#: archaeological_operations/models.py:1329 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 -#: ishtar_common/forms.py:1055 ishtar_common/forms.py:1056 +#: ishtar_common/forms.py:1047 ishtar_common/forms.py:1048 #: na_app/templates/ishtar/sheet_operation.html:204 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "Date de clôture" -#: archaeological_context_records/forms.py:346 +#: archaeological_context_records/forms.py:338 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "Documentation" -#: archaeological_context_records/forms.py:352 -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/models.py:762 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:226 -#: archaeological_finds/models_treatments.py:760 +#: archaeological_finds/models_treatments.py:227 +#: archaeological_finds/models_treatments.py:761 #: archaeological_warehouse/forms.py:744 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "Localisation" -#: archaeological_context_records/forms.py:438 +#: archaeological_context_records/forms.py:430 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: archaeological_context_records/forms.py:443 +#: archaeological_context_records/forms.py:435 msgid "You have to choose a town or a parcel." msgstr "Vous devez choisir une commune ou une parcelle." -#: archaeological_context_records/forms.py:448 -#: archaeological_context_records/forms.py:470 -#: archaeological_context_records/models.py:165 +#: archaeological_context_records/forms.py:440 +#: archaeological_context_records/forms.py:462 +#: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 -#: archaeological_finds/models_finds.py:2094 +#: archaeological_finds/models_finds.py:2069 #: archaeological_finds/templates/ishtar/sheet_find.html:249 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:197 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -430,13 +422,13 @@ msgstr "Vous devez choisir une commune ou une parcelle." msgid "Dating" msgstr "Datation" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:109 -#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:522 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 -#: archaeological_operations/forms.py:841 +#: archaeological_operations/forms.py:834 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 @@ -452,17 +444,17 @@ msgstr "Datation" msgid "Chronological period" msgstr "Période chronologique" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:782 archaeological_files/models.py:76 -#: archaeological_files/models.py:730 +#: archaeological_files/models.py:731 #: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3624 -#: archaeological_finds/models_treatments.py:264 -#: archaeological_finds/models_treatments.py:758 +#: archaeological_finds/forms_treatments.py:760 +#: archaeological_finds/models_finds.py:3598 +#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:395 #: archaeological_finds/templates/ishtar/sheet_find.html:433 #: archaeological_finds/templates/ishtar/sheet_find.html:471 @@ -470,10 +462,11 @@ msgstr "Période chronologique" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:497 -#: archaeological_operations/forms.py:790 +#: archaeological_operations/forms.py:538 +#: archaeological_operations/forms.py:783 #: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3479 +#: archaeological_operations/models.py:1330 +#: archaeological_operations/models.py:3454 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -498,12 +491,12 @@ msgstr "Période chronologique" msgid "Start date" msgstr "Date de début" -#: archaeological_context_records/forms.py:457 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:787 archaeological_files/models.py:77 -#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 -#: archaeological_finds/models_finds.py:3625 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_files/models.py:732 archaeological_finds/forms.py:1569 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_treatments.py:760 #: archaeological_finds/templates/ishtar/sheet_find.html:396 #: archaeological_finds/templates/ishtar/sheet_find.html:434 #: archaeological_finds/templates/ishtar/sheet_find.html:472 @@ -514,7 +507,7 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:498 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:536 #: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3480 +#: archaeological_operations/models.py:3455 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -545,7 +538,7 @@ msgstr "Date de début" msgid "End date" msgstr "Date de fin" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -558,7 +551,7 @@ msgstr "Date de fin" msgid "Quality" msgstr "Qualité" -#: archaeological_context_records/forms.py:459 +#: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -572,7 +565,7 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: archaeological_context_records/forms.py:460 +#: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -580,27 +573,27 @@ msgstr "Type de datation" msgid "Precise on this dating" msgstr "Précision sur cette datation" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:463 msgid "Context record - 030 - Dating" msgstr "Unité d'enregistrement - 030 - Datation" -#: archaeological_context_records/forms.py:483 +#: archaeological_context_records/forms.py:475 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:276 -#: archaeological_context_records/models.py:1522 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1516 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 -#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2762 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:2737 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1704 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 #: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/forms.py:501 +#: archaeological_context_records/forms.py:493 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -612,110 +605,110 @@ msgstr "Unité d'Enregistrement" msgid "Relations" msgstr "Relations" -#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:494 msgid "Context record - 050 - Relations" msgstr "Unité d'enregistrement - 050 - Relations" -#: archaeological_context_records/forms.py:508 -#: archaeological_context_records/forms.py:519 -#: archaeological_context_records/models.py:785 +#: archaeological_context_records/forms.py:500 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:779 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "Interprétation" -#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/forms.py:501 msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:517 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "Compléments sur la datation" -#: archaeological_context_records/forms.py:526 -#: archaeological_context_records/models.py:790 +#: archaeological_context_records/forms.py:518 +#: archaeological_context_records/models.py:784 msgid "TAQ" msgstr "TAQ" -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/models.py:793 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: archaeological_context_records/forms.py:528 -#: archaeological_context_records/models.py:805 +#: archaeological_context_records/forms.py:520 +#: archaeological_context_records/models.py:799 msgid "TPQ" msgstr "TPQ" -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/models.py:814 +#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/models.py:808 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:1150 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1870 +#: archaeological_context_records/forms.py:523 +#: archaeological_operations/forms.py:1143 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/forms.py:1851 msgid "Cultural attributions" msgstr "Attributions culturelles" -#: archaeological_context_records/forms.py:535 +#: archaeological_context_records/forms.py:527 msgid "Comments on dating" msgstr "Précisions sur la datation" -#: archaeological_context_records/forms.py:548 -#: archaeological_operations/forms.py:624 -#: archaeological_operations/forms.py:637 +#: archaeological_context_records/forms.py:540 +#: archaeological_operations/forms.py:617 +#: archaeological_operations/forms.py:630 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "Rechercher une opération" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:545 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:551 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: archaeological_context_records/forms.py:661 +#: archaeological_context_records/forms.py:653 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1817 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr " - copie" -#: archaeological_context_records/forms.py:691 +#: archaeological_context_records/forms.py:683 msgid "Context record - Quick action - Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" -#: archaeological_context_records/forms.py:711 -#: archaeological_context_records/models.py:1283 -#: archaeological_context_records/models.py:1322 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/forms.py:703 +#: archaeological_context_records/models.py:1277 +#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1384 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "Type de relation" -#: archaeological_context_records/forms.py:715 +#: archaeological_context_records/forms.py:707 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "Associé à" -#: archaeological_context_records/forms.py:740 +#: archaeological_context_records/forms.py:732 msgid "Associated parcel" msgstr "Parcelle associée" -#: archaeological_context_records/forms.py:765 +#: archaeological_context_records/forms.py:757 msgid "Parcel can be modified only if operations are the same" msgstr "" "Les parcelles ne peuvent être modifiées seulement si les opérations sont " "identiques" -#: archaeological_context_records/forms.py:784 +#: archaeological_context_records/forms.py:776 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -825,45 +818,35 @@ msgstr "datation-precise" #: archaeological_context_records/models.py:139 msgctxt "key for text search" -msgid "datings-start-before" -msgstr "datation-debut-avant" +msgid "datings-start" +msgstr "datation-debut" #: archaeological_context_records/models.py:143 msgctxt "key for text search" -msgid "datings-start-after" -msgstr "datation-debut-apres" +msgid "datings-end" +msgstr "datation-fin" #: archaeological_context_records/models.py:147 msgctxt "key for text search" -msgid "datings-end-before" -msgstr "datation-fin-avant" - -#: archaeological_context_records/models.py:151 -msgctxt "key for text search" -msgid "datings-end-after" -msgstr "datation-fin-apres" - -#: archaeological_context_records/models.py:155 -msgctxt "key for text search" msgid "datings-type" msgstr "datation-type" -#: archaeological_context_records/models.py:159 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "datation-qualite" -#: archaeological_context_records/models.py:166 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "Datations" -#: archaeological_context_records/models.py:282 +#: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:615 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2347 +#: archaeological_finds/models_finds.py:2322 +#: archaeological_finds/models_finds.py:3560 #: archaeological_finds/models_finds.py:3586 -#: archaeological_finds/models_finds.py:3612 -#: archaeological_finds/models_treatments.py:740 +#: archaeological_finds/models_treatments.py:741 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -875,8 +858,8 @@ msgstr "Datations" msgid "Find" msgstr "Mobilier" -#: archaeological_context_records/models.py:307 -#: archaeological_context_records/models.py:330 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 #: archaeological_files/models.py:75 archaeological_files/models.py:105 #: archaeological_files/models.py:159 archaeological_files/models.py:175 #: archaeological_files/models.py:235 archaeological_finds/models_finds.py:106 @@ -885,202 +868,202 @@ msgstr "Mobilier" #: archaeological_finds/models_finds.py:260 #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 -#: archaeological_finds/models_finds.py:2030 +#: archaeological_finds/models_finds.py:2005 #: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:752 +#: archaeological_finds/models_treatments.py:753 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3506 +#: archaeological_operations/models.py:3481 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 #: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 -#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 -#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2152 ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2182 ishtar_common/models_imports.py:474 msgid "Order" msgstr "Ordre" -#: archaeological_context_records/models.py:310 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "Type d'UE parent" -#: archaeological_context_records/models.py:317 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "Type d'Unité d'Enregistrement" -#: archaeological_context_records/models.py:318 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "Types d'Unité d'Enregistrement" -#: archaeological_context_records/models.py:333 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "Type d'activité" -#: archaeological_context_records/models.py:334 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "Types d'activité" -#: archaeological_context_records/models.py:347 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "Type d'identification" -#: archaeological_context_records/models.py:348 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "Types d'identification" -#: archaeological_context_records/models.py:361 +#: archaeological_context_records/models.py:353 msgid "Excavation technique type" msgstr "Type de méthode de fouille" -#: archaeological_context_records/models.py:362 +#: archaeological_context_records/models.py:354 msgid "Excavation technique types" msgstr "Types de méthode de fouille" -#: archaeological_context_records/models.py:372 +#: archaeological_context_records/models.py:364 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "Type de documentation" -#: archaeological_context_records/models.py:373 +#: archaeological_context_records/models.py:365 msgid "Documentation types" msgstr "Types de documentation" -#: archaeological_context_records/models.py:507 -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:1389 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1144 -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1359 +#: archaeological_operations/forms.py:1137 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1352 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:993 -#: archaeological_operations/models.py:1080 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1391 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "Périodes" -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:501 msgid "Datings (period)" msgstr "Datations (période)" -#: archaeological_context_records/models.py:510 -#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:504 msgid "Operation (Patriarche code)" msgstr "Opération (code Patriarche)" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:505 #: archaeological_finds/models_finds.py:1152 msgid "Operation (name)" msgstr "Opération (nom)" -#: archaeological_context_records/models.py:514 +#: archaeological_context_records/models.py:506 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant)" -#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:509 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:526 #: archaeological_finds/models_finds.py:1216 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:998 msgid "Associated document type" msgstr "Type de document associé" -#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:527 #: archaeological_finds/models_finds.py:1217 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:998 +#: archaeological_operations/models.py:999 msgid "Modification (year)" msgstr "Modification (année)" -#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:569 msgctxt "key for text search" msgid "id" msgstr "id" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:572 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1308 -#: archaeological_operations/models.py:378 -#: archaeological_operations/models.py:1144 +#: archaeological_files/models.py:491 archaeological_finds/models_finds.py:1318 +#: archaeological_operations/models.py:379 +#: archaeological_operations/models.py:1138 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4447 msgctxt "key for text search" msgid "town" msgstr "commune" -#: archaeological_context_records/models.py:581 ishtar_common/models.py:4407 +#: archaeological_context_records/models.py:575 ishtar_common/models.py:4407 msgctxt "key for text search" msgid "operation-year" msgstr "operation-annee" -#: archaeological_context_records/models.py:584 -#: archaeological_finds/models_finds.py:1689 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:578 +#: archaeological_finds/models_finds.py:1676 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "operation-nom" -#: archaeological_context_records/models.py:588 -#: archaeological_operations/models.py:1140 -#: archaeological_operations/models.py:2699 +#: archaeological_context_records/models.py:582 +#: archaeological_operations/models.py:1134 +#: archaeological_operations/models.py:2678 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "patriarche" -#: archaeological_context_records/models.py:592 -#: archaeological_finds/models_finds.py:1316 +#: archaeological_context_records/models.py:586 +#: archaeological_finds/models_finds.py:1326 msgctxt "key for text search" msgid "operation-code" msgstr "operation-code" -#: archaeological_context_records/models.py:596 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1422 -#: archaeological_finds/models_finds.py:1941 -#: archaeological_operations/models.py:413 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4398 +#: archaeological_context_records/models.py:590 +#: archaeological_context_records/models.py:661 +#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:441 ishtar_common/models.py:4398 #: ishtar_common/models.py:4521 msgctxt "key for text search" msgid "operation" msgstr "operation" -#: archaeological_context_records/models.py:600 -#: archaeological_context_records/models.py:670 -#: archaeological_finds/models_finds.py:1332 -#: archaeological_operations/models.py:1235 -#: archaeological_operations/models.py:1312 -#: archaeological_warehouse/models.py:988 ishtar_common/models.py:4439 +#: archaeological_context_records/models.py:594 +#: archaeological_context_records/models.py:664 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_operations/models.py:1222 +#: archaeological_operations/models.py:1291 +#: archaeological_warehouse/models.py:989 ishtar_common/models.py:4439 #: ishtar_common/models.py:4530 msgctxt "key for text search" msgid "site" msgstr "site" -#: archaeological_context_records/models.py:605 +#: archaeological_context_records/models.py:599 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1359 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "operation-relation-type" msgstr "operation-type-relation" -#: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:372 -#: archaeological_operations/models.py:1190 +#: archaeological_context_records/models.py:603 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1184 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1089,84 +1072,84 @@ msgctxt "key for text search" msgid "period" msgstr "periode" -#: archaeological_context_records/models.py:613 +#: archaeological_context_records/models.py:607 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "type-unite" -#: archaeological_context_records/models.py:616 +#: archaeological_context_records/models.py:610 msgctxt "key for text search" msgid "activity" msgstr "activite" -#: archaeological_context_records/models.py:619 +#: archaeological_context_records/models.py:613 msgctxt "key for text search" msgid "identification" msgstr "identification" -#: archaeological_context_records/models.py:623 -#: archaeological_files/models.py:493 archaeological_operations/models.py:1150 -#: archaeological_operations/models.py:2717 +#: archaeological_context_records/models.py:617 +#: archaeological_files/models.py:494 archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:2696 msgctxt "key for text search" msgid "parcel" msgstr "parcelle" -#: archaeological_context_records/models.py:627 -#: archaeological_operations/models.py:1263 +#: archaeological_context_records/models.py:621 +#: archaeological_operations/models.py:1246 msgctxt "key for text search" msgid "has-finds" msgstr "mobilier-rattache" -#: archaeological_context_records/models.py:630 +#: archaeological_context_records/models.py:624 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "ue-type-relation" -#: archaeological_context_records/models.py:634 +#: archaeological_context_records/models.py:628 msgctxt "key for text search" msgid "excavation-technique" msgstr "methode-de-fouille" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1657 -#: archaeological_operations/models.py:429 +#: archaeological_context_records/models.py:632 +#: archaeological_finds/models_finds.py:1644 +#: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "attribution-culturelle" -#: archaeological_context_records/models.py:685 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_operations/models.py:459 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_operations/models.py:460 +#: archaeological_operations/models.py:1274 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" -#: archaeological_context_records/models.py:692 -#: archaeological_finds/models_finds.py:1893 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:686 +#: archaeological_finds/models_finds.py:1868 +#: archaeological_operations/models.py:467 +#: archaeological_operations/models.py:1267 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1104 ishtar_common/models.py:2644 +#: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2644 #: ishtar_common/models.py:2925 ishtar_common/models.py:4547 msgid "Bulk update" msgstr "Modification par lot" -#: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1063 +#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:1057 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 -#: archaeological_finds/models_finds.py:1910 -#: archaeological_finds/models_finds.py:2664 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:1885 +#: archaeological_finds/models_finds.py:2639 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:484 -#: archaeological_operations/models.py:664 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2024 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:485 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:2003 #: archaeological_operations/views.py:904 #: archaeological_operations/views.py:919 #: archaeological_operations/views.py:926 @@ -1177,39 +1160,39 @@ msgstr "Modification par lot" msgid "Duplicate" msgstr "Dupliquer" -#: archaeological_context_records/models.py:719 -#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:2024 -#: archaeological_finds/models_treatments.py:259 -#: archaeological_operations/models.py:3170 +#: archaeological_context_records/models.py:713 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:551 +#: archaeological_finds/models_finds.py:1999 +#: archaeological_finds/models_treatments.py:260 +#: archaeological_operations/models.py:3145 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4582 msgid "External ID" msgstr "Identifiant" -#: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_operations/models.py:3173 +#: archaeological_context_records/models.py:715 +#: archaeological_files/models.py:566 archaeological_finds/models_finds.py:553 +#: archaeological_finds/models_finds.py:2001 +#: archaeological_operations/models.py:3148 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1188 +#: archaeological_warehouse/models.py:1189 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" -#: archaeological_context_records/models.py:766 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3383 +#: archaeological_context_records/models.py:760 +#: archaeological_operations/models.py:1383 ishtar_common/models_common.py:3372 msgid "Surface (m2)" msgstr "Surface (m2)" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:765 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:775 +#: archaeological_context_records/models.py:769 msgid "Comment on datings" msgstr "Précisions sur les datations" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:788 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1217,11 +1200,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date" -#: archaeological_context_records/models.py:802 +#: archaeological_context_records/models.py:796 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: archaeological_context_records/models.py:809 +#: archaeological_context_records/models.py:803 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1229,25 +1212,25 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date" -#: archaeological_context_records/models.py:817 +#: archaeological_context_records/models.py:811 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: archaeological_context_records/models.py:845 +#: archaeological_context_records/models.py:839 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2301 -#: archaeological_finds/models_treatments.py:279 -#: archaeological_finds/models_treatments.py:1162 +#: archaeological_files/models.py:752 archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:1158 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:534 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2917 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1457 +#: archaeological_operations/models.py:2892 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1193 +#: archaeological_warehouse/models.py:1194 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1256,7 +1239,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 #: ishtar_common/models.py:4145 ishtar_common/models.py:4722 -#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3400 #: 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 @@ -1272,129 +1255,129 @@ msgstr "Estimation d'un « Terminus Post Quem »" msgid "Documents" msgstr "Documents" -#: archaeological_context_records/models.py:852 -#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2307 -#: archaeological_finds/models_treatments.py:285 -#: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:540 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2924 +#: archaeological_context_records/models.py:846 +#: archaeological_files/models.py:758 archaeological_finds/models_finds.py:2282 +#: archaeological_finds/models_treatments.py:286 +#: archaeological_finds/models_treatments.py:1165 +#: archaeological_operations/models.py:541 +#: archaeological_operations/models.py:1463 +#: archaeological_operations/models.py:2899 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3417 +#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2427 +#: ishtar_common/models_common.py:3406 msgid "Main image" msgstr "Image principale" -#: archaeological_context_records/models.py:857 -#: archaeological_finds/models_finds.py:2319 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:851 +#: archaeological_finds/models_finds.py:2294 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:1554 msgid "Cached periods label" msgstr "Nom en cache des périodes" +#: archaeological_context_records/models.py:854 #: archaeological_context_records/models.py:860 -#: archaeological_context_records/models.py:866 -#: archaeological_finds/models_finds.py:2322 -#: archaeological_finds/models_finds.py:2328 -#: archaeological_finds/models_finds.py:2334 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:560 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 +#: archaeological_finds/models_finds.py:2297 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:561 +#: archaeological_operations/models.py:1545 +#: archaeological_operations/models.py:1551 +#: archaeological_operations/models.py:1557 +#: archaeological_operations/models.py:1563 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4364 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" -#: archaeological_context_records/models.py:863 +#: archaeological_context_records/models.py:857 msgid "Cached related context records" msgstr "Nom en cache des unités d'enregistrements liées" -#: archaeological_context_records/models.py:870 -#: archaeological_context_records/models.py:871 +#: archaeological_context_records/models.py:864 +#: archaeological_context_records/models.py:865 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:564 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/models.py:892 +#: archaeological_context_records/models.py:886 msgctxt "short" msgid "Context record" msgstr "UE" -#: archaeological_context_records/models.py:927 -#: archaeological_finds/models_finds.py:2536 +#: archaeological_context_records/models.py:921 +#: archaeological_finds/models_finds.py:2511 msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" -#: archaeological_context_records/models.py:1051 +#: archaeological_context_records/models.py:1045 msgid "Add find" msgstr "Ajout mobilier" -#: archaeological_context_records/models.py:1053 +#: archaeological_context_records/models.py:1047 msgid "find" msgstr "mobilier" -#: archaeological_context_records/models.py:1237 +#: archaeological_context_records/models.py:1231 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "Mobilier d'origine" -#: archaeological_context_records/models.py:1284 +#: archaeological_context_records/models.py:1278 msgid "Relation types" msgstr "Types de relation" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1311 msgid "ID (left)" msgstr "Identifiant (gauche)" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1312 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1313 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1314 msgid "Description (left)" msgstr "Description (gauche)" -#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1315 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1317 msgid "ID (right)" msgstr "Identifiant (droit)" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1318 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1319 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1320 msgid "Description (right)" msgstr "Description (droite)" -#: archaeological_context_records/models.py:1327 +#: archaeological_context_records/models.py:1321 msgid "Periods (right)" msgstr "Périodes (droite)" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1330 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1337 +#: archaeological_context_records/models.py:1331 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/models.py:1522 msgid "Context record parent" msgstr "Unité d'Enregistrement parente" @@ -1452,7 +1435,7 @@ msgstr "Opération / Site" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 -#: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 +#: archaeological_finds/forms.py:2247 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 #: archaeological_finds/models_finds.py:240 @@ -1471,9 +1454,9 @@ msgstr "Opération / Site" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2348 -#: archaeological_finds/models_finds.py:2359 -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:2323 +#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:3607 #: 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 @@ -1544,7 +1527,7 @@ msgstr "Champs personnalisés" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4376 +#: ishtar_common/models_common.py:4367 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1628,7 +1611,7 @@ msgstr "Référence numérique" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:219 +#: archaeological_finds/models_treatments.py:220 #: archaeological_finds/templates/ishtar/sheet_find.html:391 #: archaeological_finds/templates/ishtar/sheet_find.html:429 #: archaeological_finds/templates/ishtar/sheet_find.html:467 @@ -1640,8 +1623,8 @@ msgstr "Référence numérique" #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 #: ishtar_common/models.py:5493 ishtar_common/models.py:5630 -#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 -#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2028 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1734,7 +1717,7 @@ msgid "Context record deletion" msgstr "Supprimer une Unité d'Enregistrement" #: archaeological_context_records/views.py:255 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:1981 msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" @@ -1769,28 +1752,28 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 #: archaeological_files/forms.py:237 archaeological_files/forms.py:663 #: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 -#: archaeological_files/models.py:403 archaeological_files/models.py:554 +#: archaeological_files/models.py:403 archaeological_files/models.py:555 #: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_finds/forms.py:1746 +#: archaeological_finds/forms.py:1733 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:644 -#: archaeological_finds/forms_treatments.py:726 -#: archaeological_finds/forms_treatments.py:840 +#: archaeological_finds/forms_treatments.py:716 +#: archaeological_finds/forms_treatments.py:830 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:204 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:205 +#: archaeological_finds/models_treatments.py:1102 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1451 -#: archaeological_operations/forms.py:1768 -#: archaeological_operations/models.py:989 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2667 -#: archaeological_operations/models.py:2896 -#: archaeological_operations/models.py:3160 +#: archaeological_operations/forms.py:728 +#: archaeological_operations/forms.py:1444 +#: archaeological_operations/forms.py:1749 +#: archaeological_operations/models.py:990 +#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:2646 +#: archaeological_operations/models.py:2871 +#: archaeological_operations/models.py:3135 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 @@ -1798,27 +1781,27 @@ msgid "Year" msgstr "Année" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:669 archaeological_files/models.py:556 +#: archaeological_files/forms.py:669 archaeological_files/models.py:557 msgid "Numeric reference" msgstr "Identifiant numérique" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 -#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 -#: archaeological_operations/forms.py:1239 -#: archaeological_operations/forms.py:1356 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/forms.py:1530 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2899 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1134 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:2874 msgid "Other reference" msgstr "Autre référence" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1392 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1464 -#: archaeological_operations/models.py:2539 ishtar_common/models_common.py:2058 -#: ishtar_common/models_common.py:3391 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/models.py:2518 ishtar_common/models_common.py:2051 +#: ishtar_common/models_common.py:3380 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" @@ -1829,7 +1812,7 @@ msgstr "Nom du dossier" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 #: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:569 msgid "File type" msgstr "Type de dossier" @@ -1844,41 +1827,41 @@ msgstr "Type de saisine" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 #: archaeological_files/forms.py:529 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:617 +#: archaeological_files/models.py:408 archaeological_files/models.py:618 msgid "Permit type" msgstr "Type de permis" #: archaeological_files/forms.py:104 archaeological_files/forms.py:467 -#: archaeological_files/forms.py:531 archaeological_files/models.py:622 +#: archaeological_files/forms.py:531 archaeological_files/models.py:623 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "Référence du permis / de l'arrêté" #: archaeological_files/forms.py:105 archaeological_files/forms.py:660 -#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_files/models.py:671 archaeological_finds/forms.py:799 #: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 -#: archaeological_finds/forms.py:2585 +#: archaeological_finds/forms.py:2501 #: archaeological_finds/forms_treatments.py:195 -#: archaeological_finds/forms_treatments.py:765 -#: archaeological_finds/models_treatments.py:261 -#: archaeological_finds/models_treatments.py:1158 -#: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1247 -#: archaeological_operations/forms.py:1370 -#: archaeological_operations/forms.py:1467 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2913 +#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_treatments.py:1154 +#: archaeological_operations/forms.py:542 +#: archaeological_operations/forms.py:742 +#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1363 +#: archaeological_operations/forms.py:1460 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1452 +#: archaeological_operations/models.py:2888 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 +#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 #: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 +#: ishtar_common/models_common.py:2279 ishtar_common/models_imports.py:890 #: 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 @@ -1894,7 +1877,7 @@ msgstr "Responsable" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:581 msgid "General contractor" msgstr "Aménageur" @@ -1903,16 +1886,14 @@ msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 -#: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:557 ishtar_common/forms.py:955 msgid "Created by" msgstr "Créée par" #: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 -#: archaeological_finds/forms_treatments.py:864 -#: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1475 +#: archaeological_finds/forms_treatments.py:854 +#: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "Modifiée par" @@ -1924,10 +1905,10 @@ msgstr "Rechercher un dossier archéologique" msgid "Archaeological file - 010 - General" msgstr "Dossier archéologique - 010 - Général" -#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/forms.py:218 archaeological_files/models.py:638 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1146 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2164 +#: archaeological_finds/models_treatments.py:1142 +#: archaeological_operations/models.py:1328 ishtar_common/forms_common.py:2164 #: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1935,9 +1916,9 @@ msgid "Creation date" msgstr "Date de création" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:639 -#: archaeological_finds/forms_treatments.py:768 -#: archaeological_finds/models_treatments.py:1148 +#: archaeological_files/models.py:640 +#: archaeological_finds/forms_treatments.py:758 +#: archaeological_finds/models_treatments.py:1144 #: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 @@ -1973,22 +1954,22 @@ msgid "Planning name" msgstr "Nom de l'aménagement" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:470 archaeological_files/models.py:634 -#: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1054 -#: archaeological_operations/forms.py:1070 -#: archaeological_operations/forms.py:1075 -#: archaeological_operations/forms.py:1406 +#: archaeological_files/models.py:471 archaeological_files/models.py:635 +#: archaeological_operations/forms.py:722 +#: archaeological_operations/forms.py:1047 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1068 +#: archaeological_operations/forms.py:1399 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1079 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2908 +#: archaeological_operations/models.py:504 +#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1388 +#: archaeological_operations/models.py:2883 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3425 +#: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 @@ -1997,8 +1978,8 @@ msgid "Towns" msgstr "Communes" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/models.py:673 archaeological_operations/models.py:2902 -#: ishtar_common/models_common.py:2059 +#: archaeological_files/models.py:674 archaeological_operations/models.py:2877 +#: ishtar_common/models_common.py:2052 msgid "Departments" msgstr "Départements" @@ -2007,7 +1988,7 @@ msgid "Only relevant when no town is provided." msgstr "Seulement pertinent quand aucune commune n'est renseignée." #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:665 +#: archaeological_files/models.py:666 msgid "Locality" msgstr "Lieu-dit" @@ -2021,7 +2002,7 @@ msgstr "N° / voie" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 msgid "Postal code" msgstr "Code postal" @@ -2030,7 +2011,7 @@ msgid "Surfaces" msgstr "Surfaces" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:808 archaeological_files/models.py:663 +#: archaeological_files/forms.py:808 archaeological_files/models.py:664 msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" @@ -2038,7 +2019,7 @@ msgstr "Surface totale aménagée (m2)" #: 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:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 +#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -2073,7 +2054,7 @@ msgstr "Service instructeur" msgid "Archaeological file - 040 - Planning service" msgstr "Dossier archéologique - 040 - Service aménageur" -#: archaeological_files/forms.py:470 archaeological_files/models.py:641 +#: archaeological_files/forms.py:470 archaeological_files/models.py:642 msgid "Date of planning service file" msgstr "Date du dossier du service instructeur" @@ -2088,7 +2069,7 @@ msgstr "" msgid "Preventive informations" msgstr "Information archéologie préventive" -#: archaeological_files/forms.py:515 archaeological_files/models.py:601 +#: archaeological_files/forms.py:515 archaeological_files/models.py:602 msgid "Responsible for planning service" msgstr "Responsable pour le service instructeur" @@ -2101,12 +2082,12 @@ msgstr "Archéologie programmée" msgid "Archaeological file - 045 - Research - General" msgstr "Dossier archéologique - 045 - Recherche - Général" -#: archaeological_files/forms.py:592 archaeological_files/models.py:697 +#: archaeological_files/forms.py:592 archaeological_files/models.py:698 #: archaeological_operations/forms.py:525 msgid "Scientist in charge" msgstr "Responsable d'opération" -#: archaeological_files/forms.py:595 archaeological_files/models.py:681 +#: archaeological_files/forms.py:595 archaeological_files/models.py:682 msgid "Requested operation type" msgstr "Type d'opération demandée" @@ -2114,16 +2095,16 @@ msgstr "Type d'opération demandée" msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/forms.py:612 archaeological_files/models.py:701 #: archaeological_files/templates/ishtar/sheet_file.html:170 msgid "Research archaeology comment" msgstr "Précisions sur l'archéologie programmée" -#: archaeological_files/forms.py:621 archaeological_files/models.py:703 +#: archaeological_files/forms.py:621 archaeological_files/models.py:704 msgid "Classified area" msgstr "Au sein d'un site classé" -#: archaeological_files/forms.py:622 archaeological_files/models.py:705 +#: archaeological_files/forms.py:622 archaeological_files/models.py:706 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" @@ -2140,11 +2121,11 @@ msgstr "Dossier archéologique - 050 - Instruction" msgid "File managed by" msgstr "Dossier géré par" -#: archaeological_files/forms.py:653 archaeological_files/models.py:645 +#: archaeological_files/forms.py:653 archaeological_files/models.py:646 msgid "Related file" msgstr "Dossier associé" -#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/forms.py:661 archaeological_files/models.py:660 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "Date limite d'instruction" @@ -2174,27 +2155,27 @@ msgstr "Dates" msgid "Archaeological royalties" msgstr "Redevances archéologiques" -#: archaeological_files/forms.py:767 archaeological_files/models.py:722 +#: archaeological_files/forms.py:767 archaeological_files/models.py:723 msgid "Intervention period" msgstr "Période d'intervention" -#: archaeological_files/forms.py:772 archaeological_files/models.py:725 +#: archaeological_files/forms.py:772 archaeological_files/models.py:726 msgid "Study period" msgstr "Période d'étude" -#: archaeological_files/forms.py:777 archaeological_files/models.py:728 +#: archaeological_files/forms.py:777 archaeological_files/models.py:729 msgid "Report due period" msgstr "Période de remise du rapport" -#: archaeological_files/forms.py:792 archaeological_files/models.py:732 +#: archaeological_files/forms.py:792 archaeological_files/models.py:733 msgid "Ground start date" msgstr "Date de début de la fouille" -#: archaeological_files/forms.py:797 archaeological_files/models.py:733 +#: archaeological_files/forms.py:797 archaeological_files/models.py:734 msgid "Ground end date" msgstr "Date de fin de la fouille" -#: archaeological_files/forms.py:802 archaeological_files/models.py:735 +#: archaeological_files/forms.py:802 archaeological_files/models.py:736 msgid "Execution report date" msgstr "Date du rapport d'exécution" @@ -2219,7 +2200,7 @@ msgid "Days" msgstr "Jours" #: archaeological_files/forms.py:889 archaeological_files/models.py:116 -#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/models.py:1434 archaeological_files/models.py:1453 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" @@ -2227,7 +2208,7 @@ msgstr "Emploi" #: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:718 +#: archaeological_files/models.py:206 archaeological_files/models.py:719 msgid "Price agreement" msgstr "Contrat tarifaire" @@ -2266,18 +2247,18 @@ msgstr "Équipement / service" #: archaeological_finds/forms_treatments.py:566 #: archaeological_finds/forms_treatments.py:628 #: archaeological_finds/forms_treatments.py:645 -#: archaeological_finds/forms_treatments.py:799 -#: archaeological_finds/forms_treatments.py:841 -#: archaeological_finds/forms_treatments.py:908 -#: archaeological_finds/models_treatments.py:205 -#: archaeological_finds/models_treatments.py:1107 +#: archaeological_finds/forms_treatments.py:789 +#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:898 +#: archaeological_finds/models_treatments.py:206 +#: archaeological_finds/models_treatments.py:1103 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1452 -#: archaeological_operations/forms.py:1585 -#: archaeological_operations/models.py:2838 +#: archaeological_operations/forms.py:1445 +#: archaeological_operations/forms.py:1566 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1174 +#: archaeological_warehouse/models.py:1175 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 #: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2291,12 +2272,12 @@ msgstr "Index" #: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 -#: archaeological_finds/forms_treatments.py:842 -#: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1458 -#: archaeological_operations/forms.py:1519 -#: archaeological_operations/models.py:2569 -#: archaeological_operations/models.py:2828 +#: archaeological_finds/forms_treatments.py:832 +#: archaeological_finds/forms_treatments.py:887 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1500 +#: archaeological_operations/models.py:2548 +#: archaeological_operations/models.py:2803 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "Type d'acte" @@ -2307,31 +2288,31 @@ msgstr "Objet (recherche en texte intégral)" #: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 -#: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1459 -#: archaeological_operations/forms.py:1655 +#: archaeological_finds/forms_treatments.py:833 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1636 msgid "Indexed?" msgstr "Indexé ?" #: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 -#: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1465 -#: archaeological_operations/forms.py:1526 -#: archaeological_operations/models.py:2897 +#: archaeological_finds/forms_treatments.py:834 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1507 +#: archaeological_operations/models.py:2872 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" #: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 -#: archaeological_finds/forms_treatments.py:850 +#: archaeological_finds/forms_treatments.py:840 msgid "Signature date before" msgstr "Date de signature avant" #: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 -#: archaeological_finds/forms_treatments.py:848 +#: archaeological_finds/forms_treatments.py:838 msgid "Signature date after" msgstr "Date de signature après" @@ -2359,15 +2340,15 @@ msgstr "Dossier : réf. du permis / de l'arrêté" msgid "Archaeological file - Administrative act - General" msgstr "Dossier archéologique - Acte administratif - Général" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:782 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:953 -#: archaeological_operations/models.py:2033 -#: archaeological_operations/models.py:2552 -#: archaeological_operations/models.py:2668 -#: archaeological_operations/models.py:2876 +#: archaeological_operations/forms.py:674 +#: archaeological_operations/forms.py:946 +#: archaeological_operations/models.py:2012 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2647 +#: archaeological_operations/models.py:2851 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2380,10 +2361,10 @@ 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:3615 +#: archaeological_finds/models_finds.py:3589 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2933 +#: archaeological_operations/models.py:1699 +#: archaeological_operations/models.py:2908 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -2391,8 +2372,8 @@ msgstr "Acte administratif" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 #: archaeological_files/models.py:254 archaeological_files/models.py:349 -#: archaeological_files/models.py:369 archaeological_files/models.py:1439 -#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 +#: archaeological_files/models.py:369 archaeological_files/models.py:1440 +#: archaeological_files/models.py:1459 archaeological_files/models.py:1486 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5432 @@ -2594,7 +2575,7 @@ msgstr "Types d'opération pour les redevances - France" #: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 +#: archaeological_operations/models.py:991 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" @@ -2602,7 +2583,7 @@ msgstr "Zone" #: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:991 +#: archaeological_operations/models.py:992 msgid "Extended area" msgstr "Zone étendue" @@ -2614,7 +2595,7 @@ msgstr "Zone étendue" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/models_common.py:2024 ishtar_common/models_common.py:2040 #: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -2639,41 +2620,41 @@ msgstr "Surface totale (km2)" msgid "Total developed surface (km2)" msgstr "Surface totale aménagée (km²)" -#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1312 +#: archaeological_files/models.py:482 archaeological_finds/models_finds.py:1322 #: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1059 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1131 -#: archaeological_operations/models.py:2692 +#: archaeological_finds/models_treatments.py:1066 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:2671 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "annee" -#: archaeological_files/models.py:483 -#: archaeological_finds/models_treatments.py:1056 -#: archaeological_operations/models.py:362 -#: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 +#: archaeological_files/models.py:484 +#: archaeological_finds/models_treatments.py:1063 +#: archaeological_operations/models.py:363 +#: archaeological_warehouse/models.py:959 ishtar_common/models.py:4317 msgctxt "key for text search" msgid "reference" msgstr "reference" -#: archaeological_files/models.py:486 +#: archaeological_files/models.py:487 #: archaeological_finds/models_treatments.py:155 -#: archaeological_operations/models.py:368 +#: archaeological_operations/models.py:369 msgctxt "key for text search" msgid "other-reference" msgstr "autre-reference" -#: archaeological_files/models.py:498 archaeological_operations/models.py:1155 +#: archaeological_files/models.py:499 archaeological_operations/models.py:1149 msgctxt "key for text search" msgid "department" msgstr "departement" -#: archaeological_files/models.py:502 -#: archaeological_finds/models_treatments.py:1053 -#: archaeological_operations/models.py:365 -#: archaeological_operations/models.py:1159 +#: archaeological_files/models.py:503 +#: archaeological_finds/models_treatments.py:1060 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:1153 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2626 #: ishtar_common/models.py:2888 ishtar_common/models.py:3694 @@ -2681,85 +2662,85 @@ msgctxt "key for text search" msgid "name" msgstr "nom" -#: archaeological_files/models.py:505 +#: archaeological_files/models.py:506 #: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1062 -#: archaeological_operations/models.py:1165 -#: archaeological_operations/models.py:2703 +#: archaeological_finds/models_treatments.py:1069 +#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:2682 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 -#: archaeological_warehouse/models.py:954 ishtar_common/models.py:2629 +#: archaeological_warehouse/models.py:955 ishtar_common/models.py:2629 #: ishtar_common/models.py:2904 ishtar_common/models.py:3705 #: ishtar_common/models.py:4313 msgctxt "key for text search" msgid "type" msgstr "type" -#: archaeological_files/models.py:508 +#: archaeological_files/models.py:509 msgctxt "key for text search" msgid "active" msgstr "actif" -#: archaeological_files/models.py:511 +#: archaeological_files/models.py:512 msgctxt "key for text search" msgid "saisine-type" msgstr "type-saisine" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:517 msgctxt "key for text search" msgid "permit-type" msgstr "type-permis" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:522 msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1518 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:1210 -#: archaeological_operations/models.py:2813 -#: archaeological_warehouse/models.py:971 ishtar_common/models.py:4388 +#: archaeological_files/models.py:526 archaeological_finds/models_finds.py:1520 +#: archaeological_operations/models.py:385 +#: archaeological_operations/models.py:1197 +#: archaeological_operations/models.py:2788 +#: archaeological_warehouse/models.py:972 ishtar_common/models.py:4388 msgctxt "key for text search" msgid "comment" msgstr "commentaire" -#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1677 -#: archaeological_finds/models_treatments.py:1065 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:1664 +#: archaeological_finds/models_treatments.py:1072 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:532 archaeological_operations/models.py:2748 +#: archaeological_files/models.py:533 archaeological_operations/models.py:2723 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2752 +#: archaeological_files/models.py:538 archaeological_operations/models.py:2727 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" -#: archaeological_files/models.py:559 -#: archaeological_finds/models_treatments.py:1109 +#: archaeological_files/models.py:560 +#: archaeological_finds/models_treatments.py:1105 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" -#: archaeological_files/models.py:567 +#: archaeological_files/models.py:568 #: archaeological_finds/forms_treatments.py:642 -#: archaeological_finds/forms_treatments.py:724 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:714 +#: archaeological_finds/models_treatments.py:1110 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1355 -#: archaeological_operations/forms.py:1824 -#: archaeological_operations/models.py:494 +#: archaeological_operations/forms.py:1133 +#: archaeological_operations/forms.py:1231 +#: archaeological_operations/forms.py:1348 +#: archaeological_operations/forms.py:1805 +#: archaeological_operations/models.py:495 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 @@ -2774,8 +2755,8 @@ msgstr "Référence interne" #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 #: ishtar_common/models.py:3639 ishtar_common/models.py:5468 -#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 -#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 +#: ishtar_common/models_common.py:2247 ishtar_common/models_common.py:3371 +#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2802,8 +2783,8 @@ msgstr "Référence interne" msgid "Name" msgstr "Nom" -#: archaeological_files/models.py:572 -#: archaeological_finds/models_treatments.py:1123 +#: archaeological_files/models.py:573 +#: archaeological_finds/models_treatments.py:1119 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 @@ -2815,38 +2796,38 @@ msgstr "Nom" msgid "Person in charge" msgstr "Personne responsable" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:587 msgid "General contractor (raw)" msgstr "Aménageur (brut)" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:592 msgid "General contractor organization" msgstr "Organisation de l'aménageur" -#: archaeological_files/models.py:605 +#: archaeological_files/models.py:606 msgid "Planning service (raw)" msgstr "Service instructeur (brut)" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:613 msgid "Planning service organization" msgstr "Service instructeur" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:628 msgid "Main town" msgstr "Commune principale" -#: archaeological_files/models.py:666 +#: archaeological_files/models.py:667 msgid "Main address" msgstr "Adresse des terrains" -#: archaeological_files/models.py:668 +#: archaeological_files/models.py:669 msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: archaeological_files/models.py:687 +#: archaeological_files/models.py:688 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 -#: archaeological_finds/models_treatments.py:252 +#: archaeological_finds/models_treatments.py:253 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:748 ishtar_common/forms_common.py:1022 #: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1246 @@ -2859,128 +2840,128 @@ msgstr "Adresse des terrains - code postal" msgid "Organization" msgstr "Organisation" -#: archaeological_files/models.py:737 +#: archaeological_files/models.py:738 msgid "Linear meter" msgstr "Mètre linéaire" -#: archaeological_files/models.py:741 +#: archaeological_files/models.py:742 msgid "Type of agreement" msgstr "Type de convention" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:747 msgid "Operation type for royalties" msgstr "Type d'opération pour la redevance" -#: archaeological_files/models.py:762 +#: archaeological_files/models.py:763 msgid "Imported line" msgstr "Ligne importée" -#: archaeological_files/models.py:782 +#: archaeological_files/models.py:783 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: archaeological_files/models.py:809 +#: archaeological_files/models.py:810 msgid "FILE" msgstr "DOSSIER" -#: archaeological_files/models.py:1062 +#: archaeological_files/models.py:1063 msgid "Multi-town" msgstr "Intercommunal" -#: archaeological_files/models.py:1068 +#: archaeological_files/models.py:1069 msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1277 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1278 archaeological_operations/models.py:1959 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1279 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1280 archaeological_operations/models.py:1961 msgid "parcels" msgstr "parcelles" -#: archaeological_files/models.py:1289 +#: archaeological_files/models.py:1290 msgid "Edit intervention plan" msgstr "Modifier le plan d'intervention" -#: archaeological_files/models.py:1291 +#: archaeological_files/models.py:1292 msgid "plan" msgstr "plan d'intervention" -#: archaeological_files/models.py:1300 -#: archaeological_finds/models_treatments.py:409 -#: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:2013 +#: archaeological_files/models.py:1301 +#: archaeological_finds/models_treatments.py:410 +#: archaeological_finds/models_treatments.py:1226 +#: archaeological_operations/models.py:1992 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" -#: archaeological_files/models.py:1302 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:2015 +#: archaeological_files/models.py:1303 +#: archaeological_finds/models_treatments.py:412 +#: archaeological_finds/models_treatments.py:1228 +#: archaeological_operations/models.py:1994 msgid "admin. act" msgstr "acte admin." -#: archaeological_files/models.py:1311 +#: archaeological_files/models.py:1312 msgid "Add operation" msgstr "Ajouter une opération" -#: archaeological_files/models.py:1313 +#: archaeological_files/models.py:1314 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1388 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3147 +#: archaeological_files/models.py:1389 archaeological_operations/models.py:1372 +#: archaeological_operations/models.py:3122 msgid "File" msgstr "Dossier" -#: archaeological_files/models.py:1407 +#: archaeological_files/models.py:1408 msgid "Man by day - planned" msgstr "Personnes par jour - planifiés" -#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 +#: archaeological_files/models.py:1410 archaeological_files/models.py:1476 msgid "Days - planned" msgstr "Jours - planifiés" -#: archaeological_files/models.py:1411 +#: archaeological_files/models.py:1412 msgid "Man by day - worked" msgstr "Personnes par jour - travaillés" -#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 +#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 msgid "Days - worked" msgstr "Jours - travaillés" -#: archaeological_files/models.py:1437 +#: archaeological_files/models.py:1438 msgid "Human requirement on field" msgstr "Besoin humain terrains" -#: archaeological_files/models.py:1438 +#: archaeological_files/models.py:1439 msgid "Human requirements on field" msgstr "Besoins humains terrains" -#: archaeological_files/models.py:1456 +#: archaeological_files/models.py:1457 msgid "Human requirement for post-excavation" msgstr "Besoin humain post-fouille" -#: archaeological_files/models.py:1457 +#: archaeological_files/models.py:1458 msgid "Human requirements for post-excavation" msgstr "Besoins humains post-fouille" -#: archaeological_files/models.py:1473 +#: archaeological_files/models.py:1474 msgid "Quantity by day - planned" msgstr "Quantité par jour - planifié" -#: archaeological_files/models.py:1477 +#: archaeological_files/models.py:1478 msgid "Quantity by day - worked" msgstr "Quantité par jour - travaillé" -#: archaeological_files/models.py:1483 +#: archaeological_files/models.py:1484 msgid "Equipment requirement" msgstr "Besoin en équipement" -#: archaeological_files/models.py:1484 +#: archaeological_files/models.py:1485 msgid "Equipment requirements" msgstr "Besoins en équipements" @@ -3064,7 +3045,7 @@ msgstr "Parcelles associées" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2934 +#: archaeological_operations/models.py:2909 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3082,8 +3063,8 @@ msgstr "Opérations associées" #: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 -#: archaeological_operations/models.py:2666 -#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2645 +#: archaeological_operations/models.py:2944 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 @@ -3095,7 +3076,7 @@ msgstr "Réf." #: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 -#: archaeological_finds/forms_treatments.py:735 +#: archaeological_finds/forms_treatments.py:725 #: archaeological_finds/models_treatments.py:131 #: archaeological_finds/templates/ishtar/sheet_find.html:390 #: archaeological_finds/templates/ishtar/sheet_find.html:428 @@ -3109,7 +3090,7 @@ msgstr "Réf." #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: archaeological_warehouse/models.py:336 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 #: cd17_app/templates/ishtar/sheet_find.html:392 #: cd17_app/templates/ishtar/sheet_find.html:430 #: cd17_app/templates/ishtar/sheet_find.html:468 @@ -3153,8 +3134,9 @@ msgid "Type" msgstr "Type" #: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_operations/forms.py:791 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/forms.py:539 +#: archaeological_operations/forms.py:784 +#: archaeological_operations/models.py:1332 msgid "Excavation end date" msgstr "Date de fin de chantier" @@ -3327,71 +3309,71 @@ msgstr "Identification musée" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:752 #: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1357 -#: archaeological_finds/forms.py:1734 archaeological_finds/forms.py:2471 +#: archaeological_finds/forms.py:1721 archaeological_finds/forms.py:2387 #: archaeological_finds/models_finds.py:550 -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2006 msgid "Free ID" msgstr "Identifiant libre" #: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1021 -#: archaeological_finds/models_finds.py:2034 +#: archaeological_finds/models_finds.py:2009 msgid "Museum ID prefix" msgstr "Préfixe num. inventaire" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1022 -#: archaeological_finds/forms.py:1736 archaeological_finds/models_finds.py:2035 +#: archaeological_finds/forms.py:1723 archaeological_finds/models_finds.py:2010 msgid "Museum inventory number" msgstr "Numéro d'inventaire musée" #: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1023 -#: archaeological_finds/models_finds.py:2036 +#: archaeological_finds/models_finds.py:2011 msgid "Museum ID suffix" msgstr "Suffixe num. inventaire" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2037 +#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2012 msgid "Comment on museum ID" msgstr "Précisions sur le numéro d’inventaire" #: archaeological_finds/forms.py:363 archaeological_finds/forms.py:754 #: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1359 -#: archaeological_finds/forms.py:1735 archaeological_finds/forms.py:2538 -#: archaeological_finds/models_finds.py:2032 ishtar_common/forms_common.py:1410 +#: archaeological_finds/forms.py:1722 archaeological_finds/forms.py:2454 +#: archaeological_finds/models_finds.py:2007 ishtar_common/forms_common.py:1410 #: ishtar_common/models.py:3278 msgid "Denomination" msgstr "Dénomination" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1017 -#: archaeological_finds/forms.py:1738 archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:1725 archaeological_finds/models_finds.py:2153 msgid "Previous ID" msgstr "Identifiant précédent" #: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1741 archaeological_finds/models_finds.py:2038 +#: archaeological_finds/forms.py:1728 archaeological_finds/models_finds.py:2013 msgid "Laboratory ID" msgstr "Numéro de laboratoire" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1025 -#: archaeological_finds/forms.py:1740 archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:1727 archaeological_finds/models_finds.py:2004 msgid "Seal number" msgstr "Numéro de scellé" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2228 +#: archaeological_finds/models_finds.py:2203 msgid "Presence of inventory marking" msgstr "Présence d’un marquage inventaire" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1075 -#: archaeological_finds/models_finds.py:2232 +#: archaeological_finds/models_finds.py:2207 msgid "Type of marking" msgstr "Type de marquage" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1026 -#: archaeological_finds/forms.py:2063 archaeological_finds/models_finds.py:2175 +#: archaeological_finds/forms.py:1979 archaeological_finds/models_finds.py:2150 msgid "Marking details" msgstr "Précisions sur le marquage" #: archaeological_finds/forms.py:380 archaeological_finds/forms.py:990 -#: archaeological_finds/forms.py:1664 archaeological_finds/models_finds.py:429 +#: archaeological_finds/forms.py:1651 archaeological_finds/models_finds.py:429 #: archaeological_finds/models_finds.py:444 #: archaeological_finds/models_finds.py:459 #: archaeological_finds/models_finds.py:474 @@ -3401,56 +3383,56 @@ msgid "Museum" msgstr "Musée" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1036 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/models_finds.py:2174 msgid "Owner institution" msgstr "Institution propriétaire" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1042 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2179 msgid "Assigned institution" msgstr "Institution affectataire" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2184 msgid "Custodian institution" msgstr "Institution dépositaire" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2186 msgid "Depositor inventory number" msgstr "Numéro d’inventaire du déposant" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1053 -#: archaeological_finds/models_finds.py:2214 +#: archaeological_finds/models_finds.py:2189 msgid "Collections entry mode" msgstr "Mode d’entrée dans les collections" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1055 -#: archaeological_finds/models_finds.py:2216 +#: archaeological_finds/models_finds.py:2191 msgid "Comment on museum entry mode" msgstr "Précisions sur le mode d'entrée" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1058 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2192 msgid "Museum entry date (exact or start)" msgstr "Date d’entrée au musée (exacte ou début)" #: archaeological_finds/forms.py:399 archaeological_finds/forms.py:1061 -#: archaeological_finds/models_finds.py:2218 +#: archaeological_finds/models_finds.py:2193 msgid "Museum entry date (end)" msgstr "Date d’entrée au musée (fin)" -#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2194 msgid "Comment on museum entry date" msgstr "Précisions sur la date d’entrée au musée" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1064 -#: archaeological_finds/models_finds.py:2223 +#: archaeological_finds/models_finds.py:2198 msgid "Donor, testator or vendor" msgstr "Donateur, testateur ou vendeur" #: archaeological_finds/forms.py:411 archaeological_finds/forms.py:1077 -#: archaeological_finds/models_finds.py:2192 -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2214 msgid "Collection" msgstr "Collection" @@ -3459,41 +3441,41 @@ msgid "Former collections" msgstr "Anciennes collections" #: archaeological_finds/forms.py:416 archaeological_finds/forms.py:1084 -#: archaeological_finds/models_finds.py:2247 +#: archaeological_finds/models_finds.py:2222 msgid "Inventory entry year" msgstr "Année d’inscription à l’inventaire" -#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2251 +#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2226 msgid "Conformity with inventory" msgstr "Conformité avec l’inventaire" -#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2253 +#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2228 msgid "Comment on conformity" msgstr "Précisions sur la conformité" #: archaeological_finds/forms.py:425 archaeological_finds/forms.py:1085 -#: archaeological_finds/models_finds.py:2257 +#: archaeological_finds/models_finds.py:2232 msgid "Original/reproduction" msgstr "Original/reproduction" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2259 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2234 msgid "Date of museum allocation" msgstr "Date d’affectation au musée" -#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2260 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2235 msgid "Purchase price" msgstr "Prix d’achat" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2254 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2229 msgid "Inventory transcript" msgstr "Transcription de l’inventaire" -#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2273 msgid "Public description" msgstr "Description publique" #: archaeological_finds/forms.py:442 archaeological_finds/forms.py:761 -#: archaeological_finds/forms.py:1848 archaeological_finds/models_finds.py:2115 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2090 msgid "Is complete?" msgstr "Est complet ?" @@ -3501,23 +3483,23 @@ msgstr "Est complet ?" #: archaeological_finds/forms.py:1097 archaeological_finds/models_finds.py:96 #: archaeological_finds/models_finds.py:1168 #: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:2021 msgid "Material types" msgstr "Types de matériau" #: archaeological_finds/forms.py:447 archaeological_finds/forms.py:767 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2050 +#: archaeological_finds/forms.py:1838 archaeological_finds/models_finds.py:2025 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "Qualité du type de matériaux" #: archaeological_finds/forms.py:450 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2058 +#: archaeological_finds/forms.py:1841 archaeological_finds/models_finds.py:2033 msgid "Technical processes" msgstr "Procédé(s) technique(s)" -#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1866 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1847 +#: archaeological_finds/models_finds.py:2038 msgid "Comment on the material" msgstr "Précisions sur le matériau" @@ -3525,85 +3507,85 @@ msgstr "Précisions sur le matériau" #: archaeological_finds/forms.py:1104 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2117 +#: archaeological_finds/models_finds.py:2092 msgid "Object types" msgstr "Types d'objet" #: archaeological_finds/forms.py:461 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1854 archaeological_finds/models_finds.py:2096 msgid "Object type quality" msgstr "Qualité du type d'objet" #: archaeological_finds/forms.py:464 archaeological_finds/forms.py:1108 -#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2129 +#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2104 msgid "Functional areas" msgstr "Domaines fonctionnels" #: archaeological_finds/forms.py:468 archaeological_finds/forms.py:1112 -#: archaeological_finds/forms.py:1882 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2110 msgid "Technical areas" msgstr "Domaines techniques" #: archaeological_finds/forms.py:471 archaeological_finds/forms.py:776 -#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1888 -#: archaeological_finds/forms.py:2477 archaeological_finds/models_finds.py:2070 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:2393 archaeological_finds/models_finds.py:2045 msgid "Number of remains" msgstr "Nombre de restes (NR)" #: archaeological_finds/forms.py:473 archaeological_finds/forms.py:778 -#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1871 +#: archaeological_finds/models_finds.py:2047 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" #: archaeological_finds/forms.py:475 archaeological_finds/forms.py:780 -#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1892 -#: archaeological_finds/models_finds.py:2261 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1873 +#: archaeological_finds/models_finds.py:2236 msgid "Inventory quantity" msgstr "Quantité à l’inventaire" #: archaeological_finds/forms.py:476 archaeological_finds/forms.py:781 -#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1893 -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1874 +#: archaeological_finds/models_finds.py:2237 msgid "Observed quantity" msgstr "Quantité vue" #: archaeological_finds/forms.py:478 archaeological_finds/forms.py:783 -#: archaeological_finds/models_finds.py:2075 +#: archaeological_finds/models_finds.py:2050 msgid "Comment on quantity" msgstr "Précisions sur la quantité" #: archaeological_finds/forms.py:482 archaeological_finds/forms.py:787 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:2040 +#: archaeological_finds/forms.py:1877 archaeological_finds/models_finds.py:2015 msgid "Decoration" msgstr "Décor" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:790 -#: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2016 msgid "Inscription" msgstr "Inscription" #: archaeological_finds/forms.py:488 archaeological_finds/forms.py:793 -#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1895 -#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1876 +#: archaeological_finds/models_finds.py:2018 msgid "Manufacturing place" msgstr "Lieu de fabrication" #: archaeological_finds/forms.py:491 archaeological_finds/forms.py:796 -#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1899 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1880 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2128 msgid "Communicability" msgstr "Communicabilité" #: archaeological_finds/forms.py:499 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1905 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1886 +#: archaeological_finds/models_finds.py:2152 msgid "Comment on dating" msgstr "Précisions sur les datations" #: archaeological_finds/forms.py:502 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1621 #: archaeological_finds/templates/ishtar/sheet_find.html:198 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:177 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -3615,43 +3597,44 @@ msgid "Dimensions" msgstr "Dimensions" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:806 -#: archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:2132 msgid "Length (cm)" msgstr "Longueur (cm)" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:807 -#: archaeological_finds/models_finds.py:2158 +#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:2133 msgid "Width (cm)" msgstr "Largeur (cm)" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:808 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:2134 msgid "Height (cm)" msgstr "Hauteur (cm)" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:811 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2137 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:809 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:2135 msgid "Diameter (cm)" msgstr "Diamètre (cm)" #: archaeological_finds/forms.py:519 archaeological_finds/forms.py:810 -#: archaeological_finds/models_finds.py:2161 +#: archaeological_finds/forms.py:1893 archaeological_finds/models_finds.py:2136 msgid "Circumference (cm)" msgstr "Circonférence (cm)" #: archaeological_finds/forms.py:523 archaeological_finds/forms.py:812 -#: archaeological_finds/forms.py:2475 archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:1894 archaeological_finds/forms.py:2391 +#: archaeological_finds/models_finds.py:2040 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "Volume (l)" #: archaeological_finds/forms.py:525 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2392 #: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:186 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3663,31 +3646,35 @@ msgid "Weight (g)" msgstr "Poids (g)" #: archaeological_finds/forms.py:528 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:1897 msgid "Clutter long side (cm)" msgstr "Encombrement grand côté (cm)" #: archaeological_finds/forms.py:533 archaeological_finds/forms.py:818 +#: archaeological_finds/forms.py:1901 msgid "Clutter short side (cm)" msgstr "Encombrement petit côté (cm)" #: archaeological_finds/forms.py:538 archaeological_finds/forms.py:821 +#: archaeological_finds/forms.py:1905 msgid "Clutter height (cm)" msgstr "Encombrement hauteur (cm)" #: archaeological_finds/forms.py:543 archaeological_finds/forms.py:824 -#: archaeological_finds/forms.py:1976 archaeological_finds/models_finds.py:2173 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:2148 msgid "Dimensions comment" msgstr "Précisions sur les dimensions" #: archaeological_finds/forms.py:547 archaeological_finds/forms.py:828 -#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1981 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1913 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2182 +#: archaeological_finds/models_finds.py:2157 msgid "Check" msgstr "Vérification" #: archaeological_finds/forms.py:549 archaeological_finds/forms.py:830 -#: archaeological_finds/forms.py:1141 archaeological_finds/models_finds.py:2187 +#: archaeological_finds/forms.py:1141 archaeological_finds/forms.py:1914 +#: archaeological_finds/models_finds.py:2162 msgid "Check date" msgstr "Date de vérification" @@ -3708,25 +3695,27 @@ msgid "Comment on the circumstances of discovery" msgstr "Précisions sur les circonstances de découverte" #: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1019 -#: archaeological_finds/forms.py:1739 archaeological_finds/models_finds.py:555 +#: archaeological_finds/forms.py:1726 archaeological_finds/models_finds.py:555 msgid "Excavation ID" msgstr "Identifiant fouille" -#: archaeological_finds/forms.py:709 archaeological_finds/models_finds.py:568 +#: archaeological_finds/forms.py:709 archaeological_finds/forms.py:1823 +#: archaeological_finds/models_finds.py:568 #: archaeological_finds/templates/ishtar/sheet_basefind.html:32 #: man_app/templates/ishtar/sheet_basefind.html:29 #: sra_idf_app/templates/ishtar/sheet_basefind.html:32 msgid "Discovery date (exact or beginning)" msgstr "Date de découverte (exacte ou début)" -#: archaeological_finds/forms.py:712 archaeological_finds/models_finds.py:571 +#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1826 +#: archaeological_finds/models_finds.py:571 #: archaeological_finds/templates/ishtar/sheet_basefind.html:34 #: man_app/templates/ishtar/sheet_basefind.html:31 #: sra_idf_app/templates/ishtar/sheet_basefind.html:34 msgid "Discovery date (end)" msgstr "Date de découverte (fin)" -#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1847 +#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1828 #: archaeological_finds/models_finds.py:575 msgid "Batch/object" msgstr "Lot/objet" @@ -3735,12 +3724,12 @@ msgstr "Lot/objet" msgid "Topography" msgstr "Topographie" -#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1979 +#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1911 #: archaeological_finds/models_finds.py:583 msgid "Point of topographic reference" msgstr "Point topographique" -#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2468 +#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2384 msgid "Resulting find" msgstr "Mobilier résultant" @@ -3748,7 +3737,7 @@ msgstr "Mobilier résultant" msgid "Treatment n-1 - 030 - Resulting find" msgstr "Traitement n-1 - 030 - Mobilier résultant" -#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2399 msgid "Resulting finds" msgstr "Mobiliers résultants" @@ -3794,7 +3783,7 @@ msgid "Datation" msgstr "Datation" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 -#: archaeological_finds/forms.py:1651 +#: archaeological_finds/forms.py:1638 #: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3806,22 +3795,22 @@ msgid "Preservation" msgstr "Conservation" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 -#: archaeological_finds/forms.py:1990 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/forms.py:1919 archaeological_finds/models_finds.py:1213 +#: archaeological_finds/models_finds.py:2255 #: archaeological_warehouse/forms.py:593 msgid "Alteration" msgstr "Altération" #: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1991 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2284 +#: archaeological_finds/forms.py:1920 archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2259 #: archaeological_warehouse/forms.py:594 msgid "Alteration cause" msgstr "Cause d'altération" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 -#: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/forms.py:1917 archaeological_finds/models_finds.py:1208 +#: archaeological_finds/models_finds.py:2242 #: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3829,34 +3818,34 @@ msgid "Conservatory states" msgstr "États de conservation" #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1523 -#: archaeological_finds/forms.py:1995 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2290 +#: archaeological_finds/forms.py:1924 archaeological_finds/models_finds.py:1215 +#: archaeological_finds/models_finds.py:2265 #: archaeological_warehouse/forms.py:598 msgid "Treatment emergency" msgstr "Urgence du traitement" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1487 -#: archaeological_finds/forms.py:1986 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2141 +#: archaeological_finds/forms.py:1915 archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:2116 #: archaeological_warehouse/forms.py:590 msgid "Integrity" msgstr "Intégrité" #: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1493 -#: archaeological_finds/forms.py:1987 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:1916 archaeological_finds/models_finds.py:1210 +#: archaeological_finds/models_finds.py:2122 #: archaeological_warehouse/forms.py:591 msgid "Remarkability" msgstr "Remarquabilité" #: archaeological_finds/forms.py:1144 archaeological_finds/forms.py:1528 -#: archaeological_finds/models_finds.py:2296 +#: archaeological_finds/forms.py:1928 archaeological_finds/models_finds.py:2271 msgid "Appraisal date" msgstr "Date d'évaluation" #: archaeological_finds/forms.py:1146 archaeological_finds/forms.py:1526 -#: archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2295 +#: archaeological_finds/forms.py:1927 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2270 msgid "Insurance value" msgstr "Valeur d'assurance" @@ -3877,12 +3866,12 @@ msgstr "Créer" msgid "Update" msgstr "Mettre à jour" -#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1826 -#: archaeological_finds/forms.py:2687 archaeological_finds/forms.py:2692 -#: archaeological_finds/forms.py:2709 archaeological_finds/forms.py:2714 +#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1813 +#: archaeological_finds/forms.py:2603 archaeological_finds/forms.py:2608 +#: archaeological_finds/forms.py:2625 archaeological_finds/forms.py:2630 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:930 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1892 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3900,24 +3889,24 @@ msgstr "Vous ne pouvez pas mettre à jour le panier sélectionné." msgid "A label is required." msgstr "Un libellé est obligatoire." -#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2583 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2499 #: ishtar_common/models.py:1084 ishtar_common/models.py:2079 #: ishtar_common/models.py:3838 ishtar_common/models_imports.py:158 #: ishtar_common/models_imports.py:437 ishtar_common/models_imports.py:825 msgid "Slug" msgstr "Identifiant textuel" -#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2584 +#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2500 msgid "Is public" msgstr "Est public" -#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2589 -#: archaeological_finds/forms.py:2631 ishtar_common/models.py:3851 +#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2505 +#: archaeological_finds/forms.py:2547 ishtar_common/models.py:3851 msgid "Shared (read) with" msgstr "Partagé (lecture) avec" -#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2596 -#: archaeological_finds/forms.py:2638 ishtar_common/models.py:3857 +#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2512 +#: archaeological_finds/forms.py:2554 ishtar_common/models.py:3857 msgid "Shared (read/edit) with" msgstr "Partagé (lecture/édition) avec" @@ -3925,19 +3914,20 @@ msgstr "Partagé (lecture/édition) avec" msgid "Find - 030 - Preservation" msgstr "Mobilier - 030 - Conservation" -#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1922 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2275 +#: archaeological_finds/models_finds.py:2250 msgid "Recommended treatments" msgstr "Traitements recommandés" -#: archaeological_finds/forms.py:1525 archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:1525 archaeological_finds/forms.py:1926 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2163 msgid "Estimated value" msgstr "Valeur estimée" -#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1989 -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1918 +#: archaeological_finds/models_finds.py:2246 msgid "Conservatory comment" msgstr "Précisions sur la conservation" @@ -3957,107 +3947,91 @@ msgstr "Origine du mobilier" msgid "Discovery" msgstr "Découverte" -#: archaeological_finds/forms.py:1737 archaeological_finds/models_finds.py:2337 +#: archaeological_finds/forms.py:1724 archaeological_finds/models_finds.py:2312 msgid "Complete museum ID" msgstr "Numéro d’inventaire complet" -#: archaeological_finds/forms.py:1743 archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1730 archaeological_finds/models_finds.py:1148 msgid "Base find - Short ID" msgstr "Mobilier d'origine - ID court" -#: archaeological_finds/forms.py:1744 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1731 archaeological_finds/models_finds.py:1149 msgid "Base find - Complete ID" msgstr "Mobilier d'origine - ID complet" -#: archaeological_finds/forms.py:1748 +#: archaeological_finds/forms.py:1735 msgid "Operation - number (index by year)" msgstr "Opération - Numéro (index par année)" -#: archaeological_finds/forms.py:1751 +#: archaeological_finds/forms.py:1738 msgid "Operation - Code (PATRIARCHE)" msgstr "Opération - Code (PATRIARCHE)" -#: archaeological_finds/forms.py:1754 +#: archaeological_finds/forms.py:1741 msgid "Operation - Type" msgstr "Opération - Type" -#: archaeological_finds/forms.py:1757 +#: archaeological_finds/forms.py:1744 msgid "Operation - Address / Locality" msgstr "Opération - Adresse / Lieu-dit" -#: archaeological_finds/forms.py:1760 +#: archaeological_finds/forms.py:1747 msgid "Operation - In charge" msgstr "Opération - Responsable" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1758 msgid "Operation - Scientist in charge" msgstr "Opération - Responsable d'opération" -#: archaeological_finds/forms.py:1774 +#: archaeological_finds/forms.py:1761 msgid "Operation - Operator" msgstr "Opération - Opérateur" -#: archaeological_finds/forms.py:1778 +#: archaeological_finds/forms.py:1765 msgid "Operation - Name" msgstr "Opération - Nom" -#: archaeological_finds/forms.py:1781 +#: archaeological_finds/forms.py:1768 msgid "Operation - Remains" msgstr "Opération - Vestiges" -#: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 +#: archaeological_finds/forms.py:1771 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1239 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "Zones" -#: archaeological_finds/forms.py:1787 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1774 archaeological_warehouse/forms.py:537 msgid "Archaeological site (attached to the operation)" msgstr "Site archéologique (rattaché à l'opération)" -#: archaeological_finds/forms.py:1795 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1782 archaeological_warehouse/forms.py:545 msgid "Archaeological site name (attached to the operation)" msgstr "Site archéologique nom (rattaché à l'opération)" -#: archaeological_finds/forms.py:1798 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1785 archaeological_warehouse/forms.py:548 msgid "Archaeological site (attached to the context record)" msgstr "Site archéologique (rattaché à l'UE)" -#: archaeological_finds/forms.py:1806 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1793 archaeological_warehouse/forms.py:556 msgid "Archaeological site name (attached to the context record)" msgstr "Site archéologique nom (rattaché à l'UE)" -#: archaeological_finds/forms.py:1809 +#: archaeological_finds/forms.py:1796 msgid "Archaeological site - Remains" msgstr "Site archéologique - Vestiges" -#: archaeological_finds/forms.py:1822 +#: archaeological_finds/forms.py:1809 msgid "Search within related context records" msgstr "Recherche parmi les Unités d'Enregistrement associées" -#: archaeological_finds/forms.py:1834 +#: archaeological_finds/forms.py:1821 msgid "Base find - Comment on the circumstances of discovery" msgstr "Précisions sur les circonstances de découvertes" -#: archaeological_finds/forms.py:1836 -msgid "Discovery date (exact or beginning) after" -msgstr "Date de découverte (exacte ou début) après" - -#: archaeological_finds/forms.py:1839 -msgid "Discovery date (exact or beginning) before" -msgstr "Date de découverte (exacte ou début) avant" - -#: archaeological_finds/forms.py:1842 -msgid "Discovery date (end) after" -msgstr "Date de découverte (fin) après" - -#: archaeological_finds/forms.py:1845 -msgid "Discovery date (end) before" -msgstr "Date de découverte (fin) avant" - -#: archaeological_finds/forms.py:1850 archaeological_finds/forms.py:2474 +#: archaeological_finds/forms.py:1831 archaeological_finds/forms.py:2390 #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -4067,7 +4041,7 @@ msgstr "Date de découverte (fin) avant" msgid "Material type" msgstr "Type de matériau" -#: archaeological_finds/forms.py:1868 archaeological_finds/models_finds.py:275 +#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 @@ -4076,244 +4050,120 @@ msgstr "Type de matériau" msgid "Object type" msgstr "Type d'objet" -#: archaeological_finds/forms.py:1908 -msgid "Length - higher than (cm)" -msgstr "Longueur - plus grand que (cm)" - -#: archaeological_finds/forms.py:1911 -msgid "Length - lower than (cm)" -msgstr "Longueur - plus petit que (cm)" - -#: archaeological_finds/forms.py:1914 -msgid "Width - lower than (cm)" -msgstr "Largeur - plus petit que (cm)" - -#: archaeological_finds/forms.py:1917 -msgid "Width - higher than (cm)" -msgstr "Largeur - plus grand que (cm)" - -#: archaeological_finds/forms.py:1920 -msgid "Height - lower than (cm)" -msgstr "Hauteur - plus petit que (cm)" - -#: archaeological_finds/forms.py:1923 -msgid "Height - higher than (cm)" -msgstr "Hauteur - plus grand que (cm)" - -#: archaeological_finds/forms.py:1926 -msgid "Thickness - lower than (cm)" -msgstr "Épaisseur - plus petit que (cm)" - -#: archaeological_finds/forms.py:1929 -msgid "Thickness - higher than (cm)" -msgstr "Épaisseur - plus grand que (cm)" - -#: archaeological_finds/forms.py:1932 -msgid "Diameter - lower than (cm)" -msgstr "Diamètre - plus petit que (cm)" - -#: archaeological_finds/forms.py:1935 -msgid "Diameter - higher than (cm)" -msgstr "Diamètre - plus grand que (cm)" - -#: archaeological_finds/forms.py:1938 -msgid "Circumference - lower than (cm)" -msgstr "Circonférence - plus petit que (cm)" - -#: archaeological_finds/forms.py:1941 -msgid "Circumference - higher than (cm)" -msgstr "Circonférence - plus grand que (cm)" - -#: archaeological_finds/forms.py:1944 -msgid "Volume - lower than (l)" -msgstr "Volume - plus petit que (l)" - -#: archaeological_finds/forms.py:1945 -msgid "Volume - higher than (l)" -msgstr "Volume - plus grand que (l)" - -#: archaeological_finds/forms.py:1947 +#: archaeological_finds/forms.py:1895 msgid "Weight - lower than (g)" msgstr "Poids - plus petit que (g)" -#: archaeological_finds/forms.py:1950 -msgid "Weight - higher than (g)" -msgstr "Poids - plus grand que (g)" - -#: archaeological_finds/forms.py:1953 -msgid "Clutter long side - lower than (cm)" -msgstr "Encombrement grand côté - plus petit que (cm)" - -#: archaeological_finds/forms.py:1957 -msgid "Clutter long side - higher than (cm)" -msgstr "Encombrement grand côté - plus grand que (cm)" - -#: archaeological_finds/forms.py:1961 -msgid "Clutter short side - lower than (cm)" -msgstr "Encombrement petit côté - plus petit que (cm)" - -#: archaeological_finds/forms.py:1965 -msgid "Clutter short side - higher than (cm)" -msgstr "Encombrement petit côté - plus grand que (cm)" - -#: archaeological_finds/forms.py:1969 -msgid "Clutter height - lower than (cm)" -msgstr "Encombrement hauteur - plus petit que (cm)" - -#: archaeological_finds/forms.py:1973 -msgid "Clutter height - higher than (cm)" -msgstr "Encombrement hauteur - plus grand que (cm)" - -#: archaeological_finds/forms.py:1982 -msgid "Check date after" -msgstr "Date de vérification après" - -#: archaeological_finds/forms.py:1984 -msgid "Check date before" -msgstr "Date de vérification avant" - -#: archaeological_finds/forms.py:1997 -msgid "Estimated value - higher than" -msgstr "Valeur estimée - plus grand que" - -#: archaeological_finds/forms.py:1998 -msgid "Estimated value - lower than" -msgstr "Valeur estimée - plus petit que" - -#: archaeological_finds/forms.py:1999 -msgid "Insurance value - higher than" -msgstr "Valeur d'assurance - plus grand que" - -#: archaeological_finds/forms.py:2000 -msgid "Insurance value - lower than" -msgstr "Valeur d'assurance - plus petit que" - -#: archaeological_finds/forms.py:2002 -msgid "Appraisal date after" -msgstr "Date d'évaluation après" - -#: archaeological_finds/forms.py:2005 -msgid "Appraisal date before" -msgstr "Date d'évaluation avant" - -#: archaeological_finds/forms.py:2008 +#: archaeological_finds/forms.py:1930 msgid "Loan?" msgstr "Prêt ?" -#: archaeological_finds/forms.py:2010 -msgid "Treatment file end date before" -msgstr "Dossier de traitement - date de clotûre avant" +#: archaeological_finds/forms.py:1932 +msgid "Treatment file end date" +msgstr "Dossier de traitement - date de clotûre" -#: archaeological_finds/forms.py:2013 -msgid "Treatment end date before" -msgstr "Traitement - date de clôture avant" +#: archaeological_finds/forms.py:1935 +msgid "Treatment end date" +msgstr "Traitement - date de clôture" -#: archaeological_finds/forms.py:2016 +#: archaeological_finds/forms.py:1938 msgid "Museum - Comment on museum ID" msgstr "Musée - Précisions sur le numéro d’inventaire" -#: archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1940 msgid "Museum - Owner institution" msgstr "Musée - Institution propriétaire" -#: archaeological_finds/forms.py:2024 +#: archaeological_finds/forms.py:1946 msgid "Museum - Assigned institution" msgstr "Musée - Institution affectataire" -#: archaeological_finds/forms.py:2030 +#: archaeological_finds/forms.py:1952 msgid "Museum - Custodian institution" msgstr "Musée - Institution dépositaire" -#: archaeological_finds/forms.py:2035 +#: archaeological_finds/forms.py:1957 msgid "Museum - Depositor inventory number" msgstr "Musée - Numéro d’inventaire du déposant" -#: archaeological_finds/forms.py:2036 +#: archaeological_finds/forms.py:1958 msgid "Museum - Collections entry mode" msgstr "Musée - Mode d’entrée dans les collections" -#: archaeological_finds/forms.py:2037 +#: archaeological_finds/forms.py:1959 msgid "Museum - Comment on museum entry mode" msgstr "Musée - Précisions sur le mode d'entrée" -#: archaeological_finds/forms.py:2039 -msgid "Museum - Entry date (exact or start) - before" -msgstr "Musée - Date d’entrée (exacte ou début) - avant" - -#: archaeological_finds/forms.py:2042 -msgid "Museum - Entry date (exact or start) - after" -msgstr "Musée - Date d’entrée (exacte ou début) - après" - -#: archaeological_finds/forms.py:2045 -msgid "Museum - Entry date end - before" -msgstr "Musée - Date d’entrée au musée (fin) - avant" +#: archaeological_finds/forms.py:1961 +msgid "Museum - Entry date (exact or start)" +msgstr "Musée - Date d’entrée (exacte ou début)" -#: archaeological_finds/forms.py:2048 -msgid "Museum - Entry date end - after" -msgstr "Musée - Date d’entrée au musée (fin) - après" +#: archaeological_finds/forms.py:1964 +msgid "Museum - Entry date end" +msgstr "Musée - Date d’entrée (fin)" -#: archaeological_finds/forms.py:2050 +#: archaeological_finds/forms.py:1966 msgid "Museum - Comment on entry date" msgstr "Musée - Précisions sur la date d’entrée" -#: archaeological_finds/forms.py:2052 +#: archaeological_finds/forms.py:1968 msgid "Museum - Donor, testator or vendor" msgstr "Musée - Donateur, testateur ou vendeur" -#: archaeological_finds/forms.py:2058 +#: archaeological_finds/forms.py:1974 msgid "Museum - Presence of inventory marking" msgstr "Musée - Présence d’un marquage inventaire" -#: archaeological_finds/forms.py:2061 +#: archaeological_finds/forms.py:1977 msgid "Museum - Type of marking" msgstr "Musée - Type de marquage" -#: archaeological_finds/forms.py:2065 +#: archaeological_finds/forms.py:1981 msgid "Museum - Collection" msgstr "Musée - Collection" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:1984 msgid "Museum - Former collection" msgstr "Musée - Ancienne collection" -#: archaeological_finds/forms.py:2073 +#: archaeological_finds/forms.py:1989 msgid "Museum - Inventory entry year - before" msgstr "Musée - Année d’inscription à l’inventaire - avant" -#: archaeological_finds/forms.py:2074 +#: archaeological_finds/forms.py:1990 msgid "Museum - Inventory entry year - after" msgstr "Musée - Année d’inscription à l’inventaire - après" -#: archaeological_finds/forms.py:2076 +#: archaeological_finds/forms.py:1992 msgid "Museum - Conformity with inventory" msgstr "Musée - Conformité avec l’inventaire" -#: archaeological_finds/forms.py:2078 +#: archaeological_finds/forms.py:1994 msgid "Museum - Comment on conformity" msgstr "Musée - Précisions sur la conformité" -#: archaeological_finds/forms.py:2079 +#: archaeological_finds/forms.py:1995 msgid "Museum - Inventory transcript" msgstr "Musée - Transcription de l’inventaire" -#: archaeological_finds/forms.py:2081 +#: archaeological_finds/forms.py:1997 msgid "Museum - Original/reproduction" msgstr "Musée - Original/reproduction" -#: archaeological_finds/forms.py:2084 +#: archaeological_finds/forms.py:2000 msgid "Museum - Date of allocation - before" msgstr "Musée - Date d’affectation au musée - avant" -#: archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2003 msgid "Museum - Date of allocation - after" msgstr "Musée - Date d’affectation au musée - après" -#: archaeological_finds/forms.py:2089 +#: archaeological_finds/forms.py:2005 msgid "Museum - Purchase price" msgstr "Musée - Prix d’achat" -#: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2109 +#: archaeological_finds/forms.py:2076 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2084 #: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4325,11 +4175,11 @@ msgstr "Musée - Prix d’achat" msgid "Reference container" msgstr "Contenant de référence" -#: archaeological_finds/forms.py:2167 +#: archaeological_finds/forms.py:2083 msgid "Reference container - Warehouse (location)" msgstr "Lieu de conservation du contenant de référence" -#: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 +#: archaeological_finds/forms.py:2102 archaeological_finds/models_finds.py:1164 #: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4341,50 +4191,50 @@ msgstr "Lieu de conservation du contenant de référence" msgid "Current container" msgstr "Contenant actuel" -#: archaeological_finds/forms.py:2193 +#: archaeological_finds/forms.py:2109 msgid "Current container - Warehouse (location)" msgstr "Lieu de conservation du contenant actuel" -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2234 -#: archaeological_finds/forms.py:2290 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2129 archaeological_finds/forms.py:2150 +#: archaeological_finds/forms.py:2206 archaeological_finds/views.py:382 msgid "Find search" msgstr "Rechercher un mobilier" -#: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 -#: archaeological_finds/models_treatments.py:399 +#: archaeological_finds/forms.py:2245 archaeological_finds/forms.py:2408 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "Mobilier amont" -#: archaeological_finds/forms.py:2352 +#: archaeological_finds/forms.py:2268 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: archaeological_finds/forms.py:2473 +#: archaeological_finds/forms.py:2389 msgid "Precise description" msgstr "Description précise" -#: archaeological_finds/forms.py:2488 +#: archaeological_finds/forms.py:2404 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: archaeological_finds/forms.py:2531 +#: archaeological_finds/forms.py:2447 msgid "Find basket - 001 - Search" msgstr "Panier mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:2543 archaeological_finds/forms.py:2561 +#: archaeological_finds/forms.py:2459 archaeological_finds/forms.py:2477 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "Recherche de panier" -#: archaeological_finds/forms.py:2578 +#: archaeological_finds/forms.py:2494 msgid "Find basket" msgstr "Panier de mobilier" -#: archaeological_finds/forms.py:2581 +#: archaeological_finds/forms.py:2497 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:200 +#: archaeological_finds/models_treatments.py:201 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 #: archaeological_finds/templates/ishtar/sheet_find.html:389 #: archaeological_finds/templates/ishtar/sheet_find.html:427 @@ -4398,7 +4248,7 @@ msgstr "Panier de mobilier" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 +#: ishtar_common/models_common.py:2023 ishtar_common/models_common.py:2039 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4415,11 +4265,11 @@ msgstr "Panier de mobilier" msgid "Label" msgstr "Dénomination" -#: archaeological_finds/forms.py:2623 archaeological_finds/forms.py:2678 +#: archaeological_finds/forms.py:2539 archaeological_finds/forms.py:2594 msgid "A basket with this slug already exists." msgstr "Un panier avec cet identifiant textuel existe déjà." -#: archaeological_finds/forms.py:2670 +#: archaeological_finds/forms.py:2586 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." @@ -4429,14 +4279,14 @@ msgstr "Traitement - 001 - Recherche" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:203 msgid "Other ref." msgstr "Autre réf." #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 #: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:244 +#: archaeological_finds/models_treatments.py:245 msgid "Scientific monitoring manager" msgstr "Responsable de suivi scientifique" @@ -4445,8 +4295,8 @@ msgstr "Responsable de suivi scientifique" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:582 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:215 -#: archaeological_finds/models_treatments.py:757 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:758 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "Type de traitement" @@ -4462,12 +4312,12 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:292 -#: archaeological_finds/models_treatments.py:746 +#: archaeological_finds/models_treatments.py:293 +#: archaeological_finds/models_treatments.py:747 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2555 -#: archaeological_operations/models.py:2892 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2867 ishtar_common/views.py:511 msgid "Treatment" msgstr "Traitement" @@ -4477,9 +4327,9 @@ msgstr "Traitement - 020 - Général" #: archaeological_finds/forms_treatments.py:163 #: archaeological_finds/forms_treatments.py:433 -#: archaeological_finds/forms_treatments.py:737 +#: archaeological_finds/forms_treatments.py:727 #: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:236 +#: archaeological_finds/models_treatments.py:237 msgid "Responsible" msgstr "Responsable" @@ -4490,7 +4340,7 @@ msgstr "" "localisation)" #: archaeological_finds/forms_treatments.py:191 -#: archaeological_finds/models_treatments.py:263 +#: archaeological_finds/models_treatments.py:264 msgid "Goal" msgstr "But" @@ -4556,7 +4406,7 @@ msgid "Another treatment with this index exists for {}." msgstr "Un autre traitement avec cet index existe pour {}." #: archaeological_finds/forms_treatments.py:378 -#: archaeological_finds/models_treatments.py:212 +#: archaeological_finds/models_treatments.py:213 msgid "Associated request" msgstr "Demande associée" @@ -4565,13 +4415,13 @@ msgid "Treatment - 010 - Request choice" msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/forms_treatments.py:384 -#: archaeological_finds/forms_treatments.py:715 +#: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1183 -#: archaeological_finds/models_treatments.py:1203 +#: archaeological_finds/models_treatments.py:1179 +#: archaeological_finds/models_treatments.py:1199 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2884 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2533 +#: archaeological_operations/models.py:2859 ishtar_common/views.py:510 msgid "Treatment request" msgstr "Demande de traitement" @@ -4589,10 +4439,10 @@ 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:2101 -#: archaeological_finds/models_finds.py:3593 -#: archaeological_finds/models_treatments.py:269 -#: archaeological_finds/models_treatments.py:761 +#: archaeological_finds/models_finds.py:2076 +#: archaeological_finds/models_finds.py:3567 +#: archaeological_finds/models_treatments.py:270 +#: archaeological_finds/models_treatments.py:762 #: archaeological_finds/templates/ishtar/sheet_find.html:394 #: archaeological_finds/templates/ishtar/sheet_find.html:432 #: archaeological_finds/templates/ishtar/sheet_find.html:470 @@ -4600,8 +4450,8 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 #: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1212 -#: archaeological_warehouse/models.py:2061 +#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:2062 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4688,14 +4538,14 @@ 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:4584 +#: archaeological_finds/forms_treatments.py:721 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "Réf. interne" #: archaeological_finds/forms_treatments.py:655 -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1131 +#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/models_treatments.py:1127 #: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 @@ -4708,8 +4558,8 @@ msgid "Applicant" msgstr "Demandeur" #: archaeological_finds/forms_treatments.py:661 -#: archaeological_finds/forms_treatments.py:749 -#: archaeological_finds/models_treatments.py:1139 +#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/models_treatments.py:1135 #: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 @@ -4721,86 +4571,72 @@ msgstr "Demandeur" msgid "Applicant organisation" msgstr "Organisation demandeuse" -#: archaeological_finds/forms_treatments.py:670 -msgid "Exhibition started before" -msgstr "Exposition commencée avant" - -#: archaeological_finds/forms_treatments.py:673 -msgid "Exhibition started after" -msgstr "Exposition commencée après" - -#: archaeological_finds/forms_treatments.py:676 -msgid "Exhibition ended before" -msgstr "Exposition terminée avant" +#: archaeological_finds/forms_treatments.py:669 +#: archaeological_finds/forms_treatments.py:752 +#: archaeological_finds/models_treatments.py:1148 +msgid "Exhibition start date" +msgstr "Date de commencement de l'exposition" -#: archaeological_finds/forms_treatments.py:679 -msgid "Exhibition ended after" -msgstr "Exposition commencée après" +#: archaeological_finds/forms_treatments.py:670 +#: archaeological_finds/forms_treatments.py:754 +#: archaeological_finds/models_treatments.py:1151 +msgid "Exhibition end date" +msgstr "Date de fin de l'exposition" -#: archaeological_finds/forms_treatments.py:690 -#: archaeological_finds/forms_treatments.py:702 +#: archaeological_finds/forms_treatments.py:680 +#: archaeological_finds/forms_treatments.py:692 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" -#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/forms_treatments.py:723 msgid "External ref." msgstr "Référence" -#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/forms_treatments.py:745 msgid "Associated basket" msgstr "Panier associé" -#: archaeological_finds/forms_treatments.py:759 -#: archaeological_finds/models_treatments.py:1150 +#: archaeological_finds/forms_treatments.py:749 +#: archaeological_finds/models_treatments.py:1146 msgid "Exhibition name" msgstr "Nom d'exposition" -#: archaeological_finds/forms_treatments.py:762 -#: archaeological_finds/models_treatments.py:1152 -msgid "Exhibition start date" -msgstr "Date de commencement de l'exposition" - -#: archaeological_finds/forms_treatments.py:764 -#: archaeological_finds/models_treatments.py:1155 -msgid "Exhibition end date" -msgstr "Date de fin de l'exposition" - -#: archaeological_finds/forms_treatments.py:822 +#: archaeological_finds/forms_treatments.py:812 msgid "Another treatment request with this index exists for {}." msgstr "Une autre demande de traitement avec cet index existe pour {}." -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:818 msgid "Are you sure you want to delete this treatment request?" msgstr "Êtes-vous sûr de vouloir supprimer cette demande de traitement ?" -#: archaeological_finds/forms_treatments.py:829 +#: archaeological_finds/forms_treatments.py:819 msgid "Would you like to delete this treatment request?" msgstr "Voulez-vous supprimer cette demande de traitement ?" -#: archaeological_finds/forms_treatments.py:853 +#: archaeological_finds/forms_treatments.py:843 msgid "Treatment request name" msgstr "Nom du dossier de traitement" -#: archaeological_finds/forms_treatments.py:855 +#: archaeological_finds/forms_treatments.py:845 msgid "Treatment request year" msgstr "Année du dossier de traitement" -#: archaeological_finds/forms_treatments.py:857 +#: archaeological_finds/forms_treatments.py:847 msgid "Treatment request index" msgstr "Index de la demande de traitement" -#: archaeological_finds/forms_treatments.py:859 +#: archaeological_finds/forms_treatments.py:849 msgid "Treatment request internal reference" msgstr "Référence interne de la demande de traitement" -#: archaeological_finds/forms_treatments.py:861 -#: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/models_treatments.py:1117 +#: archaeological_finds/forms_treatments.py:851 +#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1113 msgid "Treatment request type" msgstr "Type de demande de traitement" -#: archaeological_finds/forms_treatments.py:895 +#: archaeological_finds/forms_treatments.py:885 msgid "Treatment request - Administrative act - General" msgstr "Demande de traitement - Acte administratif - Général" @@ -4821,9 +4657,9 @@ msgid "Treatment one to many - creation" msgstr "Traitement de un à plusieurs - création" #: archaeological_finds/models_finds.py:91 -#: archaeological_operations/models.py:2559 +#: archaeological_operations/models.py:2538 #: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1158 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4052 msgid "Code" msgstr "Code" @@ -4915,17 +4751,17 @@ msgstr "" "actuelle." #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:379 +#: archaeological_finds/models_treatments.py:380 msgid "Treatment types" msgstr "Types de traitement" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2313 +#: archaeological_finds/models_finds.py:2288 #: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:293 -#: archaeological_finds/models_treatments.py:305 -#: archaeological_finds/models_treatments.py:1006 -#: archaeological_finds/models_treatments.py:1196 +#: archaeological_finds/models_treatments.py:294 +#: archaeological_finds/models_treatments.py:306 +#: archaeological_finds/models_treatments.py:1007 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -5103,7 +4939,7 @@ msgstr "Identifiant court" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2341 ishtar_common/models.py:4709 +#: archaeological_finds/models_finds.py:2316 ishtar_common/models.py:4709 #: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" @@ -5117,7 +4953,7 @@ msgid "Concatenation of associated material types codes" msgstr "Concaténation des types de matériaux associés" #: archaeological_finds/models_finds.py:622 -#: archaeological_finds/models_finds.py:2022 +#: archaeological_finds/models_finds.py:1997 msgid "Base find" msgstr "Mobilier d'origine" @@ -5153,7 +4989,7 @@ msgid "Manage basket" msgstr "Gérer un panier" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1927 +#: archaeological_warehouse/models.py:1928 msgid "Add treatment" msgstr "Ajouter un traitement" @@ -5195,12 +5031,12 @@ msgstr "Mobilier d'origine - Date de découverte (fin)" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1705 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:988 -#: archaeological_operations/models.py:1078 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5379 +#: archaeological_operations/forms.py:715 +#: archaeological_operations/forms.py:1686 +#: archaeological_operations/forms.py:1754 +#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1380 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "Type d'opération" @@ -5209,665 +5045,620 @@ msgstr "Type d'opération" msgid "Weight (kg)" msgstr "Poids (kg)" -#: archaeological_finds/models_finds.py:1294 +#: archaeological_finds/models_finds.py:1304 msgctxt "key for text search" msgid "short-id" msgstr "id-court" -#: archaeological_finds/models_finds.py:1298 +#: archaeological_finds/models_finds.py:1308 msgctxt "key for text search" msgid "complete-id" msgstr "id-complet" -#: archaeological_finds/models_finds.py:1302 +#: archaeological_finds/models_finds.py:1312 msgctxt "key for text search" msgid "free-id" msgstr "id-libre" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1315 msgctxt "key for text search" msgid "denomination" msgstr "denomination" -#: archaeological_finds/models_finds.py:1320 archaeological_finds/tests.py:1537 -#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:984 +#: archaeological_finds/models_finds.py:1330 archaeological_finds/tests.py:1537 +#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "code-patriarche" msgstr "code-patriarche" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:4403 +#: archaeological_finds/models_finds.py:1334 ishtar_common/models.py:4403 msgctxt "key for text search" msgid "operation-type" msgstr "type-operation" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_operations/models.py:381 -#: archaeological_operations/models.py:1147 ishtar_common/models.py:4452 +#: archaeological_finds/models_finds.py:1338 +#: archaeological_operations/models.py:382 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4452 msgctxt "key for text search" msgid "area" msgstr "zone" -#: archaeological_finds/models_finds.py:1337 -#: archaeological_warehouse/models.py:993 +#: archaeological_finds/models_finds.py:1347 +#: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "site-nom" -#: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1950 -#: archaeological_warehouse/models.py:998 +#: archaeological_finds/models_finds.py:1352 +#: archaeological_finds/models_finds.py:1925 +#: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "ue-site" -#: archaeological_finds/models_finds.py:1347 -#: archaeological_warehouse/models.py:1003 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "ue-site-nom" -#: archaeological_finds/models_finds.py:1351 -#: archaeological_finds/models_finds.py:1945 -#: archaeological_warehouse/models.py:1007 ishtar_common/models.py:4411 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_finds/models_finds.py:1920 +#: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4411 #: ishtar_common/models.py:4525 msgctxt "key for text search" msgid "context-record" msgstr "ue" -#: archaeological_finds/models_finds.py:1355 +#: archaeological_finds/models_finds.py:1365 msgctxt "key for text search" msgid "discovery-comment" msgstr "decouverte-precisions" -#: archaeological_finds/models_finds.py:1363 +#: archaeological_finds/models_finds.py:1373 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "ue-type-relation" -#: archaeological_finds/models_finds.py:1367 archaeological_finds/tests.py:1444 -#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1019 +#: archaeological_finds/models_finds.py:1377 archaeological_finds/tests.py:1444 +#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "material" msgstr "materiau" -#: archaeological_finds/models_finds.py:1372 -#: archaeological_warehouse/models.py:1023 +#: archaeological_finds/models_finds.py:1382 +#: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "type-objet" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "recommended-treatments" msgstr "traitements-recommandes" -#: archaeological_finds/models_finds.py:1380 archaeological_finds/tests.py:1691 -#: archaeological_warehouse/models.py:1031 +#: archaeological_finds/models_finds.py:1390 archaeological_finds/tests.py:1691 +#: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "conservation" -#: archaeological_finds/models_finds.py:1384 -#: archaeological_warehouse/models.py:1035 +#: archaeological_finds/models_finds.py:1394 +#: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "integrite" -#: archaeological_finds/models_finds.py:1388 -#: archaeological_warehouse/models.py:1039 +#: archaeological_finds/models_finds.py:1398 +#: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "remarquabilite" -#: archaeological_finds/models_finds.py:1392 archaeological_finds/tests.py:1586 +#: archaeological_finds/models_finds.py:1402 archaeological_finds/tests.py:1586 #: ishtar_common/models.py:4325 msgctxt "key for text search" msgid "description" msgstr "description" -#: archaeological_finds/models_finds.py:1395 +#: archaeological_finds/models_finds.py:1405 msgctxt "key for text search" msgid "batch" msgstr "lot" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "checked" msgstr "verifie" -#: archaeological_finds/models_finds.py:1403 ishtar_common/models.py:4434 +#: archaeological_finds/models_finds.py:1413 ishtar_common/models.py:4434 msgctxt "key for text search" msgid "container" msgstr "contenant" -#: archaeological_finds/models_finds.py:1407 -#: archaeological_finds/models_finds.py:1948 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1417 +#: archaeological_finds/models_finds.py:1923 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "localisation" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1421 msgctxt "key for text search" msgid "current-location" msgstr "localisation-actuelle" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1425 msgctxt "key for text search" msgid "current-container" msgstr "contenant-actuel" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1429 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "panier" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "last-modified-by" msgstr "modifie-en-dernier-par" -#: archaeological_finds/models_finds.py:1430 -#: ishtar_common/models_common.py:1578 +#: archaeological_finds/models_finds.py:1440 +#: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" -#: archaeological_finds/models_finds.py:1433 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1443 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "pret" -#: archaeological_finds/models_finds.py:1435 +#: archaeological_finds/models_finds.py:1445 msgctxt "key for text search" -msgid "treatment-file-end-date-before" -msgstr "demande-fin-de-traitement-avant" +msgid "treatment-file-end-date" +msgstr "demande-fin-de-traitement" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1449 msgctxt "key for text search" -msgid "treatment-end-date-before" -msgstr "fin-de-traitement-avant" +msgid "treatment-end-date" +msgstr "fin-de-traitement" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1453 msgctxt "key for text search" msgid "previous-id" msgstr "id-precedent" -#: archaeological_finds/models_finds.py:1450 +#: archaeological_finds/models_finds.py:1460 msgctxt "key for text search" msgid "seal-number" msgstr "numero-scelle" -#: archaeological_finds/models_finds.py:1453 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "excavation-id" msgstr "id-fouille" -#: archaeological_finds/models_finds.py:1457 +#: archaeological_finds/models_finds.py:1467 msgctxt "key for text search" msgid "museum-id" msgstr "id-musee" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1470 msgctxt "key for text search" msgid "complete-museum-id" msgstr "id-musee-complet" -#: archaeological_finds/models_finds.py:1463 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "laboratory-id" msgstr "numero-laboratoire" -#: archaeological_finds/models_finds.py:1467 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "mark" msgstr "marquage" -#: archaeological_finds/models_finds.py:1470 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" -msgid "discovery-date-before" -msgstr "date-decouverte-avant" +msgid "discovery-date" +msgstr "date-decouverte" -#: archaeological_finds/models_finds.py:1474 +#: archaeological_finds/models_finds.py:1484 msgctxt "key for text search" -msgid "discovery-date-after" -msgstr "date-decouverte-apres" +msgid "discovery-date-taq" +msgstr "date-decouverte-taq" -#: archaeological_finds/models_finds.py:1478 -msgctxt "key for text search" -msgid "discovery-date-taq-before" -msgstr "date-decouverte-taq-avant" - -#: archaeological_finds/models_finds.py:1482 -msgctxt "key for text search" -msgid "discovery-date-taq-after" -msgstr "date-decouverte-taq-apres" - -#: archaeological_finds/models_finds.py:1486 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "is-complete" msgstr "est-complet" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1491 msgctxt "key for text search" msgid "material-type-quality" msgstr "type-materiaux-qualite" -#: archaeological_finds/models_finds.py:1493 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "object-type-quality" msgstr "type-objet-qualite" -#: archaeological_finds/models_finds.py:1497 +#: archaeological_finds/models_finds.py:1499 msgctxt "key for text search" msgid "find-number" msgstr "nombre-mobilier" -#: archaeological_finds/models_finds.py:1500 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "nmi" -#: archaeological_finds/models_finds.py:1504 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "decoration" msgstr "decor" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "inscription" msgstr "inscription" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1512 msgctxt "key for text search" msgid "manufacturing-place" msgstr "lieu-fabrication" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "communicabilities" msgstr "communicabilite" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1523 msgctxt "key for text search" msgid "material-comment" msgstr "materiau-commentaire" -#: archaeological_finds/models_finds.py:1525 +#: archaeological_finds/models_finds.py:1527 msgctxt "key for text search" msgid "dating-comment" msgstr "commentaire-datation" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1531 msgctxt "key for text search" msgid "conservatory-comment" msgstr "commentaire-conservation" -#: archaeological_finds/models_finds.py:1533 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "length-lower" msgstr "longueur-plus-petit" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1538 msgctxt "key for text search" msgid "width-lower" msgstr "largeur-plus-petit" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1541 msgctxt "key for text search" msgid "height-lower" msgstr "hauteur-plus-petit" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1544 msgctxt "key for text search" msgid "thickness-lower" msgstr "epaisseur-plus-petit" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "diameter-lower" msgstr "diametre-plus-petit" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "circumference-lower" msgstr "circonference-plus-petit" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "volume-lower" msgstr "volume-plus-petit" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1557 msgctxt "key for text search" msgid "weight-lower" msgstr "poids-plus-petit" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1560 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "encombrement-cote-long-plus-petit" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1564 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "encombrement-cote-court-plus-petit" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "encombrement-hauteur-plus-petit" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1572 msgctxt "key for text search" -msgid "length-higher" -msgstr "longueur-plus-grand" +msgid "length" +msgstr "longueur" -#: archaeological_finds/models_finds.py:1573 +#: archaeological_finds/models_finds.py:1575 msgctxt "key for text search" -msgid "width-higher" -msgstr "largeur-plus-grand" +msgid "width" +msgstr "largeur" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1578 msgctxt "key for text search" -msgid "height-higher" -msgstr "hauteur-plus-grand" +msgid "height" +msgstr "hauteur" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" -msgid "thickness-higher" -msgstr "epaisseur-plus-grand" +msgid "thickness" +msgstr "epaisseur" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" -msgid "diameter-higher" -msgstr "diametre-plus-grand" +msgid "diameter" +msgstr "diametre" -#: archaeological_finds/models_finds.py:1585 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" -msgid "circumference-higher" -msgstr "circonference-plus-grand" +msgid "circumference" +msgstr "circonference" -#: archaeological_finds/models_finds.py:1589 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" -msgid "volume-higher" -msgstr "volume-plus-grand" +msgid "volume" +msgstr "volume" -#: archaeological_finds/models_finds.py:1592 +#: archaeological_finds/models_finds.py:1594 msgctxt "key for text search" -msgid "weight-higher" -msgstr "poids-plus-grand" +msgid "weight" +msgstr "poids" -#: archaeological_finds/models_finds.py:1595 +#: archaeological_finds/models_finds.py:1597 msgctxt "key for text search" -msgid "clutter-long-side-higher" -msgstr "encombrement-cote-long-plus-grand" +msgid "clutter-long-side" +msgstr "encombrement-cote-long" -#: archaeological_finds/models_finds.py:1599 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" -msgid "clutter-short-side-higher" -msgstr "encombrement-cote-court-plus-grand" +msgid "clutter-short-side" +msgstr "encombrement-cote-court" -#: archaeological_finds/models_finds.py:1603 +#: archaeological_finds/models_finds.py:1605 msgctxt "key for text search" -msgid "clutter-height-higher" -msgstr "encombrement-hauteur-plus-grand" +msgid "clutter-height" +msgstr "encombrement-hauteur" -#: archaeological_finds/models_finds.py:1607 +#: archaeological_finds/models_finds.py:1609 msgctxt "key for text search" msgid "dimensions-comment" msgstr "commentaire-dimensions" -#: archaeological_finds/models_finds.py:1611 +#: archaeological_finds/models_finds.py:1613 msgctxt "key for text search" msgid "topographic-localisation" msgstr "localisation-topographique" -#: archaeological_finds/models_finds.py:1615 +#: archaeological_finds/models_finds.py:1617 msgctxt "key for text search" -msgid "check-date-before" -msgstr "date-verification-avant" +msgid "check-date" +msgstr "date-verification" -#: archaeological_finds/models_finds.py:1618 -msgctxt "key for text search" -msgid "check-date-after" -msgstr "date-verification-apres" - -#: archaeological_finds/models_finds.py:1621 -#: archaeological_warehouse/models.py:1043 +#: archaeological_finds/models_finds.py:1620 +#: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "alterations" -#: archaeological_finds/models_finds.py:1625 -#: archaeological_warehouse/models.py:1047 +#: archaeological_finds/models_finds.py:1624 +#: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "causes-alterations" -#: archaeological_finds/models_finds.py:1629 -#: archaeological_warehouse/models.py:1051 +#: archaeological_finds/models_finds.py:1628 +#: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "urgence-traitement" -#: archaeological_finds/models_finds.py:1633 -msgctxt "key for text search" -msgid "estimated-value-higher" -msgstr "valeur-estimee-plus-grand" - -#: archaeological_finds/models_finds.py:1637 -msgctxt "key for text search" -msgid "estimated-value-lower" -msgstr "valeur-estimee-plus-petit" - -#: archaeological_finds/models_finds.py:1641 -msgctxt "key for text search" -msgid "insurance-value-higher" -msgstr "valeur-assurance-plus-grand" - -#: archaeological_finds/models_finds.py:1645 +#: archaeological_finds/models_finds.py:1632 msgctxt "key for text search" -msgid "insurance-value-lower" -msgstr "valeur-assurance-plus-petit" +msgid "estimated-value" +msgstr "valeur-estimee" -#: archaeological_finds/models_finds.py:1649 +#: archaeological_finds/models_finds.py:1636 msgctxt "key for text search" -msgid "appraisal-date-before" -msgstr "date-evaluation-avant" +msgid "insurance-value" +msgstr "valeur-assurance" -#: archaeological_finds/models_finds.py:1653 +#: archaeological_finds/models_finds.py:1640 msgctxt "key for text search" -msgid "appraisal-date-after" -msgstr "date-evaluation-apres" +msgid "appraisal-date" +msgstr "date-evaluation" -#: archaeological_finds/models_finds.py:1661 +#: archaeological_finds/models_finds.py:1648 msgctxt "key for text search" msgid "functional-area" msgstr "domaine-fonctionnel" -#: archaeological_finds/models_finds.py:1665 +#: archaeological_finds/models_finds.py:1652 msgctxt "key for text search" msgid "technical-area" msgstr "domaine-technique" -#: archaeological_finds/models_finds.py:1669 +#: archaeological_finds/models_finds.py:1656 msgctxt "key for text search" msgid "technical-process" msgstr "procede-technique" -#: archaeological_finds/models_finds.py:1673 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1660 archaeological_finds/tests.py:1631 msgctxt "key for text search" msgid "operation-address" msgstr "operation-adresse" -#: archaeological_finds/models_finds.py:1681 -#: archaeological_operations/models.py:1177 +#: archaeological_finds/models_finds.py:1668 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "scientist" msgstr "scientifique" -#: archaeological_finds/models_finds.py:1685 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1182 +#: archaeological_finds/models_finds.py:1672 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1176 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "operateur" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1680 msgctxt "key for text search" msgid "operation-remain" msgstr "operation-vestige" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1684 msgctxt "key for text search" msgid "site-remain" msgstr "site-vestige" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1688 msgctxt "key for text search" msgid "museum-id-comment" msgstr "musee-id-commentaire" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1692 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "musee-proprietaire" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1697 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "musee-affectataire" -#: archaeological_finds/models_finds.py:1715 +#: archaeological_finds/models_finds.py:1702 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "musee-depositaire" -#: archaeological_finds/models_finds.py:1720 +#: archaeological_finds/models_finds.py:1707 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "musee-inventaire-deposant" -#: archaeological_finds/models_finds.py:1724 +#: archaeological_finds/models_finds.py:1711 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "musee-mode-entree-collection" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1715 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "musee-mode-entree-commentaire" -#: archaeological_finds/models_finds.py:1732 +#: archaeological_finds/models_finds.py:1719 msgctxt "key for text search" -msgid "museum-entry-date-before" -msgstr "musee-entree-avant" +msgid "museum-entry-date" +msgstr "musee-date-entree" -#: archaeological_finds/models_finds.py:1736 -msgctxt "key for text search" -msgid "museum-entry-date-after" -msgstr "musee-entree-apres" - -#: archaeological_finds/models_finds.py:1740 -msgctxt "key for text search" -msgid "museum-entry-date-end-before" -msgstr "musee-entree-fin-avant" - -#: archaeological_finds/models_finds.py:1744 +#: archaeological_finds/models_finds.py:1723 msgctxt "key for text search" -msgid "museum-entry-date-end-after" -msgstr "musee-entree-fin-apres" +msgid "museum-entry-date-end" +msgstr "musee-date-entree-fin" -#: archaeological_finds/models_finds.py:1748 +#: archaeological_finds/models_finds.py:1727 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "musee-date-entree-commentaire" -#: archaeological_finds/models_finds.py:1752 +#: archaeological_finds/models_finds.py:1731 msgctxt "key for text search" msgid "museum-donor" msgstr "musee-donneur" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1736 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "musee-type-presence-marquage" -#: archaeological_finds/models_finds.py:1761 +#: archaeological_finds/models_finds.py:1740 msgctxt "key for text search" msgid "museum-marking-type" msgstr "musee-type-marquage" -#: archaeological_finds/models_finds.py:1765 +#: archaeological_finds/models_finds.py:1744 msgctxt "key for text search" msgid "museum-collection" msgstr "musee-collection" -#: archaeological_finds/models_finds.py:1770 +#: archaeological_finds/models_finds.py:1749 msgctxt "key for text search" msgid "museum-former-collection" msgstr "musee-ancienne-collection" -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1754 msgctxt "key for text search" msgid "museum-inventory-entry-year-before" msgstr "musee-entree-inventaire-avant" -#: archaeological_finds/models_finds.py:1779 +#: archaeological_finds/models_finds.py:1758 msgctxt "key for text search" msgid "museum-inventory-entry-year-after" msgstr "musee-entree-inventaire-apres" -#: archaeological_finds/models_finds.py:1783 +#: archaeological_finds/models_finds.py:1762 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "musee-conformite-inventaire" -#: archaeological_finds/models_finds.py:1788 +#: archaeological_finds/models_finds.py:1767 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "musee-commentaire-conformite" -#: archaeological_finds/models_finds.py:1792 +#: archaeological_finds/models_finds.py:1771 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "musee-transcription-inventaire" -#: archaeological_finds/models_finds.py:1796 +#: archaeological_finds/models_finds.py:1775 msgctxt "key for text search" msgid "museum-original-repro" msgstr "musee-original-repro" -#: archaeological_finds/models_finds.py:1801 -msgctxt "key for text search" -msgid "museum-allocation-date-before" -msgstr "musee-affectation-avant" - -#: archaeological_finds/models_finds.py:1805 +#: archaeological_finds/models_finds.py:1780 msgctxt "key for text search" -msgid "museum-allocation-date-after" -msgstr "musee-affectation-apres" +msgid "museum-allocation-date" +msgstr "musee-date-affectation" -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1784 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "musee-prix-achat" -#: archaeological_finds/models_finds.py:1813 +#: archaeological_finds/models_finds.py:1788 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "musee-quantite-inventaire" -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/models_finds.py:1792 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "musee-quantite-vue" -#: archaeological_finds/models_finds.py:1924 -#: archaeological_finds/models_finds.py:2699 +#: archaeological_finds/models_finds.py:1899 +#: archaeological_finds/models_finds.py:2674 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 @@ -5877,19 +5668,19 @@ msgstr "musee-quantite-vue" msgid "Packaging" msgstr "Conditionnement" -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:1907 msgid "Treatment many to one" msgstr "Traitement de plusieurs à un" -#: archaeological_finds/models_finds.py:2066 +#: archaeological_finds/models_finds.py:2041 msgid "Weight" msgstr "Poids" -#: archaeological_finds/models_finds.py:2068 +#: archaeological_finds/models_finds.py:2043 msgid "Weight unit" msgstr "Unité de poids" -#: archaeological_finds/models_finds.py:2083 +#: archaeological_finds/models_finds.py:2058 #: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5900,7 +5691,7 @@ msgstr "Unité de poids" msgid "Upstream treatment" msgstr "Traitement amont" -#: archaeological_finds/models_finds.py:2090 +#: archaeological_finds/models_finds.py:2065 #: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5911,86 +5702,86 @@ msgstr "Traitement amont" msgid "Downstream treatment" msgstr "Traitement aval" -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2139 msgid "Clutter - long side (cm)" msgstr "Encombrement - grand côté (cm)" -#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2142 msgid "Clutter - short side (cm)" msgstr "Encombrement - petit côté (cm)" -#: archaeological_finds/models_finds.py:2170 +#: archaeological_finds/models_finds.py:2145 msgid "Clutter - height (cm)" msgstr "Encombrement - hauteur (cm)" -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2168 msgid "Do not use - need evolutions" msgstr "Ne pas utiliser - Nécessite des évolutions" -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/models_finds.py:2219 msgid "Former collection" msgstr "Ancienne collection" -#: archaeological_finds/models_finds.py:2316 +#: archaeological_finds/models_finds.py:2291 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:2325 +#: archaeological_finds/models_finds.py:2300 msgid "Cached object types label" msgstr "Nom en cache des types d'objet" -#: archaeological_finds/models_finds.py:2331 +#: archaeological_finds/models_finds.py:2306 msgid "Cached material types label" msgstr "Nom en cache des types de matériaux" -#: archaeological_finds/models_finds.py:2371 +#: archaeological_finds/models_finds.py:2346 msgid "FIND" msgstr "MOBILIER" -#: archaeological_finds/models_finds.py:2537 +#: archaeological_finds/models_finds.py:2512 msgid "Material types string" msgstr "Chaîne de caractère des types de matériau" -#: archaeological_finds/models_finds.py:2538 +#: archaeological_finds/models_finds.py:2513 msgid "Material types code string" msgstr "Code des types de matériau" -#: archaeological_finds/models_finds.py:2539 +#: archaeological_finds/models_finds.py:2514 msgid "Recommendations string from material" msgstr "Chaîne de caractères - recommandations pour le matériau" -#: archaeological_finds/models_finds.py:2540 +#: archaeological_finds/models_finds.py:2515 msgid "Complete ID of associated base finds" msgstr "Identifiant complet du mobilier d'origine associé" -#: archaeological_finds/models_finds.py:2541 +#: archaeological_finds/models_finds.py:2516 msgid "Label of associated context records" msgstr "Dénomination des unités d'enregistrement associées" -#: archaeological_finds/models_finds.py:2672 +#: archaeological_finds/models_finds.py:2647 msgid "Add to basket" msgstr "Ajouter au panier" -#: archaeological_finds/models_finds.py:2680 +#: archaeological_finds/models_finds.py:2655 msgid "Simple treatment" msgstr "Traitement simple" -#: archaeological_finds/models_finds.py:2688 +#: archaeological_finds/models_finds.py:2663 msgid "Divide treatment" msgstr "Traitement de division" -#: archaeological_finds/models_finds.py:3167 +#: archaeological_finds/models_finds.py:3141 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:3173 +#: archaeological_finds/models_finds.py:3147 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:3620 ishtar_common/forms_common.py:128 +#: archaeological_finds/models_finds.py:3594 ishtar_common/forms_common.py:128 #: ishtar_common/forms_common.py:1425 ishtar_common/forms_common.py:2860 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2979 #: ishtar_common/models.py:3298 ishtar_common/models.py:3396 @@ -6000,11 +5791,11 @@ msgstr "Aucun contenant n'a été défini - la localisation ne peut être défin msgid "Person" msgstr "Personne" -#: archaeological_finds/models_finds.py:3628 +#: archaeological_finds/models_finds.py:3602 msgid "Property" msgstr "Propriété" -#: archaeological_finds/models_finds.py:3629 +#: archaeological_finds/models_finds.py:3603 msgid "Properties" msgstr "Propriétés" @@ -6034,9 +5825,9 @@ msgid "label" msgstr "libelle" #: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2694 -#: archaeological_warehouse/models.py:968 +#: archaeological_finds/models_treatments.py:1067 +#: archaeological_operations/models.py:2673 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "index" @@ -6046,42 +5837,42 @@ msgctxt "key for text search" msgid "scientific-manager" msgstr "responsable-suivi-scientifique" -#: archaeological_finds/models_treatments.py:223 +#: archaeological_finds/models_treatments.py:224 msgid "Treatment have been executed" msgstr "Le traitement a été réalisé" -#: archaeological_finds/models_treatments.py:231 +#: archaeological_finds/models_treatments.py:232 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" "Endroit où le traitement est réalisé. Renseignez le lieu de conservation de " "destination pour un déplacement." -#: archaeological_finds/models_treatments.py:274 +#: archaeological_finds/models_treatments.py:275 msgid "Estimated cost" msgstr "Coût estimé" -#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:276 msgid "Quoted cost" msgstr "Coût devisé" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:277 msgid "Realized cost" msgstr "Coût réalisé" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:278 msgid "Insurance cost" msgstr "Coût d'assurance" -#: archaeological_finds/models_treatments.py:312 +#: archaeological_finds/models_treatments.py:313 msgid "TREATMENT" msgstr "TRAITEMENT" -#: archaeological_finds/models_treatments.py:389 +#: archaeological_finds/models_treatments.py:390 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "Mobilier aval" -#: archaeological_finds/models_treatments.py:762 +#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/templates/ishtar/sheet_find.html:393 #: archaeological_finds/templates/ishtar/sheet_find.html:431 #: archaeological_finds/templates/ishtar/sheet_find.html:469 @@ -6106,65 +5897,60 @@ msgstr "Mobilier aval" msgid "Doer" msgstr "Opérateur" -#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 +#: archaeological_finds/models_treatments.py:765 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "Mobilier associé" -#: archaeological_finds/models_treatments.py:988 +#: archaeological_finds/models_treatments.py:989 msgid "Is upstream" msgstr "Est en amont" -#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1005 msgid "Treatment request types" msgstr "Types de demande de traitement" -#: archaeological_finds/models_treatments.py:1069 +#: archaeological_finds/models_treatments.py:1076 msgctxt "key for text search" msgid "applicant" msgstr "demandeur" -#: archaeological_finds/models_treatments.py:1074 +#: archaeological_finds/models_treatments.py:1081 msgctxt "key for text search" msgid "applicant-organisation" msgstr "demandeur-organisation" -#: archaeological_finds/models_treatments.py:1079 +#: archaeological_finds/models_treatments.py:1086 msgctxt "key for text search" -msgid "exhibition-start-before" -msgstr "exposition-commence-avant" +msgid "end-date" +msgstr "date-fin" -#: archaeological_finds/models_treatments.py:1083 +#: archaeological_finds/models_treatments.py:1090 msgctxt "key for text search" -msgid "exhibition-start-after" -msgstr "exposition-commence-apres" +msgid "exhibition-start" +msgstr "exposition-debut" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1094 msgctxt "key for text search" -msgid "exhibition-end-before" -msgstr "exposition-termine-avant" +msgid "exhibition-end" +msgstr "exposition-fin" -#: archaeological_finds/models_treatments.py:1091 -msgctxt "key for text search" -msgid "exhibition-end-after" -msgstr "exposition-termine-apres" - -#: archaeological_finds/models_treatments.py:1112 -#: archaeological_operations/forms.py:1139 -#: archaeological_operations/forms.py:1236 -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/models.py:492 +#: archaeological_finds/models_treatments.py:1108 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1804 +#: archaeological_operations/models.py:493 #: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2151 #: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 #: ishtar_common/models.py:2410 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "Référence" -#: archaeological_finds/models_treatments.py:1184 +#: archaeological_finds/models_treatments.py:1180 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 @@ -6175,7 +5961,7 @@ msgstr "Référence" msgid "Treatment requests" msgstr "Demandes de traitement" -#: archaeological_finds/models_treatments.py:1252 +#: archaeological_finds/models_treatments.py:1248 msgid "Add associated treatment" msgstr "Ajouter un traitement associé" @@ -6554,13 +6340,13 @@ msgstr "Informations sur le traitement :" msgid "This importer need a document archive." msgstr "Cet import nécessite une archive de documents." -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1665 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." #: archaeological_finds/tests.py:1773 archaeological_finds/tests.py:1799 #: archaeological_finds/tests.py:1809 archaeological_operations/tests.py:3170 -#: ishtar_common/forms.py:1223 ishtar_common/forms.py:1302 +#: ishtar_common/forms.py:1215 ishtar_common/forms.py:1294 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:660 ishtar_common/views_item.py:932 @@ -6569,8 +6355,8 @@ msgid "Yes" msgstr "Oui" #: archaeological_finds/tests.py:1774 archaeological_finds/tests.py:1800 -#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1224 -#: ishtar_common/forms.py:1304 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1296 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:504 msgid "No" msgstr "Non" @@ -6669,10 +6455,10 @@ msgstr "" "recherche a été épinglée." #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1081 -#: archaeological_operations/forms.py:1097 -#: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/forms.py:1074 +#: archaeological_operations/forms.py:1090 +#: archaeological_operations/forms.py:1096 +#: archaeological_operations/models.py:3157 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 #: sra_idf_app/templates/ishtar/sheet_operation.html:523 @@ -6680,20 +6466,20 @@ msgid "Parcels" msgstr "Parcelles" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3164 +#: archaeological_operations/models.py:3139 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3166 +#: archaeological_operations/models.py:3141 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3168 -#: archaeological_operations/models.py:3196 -#: archaeological_operations/models.py:3264 +#: archaeological_operations/models.py:3143 +#: archaeological_operations/models.py:3171 +#: archaeological_operations/models.py:3239 msgid "Public domain" msgstr "Domaine public" @@ -6750,27 +6536,27 @@ msgid "Operation - 001 - Search" msgstr "Opération - 001 - Recherche" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:949 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2049 +#: archaeological_operations/forms.py:942 +#: archaeological_operations/models.py:1368 +#: archaeological_operations/models.py:2028 msgid "Yearly index" msgstr "Index annuel" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:740 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/forms.py:733 +#: archaeological_operations/models.py:1411 msgid "Old code" msgstr "Ancien code" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/forms.py:714 +#: archaeological_operations/models.py:1510 msgid "DRASSM code" msgstr "Code DRASSM" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:726 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/forms.py:719 +#: archaeological_operations/models.py:1451 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" @@ -6780,211 +6566,187 @@ msgid "Is open?" msgstr "Est ouvert ?" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2835 +#: archaeological_operations/forms.py:770 +#: archaeological_operations/models.py:1357 +#: archaeological_operations/models.py:2810 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1709 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:759 +#: archaeological_operations/forms.py:1690 +#: archaeological_operations/models.py:1350 msgid "Operator" msgstr "Opérateur" #: archaeological_operations/forms.py:534 -#: archaeological_operations/forms.py:774 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/forms.py:767 +#: archaeological_operations/models.py:1448 msgid "Operator reference" msgstr "Référence de l'opérateur" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1147 -#: archaeological_operations/forms.py:1242 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1856 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:497 -#: archaeological_operations/models.py:992 -#: archaeological_operations/models.py:1081 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/models.py:498 +#: archaeological_operations/models.py:993 +#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1385 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "Vestiges" -#: archaeological_operations/forms.py:538 -msgid "Started before" -msgstr "Commencé avant" - -#: archaeological_operations/forms.py:539 -msgid "Started after" -msgstr "Commencé après" - -#: archaeological_operations/forms.py:540 -msgid "Ended before" -msgstr "Terminé avant" - -#: archaeological_operations/forms.py:541 -msgid "Ended after" -msgstr "Terminé après" - -#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:543 msgid "Abstract (full text search)" msgstr "Résumé (recherche en texte intégral)" -#: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:833 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:1454 msgid "Comment about scientific documentation" msgstr "Précisions sur la documentation scientifique" -#: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:835 -#: archaeological_operations/models.py:994 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/forms.py:546 +#: archaeological_operations/forms.py:828 +#: archaeological_operations/models.py:995 +#: archaeological_operations/models.py:1489 msgid "Record quality" msgstr "Qualité d'enregistrement" -#: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/forms.py:547 +#: archaeological_operations/forms.py:788 +#: archaeological_operations/models.py:1406 msgid "Report processing" msgstr "Traitement du rapport" -#: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:748 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/forms.py:549 +#: archaeological_operations/forms.py:741 +#: archaeological_operations/models.py:1480 msgid "Virtual operation" msgstr "Opération virtuelle" -#: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:570 +#: archaeological_operations/forms.py:811 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:996 +#: archaeological_operations/models.py:1500 msgid "Documentation provided" msgstr "Documentation versée" -#: archaeological_operations/forms.py:574 -#: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:572 +#: archaeological_operations/forms.py:813 +#: archaeological_operations/forms.py:1702 +#: archaeological_operations/models.py:1495 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "Date de versement de la documentation" -#: archaeological_operations/forms.py:576 -msgid "Documentation deadline before" -msgstr "Date limite de versement de la documentation avant" - -#: archaeological_operations/forms.py:578 -msgid "Documentation deadline after" -msgstr "Date limite de versement de la documentation après" +#: archaeological_operations/forms.py:574 +msgid "Documentation deadline" +msgstr "Date limite de versement de la documentation" -#: archaeological_operations/forms.py:581 -#: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1724 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:577 +#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:1506 msgid "Finds provided" msgstr "Mobilier versé" -#: archaeological_operations/forms.py:583 -#: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1728 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:579 +#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:1709 +#: archaeological_operations/models.py:1502 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "Date de versement du mobilier" -#: archaeological_operations/forms.py:585 -msgid "Finds deadline before" -msgstr "Date limite de versement du mobilier avant" - -#: archaeological_operations/forms.py:587 -msgid "Finds deadline after" -msgstr "Date limite de versement du mobilier après" +#: archaeological_operations/forms.py:580 +msgid "Finds deadline" +msgstr "Date limite de versement du mobilier" -#: archaeological_operations/forms.py:677 +#: archaeological_operations/forms.py:670 msgid "Associated file" msgstr "Dossier associé" -#: archaeological_operations/forms.py:690 +#: archaeological_operations/forms.py:683 msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" -#: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1771 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:717 +#: archaeological_operations/forms.py:1752 +#: archaeological_operations/models.py:1450 msgid "Generic name" msgstr "Nom générique" -#: archaeological_operations/forms.py:751 +#: archaeological_operations/forms.py:744 msgid "Actors" msgstr "Acteurs" -#: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:746 +#: archaeological_operations/models.py:1341 +#: archaeological_operations/models.py:2828 msgid "Head scientist" msgstr "Responsable d'opération" -#: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1369 -#: archaeological_operations/forms.py:1731 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:515 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1712 +#: archaeological_operations/forms.py:1845 +#: archaeological_operations/models.py:516 +#: archaeological_operations/models.py:1364 msgid "Collaborators" msgstr "Collaborateurs" -#: archaeological_operations/forms.py:789 +#: archaeological_operations/forms.py:782 msgid "Dates / Administrative" msgstr "Dates / Administratif" -#: archaeological_operations/forms.py:793 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/forms.py:786 +#: archaeological_operations/models.py:1335 msgid "Report delivery date" msgstr "Date de livraison du rapport" -#: archaeological_operations/forms.py:815 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/forms.py:808 +#: archaeological_operations/models.py:1497 msgid "Deadline for submission of the documentation" msgstr "Date limite de versement de la documentation" -#: archaeological_operations/forms.py:823 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/forms.py:816 +#: archaeological_operations/models.py:1504 msgid "Deadline for submission of the finds" msgstr "Date limite de versement du mobilier" -#: archaeological_operations/forms.py:831 +#: archaeological_operations/forms.py:824 msgid "Scientific" msgstr "Scientifique" -#: archaeological_operations/forms.py:838 +#: archaeological_operations/forms.py:831 #: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "Type de vestige" -#: archaeological_operations/forms.py:844 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/forms.py:837 +#: archaeological_operations/models.py:1494 msgid "Abstract" msgstr "Résumé" -#: archaeological_operations/forms.py:904 +#: archaeological_operations/forms.py:897 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:909 +#: archaeological_operations/forms.py:902 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:939 +#: archaeological_operations/forms.py:932 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -6993,231 +6755,232 @@ msgstr "" "Cet index existe déjà pour l'année %(year)d - utilisez une valeur plus " "grande que %(last_val)d ou videz le champ d'index annuel." -#: archaeological_operations/forms.py:943 +#: archaeological_operations/forms.py:936 msgid "Bad operation index" msgstr "Mauvais index d'opération" -#: archaeological_operations/forms.py:984 +#: archaeological_operations/forms.py:977 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "Saisie judiciaire" -#: archaeological_operations/forms.py:985 +#: archaeological_operations/forms.py:978 msgid "Operation - 015 - Court-ordered seizure" msgstr "Opération - 015 - Saisie judiciaire" -#: archaeological_operations/forms.py:994 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/forms.py:987 +#: archaeological_operations/models.py:1513 msgid "Seizure name" msgstr "Nom de la saisie" -#: archaeological_operations/forms.py:997 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/forms.py:990 +#: archaeological_operations/models.py:1515 msgid "Official report number" msgstr "Numéro de procès-verbal ou de saisine" -#: archaeological_operations/forms.py:1003 +#: archaeological_operations/forms.py:996 msgid "Protagonist" msgstr "Protagoniste" -#: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/forms.py:1002 +#: archaeological_operations/models.py:1527 msgid "Applicant authority" msgstr "Autorité requérante" -#: archaeological_operations/forms.py:1015 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/forms.py:1008 +#: archaeological_operations/models.py:1535 msgid "Writer of the minutes" msgstr "Rédacteur du procès verbal" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1013 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1014 msgid "Operation - 033 - Preventive - Excavation" msgstr "Opération - 033 - Préventif - Fouille" -#: archaeological_operations/forms.py:1024 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/forms.py:1017 +#: archaeological_operations/models.py:1390 msgid "Cost (euros)" msgstr "Coût (euros)" -#: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/forms.py:1018 +#: archaeological_operations/models.py:1394 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: archaeological_operations/forms.py:1027 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/forms.py:1020 +#: archaeological_operations/models.py:1398 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: archaeological_operations/forms.py:1029 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/forms.py:1022 +#: archaeological_operations/models.py:1402 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: archaeological_operations/forms.py:1039 +#: archaeological_operations/forms.py:1032 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: archaeological_operations/forms.py:1040 +#: archaeological_operations/forms.py:1033 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "Opération - 037 - Préventif - Diagnostic" -#: archaeological_operations/forms.py:1045 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:1422 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: archaeological_operations/forms.py:1047 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/forms.py:1040 +#: archaeological_operations/models.py:1426 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/forms.py:1043 +#: archaeological_operations/models.py:1429 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: archaeological_operations/forms.py:1071 +#: archaeological_operations/forms.py:1064 msgid "Operation - 040 - Towns" msgstr "Opération - 040 - Communes" -#: archaeological_operations/forms.py:1076 +#: archaeological_operations/forms.py:1069 msgid "Operation - 040 - Towns (2)" msgstr "Opération - 040 - Communes (2)" -#: archaeological_operations/forms.py:1098 +#: archaeological_operations/forms.py:1091 msgid "Operation - 050 - Parcels" msgstr "Opération - 050 - Parcelles" -#: archaeological_operations/forms.py:1105 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels (2)" msgstr "Opération - 050 - Parcelles (2)" -#: archaeological_operations/forms.py:1172 -#: archaeological_operations/forms.py:1400 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1165 +#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1824 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1209 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1214 msgid "Would you like to delete this operation?" msgstr "Voulez-vous supprimer cette opération ?" -#: archaeological_operations/forms.py:1230 +#: archaeological_operations/forms.py:1223 msgid "Archaeological site - 001 - Search" msgstr "Site archéologique - 001 - Recherche" -#: archaeological_operations/forms.py:1250 +#: archaeological_operations/forms.py:1243 msgid "Top operation" msgstr "Opération chapeau" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1373 -#: archaeological_operations/models.py:507 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1366 +#: archaeological_operations/models.py:508 msgid "National Geographic Institute locality" msgstr "Lieu-dit IGN" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/models.py:510 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/models.py:511 msgid "Cadastral locality" msgstr "Lieu-dit cadastre" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1414 +#: archaeological_operations/models.py:528 msgid "AffMar number" msgstr "Numéro AffMar" -#: archaeological_operations/forms.py:1271 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:530 +#: archaeological_operations/forms.py:1264 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/models.py:531 msgid "DRASSM number" msgstr "Numéro DRASSM" -#: archaeological_operations/forms.py:1273 -#: archaeological_operations/forms.py:1425 -#: archaeological_operations/models.py:519 +#: archaeological_operations/forms.py:1266 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/models.py:520 msgid "Shipwreck name" msgstr "Nom de l'épave" -#: archaeological_operations/forms.py:1276 -#: archaeological_operations/forms.py:1433 -#: archaeological_operations/models.py:521 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:522 msgid "Oceanographic service localisation" msgstr "Localisation SHOM" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/models.py:523 +#: archaeological_operations/forms.py:1272 +#: archaeological_operations/forms.py:1420 +#: archaeological_operations/models.py:524 msgid "Shipwreck code" msgstr "Code épave" -#: archaeological_operations/forms.py:1281 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/models.py:524 +#: archaeological_operations/forms.py:1274 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/models.py:525 msgid "Sinking date" msgstr "Date de naufrage" -#: archaeological_operations/forms.py:1283 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/models.py:525 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1424 +#: archaeological_operations/models.py:526 msgid "Discovery area" msgstr "Zone de découverte" -#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1338 msgid "Archaeological site - 010 - General" msgstr "Site archéologique - 010 - Général" -#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1400 msgid "Archaeological site - 020 - Towns" msgstr "Site archéologique - 020 - Villes" -#: archaeological_operations/forms.py:1416 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1410 msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1496 +#: archaeological_operations/forms.py:1461 +#: archaeological_operations/forms.py:1509 +#: archaeological_operations/models.py:2870 +msgid "Signature date" +msgstr "Date de signature" + +#: archaeological_operations/forms.py:1477 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1511 -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1680 +#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1594 +#: archaeological_operations/forms.py:1661 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:2860 +#: archaeological_operations/forms.py:1502 +#: archaeological_operations/models.py:2835 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1528 -#: archaeological_operations/models.py:2895 -msgid "Signature date" -msgstr "Date de signature" - -#: archaeological_operations/forms.py:1539 +#: archaeological_operations/forms.py:1520 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1554 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -7226,48 +6989,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:1577 +#: archaeological_operations/forms.py:1558 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1590 +#: archaeological_operations/forms.py:1571 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1576 ishtar_common/forms.py:1338 #: ishtar_common/models.py:2082 msgid "Template" msgstr "Patron" -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1604 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:1641 +#: archaeological_operations/forms.py:1622 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1624 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1664 +#: archaeological_operations/forms.py:1645 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1666 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1798 +#: archaeological_operations/forms.py:1779 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:1854 +#: archaeological_operations/forms.py:1835 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -7315,323 +7078,303 @@ msgstr "Type d'attribution culturelle" msgid "Cultural attribution types" msgstr "Types d'attribution culturelle" -#: archaeological_operations/models.py:375 -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:1181 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "vestige" -#: archaeological_operations/models.py:387 +#: archaeological_operations/models.py:388 msgctxt "key for text search" msgid "locality-ngi" msgstr "lieu-dit-ign" -#: archaeological_operations/models.py:390 +#: archaeological_operations/models.py:391 msgctxt "key for text search" msgid "locality-cadastral" msgstr "lieu-dit-cadastre" -#: archaeological_operations/models.py:394 +#: archaeological_operations/models.py:395 msgctxt "key for text search" msgid "shipwreck-name" msgstr "nom-epave" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:399 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "localisation-shom" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:403 msgctxt "key for text search" msgid "shipwreck-code" msgstr "code-epave" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:407 msgctxt "key for text search" msgid "sinking-date" msgstr "date-naufrage" -#: archaeological_operations/models.py:409 +#: archaeological_operations/models.py:410 msgctxt "key for text search" msgid "discovery-area" msgstr "zone-decouverte" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:418 msgctxt "key for text search" msgid "top-operation" msgstr "operation-chapeau" -#: archaeological_operations/models.py:421 +#: archaeological_operations/models.py:422 msgctxt "key for text search" msgid "numero-drassm" msgstr "numero-drassm" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:426 msgctxt "key for text search" msgid "numero-affmar" msgstr "numero-affmar" -#: archaeological_operations/models.py:476 +#: archaeological_operations/models.py:477 msgid "Create associated operation" msgstr "Créer une opération associée" -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:1548 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "Nom en cache des communes" -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1560 msgid "Cached remains label" msgstr "Nom en cache des vestiges" -#: archaeological_operations/models.py:567 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:568 +#: archaeological_operations/models.py:1469 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 #: na_app/templates/ishtar/sheet_operation.html:332 #: sra_idf_app/templates/ishtar/sheet_operation.html:354 msgid "Archaeological sites" msgstr "Entités archéologiques" -#: archaeological_operations/models.py:587 +#: archaeological_operations/models.py:588 msgid "SITE" msgstr "SITE" -#: archaeological_operations/models.py:639 +#: archaeological_operations/models.py:640 msgid "Create an operation associated to this site" msgstr "Créer une opération associée à ce site" -#: archaeological_operations/models.py:641 +#: archaeological_operations/models.py:642 msgid "ope." msgstr "ope." -#: archaeological_operations/models.py:651 +#: archaeological_operations/models.py:652 msgid "Create a cluster operation for site associated to many operations" msgstr "" "Créer une opération chapeau pour un site associé à plusieurs opérations" -#: archaeological_operations/models.py:653 +#: archaeological_operations/models.py:654 msgid "top ope." msgstr "ope. sup." -#: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 +#: archaeological_operations/models.py:807 ishtar_common/forms.py:1214 #: ishtar_common/models.py:5507 ishtar_common/models.py:5668 -#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1794 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1801 msgid "Unknown" msgstr "Inconnu" -#: archaeological_operations/models.py:808 +#: archaeological_operations/models.py:809 msgid "Virtual operation of site: {}" msgstr "Opération virtuelle du site : {}" -#: archaeological_operations/models.py:1060 +#: archaeological_operations/models.py:1054 msgid "Associated file (label)" msgstr "Dossier associé (nom)" -#: archaeological_operations/models.py:1061 +#: archaeological_operations/models.py:1055 msgid "Operator name" msgstr "Nom de l'opérateur" -#: archaeological_operations/models.py:1062 +#: archaeological_operations/models.py:1056 msgid "Associated file (external ID)" msgstr "Dossier associé (identifiant)" -#: archaeological_operations/models.py:1063 +#: archaeological_operations/models.py:1057 msgid "Scientist (title)" msgstr "Responsable d'opération (titre)" -#: archaeological_operations/models.py:1064 +#: archaeological_operations/models.py:1058 msgid "Scientist (surname)" msgstr "Responsable d'opération (nom)" -#: archaeological_operations/models.py:1065 +#: archaeological_operations/models.py:1059 msgid "Scientist (name)" msgstr "Scientifique (nom)" -#: archaeological_operations/models.py:1066 +#: archaeological_operations/models.py:1060 msgid "Scientist (full name)" msgstr "Responsable d'opération (nom complet)" -#: archaeological_operations/models.py:1067 +#: archaeological_operations/models.py:1061 msgid "Scientist - Organization (name)" msgstr "Scientifique - Organisation (nom)" -#: archaeological_operations/models.py:1068 +#: archaeological_operations/models.py:1062 msgid "Scientific monitor (title)" msgstr "Responsable de suivi scientifique (titre)" -#: archaeological_operations/models.py:1069 +#: archaeological_operations/models.py:1063 msgid "Scientific monitor (surname)" msgstr "Responsable de suivi scientifique (prénom)" -#: archaeological_operations/models.py:1070 +#: archaeological_operations/models.py:1064 msgid "Scientific monitor (name)" msgstr "Responsable de suivi scientifique (nom)" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1065 msgid "Scientific monitor - Organization (name)" msgstr "Responsable de suivi scientifique - Organisation (nom)" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1070 msgid "Archaeological sites (reference)" msgstr "Entités archéologiques (référence)" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "yearly-index" msgstr "index-annuel" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1130 msgctxt "key for text search" msgid "operation-old-code" msgstr "operation-ancien-code" -#: archaeological_operations/models.py:1162 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "address" msgstr "adresse" -#: archaeological_operations/models.py:1169 +#: archaeological_operations/models.py:1163 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "est-ouvert" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1166 msgctxt "key for text search" msgid "scientific-monitor" msgstr "responsable-suivi-scientifique" -#: archaeological_operations/models.py:1193 -msgctxt "key for text search" -msgid "start-before" -msgstr "commence-avant" - -#: archaeological_operations/models.py:1196 -msgctxt "key for text search" -msgid "start-after" -msgstr "commence-apres" - -#: archaeological_operations/models.py:1199 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" -msgid "end-before" -msgstr "fini-avant" +msgid "start" +msgstr "commence" -#: archaeological_operations/models.py:1203 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" -msgid "end-after" -msgstr "fini-apres" +msgid "end" +msgstr "fin" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1194 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "type-relation" -#: archaeological_operations/models.py:1213 +#: archaeological_operations/models.py:1200 msgctxt "key for text search" msgid "operator-reference" msgstr "operateur-ref" -#: archaeological_operations/models.py:1216 +#: archaeological_operations/models.py:1203 msgctxt "key for text search" msgid "abstract" msgstr "resume" -#: archaeological_operations/models.py:1219 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "commentaire-documentation-scientifique" -#: archaeological_operations/models.py:1223 +#: archaeological_operations/models.py:1210 msgctxt "key for text search" msgid "record-quality" msgstr "qualite-enregistrement" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1214 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "traitement-rapport" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1218 msgctxt "key for text search" msgid "virtual-operation" msgstr "operation-virtuelle" -#: archaeological_operations/models.py:1240 +#: archaeological_operations/models.py:1227 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "documentation-date-versement" -#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1231 msgctxt "key for text search" msgid "documentation-provided" msgstr "documentation-versee" -#: archaeological_operations/models.py:1248 -msgctxt "key for text search" -msgid "documentation-deadline-before" -msgstr "documentation-date-limite-avant" - -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1235 msgctxt "key for text search" -msgid "documentation-deadline-after" -msgstr "documentation-date-limite-après" +msgid "documentation-deadline" +msgstr "documentation-date-limite" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1239 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "mobilier-date-versement" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1243 msgctxt "key for text search" msgid "finds-provided" msgstr "mobilier-verse" -#: archaeological_operations/models.py:1267 +#: archaeological_operations/models.py:1250 msgctxt "key for text search" -msgid "finds-deadline-before" -msgstr "mobilier-date-limite-avant" +msgid "finds-deadline" +msgstr "mobilier-date-limite" -#: archaeological_operations/models.py:1271 -msgctxt "key for text search" -msgid "finds-deadline-after" -msgstr "mobilier-date-limite-apres" - -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1254 msgctxt "key for text search" msgid "code-drassm" msgstr "code-drassm" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4430 +#: archaeological_operations/models.py:1292 ishtar_common/models.py:4430 #: ishtar_common/models.py:4528 msgctxt "key for text search" msgid "file" msgstr "dossier" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1475 msgid "Sites for which this operation is top operation" msgstr "Sites pour lesquels cette opération est une opération chapeau" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1483 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" "Si coché, cela signifie que cette opération n'a pas été officiellement " "enregistrée." -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1519 msgid "Name of the protagonist" msgstr "Nom du protagoniste" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1542 msgid "Cached label" msgstr "Libellé en cache" -#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:1570 #: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 #: ishtar_common/templates/ishtar/sheet_document.html:125 @@ -7639,287 +7382,282 @@ msgstr "Libellé en cache" msgid "Operations" msgstr "Opérations" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1610 msgid "List of associated context records" msgstr "Liste des unités d'enregistrement associées" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1611 msgid "List of containers with finds related to this operation" msgstr "Liste des contenants avec du mobilier lié à cette opération" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1612 msgid "List of containers with documents related to this operation" msgstr "Liste des contenants avec des documents liés à cette opération" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1613 msgid "List of containers with finds or documents related to this operation" msgstr "" "Liste des contenants avec du mobilier ou des documents liés à cette opération" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1730 msgid "OPE" msgstr "OPE" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1825 msgid "No associated town" msgstr "Pas de commune associée" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1840 msgid "Intercommunal" msgstr "Intercommunal" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:1983 msgid "context record" msgstr "UE" -#: archaeological_operations/models.py:2034 +#: archaeological_operations/models.py:2013 msgid "Code patriarche" msgstr "Code patriarche" -#: archaeological_operations/models.py:2082 -#: archaeological_operations/models.py:3085 +#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:3060 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:2143 +#: archaeological_operations/models.py:2122 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: archaeological_operations/models.py:2153 +#: archaeological_operations/models.py:2132 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: archaeological_operations/models.py:2161 +#: archaeological_operations/models.py:2140 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: archaeological_operations/models.py:2169 +#: archaeological_operations/models.py:2148 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: archaeological_operations/models.py:2223 +#: archaeological_operations/models.py:2202 #: 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:2284 -#: archaeological_operations/models.py:2363 +#: archaeological_operations/models.py:2263 +#: archaeological_operations/models.py:2342 msgid "No type" msgstr "Pas de type" -#: archaeological_operations/models.py:2328 +#: archaeological_operations/models.py:2307 msgid "Number of sources" msgstr "Nombre de documents" -#: archaeological_operations/models.py:2373 +#: archaeological_operations/models.py:2352 msgid "Mean" msgstr "Moyenne" -#: archaeological_operations/models.py:2465 +#: archaeological_operations/models.py:2444 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: archaeological_operations/models.py:2466 +#: archaeological_operations/models.py:2445 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: archaeological_operations/models.py:2491 +#: archaeological_operations/models.py:2470 msgid "Operation record relation" msgstr "Relation entre opérations" -#: archaeological_operations/models.py:2492 +#: archaeological_operations/models.py:2471 msgid "Operation record relations" msgstr "Relations entre opérations" -#: archaeological_operations/models.py:2558 +#: archaeological_operations/models.py:2537 msgid "Intended to" msgstr "Destiné à" -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2542 msgid "Associated template" msgstr "Patron associé" -#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2545 msgid "Indexed" msgstr "Indexé" -#: archaeological_operations/models.py:2570 +#: archaeological_operations/models.py:2549 msgid "Act types" msgstr "Types d'acte" -#: archaeological_operations/models.py:2696 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "other-ref" msgstr "autre-ref" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2685 msgctxt "key for text search" msgid "indexed" msgstr "indexe" -#: archaeological_operations/models.py:2709 -#: archaeological_warehouse/models.py:974 +#: archaeological_operations/models.py:2688 +#: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "operation-commune" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2692 msgctxt "key for text search" msgid "file-town" msgstr "dossier-commune" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2704 msgctxt "key for text search" msgid "operation-department" msgstr "operation-departement" -#: archaeological_operations/models.py:2729 +#: archaeological_operations/models.py:2708 msgctxt "key for text search" msgid "file-department" msgstr "dossier-departement" -#: archaeological_operations/models.py:2733 +#: archaeological_operations/models.py:2712 msgctxt "key for text search" msgid "object" msgstr "objet" -#: archaeological_operations/models.py:2736 +#: archaeological_operations/models.py:2715 msgctxt "key for text search" -msgid "signature-before" -msgstr "signature-avant" +msgid "signature" +msgstr "signature" -#: archaeological_operations/models.py:2740 -msgctxt "key for text search" -msgid "signature-after" -msgstr "signature-apres" - -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2719 msgctxt "key for text search" msgid "file-name" msgstr "dossier-nom" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2731 msgctxt "key for text search" msgid "file-reference" msgstr "dossier-reference" -#: archaeological_operations/models.py:2760 +#: archaeological_operations/models.py:2735 msgctxt "key for text search" msgid "file-year" msgstr "dossier-annee" -#: archaeological_operations/models.py:2763 +#: archaeological_operations/models.py:2738 msgctxt "key for text search" msgid "file-other-reference" msgstr "dossier-autre-reference" -#: archaeological_operations/models.py:2767 +#: archaeological_operations/models.py:2742 msgctxt "key for text search" msgid "file-in-charge" msgstr "dossier-responsable" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2746 msgctxt "key for text search" msgid "file-permit-reference" msgstr "dossier-ref-permis" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2750 msgctxt "key for text search" msgid "treatment-name" msgstr "traitement-nom" -#: archaeological_operations/models.py:2779 +#: archaeological_operations/models.py:2754 msgctxt "key for text search" msgid "treatment-reference" msgstr "traitement-reference" -#: archaeological_operations/models.py:2783 +#: archaeological_operations/models.py:2758 msgctxt "key for text search" msgid "treatment-year" msgstr "traitement-annee" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2761 msgctxt "key for text search" msgid "treatment-index" msgstr "traitement-index" -#: archaeological_operations/models.py:2789 +#: archaeological_operations/models.py:2764 msgctxt "key for text search" msgid "treatment-type" msgstr "traitement-type" -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2768 msgctxt "key for text search" msgid "treatment-file-name" msgstr "dossier-traitement-nom" -#: archaeological_operations/models.py:2797 +#: archaeological_operations/models.py:2772 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "dossier-traitement-reference" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2776 msgctxt "key for text search" msgid "treatment-file-year" msgstr "dossier-traitement-annee" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2780 msgctxt "key for text search" msgid "treatment-file-index" msgstr "dossier-traitement-index" -#: archaeological_operations/models.py:2809 +#: archaeological_operations/models.py:2784 msgctxt "key for text search" msgid "treatment-file-type" msgstr "dossier-traitement-type" -#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:2818 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2905 +#: archaeological_operations/models.py:2880 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2911 +#: archaeological_operations/models.py:2886 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:3175 +#: archaeological_operations/models.py:3150 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3177 ishtar_common/models.py:2669 +#: archaeological_operations/models.py:3152 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 -#: ishtar_common/models_common.py:4369 +#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 +#: ishtar_common/models_common.py:4360 msgid "Cached name" msgstr "Nom en cache" -#: archaeological_operations/models.py:3469 ishtar_common/models.py:3846 +#: archaeological_operations/models.py:3444 ishtar_common/models.py:3846 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3484 +#: archaeological_operations/models.py:3459 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3485 +#: archaeological_operations/models.py:3460 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3507 ishtar_common/models.py:5375 +#: archaeological_operations/models.py:3482 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3510 +#: archaeological_operations/models.py:3485 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3511 +#: archaeological_operations/models.py:3486 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -8213,7 +7951,7 @@ msgstr "" #: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 -#: archaeological_warehouse/models.py:934 +#: archaeological_warehouse/models.py:935 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 @@ -8287,25 +8025,25 @@ msgstr "" "conservation, les champs suivants sont utilisés pour cette organisation." #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 -#: ishtar_common/models_common.py:3853 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 +#: ishtar_common/models_common.py:3842 msgid "Address complement" msgstr "Complément d'adresse" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 msgid "Town (freeform)" msgstr "Commune (saisie libre)" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 msgid "Country" msgstr "Pays" #: archaeological_warehouse/forms.py:251 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" @@ -8314,7 +8052,7 @@ msgstr "Téléphone" #: archaeological_warehouse/forms.py:253 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8339,14 +8077,14 @@ msgid "Container - 010 - General" msgstr "Contenant - 010 - Général" #: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1185 +#: archaeological_warehouse/models.py:1186 msgid "Old reference" msgstr "Ancienne référence" #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 -#: archaeological_warehouse/models.py:904 -#: archaeological_warehouse/models.py:1153 +#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:1154 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 @@ -8358,12 +8096,12 @@ msgid "Current location (warehouse)" msgstr "Lieu de conservation actuel" #: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1168 +#: archaeological_warehouse/models.py:1169 msgid "Parent container" msgstr "Contenant parent" #: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:752 -#: archaeological_warehouse/models.py:1144 +#: archaeological_warehouse/models.py:1145 msgid "Responsibility" msgstr "Responsabilité" @@ -8372,7 +8110,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "Rattaché au lieu de conservation actuel si ce champ n'est pas rempli." #: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/models.py:1176 msgid "Measured weight (g)" msgstr "Poids mesuré (g)" @@ -8485,7 +8223,7 @@ msgstr "" "parent : {} {} et référence : {}. Fusionner ces contenants d'abord ?" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:1214 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8532,7 +8270,7 @@ msgid "Warehouses" msgstr "Lieux de conservation" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1624 +#: archaeological_warehouse/models.py:1625 msgid "No value" msgstr "Pas de valeur" @@ -8588,7 +8326,7 @@ msgid "Container types" msgstr "Types de contenant" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1139 +#: archaeological_warehouse/models.py:1140 msgid "Deprecated - do not use" msgstr "Obsolète - ne pas utiliser" @@ -8596,124 +8334,124 @@ msgstr "Obsolète - ne pas utiliser" msgid "Container parent" msgstr "Contenant parent" -#: archaeological_warehouse/models.py:898 -#: archaeological_warehouse/models.py:1129 +#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:1130 msgid "Location (warehouse)" msgstr "Lieu de conservation" -#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:900 msgid "Responsibility (warehouse)" msgstr "Lieu de conservation responsable" -#: archaeological_warehouse/models.py:931 +#: archaeological_warehouse/models.py:932 msgid "Location - index" msgstr "Localisation - index" -#: archaeological_warehouse/models.py:932 +#: archaeological_warehouse/models.py:933 msgid "Precise localisation" msgstr "Localisation précise" -#: archaeological_warehouse/models.py:950 +#: archaeological_warehouse/models.py:951 msgctxt "key for text search" msgid "responsibility" msgstr "responsabilite" -#: archaeological_warehouse/models.py:961 +#: archaeological_warehouse/models.py:962 msgctxt "key for text search" msgid "code" msgstr "code" -#: archaeological_warehouse/models.py:964 +#: archaeological_warehouse/models.py:965 msgctxt "key for text search" msgid "old-reference" msgstr "ancienne-reference" -#: archaeological_warehouse/models.py:979 +#: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "operation-scientist" msgstr "operation-responsable" -#: archaeological_warehouse/models.py:1011 +#: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "find-label" msgstr "mobilier-ID-libre" -#: archaeological_warehouse/models.py:1015 ishtar_common/models.py:4426 +#: archaeological_warehouse/models.py:1016 ishtar_common/models.py:4426 msgctxt "key for text search" msgid "find-denomination" msgstr "mobilier-denomination" -#: archaeological_warehouse/models.py:1027 +#: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "preservation" msgstr "preservation" -#: archaeological_warehouse/models.py:1055 +#: archaeological_warehouse/models.py:1056 msgctxt "key for text search" msgid "find-description" msgstr "mobilier-description" -#: archaeological_warehouse/models.py:1058 +#: archaeological_warehouse/models.py:1059 msgctxt "key for text search" msgid "empty" msgstr "vide" -#: archaeological_warehouse/models.py:1061 +#: archaeological_warehouse/models.py:1062 msgctxt "key for text search" msgid "parent-container" msgstr "contenant-parent" -#: archaeological_warehouse/models.py:1065 +#: archaeological_warehouse/models.py:1066 msgctxt "key for text search" msgid "contain-containers" msgstr "contient-contenants" -#: archaeological_warehouse/models.py:1069 +#: archaeological_warehouse/models.py:1070 msgctxt "key for text search" msgid "is-stationary" msgstr "est-immobile" -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "Responsible warehouse" msgstr "Lieu de conservation responsable" -#: archaeological_warehouse/models.py:1148 +#: archaeological_warehouse/models.py:1149 msgid "Warehouse that owns the container" msgstr "Lieu de conservation auquel le contenant appartient" -#: archaeological_warehouse/models.py:1157 +#: archaeological_warehouse/models.py:1158 msgid "Container ref." msgstr "Réf. du contenant" -#: archaeological_warehouse/models.py:1161 +#: archaeological_warehouse/models.py:1162 msgid "Cached location" msgstr "Localisation - en cache" -#: archaeological_warehouse/models.py:1164 +#: archaeological_warehouse/models.py:1165 msgid "Cached division" msgstr "Division mise en cache" -#: archaeological_warehouse/models.py:1177 +#: archaeological_warehouse/models.py:1178 msgid "Calculated weight (g)" msgstr "Poids calculé (g)" -#: archaeological_warehouse/models.py:1180 +#: archaeological_warehouse/models.py:1181 msgid "Cached weight (g)" msgstr "Poids mis en cache (g)" -#: archaeological_warehouse/models.py:1183 +#: archaeological_warehouse/models.py:1184 msgid "Entered weight if available otherwise calculated weight." msgstr "Poids saisi si disponible sinon poids calculé." -#: archaeological_warehouse/models.py:1385 +#: archaeological_warehouse/models.py:1386 msgid "Document with {}: {} does not exists" msgstr "Le document avec {} : {} n'existe pas" -#: archaeological_warehouse/models.py:1389 +#: archaeological_warehouse/models.py:1390 msgid "Multiple document with {}: {}" msgstr "Plusieurs documents avec {} : {}" -#: archaeological_warehouse/models.py:1809 +#: archaeological_warehouse/models.py:1810 msgid "" "Associated operation - use it with caution, only return the first found " "operation" @@ -8721,7 +8459,7 @@ msgstr "" "Opération associée - à utiliser avec précaution seule la première opération " "trouvée est retournée" -#: archaeological_warehouse/models.py:1816 +#: archaeological_warehouse/models.py:1817 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" @@ -8729,35 +8467,35 @@ msgstr "" "Unité d'Enregistrement associée - à utiliser avec précaution seule la " "première unité d'enregistrement trouvée est retournée" -#: archaeological_warehouse/models.py:1820 +#: archaeological_warehouse/models.py:1821 msgid "Material types inside the container - string" msgstr "Types de matériaux dans le contenant - chaîne de caractères" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1822 msgid "Material types code - string" msgstr "Code des types de matériau - chaîne de caractères" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1823 msgid "List of associated finds" msgstr "Liste du mobilier associé" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1824 msgid "List of documents contained in this container" msgstr "Liste des documents contenus dans ce contenant" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1825 msgid "List of documents whose reference container is this container" msgstr "Liste des documents dont le contenant de référence est ce contenant" -#: archaeological_warehouse/models.py:2066 +#: archaeological_warehouse/models.py:2067 msgid "Division" msgstr "Niveau" -#: archaeological_warehouse/models.py:2073 +#: archaeological_warehouse/models.py:2074 msgid "Container localisation" msgstr "Localisation de contenant" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2075 msgid "Container localisations" msgstr "Localisations de contenant" @@ -8998,12 +8736,12 @@ msgid "Export selected as CSV file" msgstr "Exporter la sélection en fichier CSV" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1612 +#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1619 msgid "True" msgstr "Oui" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1614 +#: ishtar_common/views_item.py:1621 msgid "False" msgstr "Non" @@ -9751,7 +9489,7 @@ msgstr "Confirmer" msgid "Are you sure you want to delete?" msgstr "Êtes-vous sûr de vouloir supprimer ?" -#: ishtar_common/forms.py:451 ishtar_common/forms.py:1077 +#: ishtar_common/forms.py:451 ishtar_common/forms.py:1069 msgid "You should select an item." msgstr "Vous devez sélectionner un élément." @@ -9763,91 +9501,81 @@ msgstr "Sélection invalide." msgid "There are identical items." msgstr "Il y a des éléments identiques." -#: ishtar_common/forms.py:962 -msgid "Created before" -msgstr "Créée avant" +#: ishtar_common/forms.py:962 ishtar_common/models.py:5607 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1299 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 +msgid "Created" +msgstr "Créé" #: ishtar_common/forms.py:965 -msgid "Created after" -msgstr "Créée après" - -#: ishtar_common/forms.py:968 msgid "Last modified by" msgstr "Modifiée en dernier par" -#: ishtar_common/forms.py:975 -msgid "Modified before" -msgstr "Modifiée avant" - -#: ishtar_common/forms.py:978 -msgid "Modified after" -msgstr "Modifiée après" +#: ishtar_common/forms.py:972 +msgid "Modified" +msgstr "Modifié" -#: ishtar_common/forms.py:980 +#: ishtar_common/forms.py:974 msgid "Is locked?" msgstr "Est verrouillée ?" -#: ishtar_common/forms.py:1009 +#: ishtar_common/forms.py:1001 msgid "Imported from" msgstr "Importé depuis" -#: ishtar_common/forms.py:1029 ishtar_common/forms_common.py:2496 +#: ishtar_common/forms.py:1021 ishtar_common/forms_common.py:2496 msgid "Has an image?" msgstr "A une image ?" -#: ishtar_common/forms.py:1031 +#: ishtar_common/forms.py:1023 msgid "Has an attached file?" msgstr "A un fichier rattaché ?" -#: ishtar_common/forms.py:1034 +#: ishtar_common/forms.py:1026 msgid "Has a web address?" msgstr "A une adresse web ?" -#: ishtar_common/forms.py:1036 +#: ishtar_common/forms.py:1028 msgid "Document - Type" msgstr "Document - Type" -#: ishtar_common/forms.py:1079 +#: ishtar_common/forms.py:1071 msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: ishtar_common/forms.py:1267 +#: ishtar_common/forms.py:1259 msgid " - append to existing" msgstr " - ajouter à l'existant" -#: ishtar_common/forms.py:1270 +#: ishtar_common/forms.py:1262 msgid " - replace" msgstr " - remplacer" -#: ishtar_common/forms.py:1300 +#: ishtar_common/forms.py:1292 msgid "Set to null" msgstr "Mettre à la valeur null" -#: ishtar_common/forms.py:1369 +#: ishtar_common/forms.py:1361 msgid "Geo - Name" msgstr "Géo - Nom" -#: ishtar_common/forms.py:1370 +#: ishtar_common/forms.py:1362 msgid "Geo - Data type" msgstr "Géo - Type de données" -#: ishtar_common/forms.py:1371 +#: ishtar_common/forms.py:1363 msgid "Geo - Origin" msgstr "Géo - Type d'origine" -#: ishtar_common/forms.py:1372 +#: ishtar_common/forms.py:1364 msgid "Geo - Provider" msgstr "Géo - Fournisseur" -#: ishtar_common/forms.py:1373 -msgid "Geo - Z - higher than" -msgstr "Géo - Z - plus grand que" +#: ishtar_common/forms.py:1365 +msgid "Geo - Z" +msgstr "Géo - Z" -#: ishtar_common/forms.py:1374 -msgid "Geo - Z - lower than" -msgstr "Géo - Z - plus petit que" - -#: ishtar_common/forms.py:1375 +#: ishtar_common/forms.py:1366 msgid "Geo - Comment" msgstr "Géo - Commentaire" @@ -10022,8 +9750,8 @@ msgstr "Identifiant Muséofile" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 -#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 +#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 msgid "Email" msgstr "Courriel" @@ -10097,12 +9825,12 @@ msgstr "Identité" msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 -#: ishtar_common/models_common.py:3697 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 +#: ishtar_common/models_common.py:3686 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -10110,11 +9838,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 msgid "Phone 3" msgstr "Téléphone 3" @@ -10122,23 +9850,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -10601,7 +10329,7 @@ msgstr "Élément géographique" msgid "Geo item - 010 - General" msgstr "Élément géographique - 010 - Général" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2253 msgid "Import key" msgstr "Clé d'import" @@ -10613,26 +10341,26 @@ msgstr "" "Une mise à jour via import correspondant à l'élément source et à cette clé " "va écraser la donnée." -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2268 #: 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:3053 ishtar_common/models_common.py:2267 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2260 #: 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:3056 ishtar_common/models_common.py:2283 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2276 #: 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:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2249 +#: ishtar_common/models_common.py:2242 msgid "Buffer" msgstr "Tampon" @@ -10640,18 +10368,18 @@ msgstr "Tampon" msgid "Buffer type" msgstr "Type de tampon" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:4194 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 -#: ishtar_common/models_common.py:4206 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:4197 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 -#: ishtar_common/models_common.py:4209 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2295 +#: ishtar_common/models_common.py:4200 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" @@ -10660,10 +10388,10 @@ msgid "Metadata" msgstr "Métadonnées" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 -#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 -#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 +#: ishtar_common/models_common.py:2054 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2161 +#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:2191 +#: ishtar_common/models_common.py:2320 ishtar_common/models_common.py:3418 msgid "Geography" msgstr "Géographie" @@ -10691,8 +10419,8 @@ msgstr "Type de géométrie" msgid "Coordinates" msgstr "Coordonnées" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 -#: ishtar_common/models_common.py:4218 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:4209 msgid "Point" msgstr "Point" @@ -12426,7 +12154,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "depot" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1839 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" @@ -12616,12 +12344,6 @@ msgstr "" "Le script « {} »n'est pas un fichier valable de votre répertoire de script. " "Vérifiez la configuration." -#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 -#: ishtar_common/models_imports.py:1299 -#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 -msgid "Created" -msgstr "Créé" - #: ishtar_common/models.py:5612 msgid "Filter on" msgstr "Filtrer sur" @@ -12762,383 +12484,368 @@ msgstr "Vecteur de recherche" msgid "Auto filled at save" msgstr "Auto-rempli à la sauvegarde" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1142 msgid "Created by imports" msgstr "Créé par les imports" -#: ishtar_common/models_common.py:1143 +#: ishtar_common/models_common.py:1144 msgid "Timestamp geo" msgstr "Horodatage géographique" -#: ishtar_common/models_common.py:1144 +#: ishtar_common/models_common.py:1145 msgid "Timestamp label" msgstr "Horodatage libellé" -#: ishtar_common/models_common.py:1147 +#: ishtar_common/models_common.py:1148 msgid "Updated by imports" msgstr "Mis à jour par les imports" -#: ishtar_common/models_common.py:1152 +#: ishtar_common/models_common.py:1153 msgctxt "key for text search" msgid "imports" msgstr "imports" -#: ishtar_common/models_common.py:1539 +#: ishtar_common/models_common.py:1540 msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_common/models_common.py:1547 +#: ishtar_common/models_common.py:1548 msgid "Creator" msgstr "Créateur" -#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 +#: ishtar_common/models_common.py:1555 ishtar_common/models_common.py:2246 msgid "Need update" msgstr "Nécessite une mise à jour" -#: ishtar_common/models_common.py:1556 +#: ishtar_common/models_common.py:1557 msgid "Item locked for edition" msgstr "Élément verrouillé pour l'édition" -#: ishtar_common/models_common.py:1562 +#: ishtar_common/models_common.py:1563 msgid "Locked by" msgstr "Verrouillé par" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1581 msgctxt "key for text search" msgid "modified-by" msgstr "modifie-par" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1585 msgctxt "key for text search" -msgid "created-before" -msgstr "creee-avant" +msgid "created" +msgstr "cree" -#: ishtar_common/models_common.py:1590 +#: ishtar_common/models_common.py:1589 msgctxt "key for text search" -msgid "created-after" -msgstr "creee-apres" +msgid "modified" +msgstr "modifie" #: ishtar_common/models_common.py:1593 msgctxt "key for text search" -msgid "modified-before" -msgstr "modifie-avant" - -#: ishtar_common/models_common.py:1597 -msgctxt "key for text search" -msgid "modified-after" -msgstr "modifie-apres" - -#: ishtar_common/models_common.py:1600 -msgctxt "key for text search" msgid "locked" msgstr "verrou" -#: ishtar_common/models_common.py:1850 +#: ishtar_common/models_common.py:1843 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:1854 +#: ishtar_common/models_common.py:1847 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:1858 +#: ishtar_common/models_common.py:1851 msgctxt "key for text search" msgid "document-type" msgstr "type-document" -#: ishtar_common/models_common.py:1942 +#: ishtar_common/models_common.py:1935 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:1944 +#: ishtar_common/models_common.py:1937 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2100 ishtar_common/models_common.py:2121 msgid "Authority name" msgstr "Registre" -#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2101 ishtar_common/models_common.py:2121 msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2109 +#: ishtar_common/models_common.py:2102 msgid "Number of decimal places" msgstr "Nombre de décimales" -#: ishtar_common/models_common.py:2110 +#: ishtar_common/models_common.py:2103 msgid "Number of decimal places for Z" msgstr "Nombre de décimales pour Z" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2106 msgid "Geographic - Spatial reference system" msgstr "Géographie - Système de référence spatiale" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2107 msgid "Geographic - Spatial reference systems" msgstr "Géographie - Systèmes de référence spatiale" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2138 msgid "Geographic - Origin type" msgstr "Géographie - Type d'origine" -#: ishtar_common/models_common.py:2146 +#: ishtar_common/models_common.py:2139 msgid "Geographic - Origin types" msgstr "Géographie - Types d'origine" -#: ishtar_common/models_common.py:2162 +#: ishtar_common/models_common.py:2155 msgid "Geographic - Data type" msgstr "Géographie - Type de données" -#: ishtar_common/models_common.py:2163 +#: ishtar_common/models_common.py:2156 msgid "Geographic - Data types" msgstr "Géographie - Types de données" -#: ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:2172 msgid "Geographic - Provider type" msgstr "Géographie - Type de fournisseur" -#: ishtar_common/models_common.py:2180 +#: ishtar_common/models_common.py:2173 msgid "Geographic - Provider types" msgstr "Géographie - Types de fournisseur" -#: ishtar_common/models_common.py:2192 +#: ishtar_common/models_common.py:2185 msgid "Geographic - Buffer type" msgstr "Géographie - Type de tampon" -#: ishtar_common/models_common.py:2193 +#: ishtar_common/models_common.py:2186 msgid "Geographic - Buffer types" msgstr "Géographie - Types de tampon" -#: ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:2212 msgid "Line(s)" msgstr "Ligne(s)" -#: ishtar_common/models_common.py:2220 +#: ishtar_common/models_common.py:2213 msgid "Point(s)" msgstr "Point(s)" -#: ishtar_common/models_common.py:2221 +#: ishtar_common/models_common.py:2214 msgid "Polygon(s)" msgstr "Polygone(s)" -#: ishtar_common/models_common.py:2261 +#: ishtar_common/models_common.py:2254 msgid "Use this for update imports" msgstr "Utilisez cela pour des imports de mise à jour" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2261 msgid "For instance: topographical survey, georeferencing, ..." msgstr "Par exemple : levé topographiques, géoréférencement, ..." -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2269 msgid "For instance: outline, z-sup, ..." msgstr "Par exemple : contour, Z-supérieur, ..." -#: ishtar_common/models_common.py:2284 +#: ishtar_common/models_common.py:2277 msgid "Data provider" msgstr "Fournisseur de données" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:4190 msgid "X" msgstr "X/Long" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2282 msgid "User input" msgstr "Saisie utilisateur" -#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 +#: ishtar_common/models_common.py:2281 ishtar_common/models_common.py:4191 msgid "Y" msgstr "Y/Lat" -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:2282 ishtar_common/models_common.py:4192 msgid "Z" msgstr "Z" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2285 msgid "X (cached)" msgstr "X (cache)" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2286 msgid "Y (cached)" msgstr "Y (cache)" -#: ishtar_common/models_common.py:2294 +#: ishtar_common/models_common.py:2287 msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:2299 ishtar_common/models_common.py:4204 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 +#: ishtar_common/models_common.py:2304 ishtar_common/models_common.py:4210 msgid "Point (2D)" msgstr "Point (2D)" -#: ishtar_common/models_common.py:2312 +#: ishtar_common/models_common.py:2305 msgid "Point (3D)" msgstr "Point (3D)" -#: ishtar_common/models_common.py:2313 +#: ishtar_common/models_common.py:2306 msgid "Multi points" msgstr "Points multiples" -#: ishtar_common/models_common.py:2314 +#: ishtar_common/models_common.py:2307 msgid "Multi lines" msgstr "Lignes multiples" -#: ishtar_common/models_common.py:2315 +#: ishtar_common/models_common.py:2308 msgid "Multi polygons" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:2312 msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2448 +#: ishtar_common/models_common.py:2441 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2905 msgid "Main geodata" msgstr "Élément géographique principal" -#: ishtar_common/models_common.py:2916 +#: ishtar_common/models_common.py:2909 msgid "Geodata" msgstr "Élément géographique" -#: ishtar_common/models_common.py:2920 +#: ishtar_common/models_common.py:2913 msgctxt "key for text search" msgid "geo-name" msgstr "geo-nom" -#: ishtar_common/models_common.py:2923 +#: ishtar_common/models_common.py:2916 msgctxt "key for text search" msgid "geo-type" msgstr "geo-type" -#: ishtar_common/models_common.py:2926 +#: ishtar_common/models_common.py:2919 msgctxt "key for text search" msgid "geo-origin" msgstr "geo-origine" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2922 msgctxt "key for text search" msgid "geo-provider" msgstr "geo-fournisseur" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:2925 msgctxt "key for text search" -msgid "z-higher" -msgstr "z-plus-grand" +msgid "z" +msgstr "z" -#: ishtar_common/models_common.py:2936 -msgctxt "key for text search" -msgid "z-lower" -msgstr "z-plus-petit" - -#: ishtar_common/models_common.py:2940 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-comment" msgstr "geo-commentaire" -#: ishtar_common/models_common.py:2966 +#: ishtar_common/models_common.py:2955 msgid "Add geographic item" msgstr "Ajouter élément géographique" -#: ishtar_common/models_common.py:2968 +#: ishtar_common/models_common.py:2957 msgid "geo." msgstr "géo." -#: ishtar_common/models_common.py:3363 +#: ishtar_common/models_common.py:3352 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:3365 +#: ishtar_common/models_common.py:3354 msgid "regen." msgstr "regén." -#: ishtar_common/models_common.py:3385 +#: ishtar_common/models_common.py:3374 msgid "Localisation" msgstr "Localisation" -#: ishtar_common/models_common.py:3387 +#: ishtar_common/models_common.py:3376 msgid "Limit" msgstr "Limite" -#: ishtar_common/models_common.py:3397 +#: ishtar_common/models_common.py:3386 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:3401 +#: ishtar_common/models_common.py:3390 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:3405 +#: ishtar_common/models_common.py:3394 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:3671 +#: ishtar_common/models_common.py:3660 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:3703 +#: ishtar_common/models_common.py:3692 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:3709 +#: ishtar_common/models_common.py:3698 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:3742 +#: ishtar_common/models_common.py:3731 msgid "Town with code: {} does not exists" msgstr "La commune avec le code : {} n'existe pas" -#: ishtar_common/models_common.py:3779 +#: ishtar_common/models_common.py:3768 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:3860 +#: ishtar_common/models_common.py:3849 msgid "Postal code - Town" msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:3870 +#: ishtar_common/models_common.py:3859 msgid "Mobile" msgstr "Mobile" -#: ishtar_common/models_common.py:3888 +#: ishtar_common/models_common.py:3877 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:4221 +#: ishtar_common/models_common.py:4212 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4215 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:4226 +#: ishtar_common/models_common.py:4217 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:4228 +#: ishtar_common/models_common.py:4219 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:4235 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" @@ -16041,6 +15748,345 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "Exhibition started" +#~ msgstr "Date de début de l'exposition" + +#~ msgid "Exhibition ended" +#~ msgstr "Date de fin de l'exposition" + +#~ msgid "Exhibition started before" +#~ msgstr "Exposition commencée avant" + +#~ msgid "Exhibition started after" +#~ msgstr "Exposition commencée après" + +#~ msgid "Exhibition ended before" +#~ msgstr "Exposition terminée avant" + +#~ msgid "Exhibition ended after" +#~ msgstr "Exposition commencée après" + +#~ msgctxt "key for text search" +#~ msgid "exhibition-start-before" +#~ msgstr "exposition-commence-avant" + +#~ msgctxt "key for text search" +#~ msgid "exhibition-end-before" +#~ msgstr "exposition-termine-avant" + +#~ msgid "Dating - start date before" +#~ msgstr "Datation - date de début avant" + +#~ msgid "Dating - end date before" +#~ msgstr "Datation - date de fin avant" + +#~ msgctxt "key for text search" +#~ msgid "datings-start-before" +#~ msgstr "datation-debut-avant" + +#~ msgctxt "key for text search" +#~ msgid "datings-end-before" +#~ msgstr "datation-fin-avant" + +#~ msgctxt "key for text search" +#~ msgid "datings-end-after" +#~ msgstr "datation-fin-apres" + +#~ msgid "Discovery date (exact or beginning) after" +#~ msgstr "Date de découverte (exacte ou début) après" + +#~ msgid "Discovery date (exact or beginning) before" +#~ msgstr "Date de découverte (exacte ou début) avant" + +#~ msgid "Discovery date (end) after" +#~ msgstr "Date de découverte (fin) après" + +#~ msgid "Discovery date (end) before" +#~ msgstr "Date de découverte (fin) avant" + +#~ msgid "Length - higher than (cm)" +#~ msgstr "Longueur - plus grand que (cm)" + +#~ msgid "Length - lower than (cm)" +#~ msgstr "Longueur - plus petit que (cm)" + +#~ msgid "Width - lower than (cm)" +#~ msgstr "Largeur - plus petit que (cm)" + +#~ msgid "Width - higher than (cm)" +#~ msgstr "Largeur - plus grand que (cm)" + +#~ msgid "Height - lower than (cm)" +#~ msgstr "Hauteur - plus petit que (cm)" + +#~ msgid "Height - higher than (cm)" +#~ msgstr "Hauteur - plus grand que (cm)" + +#~ msgid "Thickness - lower than (cm)" +#~ msgstr "Épaisseur - plus petit que (cm)" + +#~ msgid "Thickness - higher than (cm)" +#~ msgstr "Épaisseur - plus grand que (cm)" + +#~ msgid "Diameter - lower than (cm)" +#~ msgstr "Diamètre - plus petit que (cm)" + +#~ msgid "Diameter - higher than (cm)" +#~ msgstr "Diamètre - plus grand que (cm)" + +#~ msgid "Circumference - lower than (cm)" +#~ msgstr "Circonférence - plus petit que (cm)" + +#~ msgid "Circumference - higher than (cm)" +#~ msgstr "Circonférence - plus grand que (cm)" + +#~ msgid "Volume - lower than (l)" +#~ msgstr "Volume - plus petit que (l)" + +#~ msgid "Volume - higher than (l)" +#~ msgstr "Volume - plus grand que (l)" + +#~ msgid "Weight - higher than (g)" +#~ msgstr "Poids - plus grand que (g)" + +#~ msgid "Clutter long side - lower than (cm)" +#~ msgstr "Encombrement grand côté - plus petit que (cm)" + +#~ msgid "Clutter long side - higher than (cm)" +#~ msgstr "Encombrement grand côté - plus grand que (cm)" + +#~ msgid "Clutter short side - lower than (cm)" +#~ msgstr "Encombrement petit côté - plus petit que (cm)" + +#~ msgid "Clutter short side - higher than (cm)" +#~ msgstr "Encombrement petit côté - plus grand que (cm)" + +#~ msgid "Clutter height - lower than (cm)" +#~ msgstr "Encombrement hauteur - plus petit que (cm)" + +#~ msgid "Clutter height - higher than (cm)" +#~ msgstr "Encombrement hauteur - plus grand que (cm)" + +#~ msgid "Check date after" +#~ msgstr "Date de vérification après" + +#~ msgid "Check date before" +#~ msgstr "Date de vérification avant" + +#~ msgid "Estimated value - higher than" +#~ msgstr "Valeur estimée - plus grand que" + +#~ msgid "Estimated value - lower than" +#~ msgstr "Valeur estimée - plus petit que" + +#~ msgid "Insurance value - higher than" +#~ msgstr "Valeur d'assurance - plus grand que" + +#~ msgid "Insurance value - lower than" +#~ msgstr "Valeur d'assurance - plus petit que" + +#~ msgid "Appraisal date after" +#~ msgstr "Date d'évaluation après" + +#~ msgid "Appraisal date before" +#~ msgstr "Date d'évaluation avant" + +#~ msgid "Museum - Entry date (exact or start) - before" +#~ msgstr "Musée - Date d’entrée (exacte ou début) - avant" + +#~ msgid "Museum - Entry date (exact or start) - after" +#~ msgstr "Musée - Date d’entrée (exacte ou début) - après" + +#~ msgid "Museum - Entry date end - before" +#~ msgstr "Musée - Date d’entrée au musée (fin) - avant" + +#~ msgid "Museum - Entry date end - after" +#~ msgstr "Musée - Date d’entrée au musée (fin) - après" + +#~ msgctxt "key for text search" +#~ msgid "discovery-date-before" +#~ msgstr "date-decouverte-avant" + +#~ msgctxt "key for text search" +#~ msgid "discovery-date-after" +#~ msgstr "date-decouverte-apres" + +#~ msgctxt "key for text search" +#~ msgid "discovery-date-taq-before" +#~ msgstr "date-decouverte-taq-avant" + +#~ msgctxt "key for text search" +#~ msgid "length-higher" +#~ msgstr "longueur-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "width-higher" +#~ msgstr "largeur-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "height-higher" +#~ msgstr "hauteur-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "thickness-higher" +#~ msgstr "epaisseur-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "diameter-higher" +#~ msgstr "diametre-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "circumference-higher" +#~ msgstr "circonference-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "volume-higher" +#~ msgstr "volume-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "weight-higher" +#~ msgstr "poids-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "clutter-long-side-higher" +#~ msgstr "encombrement-cote-long-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "clutter-short-side-higher" +#~ msgstr "encombrement-cote-court-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "clutter-height-higher" +#~ msgstr "encombrement-hauteur-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "check-date-before" +#~ msgstr "date-verification-avant" + +#~ msgctxt "key for text search" +#~ msgid "check-date-after" +#~ msgstr "date-verification-apres" + +#~ msgctxt "key for text search" +#~ msgid "estimated-value-higher" +#~ msgstr "valeur-estimee-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "estimated-value-lower" +#~ msgstr "valeur-estimee-plus-petit" + +#~ msgctxt "key for text search" +#~ msgid "insurance-value-higher" +#~ msgstr "valeur-assurance-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "insurance-value-lower" +#~ msgstr "valeur-assurance-plus-petit" + +#~ msgctxt "key for text search" +#~ msgid "appraisal-date-before" +#~ msgstr "date-evaluation-avant" + +#~ msgctxt "key for text search" +#~ msgid "appraisal-date-after" +#~ msgstr "date-evaluation-apres" + +#~ msgctxt "key for text search" +#~ msgid "museum-entry-date-before" +#~ msgstr "musee-entree-avant" + +#~ msgctxt "key for text search" +#~ msgid "museum-entry-date-end-before" +#~ msgstr "musee-entree-fin-avant" + +#~ msgctxt "key for text search" +#~ msgid "museum-allocation-date-before" +#~ msgstr "musee-affectation-avant" + +#~ msgctxt "key for text search" +#~ msgid "signature-before" +#~ msgstr "signature-avant" + +#~ msgid "Geo - Z - higher than" +#~ msgstr "Géo - Z - plus grand que" + +#~ msgid "Geo - Z - lower than" +#~ msgstr "Géo - Z - plus petit que" + +#~ msgctxt "key for text search" +#~ msgid "z-higher" +#~ msgstr "z-plus-grand" + +#~ msgctxt "key for text search" +#~ msgid "z-lower" +#~ msgstr "z-plus-petit" + +#~ msgid "Started" +#~ msgstr "Date de début" + +#~| msgid "Ended after" +#~ msgid "Ended" +#~ msgstr "Terminé après" + +#~ msgid "Started before" +#~ msgstr "Commencé avant" + +#~ msgid "Started after" +#~ msgstr "Commencé après" + +#~ msgid "Ended before" +#~ msgstr "Terminé avant" + +#~ msgid "Documentation deadline before" +#~ msgstr "Date limite de versement de la documentation avant" + +#~ msgid "Finds deadline before" +#~ msgstr "Date limite de versement du mobilier avant" + +#~ msgctxt "key for text search" +#~ msgid "start-before" +#~ msgstr "commence-avant" + +#~ msgctxt "key for text search" +#~ msgid "end-before" +#~ msgstr "fini-avant" + +#~ msgctxt "key for text search" +#~ msgid "documentation-deadline-before" +#~ msgstr "documentation-date-limite-avant" + +#~ msgctxt "key for text search" +#~ msgid "finds-deadline-before" +#~ msgstr "mobilier-date-limite-avant" + +#~ msgid "Created before" +#~ msgstr "Créée avant" + +#~ msgid "Created after" +#~ msgstr "Créée après" + +#~ msgid "Modified before" +#~ msgstr "Modifiée avant" + +#~ msgid "Modified after" +#~ msgstr "Modifiée après" + +#~ msgctxt "key for text search" +#~ msgid "created-before" +#~ msgstr "creee-avant" + +#~ msgctxt "key for text search" +#~ msgid "created-after" +#~ msgstr "creee-apres" + +#~ msgctxt "key for text search" +#~ msgid "modified-before" +#~ msgstr "modifie-avant" + +#~ msgctxt "key for text search" +#~ msgid "modified-after" +#~ msgstr "modifie-apres" + #~ msgid "Generate a QR Code" #~ msgstr "Générer un QR Code" @@ -16394,9 +16440,6 @@ msgstr "Surcharges de traductions" #~ msgid "By operations" #~ msgstr "Par opérations" -#~ msgid "Modified" -#~ msgstr "Modifié" - #~ msgid "No data for these criteria." #~ msgstr "Pas de données pour ces critères." diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 88c6d0a6d..0c649d865 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-21 15:37+0200\n" +"POT-Creation-Date: 2024-06-24 16:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -20,27 +20,27 @@ msgstr "" #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 -#: archaeological_context_records/models.py:529 -#: archaeological_context_records/models.py:741 +#: archaeological_context_records/models.py:521 +#: archaeological_context_records/models.py:735 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1196 -#: archaeological_finds/models_finds.py:2770 +#: archaeological_finds/models_finds.py:2745 #: 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:1256 +#: archaeological_operations/forms.py:1249 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2535 -#: archaeological_operations/models.py:2553 -#: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2868 -#: archaeological_operations/models.py:3157 +#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:2514 +#: archaeological_operations/models.py:2532 +#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:3132 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 -#: archaeological_warehouse/models.py:902 ishtar_common/forms_common.py:2523 +#: archaeological_warehouse/models.py:903 ishtar_common/forms_common.py:2523 #: ishtar_common/models.py:5599 ishtar_common/views.py:500 #: na_app/templates/ishtar/sheet_operation.html:4 #: sra_idf_app/templates/ishtar/sheet_operation.html:4 @@ -59,107 +59,99 @@ msgstr "" msgid "Dating - precise" msgstr "" -#: archaeological_context_records/forms.py:97 -msgid "Dating - start date before" -msgstr "" - -#: archaeological_context_records/forms.py:100 -msgid "Dating - start date after" +#: archaeological_context_records/forms.py:96 +msgid "Dating - start date" msgstr "" -#: archaeological_context_records/forms.py:102 -msgid "Dating - end date before" -msgstr "" - -#: archaeological_context_records/forms.py:103 -msgid "Dating - end date after" +#: archaeological_context_records/forms.py:97 +msgid "Dating - end date" msgstr "" -#: archaeological_context_records/forms.py:105 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "" -#: archaeological_context_records/forms.py:107 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "" -#: archaeological_context_records/forms.py:138 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "" -#: archaeological_context_records/forms.py:142 archaeological_files/forms.py:87 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:87 #: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_finds/forms.py:1731 archaeological_finds/forms.py:2534 +#: archaeological_finds/forms.py:1718 archaeological_finds/forms.py:2450 #: 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_finds/forms_treatments.py:826 #: archaeological_operations/forms.py:488 -#: archaeological_operations/forms.py:1234 -#: archaeological_operations/forms.py:1447 +#: archaeological_operations/forms.py:1227 +#: archaeological_operations/forms.py:1440 #: archaeological_warehouse/forms.py:141 archaeological_warehouse/forms.py:510 #: ishtar_common/forms_common.py:821 ishtar_common/forms_common.py:1012 #: ishtar_common/forms_common.py:1237 ishtar_common/forms_common.py:2430 msgid "Full text search" msgstr "" -#: archaeological_context_records/forms.py:145 -#: archaeological_context_records/forms.py:306 -#: archaeological_context_records/forms.py:571 -#: archaeological_context_records/forms.py:625 -#: archaeological_context_records/models.py:753 -#: archaeological_context_records/models.py:1391 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:298 +#: archaeological_context_records/forms.py:563 +#: archaeological_context_records/forms.py:617 +#: archaeological_context_records/models.py:747 +#: archaeological_context_records/models.py:1385 msgid "ID" msgstr "" -#: archaeological_context_records/forms.py:149 -#: archaeological_operations/forms.py:1766 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1747 msgid "Code PATRIARCHE" msgstr "" -#: archaeological_context_records/forms.py:151 +#: archaeological_context_records/forms.py:143 msgid "Operation - name" msgstr "" -#: archaeological_context_records/forms.py:152 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2533 msgid "Operation - year" msgstr "" -#: archaeological_context_records/forms.py:154 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "" -#: archaeological_context_records/forms.py:157 -#: archaeological_context_records/forms.py:732 -#: archaeological_context_records/models.py:747 -#: archaeological_operations/forms.py:553 -#: archaeological_operations/models.py:566 ishtar_common/models.py:5600 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:724 +#: archaeological_context_records/models.py:741 +#: archaeological_operations/forms.py:551 +#: archaeological_operations/models.py:567 ishtar_common/models.py:5600 msgid "Archaeological site" msgstr "" -#: archaeological_context_records/forms.py:165 -#: archaeological_finds/forms.py:1819 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1806 msgid "Search within related operations" msgstr "" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:723 +#: archaeological_context_records/forms.py:159 +#: archaeological_context_records/forms.py:715 msgid "Unit type" msgstr "" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:521 -#: archaeological_context_records/models.py:532 -#: archaeological_context_records/models.py:831 ishtar_common/admin.py:766 +#: archaeological_context_records/forms.py:160 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:524 +#: archaeological_context_records/models.py:825 ishtar_common/admin.py:766 #: ishtar_common/models.py:3414 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:169 -#: archaeological_context_records/forms.py:523 -#: archaeological_context_records/models.py:531 -#: archaeological_context_records/models.py:824 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:515 +#: archaeological_context_records/models.py:523 +#: archaeological_context_records/models.py:818 #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:749 #: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:147 @@ -176,66 +168,66 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:171 -#: archaeological_context_records/models.py:787 +#: archaeological_context_records/forms.py:163 +#: archaeological_context_records/models.py:781 #: archaeological_finds/forms.py:495 archaeological_finds/forms.py:1152 -#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:2097 -#: archaeological_operations/forms.py:1244 -#: archaeological_operations/models.py:500 +#: archaeological_finds/forms.py:1884 archaeological_finds/models_finds.py:2072 +#: archaeological_operations/forms.py:1237 +#: archaeological_operations/models.py:501 msgid "Cultural attribution" msgstr "" -#: archaeological_context_records/forms.py:172 -#: archaeological_context_records/forms.py:297 -#: archaeological_context_records/forms.py:573 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/models.py:518 -#: archaeological_context_records/models.py:519 -#: archaeological_context_records/models.py:725 -#: archaeological_context_records/models.py:1393 +#: archaeological_context_records/forms.py:164 +#: archaeological_context_records/forms.py:289 +#: archaeological_context_records/forms.py:565 +#: archaeological_context_records/forms.py:618 +#: archaeological_context_records/models.py:510 +#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:719 +#: archaeological_context_records/models.py:1387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 #: archaeological_files/forms.py:94 archaeological_files/forms.py:1160 #: archaeological_finds/models_finds.py:1154 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1084 -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:3181 -#: archaeological_operations/models.py:3475 +#: archaeological_operations/forms.py:1077 +#: archaeological_operations/forms.py:1454 +#: archaeological_operations/models.py:3156 +#: archaeological_operations/models.py:3450 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" -#: archaeological_context_records/forms.py:173 -#: archaeological_operations/forms.py:579 +#: archaeological_context_records/forms.py:165 +#: archaeological_operations/forms.py:575 msgid "Has finds" msgstr "" -#: archaeological_context_records/forms.py:175 -#: archaeological_operations/forms.py:543 +#: archaeological_context_records/forms.py:167 +#: archaeological_operations/forms.py:541 msgid "Search within relations" msgstr "" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:317 -#: archaeological_context_records/models.py:533 -#: archaeological_context_records/models.py:836 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:309 +#: archaeological_context_records/models.py:525 +#: archaeological_context_records/models.py:830 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:211 -#: archaeological_context_records/forms.py:232 +#: archaeological_context_records/forms.py:203 +#: archaeological_context_records/forms.py:224 #: archaeological_context_records/views.py:116 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:281 +#: archaeological_context_records/forms.py:273 #: archaeological_files/forms.py:204 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 -#: archaeological_operations/forms.py:689 -#: archaeological_operations/forms.py:715 -#: archaeological_operations/forms.py:1344 -#: archaeological_operations/forms.py:1516 +#: archaeological_operations/forms.py:682 +#: archaeological_operations/forms.py:708 +#: archaeological_operations/forms.py:1337 +#: archaeological_operations/forms.py:1497 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -250,57 +242,57 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:282 +#: archaeological_context_records/forms.py:274 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:298 -#: archaeological_context_records/forms.py:563 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:725 -#: archaeological_context_records/models.py:515 -#: archaeological_context_records/models.py:516 -#: archaeological_context_records/models.py:733 +#: archaeological_context_records/forms.py:290 +#: archaeological_context_records/forms.py:555 +#: archaeological_context_records/forms.py:619 +#: archaeological_context_records/forms.py:717 +#: archaeological_context_records/models.py:507 +#: archaeological_context_records/models.py:508 +#: archaeological_context_records/models.py:727 #: archaeological_finds/models_finds.py:1151 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 -#: archaeological_operations/forms.py:1056 -#: archaeological_operations/models.py:3162 +#: archaeological_operations/forms.py:1049 +#: archaeological_operations/models.py:3137 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:146 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 -#: ishtar_common/models_common.py:3424 ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:3413 ishtar_common/models_common.py:4188 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_town.html:4 msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:303 -#: archaeological_context_records/forms.py:568 +#: archaeological_context_records/forms.py:295 +#: archaeological_context_records/forms.py:560 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:574 -#: archaeological_context_records/forms.py:629 +#: archaeological_context_records/forms.py:300 +#: archaeological_context_records/forms.py:566 +#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/models.py:512 #: archaeological_context_records/models.py:520 -#: archaeological_context_records/models.py:528 -#: archaeological_context_records/models.py:778 -#: archaeological_context_records/models.py:1392 +#: archaeological_context_records/models.py:772 +#: archaeological_context_records/models.py:1386 msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:310 -#: archaeological_context_records/models.py:754 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/forms.py:302 +#: archaeological_context_records/models.py:748 +#: archaeological_context_records/models.py:1388 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:139 #: archaeological_finds/forms.py:432 archaeological_finds/forms.py:437 #: archaeological_finds/forms.py:595 archaeological_finds/forms.py:756 #: archaeological_finds/forms.py:758 archaeological_finds/forms.py:986 -#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1833 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1820 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:556 -#: archaeological_finds/models_finds.py:2039 -#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_finds.py:2014 +#: archaeological_finds/models_treatments.py:263 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:118 #: cd17_app/templates/ishtar/sheet_find.html:177 @@ -316,109 +308,109 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:312 -#: archaeological_context_records/models.py:784 +#: archaeological_context_records/forms.py:304 +#: archaeological_context_records/models.py:778 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:314 -#: archaeological_context_records/models.py:755 -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1900 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_context_records/forms.py:306 +#: archaeological_context_records/models.py:749 +#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:1881 +#: archaeological_finds/models_finds.py:2151 #: archaeological_finds/templates/ishtar/sheet_find.html:194 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:143 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/forms.py:317 #: archaeological_files/forms.py:308 archaeological_files/forms.py:818 -#: archaeological_files/models.py:661 archaeological_operations/forms.py:744 +#: archaeological_files/models.py:662 archaeological_operations/forms.py:737 msgid "Total surface (m2)" msgstr "" -#: archaeological_context_records/forms.py:331 -#: archaeological_context_records/models.py:758 +#: archaeological_context_records/forms.py:323 +#: archaeological_context_records/models.py:752 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:332 -#: archaeological_context_records/models.py:759 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/models.py:753 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:333 -#: archaeological_context_records/models.py:760 +#: archaeological_context_records/forms.py:325 +#: archaeological_context_records/models.py:754 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:334 -#: archaeological_context_records/models.py:761 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/models.py:755 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:762 +#: archaeological_context_records/forms.py:327 +#: archaeological_context_records/models.py:756 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:764 +#: archaeological_context_records/forms.py:329 +#: archaeological_context_records/models.py:758 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:340 -#: archaeological_context_records/models.py:756 +#: archaeological_context_records/forms.py:332 +#: archaeological_context_records/models.py:750 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:343 -#: archaeological_context_records/models.py:757 +#: archaeological_context_records/forms.py:335 +#: archaeological_context_records/models.py:751 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 -#: archaeological_files/models.py:624 +#: archaeological_files/models.py:625 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/models_treatments.py:265 -#: archaeological_finds/models_treatments.py:1144 -#: archaeological_operations/models.py:1350 +#: archaeological_finds/forms_treatments.py:763 +#: archaeological_finds/models_treatments.py:266 +#: archaeological_finds/models_treatments.py:1140 +#: archaeological_operations/models.py:1329 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 -#: ishtar_common/forms.py:1055 ishtar_common/forms.py:1056 +#: ishtar_common/forms.py:1047 ishtar_common/forms.py:1048 #: na_app/templates/ishtar/sheet_operation.html:204 #: sra_idf_app/templates/ishtar/sheet_operation.html:204 msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:346 +#: archaeological_context_records/forms.py:338 #: ishtar_common/forms_common.py:1993 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:352 -#: archaeological_context_records/models.py:768 +#: archaeological_context_records/forms.py:344 +#: archaeological_context_records/models.py:762 #: archaeological_finds/forms_treatments.py:151 -#: archaeological_finds/models_treatments.py:226 -#: archaeological_finds/models_treatments.py:760 +#: archaeological_finds/models_treatments.py:227 +#: archaeological_finds/models_treatments.py:761 #: archaeological_warehouse/forms.py:744 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 #: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:438 +#: archaeological_context_records/forms.py:430 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:443 +#: archaeological_context_records/forms.py:435 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:448 -#: archaeological_context_records/forms.py:470 -#: archaeological_context_records/models.py:165 +#: archaeological_context_records/forms.py:440 +#: archaeological_context_records/forms.py:462 +#: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1559 archaeological_finds/forms.py:1580 -#: archaeological_finds/models_finds.py:2094 +#: archaeological_finds/models_finds.py:2069 #: archaeological_finds/templates/ishtar/sheet_find.html:249 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:197 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -429,13 +421,13 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:455 +#: archaeological_context_records/forms.py:447 #: archaeological_context_records/models.py:109 -#: archaeological_context_records/models.py:530 +#: archaeological_context_records/models.py:522 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 -#: archaeological_operations/forms.py:841 +#: archaeological_operations/forms.py:834 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 @@ -451,17 +443,17 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:456 +#: archaeological_context_records/forms.py:448 #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:782 archaeological_files/models.py:76 -#: archaeological_files/models.py:730 +#: archaeological_files/models.py:731 #: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 -#: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3624 -#: archaeological_finds/models_treatments.py:264 -#: archaeological_finds/models_treatments.py:758 +#: archaeological_finds/forms_treatments.py:760 +#: archaeological_finds/models_finds.py:3598 +#: archaeological_finds/models_treatments.py:265 +#: archaeological_finds/models_treatments.py:759 #: archaeological_finds/templates/ishtar/sheet_find.html:395 #: archaeological_finds/templates/ishtar/sheet_find.html:433 #: archaeological_finds/templates/ishtar/sheet_find.html:471 @@ -469,10 +461,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:497 -#: archaeological_operations/forms.py:790 +#: archaeological_operations/forms.py:538 +#: archaeological_operations/forms.py:783 #: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3479 +#: archaeological_operations/models.py:1330 +#: archaeological_operations/models.py:3454 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -497,12 +490,12 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:457 +#: archaeological_context_records/forms.py:449 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:787 archaeological_files/models.py:77 -#: archaeological_files/models.py:731 archaeological_finds/forms.py:1569 -#: archaeological_finds/models_finds.py:3625 -#: archaeological_finds/models_treatments.py:759 +#: archaeological_files/models.py:732 archaeological_finds/forms.py:1569 +#: archaeological_finds/models_finds.py:3599 +#: archaeological_finds/models_treatments.py:760 #: archaeological_finds/templates/ishtar/sheet_find.html:396 #: archaeological_finds/templates/ishtar/sheet_find.html:434 #: archaeological_finds/templates/ishtar/sheet_find.html:472 @@ -513,7 +506,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:498 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:536 #: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3480 +#: archaeological_operations/models.py:3455 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -544,7 +537,7 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:458 +#: archaeological_context_records/forms.py:450 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 @@ -557,7 +550,7 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:459 +#: archaeological_context_records/forms.py:451 #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 @@ -571,7 +564,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:460 +#: archaeological_context_records/forms.py:452 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 @@ -579,27 +572,27 @@ msgstr "" msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:471 +#: archaeological_context_records/forms.py:463 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:483 +#: archaeological_context_records/forms.py:475 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:276 -#: archaeological_context_records/models.py:1522 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1516 #: archaeological_context_records/views.py:249 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 #: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 -#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:1147 -#: archaeological_finds/models_finds.py:2762 +#: archaeological_finds/forms.py:1799 archaeological_finds/models_finds.py:1147 +#: archaeological_finds/models_finds.py:2737 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:93 archaeological_operations/models.py:1704 #: archaeological_warehouse/forms.py:569 ishtar_common/forms_common.py:2535 #: ishtar_common/models.py:5601 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:501 +#: archaeological_context_records/forms.py:493 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 #: archaeological_operations/forms.py:477 #: archaeological_operations/templates/ishtar/sheet_operation.html:71 @@ -611,108 +604,108 @@ msgstr "" msgid "Relations" msgstr "" -#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:494 msgid "Context record - 050 - Relations" msgstr "" -#: archaeological_context_records/forms.py:508 -#: archaeological_context_records/forms.py:519 -#: archaeological_context_records/models.py:785 +#: archaeological_context_records/forms.py:500 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:779 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/forms.py:501 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:525 +#: archaeological_context_records/forms.py:517 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:526 -#: archaeological_context_records/models.py:790 +#: archaeological_context_records/forms.py:518 +#: archaeological_context_records/models.py:784 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:799 +#: archaeological_context_records/forms.py:519 +#: archaeological_context_records/models.py:793 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:528 -#: archaeological_context_records/models.py:805 +#: archaeological_context_records/forms.py:520 +#: archaeological_context_records/models.py:799 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/models.py:814 +#: archaeological_context_records/forms.py:521 +#: archaeological_context_records/models.py:808 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:531 -#: archaeological_operations/forms.py:1150 -#: archaeological_operations/forms.py:1365 -#: archaeological_operations/forms.py:1870 +#: archaeological_context_records/forms.py:523 +#: archaeological_operations/forms.py:1143 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/forms.py:1851 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:535 +#: archaeological_context_records/forms.py:527 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:548 -#: archaeological_operations/forms.py:624 -#: archaeological_operations/forms.py:637 +#: archaeological_context_records/forms.py:540 +#: archaeological_operations/forms.py:617 +#: archaeological_operations/forms.py:630 #: archaeological_operations/views.py:196 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/forms.py:545 #: archaeological_operations/forms.py:412 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:551 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:661 +#: archaeological_context_records/forms.py:653 #: archaeological_finds/forms.py:1371 archaeological_finds/forms.py:1396 -#: archaeological_operations/forms.py:1836 ishtar_common/forms_common.py:2725 +#: archaeological_operations/forms.py:1817 ishtar_common/forms_common.py:2725 #: ishtar_common/models.py:3570 ishtar_common/models.py:3944 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:691 +#: archaeological_context_records/forms.py:683 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:711 -#: archaeological_context_records/models.py:1283 -#: archaeological_context_records/models.py:1322 -#: archaeological_context_records/models.py:1390 +#: archaeological_context_records/forms.py:703 +#: archaeological_context_records/models.py:1277 +#: archaeological_context_records/models.py:1316 +#: archaeological_context_records/models.py:1384 #: archaeological_operations/forms.py:378 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:715 +#: archaeological_context_records/forms.py:707 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:193 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: archaeological_context_records/forms.py:740 +#: archaeological_context_records/forms.py:732 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:765 +#: archaeological_context_records/forms.py:757 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:784 +#: archaeological_context_records/forms.py:776 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -820,45 +813,35 @@ msgstr "" #: archaeological_context_records/models.py:139 msgctxt "key for text search" -msgid "datings-start-before" +msgid "datings-start" msgstr "" #: archaeological_context_records/models.py:143 msgctxt "key for text search" -msgid "datings-start-after" +msgid "datings-end" msgstr "" #: archaeological_context_records/models.py:147 msgctxt "key for text search" -msgid "datings-end-before" -msgstr "" - -#: archaeological_context_records/models.py:151 -msgctxt "key for text search" -msgid "datings-end-after" -msgstr "" - -#: archaeological_context_records/models.py:155 -msgctxt "key for text search" msgid "datings-type" msgstr "" -#: archaeological_context_records/models.py:159 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "" -#: archaeological_context_records/models.py:166 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "" -#: archaeological_context_records/models.py:282 +#: archaeological_context_records/models.py:274 #: archaeological_finds/forms.py:211 archaeological_finds/forms.py:615 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2347 +#: archaeological_finds/models_finds.py:2322 +#: archaeological_finds/models_finds.py:3560 #: archaeological_finds/models_finds.py:3586 -#: archaeological_finds/models_finds.py:3612 -#: archaeological_finds/models_treatments.py:740 +#: archaeological_finds/models_treatments.py:741 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: cd17_app/templates/ishtar/sheet_find.html:4 @@ -870,8 +853,8 @@ msgstr "" msgid "Find" msgstr "" -#: archaeological_context_records/models.py:307 -#: archaeological_context_records/models.py:330 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 #: archaeological_files/models.py:75 archaeological_files/models.py:105 #: archaeological_files/models.py:159 archaeological_files/models.py:175 #: archaeological_files/models.py:235 archaeological_finds/models_finds.py:106 @@ -880,202 +863,202 @@ msgstr "" #: archaeological_finds/models_finds.py:260 #: archaeological_finds/models_finds.py:336 #: archaeological_finds/models_finds.py:407 -#: archaeological_finds/models_finds.py:2030 +#: archaeological_finds/models_finds.py:2005 #: archaeological_finds/models_treatments.py:66 -#: archaeological_finds/models_treatments.py:752 +#: archaeological_finds/models_treatments.py:753 #: archaeological_operations/models.py:100 #: archaeological_operations/models.py:125 #: archaeological_operations/models.py:143 #: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3506 +#: archaeological_operations/models.py:3481 #: archaeological_warehouse/forms.py:109 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:713 #: ishtar_common/models.py:769 ishtar_common/models.py:820 #: ishtar_common/models.py:1868 ishtar_common/models.py:3953 #: ishtar_common/models.py:5374 ishtar_common/models_common.py:732 -#: ishtar_common/models_common.py:2106 ishtar_common/models_common.py:2142 -#: ishtar_common/models_common.py:2159 ishtar_common/models_common.py:2176 -#: ishtar_common/models_common.py:2189 ishtar_common/models_imports.py:474 +#: ishtar_common/models_common.py:2099 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:2152 ishtar_common/models_common.py:2169 +#: ishtar_common/models_common.py:2182 ishtar_common/models_imports.py:474 msgid "Order" msgstr "" -#: archaeological_context_records/models.py:310 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "" -#: archaeological_context_records/models.py:317 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "" -#: archaeological_context_records/models.py:318 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "" -#: archaeological_context_records/models.py:333 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "" -#: archaeological_context_records/models.py:334 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "" -#: archaeological_context_records/models.py:347 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "" -#: archaeological_context_records/models.py:348 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "" -#: archaeological_context_records/models.py:361 +#: archaeological_context_records/models.py:353 msgid "Excavation technique type" msgstr "" -#: archaeological_context_records/models.py:362 +#: archaeological_context_records/models.py:354 msgid "Excavation technique types" msgstr "" -#: archaeological_context_records/models.py:372 +#: archaeological_context_records/models.py:364 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "" -#: archaeological_context_records/models.py:373 +#: archaeological_context_records/models.py:365 msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:507 -#: archaeological_context_records/models.py:508 -#: archaeological_context_records/models.py:1395 +#: archaeological_context_records/models.py:499 +#: archaeological_context_records/models.py:500 +#: archaeological_context_records/models.py:1389 #: archaeological_finds/models_finds.py:1166 #: archaeological_finds/models_finds.py:1167 #: archaeological_operations/forms.py:537 -#: archaeological_operations/forms.py:1144 -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1359 +#: archaeological_operations/forms.py:1137 +#: archaeological_operations/forms.py:1234 +#: archaeological_operations/forms.py:1352 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:993 -#: archaeological_operations/models.py:1080 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:994 +#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1391 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:509 +#: archaeological_context_records/models.py:501 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:510 -#: archaeological_context_records/models.py:511 +#: archaeological_context_records/models.py:502 +#: archaeological_context_records/models.py:503 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:512 +#: archaeological_context_records/models.py:504 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:513 +#: archaeological_context_records/models.py:505 #: archaeological_finds/models_finds.py:1152 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:514 +#: archaeological_context_records/models.py:506 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:517 +#: archaeological_context_records/models.py:509 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:534 +#: archaeological_context_records/models.py:526 #: archaeological_finds/models_finds.py:1216 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:998 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:535 +#: archaeological_context_records/models.py:527 #: archaeological_finds/models_finds.py:1217 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:998 +#: archaeological_operations/models.py:999 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:569 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:572 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:490 archaeological_finds/models_finds.py:1308 -#: archaeological_operations/models.py:378 -#: archaeological_operations/models.py:1144 +#: archaeological_files/models.py:491 archaeological_finds/models_finds.py:1318 +#: archaeological_operations/models.py:379 +#: archaeological_operations/models.py:1138 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4447 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:581 ishtar_common/models.py:4407 +#: archaeological_context_records/models.py:575 ishtar_common/models.py:4407 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:584 -#: archaeological_finds/models_finds.py:1689 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:578 +#: archaeological_finds/models_finds.py:1676 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:588 -#: archaeological_operations/models.py:1140 -#: archaeological_operations/models.py:2699 +#: archaeological_context_records/models.py:582 +#: archaeological_operations/models.py:1134 +#: archaeological_operations/models.py:2678 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:592 -#: archaeological_finds/models_finds.py:1316 +#: archaeological_context_records/models.py:586 +#: archaeological_finds/models_finds.py:1326 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:596 -#: archaeological_context_records/models.py:667 -#: archaeological_finds/models_finds.py:1422 -#: archaeological_finds/models_finds.py:1941 -#: archaeological_operations/models.py:413 -#: archaeological_operations/models.py:440 ishtar_common/models.py:4398 +#: archaeological_context_records/models.py:590 +#: archaeological_context_records/models.py:661 +#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1916 +#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:441 ishtar_common/models.py:4398 #: ishtar_common/models.py:4521 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:600 -#: archaeological_context_records/models.py:670 -#: archaeological_finds/models_finds.py:1332 -#: archaeological_operations/models.py:1235 -#: archaeological_operations/models.py:1312 -#: archaeological_warehouse/models.py:988 ishtar_common/models.py:4439 +#: archaeological_context_records/models.py:594 +#: archaeological_context_records/models.py:664 +#: archaeological_finds/models_finds.py:1342 +#: archaeological_operations/models.py:1222 +#: archaeological_operations/models.py:1291 +#: archaeological_warehouse/models.py:989 ishtar_common/models.py:4439 #: ishtar_common/models.py:4530 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:605 +#: archaeological_context_records/models.py:599 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1359 +#: archaeological_finds/models_finds.py:1369 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:372 -#: archaeological_operations/models.py:1190 +#: archaeological_context_records/models.py:603 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1184 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1084,84 +1067,84 @@ msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:613 +#: archaeological_context_records/models.py:607 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:616 +#: archaeological_context_records/models.py:610 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:619 +#: archaeological_context_records/models.py:613 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:623 -#: archaeological_files/models.py:493 archaeological_operations/models.py:1150 -#: archaeological_operations/models.py:2717 +#: archaeological_context_records/models.py:617 +#: archaeological_files/models.py:494 archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:2696 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:627 -#: archaeological_operations/models.py:1263 +#: archaeological_context_records/models.py:621 +#: archaeological_operations/models.py:1246 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:630 +#: archaeological_context_records/models.py:624 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:634 +#: archaeological_context_records/models.py:628 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1657 -#: archaeological_operations/models.py:429 +#: archaeological_context_records/models.py:632 +#: archaeological_finds/models_finds.py:1644 +#: archaeological_operations/models.py:430 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_context_records/models.py:685 -#: archaeological_finds/models_finds.py:1900 -#: archaeological_operations/models.py:459 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:679 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_operations/models.py:460 +#: archaeological_operations/models.py:1274 #: archaeological_warehouse/models.py:385 -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:692 -#: archaeological_finds/models_finds.py:1893 -#: archaeological_operations/models.py:466 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:686 +#: archaeological_finds/models_finds.py:1868 +#: archaeological_operations/models.py:467 +#: archaeological_operations/models.py:1267 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1104 ishtar_common/models.py:2644 +#: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2644 #: ishtar_common/models.py:2925 ishtar_common/models.py:4547 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:702 -#: archaeological_context_records/models.py:1063 +#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:1057 #: archaeological_context_records/views.py:273 #: archaeological_context_records/views.py:288 #: archaeological_finds/models_finds.py:923 -#: archaeological_finds/models_finds.py:1910 -#: archaeological_finds/models_finds.py:2664 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:1885 +#: archaeological_finds/models_finds.py:2639 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:484 -#: archaeological_operations/models.py:664 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2024 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:485 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:2003 #: archaeological_operations/views.py:904 #: archaeological_operations/views.py:919 #: archaeological_operations/views.py:926 @@ -1172,73 +1155,73 @@ msgstr "" msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:719 -#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:2024 -#: archaeological_finds/models_treatments.py:259 -#: archaeological_operations/models.py:3170 +#: archaeological_context_records/models.py:713 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:551 +#: archaeological_finds/models_finds.py:1999 +#: archaeological_finds/models_treatments.py:260 +#: archaeological_operations/models.py:3145 #: archaeological_warehouse/models.py:439 -#: archaeological_warehouse/models.py:1186 ishtar_common/models.py:4582 +#: archaeological_warehouse/models.py:1187 ishtar_common/models.py:4582 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:553 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_operations/models.py:3173 +#: archaeological_context_records/models.py:715 +#: archaeological_files/models.py:566 archaeological_finds/models_finds.py:553 +#: archaeological_finds/models_finds.py:2001 +#: archaeological_operations/models.py:3148 #: archaeological_warehouse/models.py:441 -#: archaeological_warehouse/models.py:1188 +#: archaeological_warehouse/models.py:1189 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:766 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3383 +#: archaeological_context_records/models.py:760 +#: archaeological_operations/models.py:1383 ishtar_common/models_common.py:3372 msgid "Surface (m2)" msgstr "" -#: archaeological_context_records/models.py:771 +#: archaeological_context_records/models.py:765 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:775 +#: archaeological_context_records/models.py:769 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:794 +#: archaeological_context_records/models.py:788 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:802 +#: archaeological_context_records/models.py:796 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:809 +#: archaeological_context_records/models.py:803 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:817 +#: archaeological_context_records/models.py:811 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:845 +#: archaeological_context_records/models.py:839 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:751 archaeological_finds/models_finds.py:2301 -#: archaeological_finds/models_treatments.py:279 -#: archaeological_finds/models_treatments.py:1162 +#: archaeological_files/models.py:752 archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_treatments.py:280 +#: archaeological_finds/models_treatments.py:1158 #: archaeological_finds/templates/ishtar/sheet_find.html:65 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:65 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:534 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2917 +#: archaeological_operations/models.py:535 +#: archaeological_operations/models.py:1457 +#: archaeological_operations/models.py:2892 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 #: archaeological_operations/templates/ishtar/sheet_site.html:95 #: archaeological_warehouse/models.py:428 -#: archaeological_warehouse/models.py:1193 +#: archaeological_warehouse/models.py:1194 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:200 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 @@ -1247,7 +1230,7 @@ msgstr "" #: ishtar_common/models.py:4076 ishtar_common/models.py:4105 #: ishtar_common/models.py:4119 ishtar_common/models.py:4133 #: ishtar_common/models.py:4145 ishtar_common/models.py:4722 -#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3411 +#: ishtar_common/models.py:4733 ishtar_common/models_common.py:3400 #: 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 @@ -1263,129 +1246,129 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:852 -#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:2307 -#: archaeological_finds/models_treatments.py:285 -#: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:540 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2924 +#: archaeological_context_records/models.py:846 +#: archaeological_files/models.py:758 archaeological_finds/models_finds.py:2282 +#: archaeological_finds/models_treatments.py:286 +#: archaeological_finds/models_treatments.py:1165 +#: archaeological_operations/models.py:541 +#: archaeological_operations/models.py:1463 +#: archaeological_operations/models.py:2899 #: archaeological_warehouse/models.py:435 -#: archaeological_warehouse/models.py:1200 ishtar_common/models.py:2427 -#: ishtar_common/models_common.py:3417 +#: archaeological_warehouse/models.py:1201 ishtar_common/models.py:2427 +#: ishtar_common/models_common.py:3406 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:857 -#: archaeological_finds/models_finds.py:2319 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:851 +#: archaeological_finds/models_finds.py:2294 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:1554 msgid "Cached periods label" msgstr "" +#: archaeological_context_records/models.py:854 #: archaeological_context_records/models.py:860 -#: archaeological_context_records/models.py:866 -#: archaeological_finds/models_finds.py:2322 -#: archaeological_finds/models_finds.py:2328 -#: archaeological_finds/models_finds.py:2334 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:560 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 -#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4373 +#: archaeological_finds/models_finds.py:2297 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:561 +#: archaeological_operations/models.py:1545 +#: archaeological_operations/models.py:1551 +#: archaeological_operations/models.py:1557 +#: archaeological_operations/models.py:1563 +#: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4364 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:863 +#: archaeological_context_records/models.py:857 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:870 -#: archaeological_context_records/models.py:871 +#: archaeological_context_records/models.py:864 +#: archaeological_context_records/models.py:865 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:564 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:892 +#: archaeological_context_records/models.py:886 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:927 -#: archaeological_finds/models_finds.py:2536 +#: archaeological_context_records/models.py:921 +#: archaeological_finds/models_finds.py:2511 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1051 +#: archaeological_context_records/models.py:1045 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1053 +#: archaeological_context_records/models.py:1047 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1237 +#: archaeological_context_records/models.py:1231 #: archaeological_finds/models_finds.py:623 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1284 +#: archaeological_context_records/models.py:1278 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1317 +#: archaeological_context_records/models.py:1311 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1318 +#: archaeological_context_records/models.py:1312 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1319 +#: archaeological_context_records/models.py:1313 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1320 +#: archaeological_context_records/models.py:1314 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1321 +#: archaeological_context_records/models.py:1315 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1323 +#: archaeological_context_records/models.py:1317 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1324 +#: archaeological_context_records/models.py:1318 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1325 +#: archaeological_context_records/models.py:1319 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1326 +#: archaeological_context_records/models.py:1320 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1327 +#: archaeological_context_records/models.py:1321 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1336 +#: archaeological_context_records/models.py:1330 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1337 +#: archaeological_context_records/models.py:1331 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/models.py:1522 msgid "Context record parent" msgstr "" @@ -1440,7 +1423,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 -#: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 +#: archaeological_finds/forms.py:2247 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 #: archaeological_finds/models_finds.py:240 @@ -1459,9 +1442,9 @@ msgstr "" #: archaeological_finds/models_finds.py:633 #: archaeological_finds/models_finds.py:872 #: archaeological_finds/models_finds.py:936 -#: archaeological_finds/models_finds.py:2348 -#: archaeological_finds/models_finds.py:2359 -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:2323 +#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:3607 #: 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 @@ -1532,7 +1515,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 #: cd17_app/templates/ishtar/sheet_find.html:160 -#: ishtar_common/models_common.py:4376 +#: ishtar_common/models_common.py:4367 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_container.html:90 #: na_app/templates/ishtar/sheet_find.html:164 @@ -1616,7 +1599,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 -#: archaeological_finds/models_treatments.py:219 +#: archaeological_finds/models_treatments.py:220 #: archaeological_finds/templates/ishtar/sheet_find.html:391 #: archaeological_finds/templates/ishtar/sheet_find.html:429 #: archaeological_finds/templates/ishtar/sheet_find.html:467 @@ -1628,8 +1611,8 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:431 #: cd17_app/templates/ishtar/sheet_find.html:469 ishtar_common/models.py:3645 #: ishtar_common/models.py:5493 ishtar_common/models.py:5630 -#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2035 -#: ishtar_common/models_common.py:2050 ishtar_common/models_imports.py:1562 +#: ishtar_common/models.py:5709 ishtar_common/models_common.py:2028 +#: ishtar_common/models_common.py:2043 ishtar_common/models_imports.py:1562 #: ishtar_common/models_imports.py:1962 #: man_app/templates/ishtar/sheet_museum_find.html:426 #: man_app/templates/ishtar/sheet_museum_find.html:464 @@ -1722,7 +1705,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:255 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:1981 msgid "Add context record" msgstr "" @@ -1757,28 +1740,28 @@ msgstr "" #: archaeological_files/forms.py:90 archaeological_files/forms.py:210 #: archaeological_files/forms.py:237 archaeological_files/forms.py:663 #: archaeological_files/forms.py:1118 archaeological_files/forms.py:1154 -#: archaeological_files/models.py:403 archaeological_files/models.py:554 +#: archaeological_files/models.py:403 archaeological_files/models.py:555 #: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_finds/forms.py:1746 +#: archaeological_finds/forms.py:1733 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:427 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:644 -#: archaeological_finds/forms_treatments.py:726 -#: archaeological_finds/forms_treatments.py:840 +#: archaeological_finds/forms_treatments.py:716 +#: archaeological_finds/forms_treatments.py:830 #: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_treatments.py:204 -#: archaeological_finds/models_treatments.py:1106 +#: archaeological_finds/models_treatments.py:205 +#: archaeological_finds/models_treatments.py:1102 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 -#: archaeological_operations/forms.py:735 -#: archaeological_operations/forms.py:1451 -#: archaeological_operations/forms.py:1768 -#: archaeological_operations/models.py:989 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2667 -#: archaeological_operations/models.py:2896 -#: archaeological_operations/models.py:3160 +#: archaeological_operations/forms.py:728 +#: archaeological_operations/forms.py:1444 +#: archaeological_operations/forms.py:1749 +#: archaeological_operations/models.py:990 +#: archaeological_operations/models.py:1367 +#: archaeological_operations/models.py:2646 +#: archaeological_operations/models.py:2871 +#: archaeological_operations/models.py:3135 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 @@ -1786,27 +1769,27 @@ msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 -#: archaeological_files/forms.py:669 archaeological_files/models.py:556 +#: archaeological_files/forms.py:669 archaeological_files/models.py:557 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1120 -#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1141 -#: archaeological_operations/forms.py:1239 -#: archaeological_operations/forms.py:1356 -#: archaeological_operations/forms.py:1453 -#: archaeological_operations/forms.py:1530 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:2899 +#: archaeological_files/forms.py:1156 archaeological_operations/forms.py:1134 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/forms.py:1446 +#: archaeological_operations/forms.py:1511 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:2874 msgid "Other reference" msgstr "" #: archaeological_files/forms.py:97 archaeological_files/forms.py:1126 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:1391 +#: archaeological_files/forms.py:1163 archaeological_files/models.py:1392 #: archaeological_operations/forms.py:506 -#: archaeological_operations/forms.py:1464 -#: archaeological_operations/models.py:2539 ishtar_common/models_common.py:2058 -#: ishtar_common/models_common.py:3391 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/models.py:2518 ishtar_common/models_common.py:2051 +#: ishtar_common/models_common.py:3380 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1817,7 +1800,7 @@ msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:208 #: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:569 msgid "File type" msgstr "" @@ -1832,41 +1815,41 @@ msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:265 #: archaeological_files/forms.py:529 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:617 +#: archaeological_files/models.py:408 archaeological_files/models.py:618 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:104 archaeological_files/forms.py:467 -#: archaeological_files/forms.py:531 archaeological_files/models.py:622 +#: archaeological_files/forms.py:531 archaeological_files/models.py:623 #: archaeological_files/templates/ishtar/sheet_file.html:131 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:660 -#: archaeological_files/models.py:670 archaeological_finds/forms.py:799 +#: archaeological_files/models.py:671 archaeological_finds/forms.py:799 #: archaeological_finds/forms.py:1136 archaeological_finds/forms.py:1425 -#: archaeological_finds/forms.py:2585 +#: archaeological_finds/forms.py:2501 #: archaeological_finds/forms_treatments.py:195 -#: archaeological_finds/forms_treatments.py:765 -#: archaeological_finds/models_treatments.py:261 -#: archaeological_finds/models_treatments.py:1158 -#: archaeological_operations/forms.py:544 -#: archaeological_operations/forms.py:749 -#: archaeological_operations/forms.py:1247 -#: archaeological_operations/forms.py:1370 -#: archaeological_operations/forms.py:1467 -#: archaeological_operations/forms.py:1529 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2913 +#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/models_treatments.py:262 +#: archaeological_finds/models_treatments.py:1154 +#: archaeological_operations/forms.py:542 +#: archaeological_operations/forms.py:742 +#: archaeological_operations/forms.py:1240 +#: archaeological_operations/forms.py:1363 +#: archaeological_operations/forms.py:1460 +#: archaeological_operations/forms.py:1510 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1452 +#: archaeological_operations/models.py:2888 #: archaeological_warehouse/forms.py:232 archaeological_warehouse/forms.py:382 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:418 -#: archaeological_warehouse/models.py:1159 ishtar_common/forms_common.py:2169 +#: archaeological_warehouse/models.py:1160 ishtar_common/forms_common.py:2169 #: ishtar_common/forms_common.py:2492 ishtar_common/forms_common.py:3066 #: ishtar_common/models.py:2963 ishtar_common/models.py:3837 #: ishtar_common/models.py:4698 ishtar_common/models_common.py:185 -#: ishtar_common/models_common.py:2286 ishtar_common/models_imports.py:890 +#: ishtar_common/models_common.py:2279 ishtar_common/models_imports.py:890 #: 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 @@ -1882,7 +1865,7 @@ msgstr "" #: archaeological_files/forms.py:117 archaeological_files/forms.py:348 #: archaeological_files/forms.py:358 archaeological_files/forms.py:501 -#: archaeological_files/forms.py:1175 archaeological_files/models.py:580 +#: archaeological_files/forms.py:1175 archaeological_files/models.py:581 msgid "General contractor" msgstr "" @@ -1891,16 +1874,14 @@ msgid "Organization of general contractor" msgstr "" #: archaeological_files/forms.py:138 archaeological_files/forms.py:1216 -#: archaeological_operations/forms.py:559 -#: archaeological_operations/forms.py:1469 ishtar_common/forms.py:955 +#: archaeological_operations/forms.py:557 ishtar_common/forms.py:955 msgid "Created by" msgstr "" #: archaeological_files/forms.py:146 archaeological_files/forms.py:1224 #: archaeological_finds/forms_treatments.py:585 -#: archaeological_finds/forms_treatments.py:864 -#: archaeological_operations/forms.py:565 -#: archaeological_operations/forms.py:1475 +#: archaeological_finds/forms_treatments.py:854 +#: archaeological_operations/forms.py:563 msgid "Modified by" msgstr "" @@ -1912,10 +1893,10 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:637 +#: archaeological_files/forms.py:218 archaeological_files/models.py:638 #: archaeological_files/templates/ishtar/sheet_file.html:63 -#: archaeological_finds/models_treatments.py:1146 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2164 +#: archaeological_finds/models_treatments.py:1142 +#: archaeological_operations/models.py:1328 ishtar_common/forms_common.py:2164 #: ishtar_common/forms_common.py:2669 ishtar_common/models.py:4683 #: ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 @@ -1923,9 +1904,9 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:221 archaeological_files/forms.py:547 -#: archaeological_files/models.py:639 -#: archaeological_finds/forms_treatments.py:768 -#: archaeological_finds/models_treatments.py:1148 +#: archaeological_files/models.py:640 +#: archaeological_finds/forms_treatments.py:758 +#: archaeological_finds/models_treatments.py:1144 #: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 @@ -1961,22 +1942,22 @@ msgid "Planning name" msgstr "" #: archaeological_files/forms.py:289 archaeological_files/forms.py:333 -#: archaeological_files/models.py:470 archaeological_files/models.py:634 -#: archaeological_operations/forms.py:729 -#: archaeological_operations/forms.py:1054 -#: archaeological_operations/forms.py:1070 -#: archaeological_operations/forms.py:1075 -#: archaeological_operations/forms.py:1406 +#: archaeological_files/models.py:471 archaeological_files/models.py:635 +#: archaeological_operations/forms.py:722 +#: archaeological_operations/forms.py:1047 +#: archaeological_operations/forms.py:1063 +#: archaeological_operations/forms.py:1068 +#: archaeological_operations/forms.py:1399 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1077 -#: archaeological_operations/models.py:1079 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2908 +#: archaeological_operations/models.py:504 +#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1388 +#: archaeological_operations/models.py:2883 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1795 ishtar_common/forms_common.py:1809 #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 -#: ishtar_common/models_common.py:3425 +#: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:132 #: na_app/templates/ishtar/sheet_operation.html:146 @@ -1985,8 +1966,8 @@ msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 -#: archaeological_files/models.py:673 archaeological_operations/models.py:2902 -#: ishtar_common/models_common.py:2059 +#: archaeological_files/models.py:674 archaeological_operations/models.py:2877 +#: ishtar_common/models_common.py:2052 msgid "Departments" msgstr "" @@ -1995,7 +1976,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:338 -#: archaeological_files/models.py:665 +#: archaeological_files/models.py:666 msgid "Locality" msgstr "" @@ -2009,7 +1990,7 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:770 -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3667 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:3656 msgid "Postal code" msgstr "" @@ -2018,7 +1999,7 @@ msgid "Surfaces" msgstr "" #: archaeological_files/forms.py:316 archaeological_files/forms.py:537 -#: archaeological_files/forms.py:808 archaeological_files/models.py:663 +#: archaeological_files/forms.py:808 archaeological_files/models.py:664 msgid "Total developed surface (m2)" msgstr "" @@ -2026,7 +2007,7 @@ msgstr "" #: 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:766 ishtar_common/forms_common.py:1174 -#: ishtar_common/models_common.py:3662 ishtar_common/models_common.py:3848 +#: ishtar_common/models_common.py:3651 ishtar_common/models_common.py:3837 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2060,7 +2041,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:470 archaeological_files/models.py:641 +#: archaeological_files/forms.py:470 archaeological_files/models.py:642 msgid "Date of planning service file" msgstr "" @@ -2073,7 +2054,7 @@ msgstr "" msgid "Preventive informations" msgstr "" -#: archaeological_files/forms.py:515 archaeological_files/models.py:601 +#: archaeological_files/forms.py:515 archaeological_files/models.py:602 msgid "Responsible for planning service" msgstr "" @@ -2086,12 +2067,12 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:592 archaeological_files/models.py:697 +#: archaeological_files/forms.py:592 archaeological_files/models.py:698 #: archaeological_operations/forms.py:525 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:595 archaeological_files/models.py:681 +#: archaeological_files/forms.py:595 archaeological_files/models.py:682 msgid "Requested operation type" msgstr "" @@ -2099,16 +2080,16 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:612 archaeological_files/models.py:700 +#: archaeological_files/forms.py:612 archaeological_files/models.py:701 #: archaeological_files/templates/ishtar/sheet_file.html:170 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:621 archaeological_files/models.py:703 +#: archaeological_files/forms.py:621 archaeological_files/models.py:704 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:622 archaeological_files/models.py:705 +#: archaeological_files/forms.py:622 archaeological_files/models.py:706 msgid "Protected area" msgstr "" @@ -2125,11 +2106,11 @@ msgstr "" msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:653 archaeological_files/models.py:645 +#: archaeological_files/forms.py:653 archaeological_files/models.py:646 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:661 archaeological_files/models.py:659 +#: archaeological_files/forms.py:661 archaeological_files/models.py:660 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" @@ -2159,27 +2140,27 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:767 archaeological_files/models.py:722 +#: archaeological_files/forms.py:767 archaeological_files/models.py:723 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:772 archaeological_files/models.py:725 +#: archaeological_files/forms.py:772 archaeological_files/models.py:726 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:777 archaeological_files/models.py:728 +#: archaeological_files/forms.py:777 archaeological_files/models.py:729 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:792 archaeological_files/models.py:732 +#: archaeological_files/forms.py:792 archaeological_files/models.py:733 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:797 archaeological_files/models.py:733 +#: archaeological_files/forms.py:797 archaeological_files/models.py:734 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:802 archaeological_files/models.py:735 +#: archaeological_files/forms.py:802 archaeological_files/models.py:736 msgid "Execution report date" msgstr "" @@ -2204,7 +2185,7 @@ msgid "Days" msgstr "" #: archaeological_files/forms.py:889 archaeological_files/models.py:116 -#: archaeological_files/models.py:1433 archaeological_files/models.py:1452 +#: archaeological_files/models.py:1434 archaeological_files/models.py:1453 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_files/templates/ishtar/sheet_file.html:336 msgid "Job" @@ -2212,7 +2193,7 @@ msgstr "" #: archaeological_files/forms.py:910 archaeological_files/models.py:80 #: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:718 +#: archaeological_files/models.py:206 archaeological_files/models.py:719 msgid "Price agreement" msgstr "" @@ -2251,18 +2232,18 @@ msgstr "" #: archaeological_finds/forms_treatments.py:566 #: archaeological_finds/forms_treatments.py:628 #: archaeological_finds/forms_treatments.py:645 -#: archaeological_finds/forms_treatments.py:799 -#: archaeological_finds/forms_treatments.py:841 -#: archaeological_finds/forms_treatments.py:908 -#: archaeological_finds/models_treatments.py:205 -#: archaeological_finds/models_treatments.py:1107 +#: archaeological_finds/forms_treatments.py:789 +#: archaeological_finds/forms_treatments.py:831 +#: archaeological_finds/forms_treatments.py:898 +#: archaeological_finds/models_treatments.py:206 +#: archaeological_finds/models_treatments.py:1103 #: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 -#: archaeological_operations/forms.py:1452 -#: archaeological_operations/forms.py:1585 -#: archaeological_operations/models.py:2838 +#: archaeological_operations/forms.py:1445 +#: archaeological_operations/forms.py:1566 +#: archaeological_operations/models.py:2813 #: archaeological_warehouse/forms.py:459 archaeological_warehouse/forms.py:519 -#: archaeological_warehouse/models.py:1174 +#: archaeological_warehouse/models.py:1175 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 #: ishtar_common/models.py:4581 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -2276,12 +2257,12 @@ msgstr "" #: archaeological_files/forms.py:1279 #: archaeological_finds/forms_treatments.py:567 #: archaeological_finds/forms_treatments.py:617 -#: archaeological_finds/forms_treatments.py:842 -#: archaeological_finds/forms_treatments.py:897 -#: archaeological_operations/forms.py:1458 -#: archaeological_operations/forms.py:1519 -#: archaeological_operations/models.py:2569 -#: archaeological_operations/models.py:2828 +#: archaeological_finds/forms_treatments.py:832 +#: archaeological_finds/forms_treatments.py:887 +#: archaeological_operations/forms.py:1451 +#: archaeological_operations/forms.py:1500 +#: archaeological_operations/models.py:2548 +#: archaeological_operations/models.py:2803 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" @@ -2292,31 +2273,31 @@ msgstr "" #: archaeological_files/forms.py:1158 #: archaeological_finds/forms_treatments.py:568 -#: archaeological_finds/forms_treatments.py:843 -#: archaeological_operations/forms.py:1459 -#: archaeological_operations/forms.py:1655 +#: archaeological_finds/forms_treatments.py:833 +#: archaeological_operations/forms.py:1452 +#: archaeological_operations/forms.py:1636 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1165 #: archaeological_finds/forms_treatments.py:569 -#: archaeological_finds/forms_treatments.py:844 -#: archaeological_operations/forms.py:1465 -#: archaeological_operations/forms.py:1526 -#: archaeological_operations/models.py:2897 +#: archaeological_finds/forms_treatments.py:834 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1507 +#: archaeological_operations/models.py:2872 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" #: archaeological_files/forms.py:1168 #: archaeological_finds/forms_treatments.py:575 -#: archaeological_finds/forms_treatments.py:850 +#: archaeological_finds/forms_treatments.py:840 msgid "Signature date before" msgstr "" #: archaeological_files/forms.py:1171 #: archaeological_finds/forms_treatments.py:573 -#: archaeological_finds/forms_treatments.py:848 +#: archaeological_finds/forms_treatments.py:838 msgid "Signature date after" msgstr "" @@ -2344,15 +2325,15 @@ msgstr "" msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:781 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:782 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 -#: archaeological_operations/forms.py:681 -#: archaeological_operations/forms.py:953 -#: archaeological_operations/models.py:2033 -#: archaeological_operations/models.py:2552 -#: archaeological_operations/models.py:2668 -#: archaeological_operations/models.py:2876 +#: archaeological_operations/forms.py:674 +#: archaeological_operations/forms.py:946 +#: archaeological_operations/models.py:2012 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2647 +#: archaeological_operations/models.py:2851 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "" @@ -2365,10 +2346,10 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3615 +#: archaeological_finds/models_finds.py:3589 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2933 +#: archaeological_operations/models.py:1699 +#: archaeological_operations/models.py:2908 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2376,8 +2357,8 @@ msgstr "" #: archaeological_files/models.py:88 archaeological_files/models.py:123 #: archaeological_files/models.py:168 archaeological_files/models.py:184 #: archaeological_files/models.py:254 archaeological_files/models.py:349 -#: archaeological_files/models.py:369 archaeological_files/models.py:1439 -#: archaeological_files/models.py:1458 archaeological_files/models.py:1485 +#: archaeological_files/models.py:369 archaeological_files/models.py:1440 +#: archaeological_files/models.py:1459 archaeological_files/models.py:1486 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5432 @@ -2576,7 +2557,7 @@ msgstr "" #: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1199 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:990 ishtar_common/admin.py:1420 +#: archaeological_operations/models.py:991 ishtar_common/admin.py:1420 #: ishtar_common/forms_common.py:2568 ishtar_common/models.py:2433 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" @@ -2584,7 +2565,7 @@ msgstr "" #: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1202 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:991 +#: archaeological_operations/models.py:992 msgid "Extended area" msgstr "" @@ -2596,7 +2577,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: ishtar_common/models.py:1992 ishtar_common/models_common.py:786 -#: ishtar_common/models_common.py:2031 ishtar_common/models_common.py:2047 +#: ishtar_common/models_common.py:2024 ishtar_common/models_common.py:2040 #: ishtar_common/templates/ishtar/sheet_person.html:30 #: na_app/templates/ishtar/sheet_operation.html:514 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -2621,41 +2602,41 @@ msgstr "" msgid "Total developed surface (km2)" msgstr "" -#: archaeological_files/models.py:481 archaeological_finds/models_finds.py:1312 +#: archaeological_files/models.py:482 archaeological_finds/models_finds.py:1322 #: archaeological_finds/models_treatments.py:158 -#: archaeological_finds/models_treatments.py:1059 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1131 -#: archaeological_operations/models.py:2692 +#: archaeological_finds/models_treatments.py:1066 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1125 +#: archaeological_operations/models.py:2671 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:483 -#: archaeological_finds/models_treatments.py:1056 -#: archaeological_operations/models.py:362 -#: archaeological_warehouse/models.py:958 ishtar_common/models.py:4317 +#: archaeological_files/models.py:484 +#: archaeological_finds/models_treatments.py:1063 +#: archaeological_operations/models.py:363 +#: archaeological_warehouse/models.py:959 ishtar_common/models.py:4317 msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:486 +#: archaeological_files/models.py:487 #: archaeological_finds/models_treatments.py:155 -#: archaeological_operations/models.py:368 +#: archaeological_operations/models.py:369 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:498 archaeological_operations/models.py:1155 +#: archaeological_files/models.py:499 archaeological_operations/models.py:1149 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:502 -#: archaeological_finds/models_treatments.py:1053 -#: archaeological_operations/models.py:365 -#: archaeological_operations/models.py:1159 +#: archaeological_files/models.py:503 +#: archaeological_finds/models_treatments.py:1060 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:1153 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2626 #: ishtar_common/models.py:2888 ishtar_common/models.py:3694 @@ -2663,85 +2644,85 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:505 +#: archaeological_files/models.py:506 #: archaeological_finds/models_treatments.py:161 -#: archaeological_finds/models_treatments.py:1062 -#: archaeological_operations/models.py:1165 -#: archaeological_operations/models.py:2703 +#: archaeological_finds/models_treatments.py:1069 +#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:2682 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 -#: archaeological_warehouse/models.py:954 ishtar_common/models.py:2629 +#: archaeological_warehouse/models.py:955 ishtar_common/models.py:2629 #: ishtar_common/models.py:2904 ishtar_common/models.py:3705 #: ishtar_common/models.py:4313 msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:508 +#: archaeological_files/models.py:509 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:511 +#: archaeological_files/models.py:512 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:517 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:522 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:525 archaeological_finds/models_finds.py:1518 -#: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:1210 -#: archaeological_operations/models.py:2813 -#: archaeological_warehouse/models.py:971 ishtar_common/models.py:4388 +#: archaeological_files/models.py:526 archaeological_finds/models_finds.py:1520 +#: archaeological_operations/models.py:385 +#: archaeological_operations/models.py:1197 +#: archaeological_operations/models.py:2788 +#: archaeological_warehouse/models.py:972 ishtar_common/models.py:4388 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_files/models.py:528 archaeological_finds/models_finds.py:1677 -#: archaeological_finds/models_treatments.py:1065 +#: archaeological_files/models.py:529 archaeological_finds/models_finds.py:1664 +#: archaeological_finds/models_treatments.py:1072 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:532 archaeological_operations/models.py:2748 +#: archaeological_files/models.py:533 archaeological_operations/models.py:2723 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2752 +#: archaeological_files/models.py:538 archaeological_operations/models.py:2727 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:559 -#: archaeological_finds/models_treatments.py:1109 +#: archaeological_files/models.py:560 +#: archaeological_finds/models_treatments.py:1105 #: ishtar_common/forms_common.py:2156 ishtar_common/forms_common.py:2446 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:567 +#: archaeological_files/models.py:568 #: archaeological_finds/forms_treatments.py:642 -#: archaeological_finds/forms_treatments.py:724 -#: archaeological_finds/models_treatments.py:1114 +#: archaeological_finds/forms_treatments.py:714 +#: archaeological_finds/models_treatments.py:1110 #: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 -#: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1355 -#: archaeological_operations/forms.py:1824 -#: archaeological_operations/models.py:494 +#: archaeological_operations/forms.py:1133 +#: archaeological_operations/forms.py:1231 +#: archaeological_operations/forms.py:1348 +#: archaeological_operations/forms.py:1805 +#: archaeological_operations/models.py:495 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:206 @@ -2756,8 +2737,8 @@ msgstr "" #: ishtar_common/models.py:2078 ishtar_common/models.py:2654 #: ishtar_common/models.py:2958 ishtar_common/models.py:3502 #: ishtar_common/models.py:3639 ishtar_common/models.py:5468 -#: ishtar_common/models_common.py:2254 ishtar_common/models_common.py:3382 -#: ishtar_common/models_common.py:3443 ishtar_common/models_imports.py:127 +#: ishtar_common/models_common.py:2247 ishtar_common/models_common.py:3371 +#: ishtar_common/models_common.py:3432 ishtar_common/models_imports.py:127 #: ishtar_common/models_imports.py:157 ishtar_common/models_imports.py:436 #: ishtar_common/models_imports.py:806 ishtar_common/models_imports.py:824 #: ishtar_common/models_imports.py:947 ishtar_common/models_imports.py:1387 @@ -2784,8 +2765,8 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:572 -#: archaeological_finds/models_treatments.py:1123 +#: archaeological_files/models.py:573 +#: archaeological_finds/models_treatments.py:1119 #: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 @@ -2797,38 +2778,38 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:586 +#: archaeological_files/models.py:587 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:592 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:605 +#: archaeological_files/models.py:606 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:612 +#: archaeological_files/models.py:613 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:627 +#: archaeological_files/models.py:628 msgid "Main town" msgstr "" -#: archaeological_files/models.py:666 +#: archaeological_files/models.py:667 msgid "Main address" msgstr "" -#: archaeological_files/models.py:668 +#: archaeological_files/models.py:669 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:687 +#: archaeological_files/models.py:688 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:439 -#: archaeological_finds/models_treatments.py:252 +#: archaeological_finds/models_treatments.py:253 #: archaeological_warehouse/forms.py:212 archaeological_warehouse/models.py:415 #: ishtar_common/forms_common.py:748 ishtar_common/forms_common.py:1022 #: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1246 @@ -2841,128 +2822,128 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:737 +#: archaeological_files/models.py:738 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:741 +#: archaeological_files/models.py:742 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:747 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:762 +#: archaeological_files/models.py:763 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:782 +#: archaeological_files/models.py:783 #: ishtar_common/templates/ishtar/sheet_town.html:109 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:809 +#: archaeological_files/models.py:810 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1062 +#: archaeological_files/models.py:1063 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1068 +#: archaeological_files/models.py:1069 msgid "No town" msgstr "" -#: archaeological_files/models.py:1277 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1278 archaeological_operations/models.py:1959 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1279 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1280 archaeological_operations/models.py:1961 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1289 +#: archaeological_files/models.py:1290 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1291 +#: archaeological_files/models.py:1292 msgid "plan" msgstr "" -#: archaeological_files/models.py:1300 -#: archaeological_finds/models_treatments.py:409 -#: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:2013 +#: archaeological_files/models.py:1301 +#: archaeological_finds/models_treatments.py:410 +#: archaeological_finds/models_treatments.py:1226 +#: archaeological_operations/models.py:1992 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1302 -#: archaeological_finds/models_treatments.py:411 -#: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:2015 +#: archaeological_files/models.py:1303 +#: archaeological_finds/models_treatments.py:412 +#: archaeological_finds/models_treatments.py:1228 +#: archaeological_operations/models.py:1994 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1311 +#: archaeological_files/models.py:1312 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1313 +#: archaeological_files/models.py:1314 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1388 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3147 +#: archaeological_files/models.py:1389 archaeological_operations/models.py:1372 +#: archaeological_operations/models.py:3122 msgid "File" msgstr "" -#: archaeological_files/models.py:1407 +#: archaeological_files/models.py:1408 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1409 archaeological_files/models.py:1475 +#: archaeological_files/models.py:1410 archaeological_files/models.py:1476 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1411 +#: archaeological_files/models.py:1412 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1413 archaeological_files/models.py:1479 +#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1437 +#: archaeological_files/models.py:1438 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1438 +#: archaeological_files/models.py:1439 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1456 +#: archaeological_files/models.py:1457 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1457 +#: archaeological_files/models.py:1458 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1473 +#: archaeological_files/models.py:1474 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1477 +#: archaeological_files/models.py:1478 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1483 +#: archaeological_files/models.py:1484 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1484 +#: archaeological_files/models.py:1485 msgid "Equipment requirements" msgstr "" @@ -3046,7 +3027,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:147 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 -#: archaeological_operations/models.py:2934 +#: archaeological_operations/models.py:2909 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3064,8 +3045,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:187 #: archaeological_files/templates/ishtar/sheet_file.html:214 -#: archaeological_operations/models.py:2666 -#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2645 +#: archaeological_operations/models.py:2944 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:516 archaeological_warehouse/models.py:737 @@ -3077,7 +3058,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 -#: archaeological_finds/forms_treatments.py:735 +#: archaeological_finds/forms_treatments.py:725 #: archaeological_finds/models_treatments.py:131 #: archaeological_finds/templates/ishtar/sheet_find.html:390 #: archaeological_finds/templates/ishtar/sheet_find.html:428 @@ -3091,7 +3072,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:610 #: archaeological_warehouse/models.py:336 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 #: cd17_app/templates/ishtar/sheet_find.html:392 #: cd17_app/templates/ishtar/sheet_find.html:430 #: cd17_app/templates/ishtar/sheet_find.html:468 @@ -3135,8 +3116,9 @@ msgid "Type" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_operations/forms.py:791 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/forms.py:539 +#: archaeological_operations/forms.py:784 +#: archaeological_operations/models.py:1332 msgid "Excavation end date" msgstr "" @@ -3309,71 +3291,71 @@ msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:752 #: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1357 -#: archaeological_finds/forms.py:1734 archaeological_finds/forms.py:2471 +#: archaeological_finds/forms.py:1721 archaeological_finds/forms.py:2387 #: archaeological_finds/models_finds.py:550 -#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2006 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1021 -#: archaeological_finds/models_finds.py:2034 +#: archaeological_finds/models_finds.py:2009 msgid "Museum ID prefix" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1022 -#: archaeological_finds/forms.py:1736 archaeological_finds/models_finds.py:2035 +#: archaeological_finds/forms.py:1723 archaeological_finds/models_finds.py:2010 msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1023 -#: archaeological_finds/models_finds.py:2036 +#: archaeological_finds/models_finds.py:2011 msgid "Museum ID suffix" msgstr "" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2037 +#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:2012 msgid "Comment on museum ID" msgstr "" #: archaeological_finds/forms.py:363 archaeological_finds/forms.py:754 #: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1359 -#: archaeological_finds/forms.py:1735 archaeological_finds/forms.py:2538 -#: archaeological_finds/models_finds.py:2032 ishtar_common/forms_common.py:1410 +#: archaeological_finds/forms.py:1722 archaeological_finds/forms.py:2454 +#: archaeological_finds/models_finds.py:2007 ishtar_common/forms_common.py:1410 #: ishtar_common/models.py:3278 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1017 -#: archaeological_finds/forms.py:1738 archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:1725 archaeological_finds/models_finds.py:2153 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1024 -#: archaeological_finds/forms.py:1741 archaeological_finds/models_finds.py:2038 +#: archaeological_finds/forms.py:1728 archaeological_finds/models_finds.py:2013 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1025 -#: archaeological_finds/forms.py:1740 archaeological_finds/models_finds.py:2029 +#: archaeological_finds/forms.py:1727 archaeological_finds/models_finds.py:2004 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2228 +#: archaeological_finds/models_finds.py:2203 msgid "Presence of inventory marking" msgstr "" #: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1075 -#: archaeological_finds/models_finds.py:2232 +#: archaeological_finds/models_finds.py:2207 msgid "Type of marking" msgstr "" #: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1026 -#: archaeological_finds/forms.py:2063 archaeological_finds/models_finds.py:2175 +#: archaeological_finds/forms.py:1979 archaeological_finds/models_finds.py:2150 msgid "Marking details" msgstr "" #: archaeological_finds/forms.py:380 archaeological_finds/forms.py:990 -#: archaeological_finds/forms.py:1664 archaeological_finds/models_finds.py:429 +#: archaeological_finds/forms.py:1651 archaeological_finds/models_finds.py:429 #: archaeological_finds/models_finds.py:444 #: archaeological_finds/models_finds.py:459 #: archaeological_finds/models_finds.py:474 @@ -3383,56 +3365,56 @@ msgid "Museum" msgstr "" #: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1036 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/models_finds.py:2174 msgid "Owner institution" msgstr "" #: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1042 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2179 msgid "Assigned institution" msgstr "" #: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2184 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2186 msgid "Depositor inventory number" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1053 -#: archaeological_finds/models_finds.py:2214 +#: archaeological_finds/models_finds.py:2189 msgid "Collections entry mode" msgstr "" #: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1055 -#: archaeological_finds/models_finds.py:2216 +#: archaeological_finds/models_finds.py:2191 msgid "Comment on museum entry mode" msgstr "" #: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1058 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/models_finds.py:2192 msgid "Museum entry date (exact or start)" msgstr "" #: archaeological_finds/forms.py:399 archaeological_finds/forms.py:1061 -#: archaeological_finds/models_finds.py:2218 +#: archaeological_finds/models_finds.py:2193 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:401 archaeological_finds/models_finds.py:2194 msgid "Comment on museum entry date" msgstr "" #: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1064 -#: archaeological_finds/models_finds.py:2223 +#: archaeological_finds/models_finds.py:2198 msgid "Donor, testator or vendor" msgstr "" #: archaeological_finds/forms.py:411 archaeological_finds/forms.py:1077 -#: archaeological_finds/models_finds.py:2192 -#: archaeological_finds/models_finds.py:2239 +#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2214 msgid "Collection" msgstr "" @@ -3441,41 +3423,41 @@ msgid "Former collections" msgstr "" #: archaeological_finds/forms.py:416 archaeological_finds/forms.py:1084 -#: archaeological_finds/models_finds.py:2247 +#: archaeological_finds/models_finds.py:2222 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2251 +#: archaeological_finds/forms.py:419 archaeological_finds/models_finds.py:2226 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2253 +#: archaeological_finds/forms.py:422 archaeological_finds/models_finds.py:2228 msgid "Comment on conformity" msgstr "" #: archaeological_finds/forms.py:425 archaeological_finds/forms.py:1085 -#: archaeological_finds/models_finds.py:2257 +#: archaeological_finds/models_finds.py:2232 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2259 +#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2234 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2260 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2235 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2254 +#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2229 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:440 archaeological_finds/models_finds.py:2273 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:442 archaeological_finds/forms.py:761 -#: archaeological_finds/forms.py:1848 archaeological_finds/models_finds.py:2115 +#: archaeological_finds/forms.py:1829 archaeological_finds/models_finds.py:2090 msgid "Is complete?" msgstr "" @@ -3483,23 +3465,23 @@ msgstr "" #: archaeological_finds/forms.py:1097 archaeological_finds/models_finds.py:96 #: archaeological_finds/models_finds.py:1168 #: archaeological_finds/models_finds.py:1169 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_finds/models_finds.py:2021 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:447 archaeological_finds/forms.py:767 -#: archaeological_finds/forms.py:1857 archaeological_finds/models_finds.py:2050 +#: archaeological_finds/forms.py:1838 archaeological_finds/models_finds.py:2025 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "" #: archaeological_finds/forms.py:450 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2058 +#: archaeological_finds/forms.py:1841 archaeological_finds/models_finds.py:2033 msgid "Technical processes" msgstr "" -#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1866 -#: archaeological_finds/models_finds.py:2063 +#: archaeological_finds/forms.py:454 archaeological_finds/forms.py:1847 +#: archaeological_finds/models_finds.py:2038 msgid "Comment on the material" msgstr "" @@ -3507,85 +3489,85 @@ msgstr "" #: archaeological_finds/forms.py:1104 archaeological_finds/models_finds.py:276 #: archaeological_finds/models_finds.py:1170 #: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:2117 +#: archaeological_finds/models_finds.py:2092 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:461 archaeological_finds/forms.py:774 -#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:1854 archaeological_finds/models_finds.py:2096 msgid "Object type quality" msgstr "" #: archaeological_finds/forms.py:464 archaeological_finds/forms.py:1108 -#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2129 +#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2104 msgid "Functional areas" msgstr "" #: archaeological_finds/forms.py:468 archaeological_finds/forms.py:1112 -#: archaeological_finds/forms.py:1882 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2110 msgid "Technical areas" msgstr "" #: archaeological_finds/forms.py:471 archaeological_finds/forms.py:776 -#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1888 -#: archaeological_finds/forms.py:2477 archaeological_finds/models_finds.py:2070 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:2393 archaeological_finds/models_finds.py:2045 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:473 archaeological_finds/forms.py:778 -#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1871 +#: archaeological_finds/models_finds.py:2047 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:475 archaeological_finds/forms.py:780 -#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1892 -#: archaeological_finds/models_finds.py:2261 +#: archaeological_finds/forms.py:1094 archaeological_finds/forms.py:1873 +#: archaeological_finds/models_finds.py:2236 msgid "Inventory quantity" msgstr "" #: archaeological_finds/forms.py:476 archaeological_finds/forms.py:781 -#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1893 -#: archaeological_finds/models_finds.py:2262 +#: archaeological_finds/forms.py:1095 archaeological_finds/forms.py:1874 +#: archaeological_finds/models_finds.py:2237 msgid "Observed quantity" msgstr "" #: archaeological_finds/forms.py:478 archaeological_finds/forms.py:783 -#: archaeological_finds/models_finds.py:2075 +#: archaeological_finds/models_finds.py:2050 msgid "Comment on quantity" msgstr "" #: archaeological_finds/forms.py:482 archaeological_finds/forms.py:787 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:2040 +#: archaeological_finds/forms.py:1877 archaeological_finds/models_finds.py:2015 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:485 archaeological_finds/forms.py:790 -#: archaeological_finds/forms.py:1897 archaeological_finds/models_finds.py:2041 +#: archaeological_finds/forms.py:1878 archaeological_finds/models_finds.py:2016 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:488 archaeological_finds/forms.py:793 -#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1895 -#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/forms.py:1116 archaeological_finds/forms.py:1876 +#: archaeological_finds/models_finds.py:2018 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:491 archaeological_finds/forms.py:796 -#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1899 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1880 #: archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2128 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:499 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1905 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:1156 archaeological_finds/forms.py:1886 +#: archaeological_finds/models_finds.py:2152 msgid "Comment on dating" msgstr "" #: archaeological_finds/forms.py:502 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:1623 +#: archaeological_finds/forms.py:1621 #: archaeological_finds/templates/ishtar/sheet_find.html:198 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:177 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -3597,43 +3579,44 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:504 archaeological_finds/forms.py:806 -#: archaeological_finds/models_finds.py:2157 +#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:2132 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:507 archaeological_finds/forms.py:807 -#: archaeological_finds/models_finds.py:2158 +#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:2133 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/forms.py:808 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:1890 archaeological_finds/models_finds.py:2134 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/forms.py:811 -#: archaeological_finds/models_finds.py:2162 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2137 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:809 -#: archaeological_finds/models_finds.py:2160 +#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:2135 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:519 archaeological_finds/forms.py:810 -#: archaeological_finds/models_finds.py:2161 +#: archaeological_finds/forms.py:1893 archaeological_finds/models_finds.py:2136 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:523 archaeological_finds/forms.py:812 -#: archaeological_finds/forms.py:2475 archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:1894 archaeological_finds/forms.py:2391 +#: archaeological_finds/models_finds.py:2040 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "" #: archaeological_finds/forms.py:525 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2392 #: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:186 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3645,31 +3628,35 @@ msgid "Weight (g)" msgstr "" #: archaeological_finds/forms.py:528 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:1897 msgid "Clutter long side (cm)" msgstr "" #: archaeological_finds/forms.py:533 archaeological_finds/forms.py:818 +#: archaeological_finds/forms.py:1901 msgid "Clutter short side (cm)" msgstr "" #: archaeological_finds/forms.py:538 archaeological_finds/forms.py:821 +#: archaeological_finds/forms.py:1905 msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:543 archaeological_finds/forms.py:824 -#: archaeological_finds/forms.py:1976 archaeological_finds/models_finds.py:2173 +#: archaeological_finds/forms.py:1908 archaeological_finds/models_finds.py:2148 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:547 archaeological_finds/forms.py:828 -#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1981 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1913 #: archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2182 +#: archaeological_finds/models_finds.py:2157 msgid "Check" msgstr "" #: archaeological_finds/forms.py:549 archaeological_finds/forms.py:830 -#: archaeological_finds/forms.py:1141 archaeological_finds/models_finds.py:2187 +#: archaeological_finds/forms.py:1141 archaeological_finds/forms.py:1914 +#: archaeological_finds/models_finds.py:2162 msgid "Check date" msgstr "" @@ -3688,25 +3675,27 @@ msgid "Comment on the circumstances of discovery" msgstr "" #: archaeological_finds/forms.py:705 archaeological_finds/forms.py:1019 -#: archaeological_finds/forms.py:1739 archaeological_finds/models_finds.py:555 +#: archaeological_finds/forms.py:1726 archaeological_finds/models_finds.py:555 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:709 archaeological_finds/models_finds.py:568 +#: archaeological_finds/forms.py:709 archaeological_finds/forms.py:1823 +#: archaeological_finds/models_finds.py:568 #: archaeological_finds/templates/ishtar/sheet_basefind.html:32 #: man_app/templates/ishtar/sheet_basefind.html:29 #: sra_idf_app/templates/ishtar/sheet_basefind.html:32 msgid "Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/forms.py:712 archaeological_finds/models_finds.py:571 +#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1826 +#: archaeological_finds/models_finds.py:571 #: archaeological_finds/templates/ishtar/sheet_basefind.html:34 #: man_app/templates/ishtar/sheet_basefind.html:31 #: sra_idf_app/templates/ishtar/sheet_basefind.html:34 msgid "Discovery date (end)" msgstr "" -#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1847 +#: archaeological_finds/forms.py:715 archaeological_finds/forms.py:1828 #: archaeological_finds/models_finds.py:575 msgid "Batch/object" msgstr "" @@ -3715,12 +3704,12 @@ msgstr "" msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1979 +#: archaeological_finds/forms.py:720 archaeological_finds/forms.py:1911 #: archaeological_finds/models_finds.py:583 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2468 +#: archaeological_finds/forms.py:736 archaeological_finds/forms.py:2384 msgid "Resulting find" msgstr "" @@ -3728,7 +3717,7 @@ msgstr "" msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2399 msgid "Resulting finds" msgstr "" @@ -3772,7 +3761,7 @@ msgid "Datation" msgstr "" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 -#: archaeological_finds/forms.py:1651 +#: archaeological_finds/forms.py:1638 #: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3784,22 +3773,22 @@ msgid "Preservation" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 -#: archaeological_finds/forms.py:1990 archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2280 +#: archaeological_finds/forms.py:1919 archaeological_finds/models_finds.py:1213 +#: archaeological_finds/models_finds.py:2255 #: archaeological_warehouse/forms.py:593 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1991 archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2284 +#: archaeological_finds/forms.py:1920 archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2259 #: archaeological_warehouse/forms.py:594 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 -#: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 -#: archaeological_finds/models_finds.py:2267 +#: archaeological_finds/forms.py:1917 archaeological_finds/models_finds.py:1208 +#: archaeological_finds/models_finds.py:2242 #: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 @@ -3807,34 +3796,34 @@ msgid "Conservatory states" msgstr "" #: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1523 -#: archaeological_finds/forms.py:1995 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2290 +#: archaeological_finds/forms.py:1924 archaeological_finds/models_finds.py:1215 +#: archaeological_finds/models_finds.py:2265 #: archaeological_warehouse/forms.py:598 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1487 -#: archaeological_finds/forms.py:1986 archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2141 +#: archaeological_finds/forms.py:1915 archaeological_finds/models_finds.py:1209 +#: archaeological_finds/models_finds.py:2116 #: archaeological_warehouse/forms.py:590 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1493 -#: archaeological_finds/forms.py:1987 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:1916 archaeological_finds/models_finds.py:1210 +#: archaeological_finds/models_finds.py:2122 #: archaeological_warehouse/forms.py:591 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:1144 archaeological_finds/forms.py:1528 -#: archaeological_finds/models_finds.py:2296 +#: archaeological_finds/forms.py:1928 archaeological_finds/models_finds.py:2271 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:1146 archaeological_finds/forms.py:1526 -#: archaeological_finds/models_finds.py:1226 -#: archaeological_finds/models_finds.py:2295 +#: archaeological_finds/forms.py:1927 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2270 msgid "Insurance value" msgstr "" @@ -3855,12 +3844,12 @@ msgstr "" msgid "Update" msgstr "" -#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1826 -#: archaeological_finds/forms.py:2687 archaeological_finds/forms.py:2692 -#: archaeological_finds/forms.py:2709 archaeological_finds/forms.py:2714 +#: archaeological_finds/forms.py:1300 archaeological_finds/forms.py:1813 +#: archaeological_finds/forms.py:2603 archaeological_finds/forms.py:2608 +#: archaeological_finds/forms.py:2625 archaeological_finds/forms.py:2630 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:930 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1892 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3878,24 +3867,24 @@ msgstr "" msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2583 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2499 #: ishtar_common/models.py:1084 ishtar_common/models.py:2079 #: ishtar_common/models.py:3838 ishtar_common/models_imports.py:158 #: ishtar_common/models_imports.py:437 ishtar_common/models_imports.py:825 msgid "Slug" msgstr "" -#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2584 +#: archaeological_finds/forms.py:1424 archaeological_finds/forms.py:2500 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2589 -#: archaeological_finds/forms.py:2631 ishtar_common/models.py:3851 +#: archaeological_finds/forms.py:1429 archaeological_finds/forms.py:2505 +#: archaeological_finds/forms.py:2547 ishtar_common/models.py:3851 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2596 -#: archaeological_finds/forms.py:2638 ishtar_common/models.py:3857 +#: archaeological_finds/forms.py:1436 archaeological_finds/forms.py:2512 +#: archaeological_finds/forms.py:2554 ishtar_common/models.py:3857 msgid "Shared (read/edit) with" msgstr "" @@ -3903,19 +3892,20 @@ msgstr "" msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1993 +#: archaeological_finds/forms.py:1517 archaeological_finds/forms.py:1922 #: archaeological_finds/models_finds.py:1207 -#: archaeological_finds/models_finds.py:2275 +#: archaeological_finds/models_finds.py:2250 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1525 archaeological_finds/models_finds.py:1225 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:1525 archaeological_finds/forms.py:1926 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2163 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1989 -#: archaeological_finds/models_finds.py:2271 +#: archaeological_finds/forms.py:1531 archaeological_finds/forms.py:1918 +#: archaeological_finds/models_finds.py:2246 msgid "Conservatory comment" msgstr "" @@ -3935,107 +3925,91 @@ msgstr "" msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1737 archaeological_finds/models_finds.py:2337 +#: archaeological_finds/forms.py:1724 archaeological_finds/models_finds.py:2312 msgid "Complete museum ID" msgstr "" -#: archaeological_finds/forms.py:1743 archaeological_finds/models_finds.py:1148 +#: archaeological_finds/forms.py:1730 archaeological_finds/models_finds.py:1148 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1744 archaeological_finds/models_finds.py:1149 +#: archaeological_finds/forms.py:1731 archaeological_finds/models_finds.py:1149 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1748 +#: archaeological_finds/forms.py:1735 msgid "Operation - number (index by year)" msgstr "" -#: archaeological_finds/forms.py:1751 +#: archaeological_finds/forms.py:1738 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1754 +#: archaeological_finds/forms.py:1741 msgid "Operation - Type" msgstr "" -#: archaeological_finds/forms.py:1757 +#: archaeological_finds/forms.py:1744 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1760 +#: archaeological_finds/forms.py:1747 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1758 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1774 +#: archaeological_finds/forms.py:1761 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1778 +#: archaeological_finds/forms.py:1765 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1781 +#: archaeological_finds/forms.py:1768 msgid "Operation - Remains" msgstr "" -#: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 -#: archaeological_operations/forms.py:1246 ishtar_common/forms_common.py:1571 +#: archaeological_finds/forms.py:1771 archaeological_operations/forms.py:502 +#: archaeological_operations/forms.py:1239 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1787 archaeological_warehouse/forms.py:537 +#: archaeological_finds/forms.py:1774 archaeological_warehouse/forms.py:537 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1795 archaeological_warehouse/forms.py:545 +#: archaeological_finds/forms.py:1782 archaeological_warehouse/forms.py:545 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1798 archaeological_warehouse/forms.py:548 +#: archaeological_finds/forms.py:1785 archaeological_warehouse/forms.py:548 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1806 archaeological_warehouse/forms.py:556 +#: archaeological_finds/forms.py:1793 archaeological_warehouse/forms.py:556 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1809 +#: archaeological_finds/forms.py:1796 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1822 +#: archaeological_finds/forms.py:1809 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1834 +#: archaeological_finds/forms.py:1821 msgid "Base find - Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:1836 -msgid "Discovery date (exact or beginning) after" -msgstr "" - -#: archaeological_finds/forms.py:1839 -msgid "Discovery date (exact or beginning) before" -msgstr "" - -#: archaeological_finds/forms.py:1842 -msgid "Discovery date (end) after" -msgstr "" - -#: archaeological_finds/forms.py:1845 -msgid "Discovery date (end) before" -msgstr "" - -#: archaeological_finds/forms.py:1850 archaeological_finds/forms.py:2474 +#: archaeological_finds/forms.py:1831 archaeological_finds/forms.py:2390 #: archaeological_finds/models_finds.py:95 #: archaeological_finds/models_finds.py:1205 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -4045,7 +4019,7 @@ msgstr "" msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1868 archaeological_finds/models_finds.py:275 +#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1206 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:585 ishtar_common/models_imports.py:1094 @@ -4054,244 +4028,120 @@ msgstr "" msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1908 -msgid "Length - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1911 -msgid "Length - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1914 -msgid "Width - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1917 -msgid "Width - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1920 -msgid "Height - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1923 -msgid "Height - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1926 -msgid "Thickness - lower than (cm)" +#: archaeological_finds/forms.py:1895 +msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1929 -msgid "Thickness - higher than (cm)" +#: archaeological_finds/forms.py:1930 +msgid "Loan?" msgstr "" #: archaeological_finds/forms.py:1932 -msgid "Diameter - lower than (cm)" +msgid "Treatment file end date" msgstr "" #: archaeological_finds/forms.py:1935 -msgid "Diameter - higher than (cm)" +msgid "Treatment end date" msgstr "" #: archaeological_finds/forms.py:1938 -msgid "Circumference - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1941 -msgid "Circumference - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1944 -msgid "Volume - lower than (l)" -msgstr "" - -#: archaeological_finds/forms.py:1945 -msgid "Volume - higher than (l)" -msgstr "" - -#: archaeological_finds/forms.py:1947 -msgid "Weight - lower than (g)" -msgstr "" - -#: archaeological_finds/forms.py:1950 -msgid "Weight - higher than (g)" -msgstr "" - -#: archaeological_finds/forms.py:1953 -msgid "Clutter long side - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1957 -msgid "Clutter long side - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1961 -msgid "Clutter short side - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1965 -msgid "Clutter short side - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1969 -msgid "Clutter height - lower than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1973 -msgid "Clutter height - higher than (cm)" -msgstr "" - -#: archaeological_finds/forms.py:1982 -msgid "Check date after" -msgstr "" - -#: archaeological_finds/forms.py:1984 -msgid "Check date before" -msgstr "" - -#: archaeological_finds/forms.py:1997 -msgid "Estimated value - higher than" -msgstr "" - -#: archaeological_finds/forms.py:1998 -msgid "Estimated value - lower than" -msgstr "" - -#: archaeological_finds/forms.py:1999 -msgid "Insurance value - higher than" -msgstr "" - -#: archaeological_finds/forms.py:2000 -msgid "Insurance value - lower than" -msgstr "" - -#: archaeological_finds/forms.py:2002 -msgid "Appraisal date after" -msgstr "" - -#: archaeological_finds/forms.py:2005 -msgid "Appraisal date before" -msgstr "" - -#: archaeological_finds/forms.py:2008 -msgid "Loan?" -msgstr "" - -#: archaeological_finds/forms.py:2010 -msgid "Treatment file end date before" -msgstr "" - -#: archaeological_finds/forms.py:2013 -msgid "Treatment end date before" -msgstr "" - -#: archaeological_finds/forms.py:2016 msgid "Museum - Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:2018 +#: archaeological_finds/forms.py:1940 msgid "Museum - Owner institution" msgstr "" -#: archaeological_finds/forms.py:2024 +#: archaeological_finds/forms.py:1946 msgid "Museum - Assigned institution" msgstr "" -#: archaeological_finds/forms.py:2030 +#: archaeological_finds/forms.py:1952 msgid "Museum - Custodian institution" msgstr "" -#: archaeological_finds/forms.py:2035 +#: archaeological_finds/forms.py:1957 msgid "Museum - Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:2036 +#: archaeological_finds/forms.py:1958 msgid "Museum - Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:2037 +#: archaeological_finds/forms.py:1959 msgid "Museum - Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:2039 -msgid "Museum - Entry date (exact or start) - before" -msgstr "" - -#: archaeological_finds/forms.py:2042 -msgid "Museum - Entry date (exact or start) - after" -msgstr "" - -#: archaeological_finds/forms.py:2045 -msgid "Museum - Entry date end - before" +#: archaeological_finds/forms.py:1961 +msgid "Museum - Entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:2048 -msgid "Museum - Entry date end - after" +#: archaeological_finds/forms.py:1964 +msgid "Museum - Entry date end" msgstr "" -#: archaeological_finds/forms.py:2050 +#: archaeological_finds/forms.py:1966 msgid "Museum - Comment on entry date" msgstr "" -#: archaeological_finds/forms.py:2052 +#: archaeological_finds/forms.py:1968 msgid "Museum - Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:2058 +#: archaeological_finds/forms.py:1974 msgid "Museum - Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:2061 +#: archaeological_finds/forms.py:1977 msgid "Museum - Type of marking" msgstr "" -#: archaeological_finds/forms.py:2065 +#: archaeological_finds/forms.py:1981 msgid "Museum - Collection" msgstr "" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:1984 msgid "Museum - Former collection" msgstr "" -#: archaeological_finds/forms.py:2073 +#: archaeological_finds/forms.py:1989 msgid "Museum - Inventory entry year - before" msgstr "" -#: archaeological_finds/forms.py:2074 +#: archaeological_finds/forms.py:1990 msgid "Museum - Inventory entry year - after" msgstr "" -#: archaeological_finds/forms.py:2076 +#: archaeological_finds/forms.py:1992 msgid "Museum - Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:2078 +#: archaeological_finds/forms.py:1994 msgid "Museum - Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:2079 +#: archaeological_finds/forms.py:1995 msgid "Museum - Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:2081 +#: archaeological_finds/forms.py:1997 msgid "Museum - Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:2084 +#: archaeological_finds/forms.py:2000 msgid "Museum - Date of allocation - before" msgstr "" -#: archaeological_finds/forms.py:2087 +#: archaeological_finds/forms.py:2003 msgid "Museum - Date of allocation - after" msgstr "" -#: archaeological_finds/forms.py:2089 +#: archaeological_finds/forms.py:2005 msgid "Museum - Purchase price" msgstr "" -#: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 -#: archaeological_finds/models_finds.py:2109 +#: archaeological_finds/forms.py:2076 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2084 #: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4303,11 +4153,11 @@ msgstr "" msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:2167 +#: archaeological_finds/forms.py:2083 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 +#: archaeological_finds/forms.py:2102 archaeological_finds/models_finds.py:1164 #: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4319,50 +4169,50 @@ msgstr "" msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:2193 +#: archaeological_finds/forms.py:2109 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2213 archaeological_finds/forms.py:2234 -#: archaeological_finds/forms.py:2290 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2129 archaeological_finds/forms.py:2150 +#: archaeological_finds/forms.py:2206 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:2329 archaeological_finds/forms.py:2492 -#: archaeological_finds/models_treatments.py:399 +#: archaeological_finds/forms.py:2245 archaeological_finds/forms.py:2408 +#: archaeological_finds/models_treatments.py:400 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:2352 +#: archaeological_finds/forms.py:2268 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:2473 +#: archaeological_finds/forms.py:2389 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2488 +#: archaeological_finds/forms.py:2404 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2531 +#: archaeological_finds/forms.py:2447 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2543 archaeological_finds/forms.py:2561 +#: archaeological_finds/forms.py:2459 archaeological_finds/forms.py:2477 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2578 +#: archaeological_finds/forms.py:2494 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2581 +#: archaeological_finds/forms.py:2497 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 -#: archaeological_finds/models_treatments.py:200 +#: archaeological_finds/models_treatments.py:201 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 #: archaeological_finds/templates/ishtar/sheet_find.html:389 #: archaeological_finds/templates/ishtar/sheet_find.html:427 @@ -4376,7 +4226,7 @@ msgstr "" #: ishtar_common/forms_common.py:1968 ishtar_common/models.py:1010 #: ishtar_common/models.py:1867 ishtar_common/models.py:3836 #: ishtar_common/models_common.py:174 ishtar_common/models_common.py:207 -#: ishtar_common/models_common.py:2030 ishtar_common/models_common.py:2046 +#: ishtar_common/models_common.py:2023 ishtar_common/models_common.py:2039 #: ishtar_common/models_imports.py:699 #: man_app/templates/ishtar/sheet_museum_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:462 @@ -4393,11 +4243,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2623 archaeological_finds/forms.py:2678 +#: archaeological_finds/forms.py:2539 archaeological_finds/forms.py:2594 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2670 +#: archaeological_finds/forms.py:2586 msgid "Another basket already exists with this name." msgstr "" @@ -4407,14 +4257,14 @@ msgstr "" #: archaeological_finds/forms_treatments.py:57 #: archaeological_finds/forms_treatments.py:177 -#: archaeological_finds/models_treatments.py:202 +#: archaeological_finds/models_treatments.py:203 msgid "Other ref." msgstr "" #: archaeological_finds/forms_treatments.py:64 #: archaeological_finds/forms_treatments.py:157 #: archaeological_finds/models_treatments.py:135 -#: archaeological_finds/models_treatments.py:244 +#: archaeological_finds/models_treatments.py:245 msgid "Scientific monitoring manager" msgstr "" @@ -4423,8 +4273,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:424 #: archaeological_finds/forms_treatments.py:582 #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:215 -#: archaeological_finds/models_treatments.py:757 +#: archaeological_finds/models_treatments.py:216 +#: archaeological_finds/models_treatments.py:758 #: ishtar_common/models_imports.py:1089 msgid "Treatment type" msgstr "" @@ -4440,12 +4290,12 @@ msgstr "" #: archaeological_finds/forms_treatments.py:126 #: archaeological_finds/ishtar_menu.py:184 -#: archaeological_finds/models_treatments.py:292 -#: archaeological_finds/models_treatments.py:746 +#: archaeological_finds/models_treatments.py:293 +#: archaeological_finds/models_treatments.py:747 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2555 -#: archaeological_operations/models.py:2892 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2534 +#: archaeological_operations/models.py:2867 ishtar_common/views.py:511 msgid "Treatment" msgstr "" @@ -4455,9 +4305,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:163 #: archaeological_finds/forms_treatments.py:433 -#: archaeological_finds/forms_treatments.py:737 +#: archaeological_finds/forms_treatments.py:727 #: archaeological_finds/models_treatments.py:133 -#: archaeological_finds/models_treatments.py:236 +#: archaeological_finds/models_treatments.py:237 msgid "Responsible" msgstr "" @@ -4466,7 +4316,7 @@ msgid "Destination container (relevant for treatment that change location)" msgstr "" #: archaeological_finds/forms_treatments.py:191 -#: archaeological_finds/models_treatments.py:263 +#: archaeological_finds/models_treatments.py:264 msgid "Goal" msgstr "" @@ -4528,7 +4378,7 @@ msgid "Another treatment with this index exists for {}." msgstr "" #: archaeological_finds/forms_treatments.py:378 -#: archaeological_finds/models_treatments.py:212 +#: archaeological_finds/models_treatments.py:213 msgid "Associated request" msgstr "" @@ -4537,13 +4387,13 @@ msgid "Treatment - 010 - Request choice" msgstr "" #: archaeological_finds/forms_treatments.py:384 -#: archaeological_finds/forms_treatments.py:715 +#: archaeological_finds/forms_treatments.py:705 #: archaeological_finds/ishtar_menu.py:110 -#: archaeological_finds/models_treatments.py:1183 -#: archaeological_finds/models_treatments.py:1203 +#: archaeological_finds/models_treatments.py:1179 +#: archaeological_finds/models_treatments.py:1199 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2884 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:563 archaeological_operations/models.py:2533 +#: archaeological_operations/models.py:2859 ishtar_common/views.py:510 msgid "Treatment request" msgstr "" @@ -4558,10 +4408,10 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:2101 -#: archaeological_finds/models_finds.py:3593 -#: archaeological_finds/models_treatments.py:269 -#: archaeological_finds/models_treatments.py:761 +#: archaeological_finds/models_finds.py:2076 +#: archaeological_finds/models_finds.py:3567 +#: archaeological_finds/models_treatments.py:270 +#: archaeological_finds/models_treatments.py:762 #: archaeological_finds/templates/ishtar/sheet_find.html:394 #: archaeological_finds/templates/ishtar/sheet_find.html:432 #: archaeological_finds/templates/ishtar/sheet_find.html:470 @@ -4569,8 +4419,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 #: archaeological_warehouse/forms.py:329 archaeological_warehouse/models.py:839 -#: archaeological_warehouse/models.py:1212 -#: archaeological_warehouse/models.py:2061 +#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:2062 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: cd17_app/templates/ishtar/sheet_find.html:396 #: cd17_app/templates/ishtar/sheet_find.html:434 @@ -4657,14 +4507,14 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:643 -#: archaeological_finds/forms_treatments.py:731 ishtar_common/models.py:4584 +#: archaeological_finds/forms_treatments.py:721 ishtar_common/models.py:4584 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" #: archaeological_finds/forms_treatments.py:655 -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1131 +#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/models_treatments.py:1127 #: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 @@ -4677,8 +4527,8 @@ msgid "Applicant" msgstr "" #: archaeological_finds/forms_treatments.py:661 -#: archaeological_finds/forms_treatments.py:749 -#: archaeological_finds/models_treatments.py:1139 +#: archaeological_finds/forms_treatments.py:739 +#: archaeological_finds/models_treatments.py:1135 #: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 @@ -4690,86 +4540,72 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:670 -msgid "Exhibition started before" -msgstr "" - -#: archaeological_finds/forms_treatments.py:673 -msgid "Exhibition started after" -msgstr "" - -#: archaeological_finds/forms_treatments.py:676 -msgid "Exhibition ended before" +#: archaeological_finds/forms_treatments.py:669 +#: archaeological_finds/forms_treatments.py:752 +#: archaeological_finds/models_treatments.py:1148 +msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:679 -msgid "Exhibition ended after" +#: archaeological_finds/forms_treatments.py:670 +#: archaeological_finds/forms_treatments.py:754 +#: archaeological_finds/models_treatments.py:1151 +msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:690 -#: archaeological_finds/forms_treatments.py:702 +#: archaeological_finds/forms_treatments.py:680 +#: archaeological_finds/forms_treatments.py:692 #: archaeological_finds/views.py:992 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/forms_treatments.py:723 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:755 +#: archaeological_finds/forms_treatments.py:745 msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:759 -#: archaeological_finds/models_treatments.py:1150 +#: archaeological_finds/forms_treatments.py:749 +#: archaeological_finds/models_treatments.py:1146 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:762 -#: archaeological_finds/models_treatments.py:1152 -msgid "Exhibition start date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:764 -#: archaeological_finds/models_treatments.py:1155 -msgid "Exhibition end date" -msgstr "" - -#: archaeological_finds/forms_treatments.py:822 +#: archaeological_finds/forms_treatments.py:812 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:828 +#: archaeological_finds/forms_treatments.py:818 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:829 +#: archaeological_finds/forms_treatments.py:819 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:853 +#: archaeological_finds/forms_treatments.py:843 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:855 +#: archaeological_finds/forms_treatments.py:845 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:857 +#: archaeological_finds/forms_treatments.py:847 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:859 +#: archaeological_finds/forms_treatments.py:849 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:861 -#: archaeological_finds/models_treatments.py:1003 -#: archaeological_finds/models_treatments.py:1117 +#: archaeological_finds/forms_treatments.py:851 +#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1113 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:895 +#: archaeological_finds/forms_treatments.py:885 msgid "Treatment request - Administrative act - General" msgstr "" @@ -4790,9 +4626,9 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:91 -#: archaeological_operations/models.py:2559 +#: archaeological_operations/models.py:2538 #: archaeological_warehouse/forms.py:340 archaeological_warehouse/forms.py:517 -#: archaeological_warehouse/models.py:1158 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1159 ishtar_common/models.py:4052 msgid "Code" msgstr "" @@ -4876,17 +4712,17 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:183 -#: archaeological_finds/models_treatments.py:379 +#: archaeological_finds/models_treatments.py:380 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:188 -#: archaeological_finds/models_finds.py:2313 +#: archaeological_finds/models_finds.py:2288 #: archaeological_finds/models_treatments.py:75 -#: archaeological_finds/models_treatments.py:293 -#: archaeological_finds/models_treatments.py:305 -#: archaeological_finds/models_treatments.py:1006 -#: archaeological_finds/models_treatments.py:1196 +#: archaeological_finds/models_treatments.py:294 +#: archaeological_finds/models_treatments.py:306 +#: archaeological_finds/models_treatments.py:1007 +#: archaeological_finds/models_treatments.py:1192 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 msgid "Treatments" @@ -5064,7 +4900,7 @@ msgstr "" #: archaeological_finds/models_finds.py:592 #: archaeological_finds/models_finds.py:599 -#: archaeological_finds/models_finds.py:2341 ishtar_common/models.py:4709 +#: archaeological_finds/models_finds.py:2316 ishtar_common/models.py:4709 #: ishtar_common/models.py:4716 msgid "Cached value - do not edit" msgstr "" @@ -5078,7 +4914,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:622 -#: archaeological_finds/models_finds.py:2022 +#: archaeological_finds/models_finds.py:1997 msgid "Base find" msgstr "" @@ -5114,7 +4950,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:983 -#: archaeological_warehouse/models.py:1927 +#: archaeological_warehouse/models.py:1928 msgid "Add treatment" msgstr "" @@ -5156,12 +4992,12 @@ msgstr "" #: archaeological_finds/models_finds.py:1192 #: archaeological_operations/forms.py:509 -#: archaeological_operations/forms.py:722 -#: archaeological_operations/forms.py:1705 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:988 -#: archaeological_operations/models.py:1078 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5379 +#: archaeological_operations/forms.py:715 +#: archaeological_operations/forms.py:1686 +#: archaeological_operations/forms.py:1754 +#: archaeological_operations/models.py:989 +#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1380 ishtar_common/models.py:5379 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" @@ -5170,665 +5006,620 @@ msgstr "" msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1294 +#: archaeological_finds/models_finds.py:1304 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1298 +#: archaeological_finds/models_finds.py:1308 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1302 +#: archaeological_finds/models_finds.py:1312 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1305 +#: archaeological_finds/models_finds.py:1315 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1320 archaeological_finds/tests.py:1537 -#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:984 +#: archaeological_finds/models_finds.py:1330 archaeological_finds/tests.py:1537 +#: archaeological_finds/tests.py:1750 archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:4403 +#: archaeological_finds/models_finds.py:1334 ishtar_common/models.py:4403 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1328 -#: archaeological_operations/models.py:381 -#: archaeological_operations/models.py:1147 ishtar_common/models.py:4452 +#: archaeological_finds/models_finds.py:1338 +#: archaeological_operations/models.py:382 +#: archaeological_operations/models.py:1141 ishtar_common/models.py:4452 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1337 -#: archaeological_warehouse/models.py:993 +#: archaeological_finds/models_finds.py:1347 +#: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1950 -#: archaeological_warehouse/models.py:998 +#: archaeological_finds/models_finds.py:1352 +#: archaeological_finds/models_finds.py:1925 +#: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1347 -#: archaeological_warehouse/models.py:1003 +#: archaeological_finds/models_finds.py:1357 +#: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1351 -#: archaeological_finds/models_finds.py:1945 -#: archaeological_warehouse/models.py:1007 ishtar_common/models.py:4411 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_finds/models_finds.py:1920 +#: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4411 #: ishtar_common/models.py:4525 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1355 +#: archaeological_finds/models_finds.py:1365 msgctxt "key for text search" msgid "discovery-comment" msgstr "" -#: archaeological_finds/models_finds.py:1363 +#: archaeological_finds/models_finds.py:1373 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1367 archaeological_finds/tests.py:1444 -#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1019 +#: archaeological_finds/models_finds.py:1377 archaeological_finds/tests.py:1444 +#: archaeological_finds/tests.py:1748 archaeological_warehouse/models.py:1020 msgctxt "key for text search" msgid "material" msgstr "" -#: archaeological_finds/models_finds.py:1372 -#: archaeological_warehouse/models.py:1023 +#: archaeological_finds/models_finds.py:1382 +#: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1386 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1380 archaeological_finds/tests.py:1691 -#: archaeological_warehouse/models.py:1031 +#: archaeological_finds/models_finds.py:1390 archaeological_finds/tests.py:1691 +#: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1384 -#: archaeological_warehouse/models.py:1035 +#: archaeological_finds/models_finds.py:1394 +#: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1388 -#: archaeological_warehouse/models.py:1039 +#: archaeological_finds/models_finds.py:1398 +#: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1392 archaeological_finds/tests.py:1586 +#: archaeological_finds/models_finds.py:1402 archaeological_finds/tests.py:1586 #: ishtar_common/models.py:4325 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_finds/models_finds.py:1395 +#: archaeological_finds/models_finds.py:1405 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1399 +#: archaeological_finds/models_finds.py:1409 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1403 ishtar_common/models.py:4434 +#: archaeological_finds/models_finds.py:1413 ishtar_common/models.py:4434 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1407 -#: archaeological_finds/models_finds.py:1948 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1417 +#: archaeological_finds/models_finds.py:1923 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1411 +#: archaeological_finds/models_finds.py:1421 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1415 +#: archaeological_finds/models_finds.py:1425 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1419 +#: archaeological_finds/models_finds.py:1429 #: archaeological_finds/wizards.py:458 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1426 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1430 -#: ishtar_common/models_common.py:1578 +#: archaeological_finds/models_finds.py:1440 +#: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1433 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1443 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1435 +#: archaeological_finds/models_finds.py:1445 msgctxt "key for text search" -msgid "treatment-file-end-date-before" +msgid "treatment-file-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1439 +#: archaeological_finds/models_finds.py:1449 msgctxt "key for text search" -msgid "treatment-end-date-before" +msgid "treatment-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1443 +#: archaeological_finds/models_finds.py:1453 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1450 +#: archaeological_finds/models_finds.py:1460 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1453 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1457 +#: archaeological_finds/models_finds.py:1467 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1470 msgctxt "key for text search" msgid "complete-museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1463 +#: archaeological_finds/models_finds.py:1473 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1467 +#: archaeological_finds/models_finds.py:1477 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1470 -msgctxt "key for text search" -msgid "discovery-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1474 -msgctxt "key for text search" -msgid "discovery-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" -msgid "discovery-date-taq-before" +msgid "discovery-date" msgstr "" -#: archaeological_finds/models_finds.py:1482 +#: archaeological_finds/models_finds.py:1484 msgctxt "key for text search" -msgid "discovery-date-taq-after" +msgid "discovery-date-taq" msgstr "" -#: archaeological_finds/models_finds.py:1486 +#: archaeological_finds/models_finds.py:1488 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1489 +#: archaeological_finds/models_finds.py:1491 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1493 +#: archaeological_finds/models_finds.py:1495 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1497 +#: archaeological_finds/models_finds.py:1499 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1500 +#: archaeological_finds/models_finds.py:1502 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1504 +#: archaeological_finds/models_finds.py:1506 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1507 +#: archaeological_finds/models_finds.py:1509 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1512 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1514 +#: archaeological_finds/models_finds.py:1516 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1521 +#: archaeological_finds/models_finds.py:1523 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1525 +#: archaeological_finds/models_finds.py:1527 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1529 +#: archaeological_finds/models_finds.py:1531 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1533 +#: archaeological_finds/models_finds.py:1535 msgctxt "key for text search" msgid "length-lower" msgstr "" -#: archaeological_finds/models_finds.py:1536 +#: archaeological_finds/models_finds.py:1538 msgctxt "key for text search" msgid "width-lower" msgstr "" -#: archaeological_finds/models_finds.py:1539 +#: archaeological_finds/models_finds.py:1541 msgctxt "key for text search" msgid "height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1544 msgctxt "key for text search" msgid "thickness-lower" msgstr "" -#: archaeological_finds/models_finds.py:1545 +#: archaeological_finds/models_finds.py:1547 msgctxt "key for text search" msgid "diameter-lower" msgstr "" -#: archaeological_finds/models_finds.py:1548 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "circumference-lower" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "volume-lower" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1557 msgctxt "key for text search" msgid "weight-lower" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1560 msgctxt "key for text search" msgid "clutter-long-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1562 +#: archaeological_finds/models_finds.py:1564 msgctxt "key for text search" msgid "clutter-short-side-lower" msgstr "" -#: archaeological_finds/models_finds.py:1566 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "clutter-height-lower" msgstr "" -#: archaeological_finds/models_finds.py:1570 +#: archaeological_finds/models_finds.py:1572 msgctxt "key for text search" -msgid "length-higher" +msgid "length" msgstr "" -#: archaeological_finds/models_finds.py:1573 +#: archaeological_finds/models_finds.py:1575 msgctxt "key for text search" -msgid "width-higher" +msgid "width" msgstr "" -#: archaeological_finds/models_finds.py:1576 +#: archaeological_finds/models_finds.py:1578 msgctxt "key for text search" -msgid "height-higher" +msgid "height" msgstr "" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" -msgid "thickness-higher" +msgid "thickness" msgstr "" -#: archaeological_finds/models_finds.py:1582 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" -msgid "diameter-higher" +msgid "diameter" msgstr "" -#: archaeological_finds/models_finds.py:1585 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" -msgid "circumference-higher" +msgid "circumference" msgstr "" -#: archaeological_finds/models_finds.py:1589 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" -msgid "volume-higher" +msgid "volume" msgstr "" -#: archaeological_finds/models_finds.py:1592 +#: archaeological_finds/models_finds.py:1594 msgctxt "key for text search" -msgid "weight-higher" +msgid "weight" msgstr "" -#: archaeological_finds/models_finds.py:1595 +#: archaeological_finds/models_finds.py:1597 msgctxt "key for text search" -msgid "clutter-long-side-higher" +msgid "clutter-long-side" msgstr "" -#: archaeological_finds/models_finds.py:1599 +#: archaeological_finds/models_finds.py:1601 msgctxt "key for text search" -msgid "clutter-short-side-higher" +msgid "clutter-short-side" msgstr "" -#: archaeological_finds/models_finds.py:1603 +#: archaeological_finds/models_finds.py:1605 msgctxt "key for text search" -msgid "clutter-height-higher" +msgid "clutter-height" msgstr "" -#: archaeological_finds/models_finds.py:1607 +#: archaeological_finds/models_finds.py:1609 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1611 +#: archaeological_finds/models_finds.py:1613 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1615 +#: archaeological_finds/models_finds.py:1617 msgctxt "key for text search" -msgid "check-date-before" +msgid "check-date" msgstr "" -#: archaeological_finds/models_finds.py:1618 -msgctxt "key for text search" -msgid "check-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1621 -#: archaeological_warehouse/models.py:1043 +#: archaeological_finds/models_finds.py:1620 +#: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1625 -#: archaeological_warehouse/models.py:1047 +#: archaeological_finds/models_finds.py:1624 +#: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1629 -#: archaeological_warehouse/models.py:1051 +#: archaeological_finds/models_finds.py:1628 +#: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1633 -msgctxt "key for text search" -msgid "estimated-value-higher" -msgstr "" - -#: archaeological_finds/models_finds.py:1637 -msgctxt "key for text search" -msgid "estimated-value-lower" -msgstr "" - -#: archaeological_finds/models_finds.py:1641 -msgctxt "key for text search" -msgid "insurance-value-higher" -msgstr "" - -#: archaeological_finds/models_finds.py:1645 +#: archaeological_finds/models_finds.py:1632 msgctxt "key for text search" -msgid "insurance-value-lower" +msgid "estimated-value" msgstr "" -#: archaeological_finds/models_finds.py:1649 +#: archaeological_finds/models_finds.py:1636 msgctxt "key for text search" -msgid "appraisal-date-before" +msgid "insurance-value" msgstr "" -#: archaeological_finds/models_finds.py:1653 +#: archaeological_finds/models_finds.py:1640 msgctxt "key for text search" -msgid "appraisal-date-after" +msgid "appraisal-date" msgstr "" -#: archaeological_finds/models_finds.py:1661 +#: archaeological_finds/models_finds.py:1648 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1665 +#: archaeological_finds/models_finds.py:1652 msgctxt "key for text search" msgid "technical-area" msgstr "" -#: archaeological_finds/models_finds.py:1669 +#: archaeological_finds/models_finds.py:1656 msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1673 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1660 archaeological_finds/tests.py:1631 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1681 -#: archaeological_operations/models.py:1177 +#: archaeological_finds/models_finds.py:1668 +#: archaeological_operations/models.py:1171 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1685 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1182 +#: archaeological_finds/models_finds.py:1672 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1176 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1680 msgctxt "key for text search" msgid "operation-remain" msgstr "" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1684 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1688 msgctxt "key for text search" msgid "museum-id-comment" msgstr "" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1692 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1697 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "" -#: archaeological_finds/models_finds.py:1715 +#: archaeological_finds/models_finds.py:1702 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "" -#: archaeological_finds/models_finds.py:1720 +#: archaeological_finds/models_finds.py:1707 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "" -#: archaeological_finds/models_finds.py:1724 +#: archaeological_finds/models_finds.py:1711 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1715 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "" -#: archaeological_finds/models_finds.py:1732 -msgctxt "key for text search" -msgid "museum-entry-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1736 -msgctxt "key for text search" -msgid "museum-entry-date-after" -msgstr "" - -#: archaeological_finds/models_finds.py:1740 +#: archaeological_finds/models_finds.py:1719 msgctxt "key for text search" -msgid "museum-entry-date-end-before" +msgid "museum-entry-date" msgstr "" -#: archaeological_finds/models_finds.py:1744 +#: archaeological_finds/models_finds.py:1723 msgctxt "key for text search" -msgid "museum-entry-date-end-after" +msgid "museum-entry-date-end" msgstr "" -#: archaeological_finds/models_finds.py:1748 +#: archaeological_finds/models_finds.py:1727 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "" -#: archaeological_finds/models_finds.py:1752 +#: archaeological_finds/models_finds.py:1731 msgctxt "key for text search" msgid "museum-donor" msgstr "" -#: archaeological_finds/models_finds.py:1757 +#: archaeological_finds/models_finds.py:1736 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "" -#: archaeological_finds/models_finds.py:1761 +#: archaeological_finds/models_finds.py:1740 msgctxt "key for text search" msgid "museum-marking-type" msgstr "" -#: archaeological_finds/models_finds.py:1765 +#: archaeological_finds/models_finds.py:1744 msgctxt "key for text search" msgid "museum-collection" msgstr "" -#: archaeological_finds/models_finds.py:1770 +#: archaeological_finds/models_finds.py:1749 msgctxt "key for text search" msgid "museum-former-collection" msgstr "" -#: archaeological_finds/models_finds.py:1775 +#: archaeological_finds/models_finds.py:1754 msgctxt "key for text search" msgid "museum-inventory-entry-year-before" msgstr "" -#: archaeological_finds/models_finds.py:1779 +#: archaeological_finds/models_finds.py:1758 msgctxt "key for text search" msgid "museum-inventory-entry-year-after" msgstr "" -#: archaeological_finds/models_finds.py:1783 +#: archaeological_finds/models_finds.py:1762 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "" -#: archaeological_finds/models_finds.py:1788 +#: archaeological_finds/models_finds.py:1767 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "" -#: archaeological_finds/models_finds.py:1792 +#: archaeological_finds/models_finds.py:1771 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "" -#: archaeological_finds/models_finds.py:1796 +#: archaeological_finds/models_finds.py:1775 msgctxt "key for text search" msgid "museum-original-repro" msgstr "" -#: archaeological_finds/models_finds.py:1801 -msgctxt "key for text search" -msgid "museum-allocation-date-before" -msgstr "" - -#: archaeological_finds/models_finds.py:1805 +#: archaeological_finds/models_finds.py:1780 msgctxt "key for text search" -msgid "museum-allocation-date-after" +msgid "museum-allocation-date" msgstr "" -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1784 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "" -#: archaeological_finds/models_finds.py:1813 +#: archaeological_finds/models_finds.py:1788 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1817 +#: archaeological_finds/models_finds.py:1792 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1924 -#: archaeological_finds/models_finds.py:2699 +#: archaeological_finds/models_finds.py:1899 +#: archaeological_finds/models_finds.py:2674 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:692 #: archaeological_warehouse/views.py:303 ishtar_common/models.py:4563 @@ -5838,19 +5629,19 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1932 +#: archaeological_finds/models_finds.py:1907 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:2066 +#: archaeological_finds/models_finds.py:2041 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:2068 +#: archaeological_finds/models_finds.py:2043 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:2083 +#: archaeological_finds/models_finds.py:2058 #: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5861,7 +5652,7 @@ msgstr "" msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2090 +#: archaeological_finds/models_finds.py:2065 #: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5872,83 +5663,83 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/models_finds.py:2139 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2167 +#: archaeological_finds/models_finds.py:2142 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2170 +#: archaeological_finds/models_finds.py:2145 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2193 +#: archaeological_finds/models_finds.py:2168 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/models_finds.py:2219 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2316 +#: archaeological_finds/models_finds.py:2291 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2325 +#: archaeological_finds/models_finds.py:2300 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2331 +#: archaeological_finds/models_finds.py:2306 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2371 +#: archaeological_finds/models_finds.py:2346 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2537 +#: archaeological_finds/models_finds.py:2512 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2538 +#: archaeological_finds/models_finds.py:2513 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2539 +#: archaeological_finds/models_finds.py:2514 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2540 +#: archaeological_finds/models_finds.py:2515 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2541 +#: archaeological_finds/models_finds.py:2516 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2672 +#: archaeological_finds/models_finds.py:2647 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2680 +#: archaeological_finds/models_finds.py:2655 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2688 +#: archaeological_finds/models_finds.py:2663 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3167 +#: archaeological_finds/models_finds.py:3141 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3173 +#: archaeological_finds/models_finds.py:3147 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3620 ishtar_common/forms_common.py:128 +#: archaeological_finds/models_finds.py:3594 ishtar_common/forms_common.py:128 #: ishtar_common/forms_common.py:1425 ishtar_common/forms_common.py:2860 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2979 #: ishtar_common/models.py:3298 ishtar_common/models.py:3396 @@ -5958,11 +5749,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3628 +#: archaeological_finds/models_finds.py:3602 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3629 +#: archaeological_finds/models_finds.py:3603 msgid "Properties" msgstr "" @@ -5992,9 +5783,9 @@ msgid "label" msgstr "" #: archaeological_finds/models_treatments.py:159 -#: archaeological_finds/models_treatments.py:1060 -#: archaeological_operations/models.py:2694 -#: archaeological_warehouse/models.py:968 +#: archaeological_finds/models_treatments.py:1067 +#: archaeological_operations/models.py:2673 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" msgstr "" @@ -6004,40 +5795,40 @@ msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:223 +#: archaeological_finds/models_treatments.py:224 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:231 +#: archaeological_finds/models_treatments.py:232 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:274 +#: archaeological_finds/models_treatments.py:275 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:275 +#: archaeological_finds/models_treatments.py:276 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:276 +#: archaeological_finds/models_treatments.py:277 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:277 +#: archaeological_finds/models_treatments.py:278 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:312 +#: archaeological_finds/models_treatments.py:313 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:389 +#: archaeological_finds/models_treatments.py:390 #: archaeological_finds/templates/ishtar/sheet_treatment.html:122 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:762 +#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/templates/ishtar/sheet_find.html:393 #: archaeological_finds/templates/ishtar/sheet_find.html:431 #: archaeological_finds/templates/ishtar/sheet_find.html:469 @@ -6062,65 +5853,60 @@ msgstr "" msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:763 #: archaeological_finds/models_treatments.py:764 +#: archaeological_finds/models_treatments.py:765 #: archaeological_finds/templates/ishtar/sheet_treatment.html:112 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:988 +#: archaeological_finds/models_treatments.py:989 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1004 +#: archaeological_finds/models_treatments.py:1005 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1069 +#: archaeological_finds/models_treatments.py:1076 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1074 +#: archaeological_finds/models_treatments.py:1081 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1079 -msgctxt "key for text search" -msgid "exhibition-start-before" -msgstr "" - -#: archaeological_finds/models_treatments.py:1083 +#: archaeological_finds/models_treatments.py:1086 msgctxt "key for text search" -msgid "exhibition-start-after" +msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1087 +#: archaeological_finds/models_treatments.py:1090 msgctxt "key for text search" -msgid "exhibition-end-before" +msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1091 +#: archaeological_finds/models_treatments.py:1094 msgctxt "key for text search" -msgid "exhibition-end-after" +msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1112 -#: archaeological_operations/forms.py:1139 -#: archaeological_operations/forms.py:1236 -#: archaeological_operations/forms.py:1354 -#: archaeological_operations/forms.py:1823 -#: archaeological_operations/models.py:492 +#: archaeological_finds/models_treatments.py:1108 +#: archaeological_operations/forms.py:1132 +#: archaeological_operations/forms.py:1229 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/forms.py:1804 +#: archaeological_operations/models.py:493 #: archaeological_warehouse/forms.py:339 -#: archaeological_warehouse/models.py:2068 ishtar_common/forms_common.py:2151 +#: archaeological_warehouse/models.py:2069 ishtar_common/forms_common.py:2151 #: ishtar_common/forms_common.py:2445 ishtar_common/forms_common.py:2708 #: ishtar_common/models.py:2410 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" msgstr "" -#: archaeological_finds/models_treatments.py:1184 +#: archaeological_finds/models_treatments.py:1180 #: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 @@ -6131,7 +5917,7 @@ msgstr "" msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1252 +#: archaeological_finds/models_treatments.py:1248 msgid "Add associated treatment" msgstr "" @@ -6493,13 +6279,13 @@ msgstr "" msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1665 +#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1666 msgid "The division {} {} do not exist for the location {}." msgstr "" #: archaeological_finds/tests.py:1773 archaeological_finds/tests.py:1799 #: archaeological_finds/tests.py:1809 archaeological_operations/tests.py:3170 -#: ishtar_common/forms.py:1223 ishtar_common/forms.py:1302 +#: ishtar_common/forms.py:1215 ishtar_common/forms.py:1294 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 #: ishtar_common/views_item.py:660 ishtar_common/views_item.py:932 @@ -6508,8 +6294,8 @@ msgid "Yes" msgstr "" #: archaeological_finds/tests.py:1774 archaeological_finds/tests.py:1800 -#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1224 -#: ishtar_common/forms.py:1304 ishtar_common/templatetags/window_field.py:24 +#: archaeological_finds/tests.py:1810 ishtar_common/forms.py:1216 +#: ishtar_common/forms.py:1296 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:504 msgid "No" msgstr "" @@ -6606,10 +6392,10 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:67 -#: archaeological_operations/forms.py:1081 -#: archaeological_operations/forms.py:1097 -#: archaeological_operations/forms.py:1103 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/forms.py:1074 +#: archaeological_operations/forms.py:1090 +#: archaeological_operations/forms.py:1096 +#: archaeological_operations/models.py:3157 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: na_app/templates/ishtar/sheet_operation.html:501 #: sra_idf_app/templates/ishtar/sheet_operation.html:523 @@ -6617,20 +6403,20 @@ msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3164 +#: archaeological_operations/models.py:3139 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3166 +#: archaeological_operations/models.py:3141 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3168 -#: archaeological_operations/models.py:3196 -#: archaeological_operations/models.py:3264 +#: archaeological_operations/models.py:3143 +#: archaeological_operations/models.py:3171 +#: archaeological_operations/models.py:3239 msgid "Public domain" msgstr "" @@ -6687,27 +6473,27 @@ msgid "Operation - 001 - Search" msgstr "" #: archaeological_operations/forms.py:491 -#: archaeological_operations/forms.py:949 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2049 +#: archaeological_operations/forms.py:942 +#: archaeological_operations/models.py:1368 +#: archaeological_operations/models.py:2028 msgid "Yearly index" msgstr "" #: archaeological_operations/forms.py:498 -#: archaeological_operations/forms.py:740 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/forms.py:733 +#: archaeological_operations/models.py:1411 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:500 -#: archaeological_operations/forms.py:721 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/forms.py:714 +#: archaeological_operations/models.py:1510 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:508 -#: archaeological_operations/forms.py:726 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/forms.py:719 +#: archaeological_operations/models.py:1451 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "" @@ -6717,488 +6503,465 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:518 -#: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2835 +#: archaeological_operations/forms.py:770 +#: archaeological_operations/models.py:1357 +#: archaeological_operations/models.py:2810 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:527 -#: archaeological_operations/forms.py:766 -#: archaeological_operations/forms.py:1709 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:759 +#: archaeological_operations/forms.py:1690 +#: archaeological_operations/models.py:1350 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:534 -#: archaeological_operations/forms.py:774 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/forms.py:767 +#: archaeological_operations/models.py:1448 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:536 -#: archaeological_operations/forms.py:1147 -#: archaeological_operations/forms.py:1242 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1875 +#: archaeological_operations/forms.py:1140 +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/forms.py:1856 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:497 -#: archaeological_operations/models.py:992 -#: archaeological_operations/models.py:1081 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/models.py:498 +#: archaeological_operations/models.py:993 +#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1385 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" -#: archaeological_operations/forms.py:538 -msgid "Started before" -msgstr "" - -#: archaeological_operations/forms.py:539 -msgid "Started after" -msgstr "" - -#: archaeological_operations/forms.py:540 -msgid "Ended before" -msgstr "" - -#: archaeological_operations/forms.py:541 -msgid "Ended after" -msgstr "" - -#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:543 msgid "Abstract (full text search)" msgstr "" -#: archaeological_operations/forms.py:547 -#: archaeological_operations/forms.py:833 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/forms.py:545 +#: archaeological_operations/forms.py:826 +#: archaeological_operations/models.py:1454 msgid "Comment about scientific documentation" msgstr "" -#: archaeological_operations/forms.py:548 -#: archaeological_operations/forms.py:835 -#: archaeological_operations/models.py:994 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/forms.py:546 +#: archaeological_operations/forms.py:828 +#: archaeological_operations/models.py:995 +#: archaeological_operations/models.py:1489 msgid "Record quality" msgstr "" -#: archaeological_operations/forms.py:549 -#: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/forms.py:547 +#: archaeological_operations/forms.py:788 +#: archaeological_operations/models.py:1406 msgid "Report processing" msgstr "" -#: archaeological_operations/forms.py:551 -#: archaeological_operations/forms.py:748 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/forms.py:549 +#: archaeological_operations/forms.py:741 +#: archaeological_operations/models.py:1480 msgid "Virtual operation" msgstr "" -#: archaeological_operations/forms.py:572 -#: archaeological_operations/forms.py:818 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/models.py:995 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:570 +#: archaeological_operations/forms.py:811 +#: archaeological_operations/forms.py:1698 +#: archaeological_operations/models.py:996 +#: archaeological_operations/models.py:1500 msgid "Documentation provided" msgstr "" -#: archaeological_operations/forms.py:574 -#: archaeological_operations/forms.py:820 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:572 +#: archaeological_operations/forms.py:813 +#: archaeological_operations/forms.py:1702 +#: archaeological_operations/models.py:1495 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "" -#: archaeological_operations/forms.py:576 -msgid "Documentation deadline before" -msgstr "" - -#: archaeological_operations/forms.py:578 -msgid "Documentation deadline after" +#: archaeological_operations/forms.py:574 +msgid "Documentation deadline" msgstr "" -#: archaeological_operations/forms.py:581 -#: archaeological_operations/forms.py:826 -#: archaeological_operations/forms.py:1724 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:577 +#: archaeological_operations/forms.py:819 +#: archaeological_operations/forms.py:1705 +#: archaeological_operations/models.py:997 +#: archaeological_operations/models.py:1506 msgid "Finds provided" msgstr "" -#: archaeological_operations/forms.py:583 -#: archaeological_operations/forms.py:828 -#: archaeological_operations/forms.py:1728 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:579 +#: archaeological_operations/forms.py:821 +#: archaeological_operations/forms.py:1709 +#: archaeological_operations/models.py:1502 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "" -#: archaeological_operations/forms.py:585 -msgid "Finds deadline before" -msgstr "" - -#: archaeological_operations/forms.py:587 -msgid "Finds deadline after" +#: archaeological_operations/forms.py:580 +msgid "Finds deadline" msgstr "" -#: archaeological_operations/forms.py:677 +#: archaeological_operations/forms.py:670 msgid "Associated file" msgstr "" -#: archaeological_operations/forms.py:690 +#: archaeological_operations/forms.py:683 msgid "Operation - 010 - General" msgstr "" -#: archaeological_operations/forms.py:724 -#: archaeological_operations/forms.py:1771 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:717 +#: archaeological_operations/forms.py:1752 +#: archaeological_operations/models.py:1450 msgid "Generic name" msgstr "" -#: archaeological_operations/forms.py:751 +#: archaeological_operations/forms.py:744 msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:746 +#: archaeological_operations/models.py:1341 +#: archaeological_operations/models.py:2828 msgid "Head scientist" msgstr "" -#: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1369 -#: archaeological_operations/forms.py:1731 -#: archaeological_operations/forms.py:1864 -#: archaeological_operations/models.py:515 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:781 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/forms.py:1712 +#: archaeological_operations/forms.py:1845 +#: archaeological_operations/models.py:516 +#: archaeological_operations/models.py:1364 msgid "Collaborators" msgstr "" -#: archaeological_operations/forms.py:789 +#: archaeological_operations/forms.py:782 msgid "Dates / Administrative" msgstr "" -#: archaeological_operations/forms.py:793 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/forms.py:786 +#: archaeological_operations/models.py:1335 msgid "Report delivery date" msgstr "" -#: archaeological_operations/forms.py:815 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/forms.py:808 +#: archaeological_operations/models.py:1497 msgid "Deadline for submission of the documentation" msgstr "" -#: archaeological_operations/forms.py:823 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/forms.py:816 +#: archaeological_operations/models.py:1504 msgid "Deadline for submission of the finds" msgstr "" -#: archaeological_operations/forms.py:831 +#: archaeological_operations/forms.py:824 msgid "Scientific" msgstr "" -#: archaeological_operations/forms.py:838 +#: archaeological_operations/forms.py:831 #: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "" -#: archaeological_operations/forms.py:844 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/forms.py:837 +#: archaeological_operations/models.py:1494 msgid "Abstract" msgstr "" -#: archaeological_operations/forms.py:904 +#: archaeological_operations/forms.py:897 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: archaeological_operations/forms.py:909 +#: archaeological_operations/forms.py:902 msgid "The excavation end date cannot be before the start date." msgstr "" -#: archaeological_operations/forms.py:939 +#: archaeological_operations/forms.py:932 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d or empty the yearly index field." msgstr "" -#: archaeological_operations/forms.py:943 +#: archaeological_operations/forms.py:936 msgid "Bad operation index" msgstr "" -#: archaeological_operations/forms.py:984 +#: archaeological_operations/forms.py:977 #: archaeological_operations/templates/ishtar/sheet_operation.html:322 #: na_app/templates/ishtar/sheet_operation.html:290 #: sra_idf_app/templates/ishtar/sheet_operation.html:312 msgid "Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:985 +#: archaeological_operations/forms.py:978 msgid "Operation - 015 - Court-ordered seizure" msgstr "" -#: archaeological_operations/forms.py:994 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/forms.py:987 +#: archaeological_operations/models.py:1513 msgid "Seizure name" msgstr "" -#: archaeological_operations/forms.py:997 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/forms.py:990 +#: archaeological_operations/models.py:1515 msgid "Official report number" msgstr "" -#: archaeological_operations/forms.py:1003 +#: archaeological_operations/forms.py:996 msgid "Protagonist" msgstr "" -#: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/forms.py:1002 +#: archaeological_operations/models.py:1527 msgid "Applicant authority" msgstr "" -#: archaeological_operations/forms.py:1015 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/forms.py:1008 +#: archaeological_operations/models.py:1535 msgid "Writer of the minutes" msgstr "" -#: archaeological_operations/forms.py:1020 +#: archaeological_operations/forms.py:1013 msgid "Preventive informations - excavation" msgstr "" -#: archaeological_operations/forms.py:1021 +#: archaeological_operations/forms.py:1014 msgid "Operation - 033 - Preventive - Excavation" msgstr "" -#: archaeological_operations/forms.py:1024 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/forms.py:1017 +#: archaeological_operations/models.py:1390 msgid "Cost (euros)" msgstr "" -#: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/forms.py:1018 +#: archaeological_operations/models.py:1394 msgid "Scheduled man-days" msgstr "" -#: archaeological_operations/forms.py:1027 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/forms.py:1020 +#: archaeological_operations/models.py:1398 msgid "Optional man-days" msgstr "" -#: archaeological_operations/forms.py:1029 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/forms.py:1022 +#: archaeological_operations/models.py:1402 msgid "Effective man-days" msgstr "" -#: archaeological_operations/forms.py:1039 +#: archaeological_operations/forms.py:1032 msgid "Preventive informations - diagnostic" msgstr "" -#: archaeological_operations/forms.py:1040 +#: archaeological_operations/forms.py:1033 msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" -#: archaeological_operations/forms.py:1045 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/forms.py:1038 +#: archaeological_operations/models.py:1422 msgid "Prescription on zoning" msgstr "" -#: archaeological_operations/forms.py:1047 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/forms.py:1040 +#: archaeological_operations/models.py:1426 msgid "Prescription on large area" msgstr "" -#: archaeological_operations/forms.py:1050 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/forms.py:1043 +#: archaeological_operations/models.py:1429 msgid "Prescription on geoarchaeological context" msgstr "" -#: archaeological_operations/forms.py:1071 +#: archaeological_operations/forms.py:1064 msgid "Operation - 040 - Towns" msgstr "" -#: archaeological_operations/forms.py:1076 +#: archaeological_operations/forms.py:1069 msgid "Operation - 040 - Towns (2)" msgstr "" -#: archaeological_operations/forms.py:1098 +#: archaeological_operations/forms.py:1091 msgid "Operation - 050 - Parcels" msgstr "" -#: archaeological_operations/forms.py:1105 +#: archaeological_operations/forms.py:1098 msgid "Operation - 050 - Parcels (2)" msgstr "" -#: archaeological_operations/forms.py:1172 -#: archaeological_operations/forms.py:1400 -#: archaeological_operations/forms.py:1843 +#: archaeological_operations/forms.py:1165 +#: archaeological_operations/forms.py:1393 +#: archaeological_operations/forms.py:1824 msgid "This reference already exists." msgstr "" -#: archaeological_operations/forms.py:1216 +#: archaeological_operations/forms.py:1209 msgid "Would you like to close this operation?" msgstr "" -#: archaeological_operations/forms.py:1221 +#: archaeological_operations/forms.py:1214 msgid "Would you like to delete this operation?" msgstr "" -#: archaeological_operations/forms.py:1230 +#: archaeological_operations/forms.py:1223 msgid "Archaeological site - 001 - Search" msgstr "" -#: archaeological_operations/forms.py:1250 +#: archaeological_operations/forms.py:1243 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1262 -#: archaeological_operations/forms.py:1373 -#: archaeological_operations/models.py:507 +#: archaeological_operations/forms.py:1255 +#: archaeological_operations/forms.py:1366 +#: archaeological_operations/models.py:508 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1265 -#: archaeological_operations/forms.py:1377 -#: archaeological_operations/models.py:510 +#: archaeological_operations/forms.py:1258 +#: archaeological_operations/forms.py:1370 +#: archaeological_operations/models.py:511 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1269 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1262 +#: archaeological_operations/forms.py:1414 +#: archaeological_operations/models.py:528 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1271 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:530 +#: archaeological_operations/forms.py:1264 +#: archaeological_operations/forms.py:1416 +#: archaeological_operations/models.py:531 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1273 -#: archaeological_operations/forms.py:1425 -#: archaeological_operations/models.py:519 +#: archaeological_operations/forms.py:1266 +#: archaeological_operations/forms.py:1418 +#: archaeological_operations/models.py:520 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1276 -#: archaeological_operations/forms.py:1433 -#: archaeological_operations/models.py:521 +#: archaeological_operations/forms.py:1269 +#: archaeological_operations/forms.py:1426 +#: archaeological_operations/models.py:522 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1279 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/models.py:523 +#: archaeological_operations/forms.py:1272 +#: archaeological_operations/forms.py:1420 +#: archaeological_operations/models.py:524 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1281 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/models.py:524 +#: archaeological_operations/forms.py:1274 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/models.py:525 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1283 -#: archaeological_operations/forms.py:1431 -#: archaeological_operations/models.py:525 +#: archaeological_operations/forms.py:1276 +#: archaeological_operations/forms.py:1424 +#: archaeological_operations/models.py:526 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1345 +#: archaeological_operations/forms.py:1338 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1407 +#: archaeological_operations/forms.py:1400 msgid "Archaeological site - 020 - Towns" msgstr "" -#: archaeological_operations/forms.py:1416 +#: archaeological_operations/forms.py:1409 #: archaeological_operations/templates/ishtar/sheet_site.html:52 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1417 +#: archaeological_operations/forms.py:1410 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1496 +#: archaeological_operations/forms.py:1461 +#: archaeological_operations/forms.py:1509 +#: archaeological_operations/models.py:2870 +msgid "Signature date" +msgstr "" + +#: archaeological_operations/forms.py:1477 #: archaeological_operations/views.py:637 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1511 -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1680 +#: archaeological_operations/forms.py:1492 +#: archaeological_operations/forms.py:1594 +#: archaeological_operations/forms.py:1661 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1521 -#: archaeological_operations/models.py:2860 +#: archaeological_operations/forms.py:1502 +#: archaeological_operations/models.py:2835 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1528 -#: archaeological_operations/models.py:2895 -msgid "Signature date" -msgstr "" - -#: archaeological_operations/forms.py:1539 +#: archaeological_operations/forms.py:1520 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1554 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1558 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1590 +#: archaeological_operations/forms.py:1571 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1595 ishtar_common/forms.py:1346 +#: archaeological_operations/forms.py:1576 ishtar_common/forms.py:1338 #: ishtar_common/models.py:2082 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1619 -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1600 +#: archaeological_operations/forms.py:1604 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1641 +#: archaeological_operations/forms.py:1622 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1624 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1664 +#: archaeological_operations/forms.py:1645 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:748 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1685 +#: archaeological_operations/forms.py:1666 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1798 +#: archaeological_operations/forms.py:1779 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1854 +#: archaeological_operations/forms.py:1835 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7246,320 +7009,300 @@ msgstr "" msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:375 -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:1181 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:387 +#: archaeological_operations/models.py:388 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:390 +#: archaeological_operations/models.py:391 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:394 +#: archaeological_operations/models.py:395 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:399 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:403 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:407 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:409 +#: archaeological_operations/models.py:410 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:418 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:421 +#: archaeological_operations/models.py:422 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:426 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:476 +#: archaeological_operations/models.py:477 msgid "Create associated operation" msgstr "" -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:1548 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1560 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:567 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:568 +#: archaeological_operations/models.py:1469 #: archaeological_operations/templates/ishtar/sheet_operation.html:364 #: na_app/templates/ishtar/sheet_operation.html:332 #: sra_idf_app/templates/ishtar/sheet_operation.html:354 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:587 +#: archaeological_operations/models.py:588 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:639 +#: archaeological_operations/models.py:640 msgid "Create an operation associated to this site" msgstr "" -#: archaeological_operations/models.py:641 +#: archaeological_operations/models.py:642 msgid "ope." msgstr "" -#: archaeological_operations/models.py:651 +#: archaeological_operations/models.py:652 msgid "Create a cluster operation for site associated to many operations" msgstr "" -#: archaeological_operations/models.py:653 +#: archaeological_operations/models.py:654 msgid "top ope." msgstr "" -#: archaeological_operations/models.py:806 ishtar_common/forms.py:1222 +#: archaeological_operations/models.py:807 ishtar_common/forms.py:1214 #: ishtar_common/models.py:5507 ishtar_common/models.py:5668 -#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1794 +#: ishtar_common/models.py:5728 ishtar_common/views_item.py:1801 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:808 +#: archaeological_operations/models.py:809 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1060 +#: archaeological_operations/models.py:1054 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1061 +#: archaeological_operations/models.py:1055 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1062 +#: archaeological_operations/models.py:1056 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1063 +#: archaeological_operations/models.py:1057 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1064 +#: archaeological_operations/models.py:1058 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1065 +#: archaeological_operations/models.py:1059 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1066 +#: archaeological_operations/models.py:1060 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1067 +#: archaeological_operations/models.py:1061 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1068 +#: archaeological_operations/models.py:1062 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1069 +#: archaeological_operations/models.py:1063 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1070 +#: archaeological_operations/models.py:1064 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1065 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1070 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:1127 msgctxt "key for text search" msgid "yearly-index" msgstr "" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1130 msgctxt "key for text search" msgid "operation-old-code" msgstr "" -#: archaeological_operations/models.py:1162 +#: archaeological_operations/models.py:1156 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1169 +#: archaeological_operations/models.py:1163 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1172 +#: archaeological_operations/models.py:1166 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1193 -msgctxt "key for text search" -msgid "start-before" -msgstr "" - -#: archaeological_operations/models.py:1196 -msgctxt "key for text search" -msgid "start-after" -msgstr "" - -#: archaeological_operations/models.py:1199 +#: archaeological_operations/models.py:1187 msgctxt "key for text search" -msgid "end-before" +msgid "start" msgstr "" -#: archaeological_operations/models.py:1203 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" -msgid "end-after" +msgid "end" msgstr "" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1194 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1213 +#: archaeological_operations/models.py:1200 msgctxt "key for text search" msgid "operator-reference" msgstr "" -#: archaeological_operations/models.py:1216 +#: archaeological_operations/models.py:1203 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1219 +#: archaeological_operations/models.py:1206 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1223 +#: archaeological_operations/models.py:1210 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1214 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1218 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1240 +#: archaeological_operations/models.py:1227 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "" -#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1231 msgctxt "key for text search" msgid "documentation-provided" msgstr "" -#: archaeological_operations/models.py:1248 -msgctxt "key for text search" -msgid "documentation-deadline-before" -msgstr "" - -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1235 msgctxt "key for text search" -msgid "documentation-deadline-after" +msgid "documentation-deadline" msgstr "" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1239 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1243 msgctxt "key for text search" msgid "finds-provided" msgstr "" -#: archaeological_operations/models.py:1267 -msgctxt "key for text search" -msgid "finds-deadline-before" -msgstr "" - -#: archaeological_operations/models.py:1271 +#: archaeological_operations/models.py:1250 msgctxt "key for text search" -msgid "finds-deadline-after" +msgid "finds-deadline" msgstr "" -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1254 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4430 +#: archaeological_operations/models.py:1292 ishtar_common/models.py:4430 #: ishtar_common/models.py:4528 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1475 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1483 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1519 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1542 msgid "Cached label" msgstr "" -#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:1570 #: archaeological_operations/templates/ishtar/sheet_site.html:85 #: ishtar_common/models.py:1039 #: ishtar_common/templates/ishtar/sheet_document.html:125 @@ -7567,286 +7310,281 @@ msgstr "" msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1610 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1611 msgid "List of containers with finds related to this operation" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1612 msgid "List of containers with documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1613 msgid "List of containers with finds or documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1730 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1825 msgid "No associated town" msgstr "" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1840 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:1983 msgid "context record" msgstr "" -#: archaeological_operations/models.py:2034 +#: archaeological_operations/models.py:2013 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:2082 -#: archaeological_operations/models.py:3085 +#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:3060 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2143 +#: archaeological_operations/models.py:2122 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2153 +#: archaeological_operations/models.py:2132 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2161 +#: archaeological_operations/models.py:2140 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2169 +#: archaeological_operations/models.py:2148 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2223 +#: archaeological_operations/models.py:2202 #: 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:2284 -#: archaeological_operations/models.py:2363 +#: archaeological_operations/models.py:2263 +#: archaeological_operations/models.py:2342 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2328 +#: archaeological_operations/models.py:2307 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2373 +#: archaeological_operations/models.py:2352 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2465 +#: archaeological_operations/models.py:2444 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2466 +#: archaeological_operations/models.py:2445 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2491 +#: archaeological_operations/models.py:2470 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2492 +#: archaeological_operations/models.py:2471 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2558 +#: archaeological_operations/models.py:2537 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2563 +#: archaeological_operations/models.py:2542 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2566 +#: archaeological_operations/models.py:2545 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2570 +#: archaeological_operations/models.py:2549 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2696 +#: archaeological_operations/models.py:2675 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2706 +#: archaeological_operations/models.py:2685 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2709 -#: archaeological_warehouse/models.py:974 +#: archaeological_operations/models.py:2688 +#: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2692 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2704 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2729 +#: archaeological_operations/models.py:2708 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2733 +#: archaeological_operations/models.py:2712 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2736 -msgctxt "key for text search" -msgid "signature-before" -msgstr "" - -#: archaeological_operations/models.py:2740 +#: archaeological_operations/models.py:2715 msgctxt "key for text search" -msgid "signature-after" +msgid "signature" msgstr "" -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2719 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2731 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2760 +#: archaeological_operations/models.py:2735 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2763 +#: archaeological_operations/models.py:2738 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2767 +#: archaeological_operations/models.py:2742 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2746 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2750 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2779 +#: archaeological_operations/models.py:2754 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2783 +#: archaeological_operations/models.py:2758 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2761 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2789 +#: archaeological_operations/models.py:2764 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2793 +#: archaeological_operations/models.py:2768 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2797 +#: archaeological_operations/models.py:2772 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2776 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:2780 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2809 +#: archaeological_operations/models.py:2784 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2843 +#: archaeological_operations/models.py:2818 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2905 +#: archaeological_operations/models.py:2880 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2911 +#: archaeological_operations/models.py:2886 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:3175 +#: archaeological_operations/models.py:3150 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3177 ishtar_common/models.py:2669 +#: archaeological_operations/models.py:3152 ishtar_common/models.py:2669 #: ishtar_common/models.py:2974 ishtar_common/models.py:3981 -#: ishtar_common/models_common.py:3408 ishtar_common/models_common.py:3443 -#: ishtar_common/models_common.py:4369 +#: ishtar_common/models_common.py:3397 ishtar_common/models_common.py:3432 +#: ishtar_common/models_common.py:4360 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3469 ishtar_common/models.py:3846 +#: archaeological_operations/models.py:3444 ishtar_common/models.py:3846 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3484 +#: archaeological_operations/models.py:3459 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3485 +#: archaeological_operations/models.py:3460 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3507 ishtar_common/models.py:5375 +#: archaeological_operations/models.py:3482 ishtar_common/models.py:5375 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3510 +#: archaeological_operations/models.py:3485 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3511 +#: archaeological_operations/models.py:3486 msgid "Operation types old" msgstr "" @@ -8126,7 +7864,7 @@ msgstr "" #: archaeological_warehouse/forms.py:513 archaeological_warehouse/forms.py:736 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:457 -#: archaeological_warehouse/models.py:934 +#: archaeological_warehouse/models.py:935 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:2235 ishtar_common/models.py:5603 #: ishtar_common/views.py:506 @@ -8196,25 +7934,25 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:768 -#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3664 -#: ishtar_common/models_common.py:3853 +#: ishtar_common/forms_common.py:1176 ishtar_common/models_common.py:3653 +#: ishtar_common/models_common.py:3842 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:248 ishtar_common/forms_common.py:771 -#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3669 +#: ishtar_common/forms_common.py:1179 ishtar_common/models_common.py:3658 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:773 -#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3675 +#: ishtar_common/forms_common.py:1181 ishtar_common/models_common.py:3664 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:251 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 -#: ishtar_common/models_common.py:3689 ishtar_common/models_common.py:3865 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" @@ -8223,7 +7961,7 @@ msgstr "" #: archaeological_warehouse/forms.py:253 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8246,14 +7984,14 @@ msgid "Container - 010 - General" msgstr "" #: archaeological_warehouse/forms.py:342 archaeological_warehouse/forms.py:518 -#: archaeological_warehouse/models.py:1185 +#: archaeological_warehouse/models.py:1186 msgid "Old reference" msgstr "" #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:515 #: archaeological_warehouse/forms.py:741 archaeological_warehouse/models.py:741 -#: archaeological_warehouse/models.py:904 -#: archaeological_warehouse/models.py:1153 +#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:1154 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1086 #: na_app/templates/ishtar/sheet_container.html:161 @@ -8265,12 +8003,12 @@ msgid "Current location (warehouse)" msgstr "" #: archaeological_warehouse/forms.py:355 archaeological_warehouse/forms.py:526 -#: archaeological_warehouse/models.py:1168 +#: archaeological_warehouse/models.py:1169 msgid "Parent container" msgstr "" #: archaeological_warehouse/forms.py:365 archaeological_warehouse/forms.py:752 -#: archaeological_warehouse/models.py:1144 +#: archaeological_warehouse/models.py:1145 msgid "Responsibility" msgstr "" @@ -8279,7 +8017,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "" #: archaeological_warehouse/forms.py:378 -#: archaeological_warehouse/models.py:1175 +#: archaeological_warehouse/models.py:1176 msgid "Measured weight (g)" msgstr "" @@ -8389,7 +8127,7 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1213 +#: archaeological_warehouse/models.py:1214 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:224 @@ -8435,7 +8173,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:514 -#: archaeological_warehouse/models.py:1624 +#: archaeological_warehouse/models.py:1625 msgid "No value" msgstr "" @@ -8486,7 +8224,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:765 -#: archaeological_warehouse/models.py:1139 +#: archaeological_warehouse/models.py:1140 msgid "Deprecated - do not use" msgstr "" @@ -8494,164 +8232,164 @@ msgstr "" msgid "Container parent" msgstr "" -#: archaeological_warehouse/models.py:898 -#: archaeological_warehouse/models.py:1129 +#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:1130 msgid "Location (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:899 +#: archaeological_warehouse/models.py:900 msgid "Responsibility (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:931 +#: archaeological_warehouse/models.py:932 msgid "Location - index" msgstr "" -#: archaeological_warehouse/models.py:932 +#: archaeological_warehouse/models.py:933 msgid "Precise localisation" msgstr "" -#: archaeological_warehouse/models.py:950 +#: archaeological_warehouse/models.py:951 msgctxt "key for text search" msgid "responsibility" msgstr "" -#: archaeological_warehouse/models.py:961 +#: archaeological_warehouse/models.py:962 msgctxt "key for text search" msgid "code" msgstr "" -#: archaeological_warehouse/models.py:964 +#: archaeological_warehouse/models.py:965 msgctxt "key for text search" msgid "old-reference" msgstr "" -#: archaeological_warehouse/models.py:979 +#: archaeological_warehouse/models.py:980 msgctxt "key for text search" msgid "operation-scientist" msgstr "" -#: archaeological_warehouse/models.py:1011 +#: archaeological_warehouse/models.py:1012 msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:1015 ishtar_common/models.py:4426 +#: archaeological_warehouse/models.py:1016 ishtar_common/models.py:4426 msgctxt "key for text search" msgid "find-denomination" msgstr "" -#: archaeological_warehouse/models.py:1027 +#: archaeological_warehouse/models.py:1028 msgctxt "key for text search" msgid "preservation" msgstr "" -#: archaeological_warehouse/models.py:1055 +#: archaeological_warehouse/models.py:1056 msgctxt "key for text search" msgid "find-description" msgstr "" -#: archaeological_warehouse/models.py:1058 +#: archaeological_warehouse/models.py:1059 msgctxt "key for text search" msgid "empty" msgstr "" -#: archaeological_warehouse/models.py:1061 +#: archaeological_warehouse/models.py:1062 msgctxt "key for text search" msgid "parent-container" msgstr "" -#: archaeological_warehouse/models.py:1065 +#: archaeological_warehouse/models.py:1066 msgctxt "key for text search" msgid "contain-containers" msgstr "" -#: archaeological_warehouse/models.py:1069 +#: archaeological_warehouse/models.py:1070 msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1148 +#: archaeological_warehouse/models.py:1149 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1157 +#: archaeological_warehouse/models.py:1158 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1161 +#: archaeological_warehouse/models.py:1162 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1164 +#: archaeological_warehouse/models.py:1165 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1177 +#: archaeological_warehouse/models.py:1178 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1180 +#: archaeological_warehouse/models.py:1181 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1183 +#: archaeological_warehouse/models.py:1184 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1385 +#: archaeological_warehouse/models.py:1386 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1389 +#: archaeological_warehouse/models.py:1390 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1809 +#: archaeological_warehouse/models.py:1810 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1816 +#: archaeological_warehouse/models.py:1817 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1820 +#: archaeological_warehouse/models.py:1821 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1821 +#: archaeological_warehouse/models.py:1822 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1822 +#: archaeological_warehouse/models.py:1823 msgid "List of associated finds" msgstr "" -#: archaeological_warehouse/models.py:1823 +#: archaeological_warehouse/models.py:1824 msgid "List of documents contained in this container" msgstr "" -#: archaeological_warehouse/models.py:1824 +#: archaeological_warehouse/models.py:1825 msgid "List of documents whose reference container is this container" msgstr "" -#: archaeological_warehouse/models.py:2066 +#: archaeological_warehouse/models.py:2067 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:2073 +#: archaeological_warehouse/models.py:2074 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:2074 +#: archaeological_warehouse/models.py:2075 msgid "Container localisations" msgstr "" @@ -8881,12 +8619,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1612 +#: ishtar_common/views_item.py:661 ishtar_common/views_item.py:1619 msgid "True" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1614 +#: ishtar_common/views_item.py:1621 msgid "False" msgstr "" @@ -9594,7 +9332,7 @@ msgstr "" msgid "Are you sure you want to delete?" msgstr "" -#: ishtar_common/forms.py:451 ishtar_common/forms.py:1077 +#: ishtar_common/forms.py:451 ishtar_common/forms.py:1069 msgid "You should select an item." msgstr "" @@ -9606,91 +9344,81 @@ msgstr "" msgid "There are identical items." msgstr "" -#: ishtar_common/forms.py:962 -msgid "Created before" +#: ishtar_common/forms.py:962 ishtar_common/models.py:5607 +#: ishtar_common/models_imports.py:1282 ishtar_common/models_imports.py:1299 +#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 +msgid "Created" msgstr "" #: ishtar_common/forms.py:965 -msgid "Created after" -msgstr "" - -#: ishtar_common/forms.py:968 msgid "Last modified by" msgstr "" -#: ishtar_common/forms.py:975 -msgid "Modified before" +#: ishtar_common/forms.py:972 +msgid "Modified" msgstr "" -#: ishtar_common/forms.py:978 -msgid "Modified after" -msgstr "" - -#: ishtar_common/forms.py:980 +#: ishtar_common/forms.py:974 msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:1009 +#: ishtar_common/forms.py:1001 msgid "Imported from" msgstr "" -#: ishtar_common/forms.py:1029 ishtar_common/forms_common.py:2496 +#: ishtar_common/forms.py:1021 ishtar_common/forms_common.py:2496 msgid "Has an image?" msgstr "" -#: ishtar_common/forms.py:1031 +#: ishtar_common/forms.py:1023 msgid "Has an attached file?" msgstr "" -#: ishtar_common/forms.py:1034 +#: ishtar_common/forms.py:1026 msgid "Has a web address?" msgstr "" -#: ishtar_common/forms.py:1036 +#: ishtar_common/forms.py:1028 msgid "Document - Type" msgstr "" -#: ishtar_common/forms.py:1079 +#: ishtar_common/forms.py:1071 msgid "Add a new item" msgstr "" -#: ishtar_common/forms.py:1267 +#: ishtar_common/forms.py:1259 msgid " - append to existing" msgstr "" -#: ishtar_common/forms.py:1270 +#: ishtar_common/forms.py:1262 msgid " - replace" msgstr "" -#: ishtar_common/forms.py:1300 +#: ishtar_common/forms.py:1292 msgid "Set to null" msgstr "" -#: ishtar_common/forms.py:1369 +#: ishtar_common/forms.py:1361 msgid "Geo - Name" msgstr "" -#: ishtar_common/forms.py:1370 +#: ishtar_common/forms.py:1362 msgid "Geo - Data type" msgstr "" -#: ishtar_common/forms.py:1371 +#: ishtar_common/forms.py:1363 msgid "Geo - Origin" msgstr "" -#: ishtar_common/forms.py:1372 +#: ishtar_common/forms.py:1364 msgid "Geo - Provider" msgstr "" -#: ishtar_common/forms.py:1373 -msgid "Geo - Z - higher than" -msgstr "" - -#: ishtar_common/forms.py:1374 -msgid "Geo - Z - lower than" +#: ishtar_common/forms.py:1365 +msgid "Geo - Z" msgstr "" -#: ishtar_common/forms.py:1375 +#: ishtar_common/forms.py:1366 msgid "Geo - Comment" msgstr "" @@ -9851,8 +9579,8 @@ msgstr "" #: ishtar_common/forms_common.py:774 ishtar_common/forms_common.py:1019 #: ishtar_common/forms_common.py:1148 ishtar_common/forms_common.py:1243 -#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3707 -#: ishtar_common/models_common.py:3875 ishtar_common/wizards.py:2005 +#: ishtar_common/forms_common.py:1486 ishtar_common/models_common.py:3696 +#: ishtar_common/models_common.py:3864 ishtar_common/wizards.py:2005 msgid "Email" msgstr "" @@ -9926,12 +9654,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3691 +#: ishtar_common/forms_common.py:1150 ishtar_common/models_common.py:3680 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3694 -#: ishtar_common/models_common.py:3697 +#: ishtar_common/forms_common.py:1154 ishtar_common/models_common.py:3683 +#: ishtar_common/models_common.py:3686 msgid "Phone description 2" msgstr "" @@ -9939,11 +9667,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3701 +#: ishtar_common/forms_common.py:1158 ishtar_common/models_common.py:3690 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3699 +#: ishtar_common/forms_common.py:1160 ishtar_common/models_common.py:3688 msgid "Phone 3" msgstr "" @@ -9951,23 +9679,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3676 +#: ishtar_common/forms_common.py:1183 ishtar_common/models_common.py:3665 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3678 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:3667 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3681 +#: ishtar_common/forms_common.py:1191 ishtar_common/models_common.py:3670 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3684 +#: ishtar_common/forms_common.py:1194 ishtar_common/models_common.py:3673 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3687 +#: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3676 msgid "Other address: country" msgstr "" @@ -10418,7 +10146,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2260 +#: ishtar_common/forms_common.py:3035 ishtar_common/models_common.py:2253 msgid "Import key" msgstr "" @@ -10428,26 +10156,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2275 +#: ishtar_common/forms_common.py:3050 ishtar_common/models_common.py:2268 #: 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:3053 ishtar_common/models_common.py:2267 +#: ishtar_common/forms_common.py:3053 ishtar_common/models_common.py:2260 #: 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:3056 ishtar_common/models_common.py:2283 +#: ishtar_common/forms_common.py:3056 ishtar_common/models_common.py:2276 #: 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:3059 ishtar_common/forms_common.py:3110 -#: ishtar_common/models_common.py:2249 +#: ishtar_common/models_common.py:2242 msgid "Buffer" msgstr "" @@ -10455,18 +10183,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2296 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/forms_common.py:3068 ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:4194 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2299 -#: ishtar_common/models_common.py:4206 +#: ishtar_common/forms_common.py:3073 ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:4197 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2302 -#: ishtar_common/models_common.py:4209 +#: ishtar_common/forms_common.py:3078 ishtar_common/models_common.py:2295 +#: ishtar_common/models_common.py:4200 msgid "Estimated error for Z" msgstr "" @@ -10475,10 +10203,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3109 ishtar_common/models.py:2436 -#: ishtar_common/models_common.py:2061 ishtar_common/models_common.py:2119 -#: ishtar_common/models_common.py:2151 ishtar_common/models_common.py:2168 -#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:2198 -#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:3429 +#: ishtar_common/models_common.py:2054 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2144 ishtar_common/models_common.py:2161 +#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:2191 +#: ishtar_common/models_common.py:2320 ishtar_common/models_common.py:3418 msgid "Geography" msgstr "" @@ -10506,8 +10234,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2218 -#: ishtar_common/models_common.py:4218 +#: ishtar_common/forms_common.py:3390 ishtar_common/models_common.py:2211 +#: ishtar_common/models_common.py:4209 msgid "Point" msgstr "" @@ -12149,7 +11877,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1846 +#: ishtar_common/models.py:4456 ishtar_common/models_common.py:1839 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12331,12 +12059,6 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:5607 ishtar_common/models_imports.py:1282 -#: ishtar_common/models_imports.py:1299 -#: ishtar_common/templates/ishtar/sheet_import_gen.html:25 -msgid "Created" -msgstr "" - #: ishtar_common/models.py:5612 msgid "Filter on" msgstr "" @@ -12466,381 +12188,366 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1141 +#: ishtar_common/models_common.py:1142 msgid "Created by imports" msgstr "" -#: ishtar_common/models_common.py:1143 +#: ishtar_common/models_common.py:1144 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1144 +#: ishtar_common/models_common.py:1145 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1147 +#: ishtar_common/models_common.py:1148 msgid "Updated by imports" msgstr "" -#: ishtar_common/models_common.py:1152 +#: ishtar_common/models_common.py:1153 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1539 +#: ishtar_common/models_common.py:1540 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1547 +#: ishtar_common/models_common.py:1548 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1554 ishtar_common/models_common.py:2253 +#: ishtar_common/models_common.py:1555 ishtar_common/models_common.py:2246 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1556 +#: ishtar_common/models_common.py:1557 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1562 +#: ishtar_common/models_common.py:1563 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1582 +#: ishtar_common/models_common.py:1581 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1586 +#: ishtar_common/models_common.py:1585 msgctxt "key for text search" -msgid "created-before" +msgid "created" msgstr "" -#: ishtar_common/models_common.py:1590 +#: ishtar_common/models_common.py:1589 msgctxt "key for text search" -msgid "created-after" +msgid "modified" msgstr "" #: ishtar_common/models_common.py:1593 msgctxt "key for text search" -msgid "modified-before" -msgstr "" - -#: ishtar_common/models_common.py:1597 -msgctxt "key for text search" -msgid "modified-after" -msgstr "" - -#: ishtar_common/models_common.py:1600 -msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:1850 +#: ishtar_common/models_common.py:1843 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:1854 +#: ishtar_common/models_common.py:1847 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:1858 +#: ishtar_common/models_common.py:1851 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:1942 +#: ishtar_common/models_common.py:1935 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:1944 +#: ishtar_common/models_common.py:1937 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2107 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2100 ishtar_common/models_common.py:2121 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2128 +#: ishtar_common/models_common.py:2101 ishtar_common/models_common.py:2121 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2109 +#: ishtar_common/models_common.py:2102 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2110 +#: ishtar_common/models_common.py:2103 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2106 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2107 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2138 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2146 +#: ishtar_common/models_common.py:2139 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2162 +#: ishtar_common/models_common.py:2155 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2163 +#: ishtar_common/models_common.py:2156 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2179 +#: ishtar_common/models_common.py:2172 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2180 +#: ishtar_common/models_common.py:2173 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2192 +#: ishtar_common/models_common.py:2185 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2193 +#: ishtar_common/models_common.py:2186 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2219 +#: ishtar_common/models_common.py:2212 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2220 +#: ishtar_common/models_common.py:2213 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2221 +#: ishtar_common/models_common.py:2214 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2261 +#: ishtar_common/models_common.py:2254 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2261 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2276 +#: ishtar_common/models_common.py:2269 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2284 +#: ishtar_common/models_common.py:2277 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:4199 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:4190 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2287 ishtar_common/models_common.py:2288 -#: ishtar_common/models_common.py:2289 +#: ishtar_common/models_common.py:2280 ishtar_common/models_common.py:2281 +#: ishtar_common/models_common.py:2282 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2288 ishtar_common/models_common.py:4200 +#: ishtar_common/models_common.py:2281 ishtar_common/models_common.py:4191 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2289 ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:2282 ishtar_common/models_common.py:4192 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2292 +#: ishtar_common/models_common.py:2285 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2293 +#: ishtar_common/models_common.py:2286 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2294 +#: ishtar_common/models_common.py:2287 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2306 ishtar_common/models_common.py:4213 +#: ishtar_common/models_common.py:2299 ishtar_common/models_common.py:4204 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:4219 +#: ishtar_common/models_common.py:2304 ishtar_common/models_common.py:4210 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2312 +#: ishtar_common/models_common.py:2305 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2313 +#: ishtar_common/models_common.py:2306 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2314 +#: ishtar_common/models_common.py:2307 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2315 +#: ishtar_common/models_common.py:2308 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2318 ishtar_common/models_common.py:2319 +#: ishtar_common/models_common.py:2311 ishtar_common/models_common.py:2312 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2448 +#: ishtar_common/models_common.py:2441 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2912 +#: ishtar_common/models_common.py:2905 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2916 +#: ishtar_common/models_common.py:2909 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2920 +#: ishtar_common/models_common.py:2913 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:2923 +#: ishtar_common/models_common.py:2916 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2926 +#: ishtar_common/models_common.py:2919 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2929 +#: ishtar_common/models_common.py:2922 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2932 +#: ishtar_common/models_common.py:2925 msgctxt "key for text search" -msgid "z-higher" +msgid "z" msgstr "" -#: ishtar_common/models_common.py:2936 -msgctxt "key for text search" -msgid "z-lower" -msgstr "" - -#: ishtar_common/models_common.py:2940 +#: ishtar_common/models_common.py:2929 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2966 +#: ishtar_common/models_common.py:2955 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2968 +#: ishtar_common/models_common.py:2957 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3363 +#: ishtar_common/models_common.py:3352 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3365 +#: ishtar_common/models_common.py:3354 msgid "regen." msgstr "" -#: ishtar_common/models_common.py:3385 +#: ishtar_common/models_common.py:3374 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3387 +#: ishtar_common/models_common.py:3376 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3397 +#: ishtar_common/models_common.py:3386 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3401 +#: ishtar_common/models_common.py:3390 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3405 +#: ishtar_common/models_common.py:3394 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3671 +#: ishtar_common/models_common.py:3660 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3703 +#: ishtar_common/models_common.py:3692 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3709 +#: ishtar_common/models_common.py:3698 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3742 +#: ishtar_common/models_common.py:3731 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:3779 +#: ishtar_common/models_common.py:3768 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3860 +#: ishtar_common/models_common.py:3849 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3870 +#: ishtar_common/models_common.py:3859 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3888 +#: ishtar_common/models_common.py:3877 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4197 +#: ishtar_common/models_common.py:4188 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4221 +#: ishtar_common/models_common.py:4212 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4224 +#: ishtar_common/models_common.py:4215 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4226 +#: ishtar_common/models_common.py:4217 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4228 +#: ishtar_common/models_common.py:4219 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4235 +#: ishtar_common/models_common.py:4226 msgid "Multi polygon source item" msgstr "" |