diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-20 15:26:14 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-20 15:47:14 +0200 |
commit | ebba3f20d0e399c067be2c9b39b56baa234aa690 (patch) | |
tree | e48a641f99e0b2eb646cd29027d469e54f0fb76f | |
parent | df7b7527db7936d9a5014cd121525a36dbf57531 (diff) | |
download | Ishtar-ebba3f20d0e399c067be2c9b39b56baa234aa690.tar.bz2 Ishtar-ebba3f20d0e399c067be2c9b39b56baa234aa690.zip |
🌐 localization
-rw-r--r-- | locale/de/LC_MESSAGES/django.po | 3656 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 3642 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 3672 | ||||
-rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 3642 |
4 files changed, 7742 insertions, 6870 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 6b5032b0b..7f69836ba 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-09-17 11:29+0200\n" +"POT-Creation-Date: 2024-09-20 15:25+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-" @@ -19,25 +19,25 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.9.1\n" -#: archaeological_context_records/forms.py:77 -#: archaeological_context_records/forms.py:83 -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/models.py:835 +#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:84 +#: archaeological_context_records/models.py:576 +#: archaeological_context_records/models.py:842 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2739 +#: archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2759 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:386 -#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1227 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2572 -#: archaeological_operations/models.py:2688 -#: archaeological_operations/models.py:2883 -#: archaeological_operations/models.py:3173 +#: archaeological_operations/models.py:1707 +#: archaeological_operations/models.py:2671 +#: archaeological_operations/models.py:2689 +#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:3000 +#: archaeological_operations/models.py:3290 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 @@ -48,101 +48,101 @@ msgstr "" msgid "Operation" msgstr "" -#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:79 msgid "Context record - 010 - Operation choice" msgstr "" -#: archaeological_context_records/forms.py:93 +#: archaeological_context_records/forms.py:94 msgid "Dating - period" msgstr "" -#: archaeological_context_records/forms.py:94 +#: archaeological_context_records/forms.py:95 msgid "Dating - precise" msgstr "" -#: archaeological_context_records/forms.py:95 +#: archaeological_context_records/forms.py:96 msgid "Dating - start date" msgstr "" -#: archaeological_context_records/forms.py:96 +#: archaeological_context_records/forms.py:97 msgid "Dating - end date" msgstr "" -#: archaeological_context_records/forms.py:98 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "" -#: archaeological_context_records/forms.py:100 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "" -#: archaeological_context_records/forms.py:129 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "" -#: archaeological_context_records/forms.py:133 archaeological_files/forms.py:88 -#: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 -#: archaeological_finds/forms.py:1693 archaeological_finds/forms.py:2409 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:88 +#: archaeological_files/forms.py:1079 archaeological_files/forms.py:1115 +#: archaeological_finds/forms.py:1703 archaeological_finds/forms.py:2421 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:557 #: archaeological_finds/forms_treatments.py:632 #: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:458 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1453 #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" msgstr "" -#: archaeological_context_records/forms.py:136 -#: archaeological_context_records/forms.py:316 -#: archaeological_context_records/forms.py:624 -#: archaeological_context_records/forms.py:678 -#: archaeological_context_records/models.py:847 -#: archaeological_context_records/models.py:1514 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/forms.py:639 +#: archaeological_context_records/forms.py:693 +#: archaeological_context_records/models.py:854 +#: archaeological_context_records/models.py:1525 msgid "ID" msgstr "" -#: archaeological_context_records/forms.py:140 -#: archaeological_operations/forms.py:1716 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1760 msgid "Code PATRIARCHE" msgstr "" -#: archaeological_context_records/forms.py:142 +#: archaeological_context_records/forms.py:143 #, fuzzy #| msgid "email address" msgid "Operation - name" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:143 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2526 #, fuzzy #| msgid "email address" msgid "Operation - year" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:145 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "" -#: archaeological_context_records/forms.py:148 -#: archaeological_context_records/forms.py:794 -#: archaeological_context_records/models.py:841 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:817 +#: archaeological_context_records/models.py:848 #: archaeological_operations/forms.py:521 -#: archaeological_operations/models.py:574 ishtar_common/models.py:5563 +#: archaeological_operations/models.py:691 ishtar_common/models.py:5563 msgid "Archaeological site" msgstr "" -#: archaeological_context_records/forms.py:156 -#: archaeological_finds/forms.py:1782 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1792 msgid "Search within related operations" msgstr "" -#: archaeological_context_records/forms.py:158 -#: archaeological_files/templates/ishtar/sheet_file.html:188 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_context_records/forms.py:159 +#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:717 #: archaeological_finds/models_treatments.py:140 @@ -200,22 +200,29 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_context_records/forms.py:159 -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/forms.py:791 -#: archaeological_context_records/models.py:578 -#: archaeological_context_records/models.py:931 ishtar_common/admin.py:797 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:858 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +msgid "Excavator" +msgstr "" + +#: archaeological_context_records/forms.py:166 +#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:810 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:942 ishtar_common/admin.py:797 #: ishtar_common/models.py:3389 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:160 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/forms.py:792 -#: archaeological_context_records/models.py:577 -#: archaeological_context_records/models.py:923 -#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:741 -#: archaeological_finds/forms.py:975 +#: archaeological_context_records/forms.py:167 +#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:811 +#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:934 +#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:751 +#: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:145 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:98 #: cd17_app/templates/ishtar/sheet_find.html:155 @@ -230,38 +237,42 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:162 -#: archaeological_context_records/models.py:888 -#: archaeological_finds/forms.py:489 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2049 -#: archaeological_operations/forms.py:1206 -#: archaeological_operations/models.py:508 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/models.py:899 +#: archaeological_finds/forms.py:494 archaeological_finds/forms.py:1146 +#: archaeological_finds/forms.py:1867 archaeological_finds/models_finds.py:2069 +#: archaeological_operations/forms.py:1210 +#: archaeological_operations/models.py:606 msgid "Cultural attribution" msgstr "" -#: archaeological_context_records/forms.py:163 -#: archaeological_context_records/forms.py:330 -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:170 +#: archaeological_context_records/forms.py:345 +#: archaeological_context_records/forms.py:808 #: ishtar_common/forms_common.py:1992 ishtar_common/templates/welcome.html:12 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:164 -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/forms.py:345 -#: archaeological_context_records/models.py:848 -#: archaeological_context_records/models.py:1517 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 -#: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 -#: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:976 -#: archaeological_finds/forms.py:1076 archaeological_finds/forms.py:1796 +#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:337 +#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/models.py:855 +#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: archaeological_finds/forms.py:428 archaeological_finds/forms.py:433 +#: archaeological_finds/forms.py:593 archaeological_finds/forms.py:758 +#: archaeological_finds/forms.py:760 archaeological_finds/forms.py:986 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1806 #: archaeological_finds/forms_treatments.py:192 -#: archaeological_finds/models_finds.py:554 -#: archaeological_finds/models_finds.py:1991 +#: archaeological_finds/models_finds.py:566 +#: archaeological_finds/models_finds.py:2011 #: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 +#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/models.py:628 +#: archaeological_operations/templates/ishtar/sheet_site.html:54 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2164 ishtar_common/forms_common.py:2440 #: ishtar_common/models.py:1056 ishtar_common/models.py:4652 @@ -275,113 +286,115 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:165 -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:849 -#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1853 -#: archaeological_finds/models_finds.py:2136 +#: archaeological_context_records/forms.py:172 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:856 +#: archaeological_finds/forms.py:492 archaeological_finds/forms.py:1864 +#: archaeological_finds/models_finds.py:2156 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:166 -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:885 +#: archaeological_context_records/forms.py:173 +#: archaeological_context_records/forms.py:352 +#: archaeological_context_records/models.py:896 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:516 -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/forms.py:174 +#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/models.py:897 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:195 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:196 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:307 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/forms.py:679 -#: archaeological_context_records/models.py:564 +#: archaeological_context_records/forms.py:175 +#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:641 +#: archaeological_context_records/forms.py:694 #: archaeological_context_records/models.py:565 -#: archaeological_context_records/models.py:819 -#: archaeological_context_records/models.py:1516 +#: archaeological_context_records/models.py:566 +#: archaeological_context_records/models.py:826 +#: archaeological_context_records/models.py:1527 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 -#: archaeological_finds/models_finds.py:1156 +#: archaeological_files/forms.py:95 archaeological_files/forms.py:1128 +#: archaeological_finds/models_finds.py:1172 #: archaeological_operations/forms.py:473 #: archaeological_operations/forms.py:1046 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:3197 -#: archaeological_operations/models.py:3491 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3608 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" -#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:176 #: archaeological_operations/forms.py:546 msgid "Has finds" msgstr "" -#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:178 #: archaeological_operations/forms.py:511 msgid "Search within relations" msgstr "" -#: archaeological_context_records/forms.py:173 -#: archaeological_context_records/forms.py:324 -#: archaeological_context_records/models.py:579 -#: archaeological_context_records/models.py:936 +#: archaeological_context_records/forms.py:180 +#: archaeological_context_records/forms.py:339 +#: archaeological_context_records/models.py:580 +#: archaeological_context_records/models.py:947 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:174 -#: archaeological_context_records/forms.py:348 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/forms.py:181 +#: archaeological_context_records/forms.py:363 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:147 msgid "Structure" msgstr "" -#: archaeological_context_records/forms.py:175 -#: archaeological_context_records/forms.py:354 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/forms.py:182 +#: archaeological_context_records/forms.py:369 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:148 msgid "Texture" msgstr "" -#: archaeological_context_records/forms.py:176 -#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/forms.py:183 +#: archaeological_context_records/forms.py:375 +#: archaeological_context_records/forms.py:815 msgid "Inclusions" msgstr "" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:366 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/forms.py:184 +#: archaeological_context_records/forms.py:381 +#: archaeological_context_records/forms.py:814 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 msgid "Colors" msgstr "" -#: archaeological_context_records/forms.py:178 -#: archaeological_context_records/forms.py:371 -#: archaeological_context_records/models.py:874 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/forms.py:185 +#: archaeological_context_records/forms.py:386 +#: archaeological_context_records/models.py:885 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 msgid "Details on color" msgstr "" -#: archaeological_context_records/forms.py:217 -#: archaeological_context_records/forms.py:238 +#: archaeological_context_records/forms.py:224 +#: archaeological_context_records/forms.py:245 #: archaeological_context_records/views.py:115 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:287 -#: archaeological_files/forms.py:205 +#: archaeological_context_records/forms.py:294 +#: archaeological_files/forms.py:209 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:651 #: archaeological_operations/forms.py:677 -#: archaeological_operations/forms.py:1306 -#: archaeological_operations/forms.py:1466 +#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1510 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -396,21 +409,21 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:288 +#: archaeological_context_records/forms.py:295 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:616 -#: archaeological_context_records/forms.py:680 -#: archaeological_context_records/forms.py:783 -#: archaeological_context_records/models.py:561 +#: archaeological_context_records/forms.py:316 +#: archaeological_context_records/forms.py:631 +#: archaeological_context_records/forms.py:695 +#: archaeological_context_records/forms.py:802 #: archaeological_context_records/models.py:562 -#: archaeological_context_records/models.py:827 -#: archaeological_finds/models_finds.py:1153 +#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:834 +#: archaeological_finds/models_finds.py:1169 #: archaeological_operations/forms.py:72 archaeological_operations/forms.py:210 #: archaeological_operations/forms.py:1018 -#: archaeological_operations/models.py:3178 +#: archaeological_operations/models.py:3295 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 @@ -420,37 +433,37 @@ msgstr "" msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:313 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:321 +#: archaeological_context_records/forms.py:636 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:318 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:682 -#: archaeological_context_records/models.py:566 -#: archaeological_context_records/models.py:574 -#: archaeological_context_records/models.py:879 -#: archaeological_context_records/models.py:1515 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/forms.py:642 +#: archaeological_context_records/forms.py:697 +#: archaeological_context_records/models.py:567 +#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:890 +#: archaeological_context_records/models.py:1526 msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:850 +#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/models.py:861 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:336 -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:248 -#: archaeological_files/models.py:629 +#: archaeological_context_records/forms.py:351 +#: archaeological_context_records/models.py:862 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_files/models.py:663 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:660 #: archaeological_finds/forms_treatments.py:753 #: archaeological_finds/models_treatments.py:276 #: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:1350 +#: archaeological_operations/models.py:1467 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1043 ishtar_common/forms.py:1044 #: na_app/templates/ishtar/sheet_operation.html:204 @@ -458,8 +471,8 @@ msgstr "" msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:339 -#: archaeological_context_records/models.py:864 +#: archaeological_context_records/forms.py:354 +#: archaeological_context_records/models.py:875 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:237 #: archaeological_finds/models_treatments.py:851 @@ -469,10 +482,10 @@ msgstr "" msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:372 +#: archaeological_context_records/forms.py:387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:155 -#: archaeological_finds/forms.py:496 archaeological_finds/forms.py:797 -#: archaeological_finds/forms.py:1604 +#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:807 +#: archaeological_finds/forms.py:1614 #: archaeological_finds/templates/ishtar/sheet_find.html:196 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:175 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -483,65 +496,66 @@ msgstr "" msgid "Dimensions" msgstr "" -#: archaeological_context_records/forms.py:376 +#: archaeological_context_records/forms.py:391 +#: archaeological_files/forms.py:313 archaeological_files/models.py:700 msgid "Total surface (m²)" msgstr "" -#: archaeological_context_records/forms.py:382 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/forms.py:397 +#: archaeological_context_records/models.py:863 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:383 -#: archaeological_context_records/models.py:853 +#: archaeological_context_records/forms.py:398 +#: archaeological_context_records/models.py:864 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 msgid "Excavated length (m)" msgstr "" -#: archaeological_context_records/forms.py:384 -#: archaeological_context_records/models.py:854 +#: archaeological_context_records/forms.py:399 +#: archaeological_context_records/models.py:865 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:385 -#: archaeological_context_records/models.py:855 +#: archaeological_context_records/forms.py:400 +#: archaeological_context_records/models.py:866 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:168 msgid "Excavated width (m)" msgstr "" -#: archaeological_context_records/forms.py:386 -#: archaeological_context_records/models.py:856 +#: archaeological_context_records/forms.py:401 +#: archaeological_context_records/models.py:867 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:387 -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/forms.py:402 +#: archaeological_context_records/models.py:868 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:388 -#: archaeological_context_records/models.py:858 +#: archaeological_context_records/forms.py:403 +#: archaeological_context_records/models.py:869 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:390 -#: archaeological_context_records/models.py:860 +#: archaeological_context_records/forms.py:405 +#: archaeological_context_records/models.py:871 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:477 +#: archaeological_context_records/forms.py:492 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:482 +#: archaeological_context_records/forms.py:497 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:487 -#: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:156 -#: archaeological_finds/forms.py:1541 archaeological_finds/forms.py:1562 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/models.py:157 +#: archaeological_finds/forms.py:1551 archaeological_finds/forms.py:1572 +#: archaeological_finds/models_finds.py:2066 #: archaeological_finds/templates/ishtar/sheet_find.html:247 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:195 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -552,11 +566,11 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:494 -#: archaeological_context_records/models.py:108 -#: archaeological_context_records/models.py:576 -#: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1548 -#: archaeological_finds/models_finds.py:1206 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:109 +#: archaeological_context_records/models.py:577 +#: archaeological_finds/forms.py:1143 archaeological_finds/forms.py:1558 +#: archaeological_finds/models_finds.py:1222 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 #: archaeological_operations/forms.py:803 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 @@ -574,15 +588,15 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:495 -#: archaeological_context_records/models.py:110 -#: archaeological_files/forms.py:775 archaeological_files/models.py:76 -#: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms.py:1550 +#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/models.py:111 +#: archaeological_files/forms.py:750 archaeological_files/models.py:78 +#: archaeological_files/models.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:193 +#: archaeological_finds/forms.py:1560 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:751 -#: archaeological_finds/models_finds.py:3700 +#: archaeological_finds/models_finds.py:3720 #: archaeological_finds/models_treatments.py:275 #: archaeological_finds/models_treatments.py:849 #: archaeological_finds/templates/ishtar/sheet_find.html:438 @@ -593,9 +607,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 #: archaeological_operations/forms.py:508 #: archaeological_operations/forms.py:752 -#: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3495 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:3612 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -620,11 +634,11 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:496 -#: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:664 archaeological_files/forms.py:780 -#: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3701 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:112 +#: archaeological_files/forms.py:639 archaeological_files/forms.py:755 +#: archaeological_files/models.py:79 archaeological_files/models.py:778 +#: archaeological_finds/forms.py:1561 archaeological_finds/models_finds.py:3721 #: archaeological_finds/models_treatments.py:850 #: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_finds/templates/ishtar/sheet_find.html:477 @@ -634,8 +648,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3496 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:3613 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -666,9 +680,9 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:497 -#: archaeological_context_records/models.py:121 -#: archaeological_finds/forms.py:1552 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:122 +#: archaeological_finds/forms.py:1562 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: cd17_app/templates/ishtar/sheet_find.html:233 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 @@ -679,10 +693,10 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:498 -#: archaeological_context_records/models.py:83 -#: archaeological_context_records/models.py:114 -#: archaeological_finds/forms.py:1549 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:115 +#: archaeological_finds/forms.py:1559 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: cd17_app/templates/ishtar/sheet_find.html:232 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 @@ -693,150 +707,158 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:499 -#: archaeological_context_records/models.py:126 -#: archaeological_finds/forms.py:1553 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:127 +#: archaeological_finds/forms.py:1563 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/forms.py:525 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:532 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:211 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:212 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:536 -#: archaeological_context_records/models.py:891 +#: archaeological_context_records/forms.py:551 +#: archaeological_context_records/models.py:902 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:900 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/models.py:911 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:906 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/models.py:917 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:915 +#: archaeological_context_records/forms.py:554 +#: archaeological_context_records/models.py:926 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:541 +#: archaeological_context_records/forms.py:556 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/forms.py:1327 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1368 +#: archaeological_operations/forms.py:1864 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:561 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:574 #: archaeological_operations/forms.py:586 #: archaeological_operations/forms.py:599 #: archaeological_operations/views.py:197 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:579 #: archaeological_operations/forms.py:379 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:570 +#: archaeological_context_records/forms.py:585 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:580 +#: archaeological_context_records/forms.py:595 msgid "You should select a context record and a relation type." msgstr "" -#: archaeological_context_records/forms.py:581 +#: archaeological_context_records/forms.py:596 msgid "A context record cannot be related to himself." msgstr "" -#: archaeological_context_records/forms.py:584 +#: archaeological_context_records/forms.py:599 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1645 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1656 #: archaeological_context_records/views.py:253 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 -#: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 -#: archaeological_finds/forms.py:1774 archaeological_finds/models_finds.py:1149 -#: archaeological_finds/models_finds.py:2731 +#: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:1784 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2751 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1842 #: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5564 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:610 +#: archaeological_context_records/forms.py:625 msgid "Context records - Relations" msgstr "" -#: archaeological_context_records/forms.py:611 +#: archaeological_context_records/forms.py:626 msgid "Context record - Relations" msgstr "" -#: archaeological_context_records/forms.py:714 -#: archaeological_finds/forms.py:1355 archaeological_finds/forms.py:1380 -#: archaeological_operations/forms.py:1786 ishtar_common/forms_common.py:2701 +#: archaeological_context_records/forms.py:729 +#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1390 +#: archaeological_operations/forms.py:1830 ishtar_common/forms_common.py:2701 #: ishtar_common/models.py:3545 ishtar_common/models.py:3919 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:744 +#: archaeological_context_records/forms.py:759 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:769 -#: archaeological_context_records/models.py:1406 -#: archaeological_context_records/models.py:1445 -#: archaeological_context_records/models.py:1513 +#: archaeological_context_records/forms.py:788 +#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1524 #: archaeological_operations/forms.py:383 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:773 +#: archaeological_context_records/forms.py:792 #: 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:781 +#: archaeological_context_records/forms.py:800 msgid "Unit type" msgstr "" -#: archaeological_context_records/forms.py:790 +#: archaeological_context_records/forms.py:809 msgid "Excavation technic" msgstr "" -#: archaeological_context_records/forms.py:802 +#: archaeological_context_records/forms.py:812 +msgid "Structures" +msgstr "" + +#: archaeological_context_records/forms.py:813 +msgid "Textures" +msgstr "" + +#: archaeological_context_records/forms.py:825 #, fuzzy #| msgid "email address" msgid "Associated parcel" msgstr "E-Mail-Adresse" -#: archaeological_context_records/forms.py:831 +#: archaeological_context_records/forms.py:858 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:850 +#: archaeological_context_records/forms.py:877 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -918,61 +940,61 @@ msgstr "" msgid "Deletion" msgstr "" -#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:85 msgid "Dating types" msgstr "" -#: archaeological_context_records/models.py:94 +#: archaeological_context_records/models.py:95 msgid "Dating quality type" msgstr "" -#: archaeological_context_records/models.py:95 +#: archaeological_context_records/models.py:96 msgid "Dating quality types" msgstr "" -#: archaeological_context_records/models.py:130 +#: archaeological_context_records/models.py:131 #: archaeological_context_records/tests.py:935 #: archaeological_finds/tests.py:1520 archaeological_finds/tests.py:1749 msgctxt "key for text search" msgid "datings-period" msgstr "" -#: archaeological_context_records/models.py:134 +#: archaeological_context_records/models.py:135 msgctxt "key for text search" msgid "datings-precise" msgstr "" -#: archaeological_context_records/models.py:138 +#: archaeological_context_records/models.py:139 msgctxt "key for text search" msgid "datings-start" msgstr "" -#: archaeological_context_records/models.py:142 +#: archaeological_context_records/models.py:143 msgctxt "key for text search" msgid "datings-end" msgstr "" -#: archaeological_context_records/models.py:146 +#: archaeological_context_records/models.py:147 msgctxt "key for text search" msgid "datings-type" msgstr "" -#: archaeological_context_records/models.py:150 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "" -#: archaeological_context_records/models.py:157 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "" -#: archaeological_context_records/models.py:273 -#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 +#: archaeological_context_records/models.py:274 +#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:613 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2308 -#: archaeological_finds/models_finds.py:3605 -#: archaeological_finds/models_finds.py:3645 -#: archaeological_finds/models_finds.py:3688 +#: archaeological_finds/models_finds.py:2328 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/models_finds.py:3665 +#: archaeological_finds/models_finds.py:3708 #: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 @@ -985,24 +1007,24 @@ msgstr "" msgid "Find" msgstr "" -#: archaeological_context_records/models.py:298 -#: archaeological_context_records/models.py:321 -#: 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:105 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 +#: archaeological_files/models.py:77 archaeological_files/models.py:107 +#: archaeological_files/models.py:161 archaeological_files/models.py:177 +#: archaeological_files/models.py:237 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:259 #: archaeological_finds/models_finds.py:335 #: archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1982 +#: archaeological_finds/models_finds.py:2002 #: archaeological_finds/models_treatments.py:67 #: archaeological_finds/models_treatments.py:843 -#: archaeological_operations/models.py:100 -#: archaeological_operations/models.py:125 -#: archaeological_operations/models.py:143 -#: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3522 +#: archaeological_operations/models.py:102 +#: archaeological_operations/models.py:127 +#: archaeological_operations/models.py:184 +#: archaeological_operations/models.py:197 +#: archaeological_operations/models.py:3639 #: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:681 #: ishtar_common/models.py:737 ishtar_common/models.py:788 @@ -1014,215 +1036,215 @@ msgstr "" msgid "Order" msgstr "" -#: archaeological_context_records/models.py:301 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "" -#: archaeological_context_records/models.py:308 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "" -#: archaeological_context_records/models.py:309 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "" -#: archaeological_context_records/models.py:324 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "" -#: archaeological_context_records/models.py:325 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "" -#: archaeological_context_records/models.py:338 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "" -#: archaeological_context_records/models.py:339 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "" -#: archaeological_context_records/models.py:352 +#: archaeological_context_records/models.py:353 msgid "Structure Type" msgstr "" -#: archaeological_context_records/models.py:353 +#: archaeological_context_records/models.py:354 msgid "Structure Types" msgstr "" -#: archaeological_context_records/models.py:366 +#: archaeological_context_records/models.py:367 msgid "Texture Type" msgstr "" -#: archaeological_context_records/models.py:367 +#: archaeological_context_records/models.py:368 msgid "Texture Types" msgstr "" -#: archaeological_context_records/models.py:380 +#: archaeological_context_records/models.py:381 msgid "Color Type" msgstr "" -#: archaeological_context_records/models.py:381 +#: archaeological_context_records/models.py:382 msgid "Color Types" msgstr "" -#: archaeological_context_records/models.py:394 +#: archaeological_context_records/models.py:395 msgid "Inclusion Type" msgstr "" -#: archaeological_context_records/models.py:395 +#: archaeological_context_records/models.py:396 msgid "Inclusion Types" msgstr "" -#: archaeological_context_records/models.py:408 +#: archaeological_context_records/models.py:409 msgid "Excavation technique type" msgstr "" -#: archaeological_context_records/models.py:409 +#: archaeological_context_records/models.py:410 msgid "Excavation technique types" msgstr "" -#: archaeological_context_records/models.py:419 +#: archaeological_context_records/models.py:420 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "" -#: archaeological_context_records/models.py:420 +#: archaeological_context_records/models.py:421 msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:553 #: archaeological_context_records/models.py:554 -#: archaeological_context_records/models.py:1518 -#: archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1169 +#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:1529 +#: archaeological_finds/models_finds.py:1184 +#: archaeological_finds/models_finds.py:1185 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1106 -#: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/models.py:305 -#: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1001 -#: archaeological_operations/models.py:1091 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/forms.py:1207 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:601 +#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1208 +#: archaeological_operations/models.py:1529 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:556 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:556 #: archaeological_context_records/models.py:557 +#: archaeological_context_records/models.py:558 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:558 +#: archaeological_context_records/models.py:559 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:559 -#: archaeological_finds/models_finds.py:1154 +#: archaeological_context_records/models.py:560 +#: archaeological_finds/models_finds.py:1170 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:560 +#: archaeological_context_records/models.py:561 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:564 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:580 -#: archaeological_finds/models_finds.py:1218 -#: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:1005 +#: archaeological_context_records/models.py:581 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1122 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1219 -#: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:1006 +#: archaeological_context_records/models.py:582 +#: archaeological_finds/models_finds.py:1235 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1123 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:631 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:632 +#: archaeological_context_records/models.py:634 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:495 archaeological_finds/models_finds.py:1325 -#: archaeological_operations/models.py:386 -#: archaeological_operations/models.py:1155 +#: archaeological_files/models.py:521 archaeological_finds/models_finds.py:1341 +#: archaeological_operations/models.py:471 +#: archaeological_operations/models.py:1272 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4422 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:635 ishtar_common/models.py:4382 +#: archaeological_context_records/models.py:637 ishtar_common/models.py:4382 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:640 +#: archaeological_finds/models_finds.py:1670 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:642 -#: archaeological_operations/models.py:1151 -#: archaeological_operations/models.py:2718 +#: archaeological_context_records/models.py:644 +#: archaeological_operations/models.py:1268 +#: archaeological_operations/models.py:2835 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:646 -#: archaeological_finds/models_finds.py:1333 +#: archaeological_context_records/models.py:648 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:650 -#: archaeological_context_records/models.py:761 -#: archaeological_finds/models_finds.py:1443 -#: archaeological_finds/models_finds.py:1886 -#: archaeological_operations/models.py:421 -#: archaeological_operations/models.py:448 ishtar_common/models.py:4373 +#: archaeological_context_records/models.py:652 +#: archaeological_context_records/models.py:768 +#: archaeological_finds/models_finds.py:1459 +#: archaeological_finds/models_finds.py:1906 +#: archaeological_operations/models.py:518 +#: archaeological_operations/models.py:545 ishtar_common/models.py:4373 #: ishtar_common/models.py:4484 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:654 -#: archaeological_context_records/models.py:764 -#: archaeological_finds/models_finds.py:1349 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:1312 +#: archaeological_context_records/models.py:656 +#: archaeological_context_records/models.py:771 +#: archaeological_finds/models_finds.py:1365 +#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1429 #: archaeological_warehouse/models.py:989 ishtar_common/models.py:4414 #: ishtar_common/models.py:4493 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:659 +#: archaeological_context_records/models.py:661 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1380 +#: archaeological_finds/models_finds.py:1396 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:663 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1201 +#: archaeological_context_records/models.py:665 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1318 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1231,218 +1253,222 @@ msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:667 +#: archaeological_context_records/models.py:669 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:670 +#: archaeological_context_records/models.py:672 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:673 -#: archaeological_files/models.py:498 archaeological_operations/models.py:1161 -#: archaeological_operations/models.py:2736 +#: archaeological_context_records/models.py:675 +#: archaeological_files/models.py:524 archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:2853 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:677 -#: archaeological_operations/models.py:1267 +#: archaeological_context_records/models.py:679 +#: archaeological_operations/models.py:1384 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:680 +#: archaeological_context_records/models.py:682 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:684 +#: archaeological_context_records/models.py:686 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:688 -#: archaeological_finds/models_finds.py:1618 -#: archaeological_operations/models.py:437 +#: archaeological_context_records/models.py:690 +#: archaeological_finds/models_finds.py:1638 +#: archaeological_operations/models.py:534 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_context_records/models.py:692 +#: archaeological_context_records/models.py:694 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:698 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "documentation" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:700 -#: archaeological_finds/models_finds.py:1413 archaeological_finds/tests.py:1586 -#: ishtar_common/models.py:4300 +#: archaeological_context_records/models.py:702 +#: archaeological_finds/models_finds.py:1429 archaeological_finds/tests.py:1586 +#: archaeological_operations/models.py:477 ishtar_common/models.py:4300 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_context_records/models.py:704 +#: archaeological_context_records/models.py:706 msgctxt "key for text search" msgid "filling" msgstr "" -#: archaeological_context_records/models.py:708 +#: archaeological_context_records/models.py:710 msgctxt "key for text search" msgid "interpretation" msgstr "" -#: archaeological_context_records/models.py:712 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:1531 -#: archaeological_operations/models.py:392 -#: archaeological_operations/models.py:1214 -#: archaeological_operations/models.py:2828 +#: archaeological_context_records/models.py:714 +#: archaeological_files/models.py:564 archaeological_finds/models_finds.py:1547 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:1331 +#: archaeological_operations/models.py:2945 #: archaeological_warehouse/models.py:972 ishtar_common/models.py:4363 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:718 msgctxt "key for text search" msgid "structure" msgstr "" -#: archaeological_context_records/models.py:720 +#: archaeological_context_records/models.py:722 msgctxt "key for text search" msgid "texture" msgstr "" -#: archaeological_context_records/models.py:724 +#: archaeological_context_records/models.py:726 msgctxt "key for text search" msgid "inclusion" msgstr "" -#: archaeological_context_records/models.py:728 +#: archaeological_context_records/models.py:730 msgctxt "key for text search" msgid "color" msgstr "" -#: archaeological_context_records/models.py:732 +#: archaeological_context_records/models.py:734 msgctxt "key for text search" msgid "color-details" msgstr "" -#: archaeological_context_records/models.py:779 -#: archaeological_finds/models_finds.py:1845 -#: archaeological_operations/models.py:467 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:738 +msgctxt "key for text search" +msgid "excavator" +msgstr "" + +#: archaeological_context_records/models.py:786 +#: archaeological_finds/models_finds.py:1865 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1412 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:786 -#: archaeological_finds/models_finds.py:1838 -#: archaeological_operations/models.py:474 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:793 +#: archaeological_finds/models_finds.py:1858 +#: archaeological_operations/models.py:571 +#: archaeological_operations/models.py:1405 #: archaeological_warehouse/models.py:377 #: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2619 #: ishtar_common/models.py:2900 ishtar_common/models.py:4510 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:796 -#: archaeological_context_records/models.py:1178 +#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:1189 #: archaeological_context_records/views.py:277 #: archaeological_context_records/views.py:292 -#: archaeological_finds/models_finds.py:926 -#: archaeological_finds/models_finds.py:1855 -#: archaeological_finds/models_finds.py:2633 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:942 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/models_finds.py:2653 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 -#: archaeological_operations/models.py:672 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2036 -#: archaeological_operations/views.py:1027 -#: archaeological_operations/views.py:1042 -#: archaeological_operations/views.py:1049 -#: archaeological_operations/views.py:1066 ishtar_common/admin.py:1722 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:589 +#: archaeological_operations/models.py:789 +#: archaeological_operations/models.py:1422 +#: archaeological_operations/models.py:2153 +#: archaeological_operations/views.py:1025 +#: archaeological_operations/views.py:1040 +#: archaeological_operations/views.py:1047 +#: archaeological_operations/views.py:1064 ishtar_common/admin.py:1722 #: ishtar_common/admin.py:1865 ishtar_common/models.py:4519 #: ishtar_common/models.py:4898 ishtar_common/views.py:3154 #: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:813 -#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:549 -#: archaeological_finds/models_finds.py:1976 +#: archaeological_context_records/models.py:820 +#: archaeological_files/models.py:601 archaeological_finds/models_finds.py:561 +#: archaeological_finds/models_finds.py:1996 #: archaeological_finds/models_treatments.py:270 -#: archaeological_operations/models.py:3186 +#: archaeological_operations/models.py:3303 #: archaeological_warehouse/models.py:439 #: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4545 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:815 -#: archaeological_files/models.py:570 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:1978 -#: archaeological_operations/models.py:3189 +#: archaeological_context_records/models.py:822 +#: archaeological_files/models.py:604 archaeological_finds/models_finds.py:563 +#: archaeological_finds/models_finds.py:1998 +#: archaeological_operations/models.py:3306 #: archaeological_warehouse/models.py:441 #: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:862 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3395 -msgid "Surface (m2)" +#: archaeological_context_records/models.py:873 +msgid "Surface (m²)" msgstr "" -#: archaeological_context_records/models.py:867 +#: archaeological_context_records/models.py:878 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:876 +#: archaeological_context_records/models.py:887 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:895 +#: archaeological_context_records/models.py:906 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:903 +#: archaeological_context_records/models.py:914 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:910 +#: archaeological_context_records/models.py:921 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:918 +#: archaeological_context_records/models.py:929 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:945 +#: archaeological_context_records/models.py:956 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2261 +#: archaeological_files/models.py:798 archaeological_finds/models_finds.py:2281 #: archaeological_finds/models_treatments.py:290 #: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2932 +#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:1595 +#: archaeological_operations/models.py:3049 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:95 +#: archaeological_operations/templates/ishtar/sheet_site.html:104 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 @@ -1456,7 +1482,7 @@ msgstr "" #: ishtar_common/models.py:4696 ishtar_common/models_common.py:3424 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:161 +#: ishtar_common/templates/ishtar/sheet_person.html:171 #: ishtar_common/templates/ishtar/sheet_town.html:119 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1469,143 +1495,143 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:952 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2267 +#: archaeological_context_records/models.py:963 +#: archaeological_files/models.py:804 archaeological_finds/models_finds.py:2287 #: archaeological_finds/models_treatments.py:296 #: archaeological_finds/models_treatments.py:1255 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2939 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1601 +#: archaeological_operations/models.py:3056 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2402 #: ishtar_common/models_common.py:3430 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:957 -#: archaeological_finds/models_finds.py:2280 -#: archaeological_operations/models.py:559 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:968 +#: archaeological_finds/models_finds.py:2300 +#: archaeological_operations/models.py:676 +#: archaeological_operations/models.py:1692 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:960 -#: archaeological_context_records/models.py:966 -#: archaeological_finds/models_finds.py:2283 -#: archaeological_finds/models_finds.py:2289 -#: archaeological_finds/models_finds.py:2295 -#: archaeological_operations/models.py:556 -#: archaeological_operations/models.py:562 -#: archaeological_operations/models.py:568 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 +#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:977 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_finds/models_finds.py:2315 +#: archaeological_operations/models.py:673 +#: archaeological_operations/models.py:679 +#: archaeological_operations/models.py:685 +#: archaeological_operations/models.py:1683 +#: archaeological_operations/models.py:1689 +#: archaeological_operations/models.py:1695 +#: archaeological_operations/models.py:1701 #: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4398 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:974 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:970 -#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:981 +#: archaeological_context_records/models.py:982 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:562 +#: archaeological_finds/models_finds.py:574 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:992 +#: archaeological_context_records/models.py:1003 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:1027 -#: archaeological_finds/models_finds.py:2505 +#: archaeological_context_records/models.py:1038 +#: archaeological_finds/models_finds.py:2525 #, fuzzy #| msgid "email address" msgid "List of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1155 +#: archaeological_context_records/models.py:1166 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1157 +#: archaeological_context_records/models.py:1168 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1166 -#: archaeological_operations/models.py:2024 +#: archaeological_context_records/models.py:1177 +#: archaeological_operations/models.py:2141 msgid "Modify relations" msgstr "" -#: archaeological_context_records/models.py:1168 -#: archaeological_operations/models.py:2026 +#: archaeological_context_records/models.py:1179 +#: archaeological_operations/models.py:2143 #, fuzzy #| msgid "email address" msgid "relations" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1352 -#: archaeological_finds/models_finds.py:621 +#: archaeological_context_records/models.py:1363 +#: archaeological_finds/models_finds.py:637 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1407 +#: archaeological_context_records/models.py:1418 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1440 +#: archaeological_context_records/models.py:1451 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1441 +#: archaeological_context_records/models.py:1452 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1442 +#: archaeological_context_records/models.py:1453 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1443 +#: archaeological_context_records/models.py:1454 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1444 +#: archaeological_context_records/models.py:1455 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1446 +#: archaeological_context_records/models.py:1457 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1447 +#: archaeological_context_records/models.py:1458 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1448 +#: archaeological_context_records/models.py:1459 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1449 +#: archaeological_context_records/models.py:1460 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1450 +#: archaeological_context_records/models.py:1461 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:1470 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:1471 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1651 +#: archaeological_context_records/models.py:1662 msgid "Context record parent" msgstr "" @@ -1651,7 +1677,7 @@ msgid "Identification / Description" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:208 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:209 msgid "Datations" msgstr "" @@ -1660,8 +1686,8 @@ msgid "Operation / Archaeological site" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 -#: archaeological_finds/forms.py:2206 archaeological_finds/models_finds.py:97 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:280 +#: archaeological_finds/forms.py:2218 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 #: archaeological_finds/models_finds.py:239 @@ -1677,18 +1703,19 @@ msgstr "" #: archaeological_finds/models_finds.py:383 #: archaeological_finds/models_finds.py:398 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:631 -#: archaeological_finds/models_finds.py:870 -#: archaeological_finds/models_finds.py:939 -#: archaeological_finds/models_finds.py:2309 -#: archaeological_finds/models_finds.py:2320 -#: archaeological_finds/models_finds.py:3709 +#: archaeological_finds/models_finds.py:427 +#: archaeological_finds/models_finds.py:647 +#: archaeological_finds/models_finds.py:886 +#: archaeological_finds/models_finds.py:955 +#: archaeological_finds/models_finds.py:2329 +#: archaeological_finds/models_finds.py:2340 +#: archaeological_finds/models_finds.py:3729 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_operations/templates/ishtar/sheet_site.html:100 #: archaeological_warehouse/templates/ishtar/sheet_container.html:195 #: archaeological_warehouse/templates/ishtar/sheet_container.html:242 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 @@ -1721,7 +1748,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:103 +#: archaeological_operations/templates/ishtar/sheet_site.html:112 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1776,13 +1803,13 @@ msgstr "" msgid "Complete identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 msgid "Inclusion" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_files/templates/ishtar/sheet_file.html:272 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1792,11 +1819,11 @@ msgid "Surface" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 -#: archaeological_files/forms.py:283 +#: archaeological_files/forms.py:289 #: archaeological_files/templates/ishtar/sheet_file.html:88 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:59 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_operations/templates/ishtar/sheet_site.html:74 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:110 #: man_app/templates/ishtar/sheet_basefind.html:56 @@ -1806,25 +1833,25 @@ msgstr "" msgid "Geographic localisation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:239 -#: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 -#: archaeological_finds/forms.py:977 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:242 +#: archaeological_finds/forms.py:545 archaeological_finds/forms.py:829 +#: archaeological_finds/forms.py:987 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:71 #: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 -#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_operations/templates/ishtar/sheet_site.html:117 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 -#: ishtar_common/templates/ishtar/sheet_person.html:166 +#: ishtar_common/templates/ishtar/sheet_person.html:176 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1835,22 +1862,22 @@ msgstr "" msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:231 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:236 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 msgid "Numerical reference" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:242 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:141 #: archaeological_finds/models_treatments.py:230 @@ -1885,7 +1912,7 @@ msgstr "" msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 @@ -1893,14 +1920,14 @@ msgstr "" msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:250 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:251 #: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 @@ -1908,43 +1935,43 @@ msgstr "" msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:262 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:284 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:285 #, fuzzy #| msgid "email address" msgid "No associated finds." msgstr "E-Mail-Adresse" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:301 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:307 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:308 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:315 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:316 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:323 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:324 msgid "Diagram of stratigraphic relations - full" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:339 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:340 msgid "Document from this context record" msgstr "" @@ -1961,31 +1988,31 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:259 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:2119 msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:139 +#: archaeological_files/admin.py:141 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:143 +#: archaeological_files/admin.py:145 msgid "To" msgstr "" -#: archaeological_files/admin.py:160 archaeological_files/tests.py:301 +#: archaeological_files/admin.py:162 archaeological_files/tests.py:301 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:180 +#: archaeological_files/admin.py:182 msgid "Cannot change price agreement." msgstr "" -#: archaeological_files/admin.py:212 +#: archaeological_files/admin.py:214 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:216 +#: archaeological_files/admin.py:218 msgid "{} item(s) already in database." msgstr "" @@ -1993,12 +2020,12 @@ msgstr "" msgid "File - 001 - Search" msgstr "" -#: archaeological_files/forms.py:91 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:234 archaeological_files/forms.py:656 -#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:212 -#: archaeological_finds/forms.py:1708 +#: archaeological_files/forms.py:91 archaeological_files/forms.py:215 +#: archaeological_files/forms.py:631 archaeological_files/forms.py:1086 +#: archaeological_files/forms.py:1122 archaeological_files/models.py:429 +#: archaeological_files/models.py:593 +#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_finds/forms.py:1718 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:407 @@ -2006,57 +2033,57 @@ msgstr "" #: archaeological_finds/forms_treatments.py:637 #: archaeological_finds/forms_treatments.py:708 #: archaeological_finds/forms_treatments.py:819 -#: archaeological_finds/models_finds.py:1200 +#: archaeological_finds/models_finds.py:1216 #: archaeological_finds/models_treatments.py:215 #: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:74 archaeological_operations/forms.py:460 #: archaeological_operations/forms.py:697 -#: archaeological_operations/forms.py:1413 -#: archaeological_operations/forms.py:1718 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2686 -#: archaeological_operations/models.py:2911 -#: archaeological_operations/models.py:3176 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1762 +#: archaeological_operations/models.py:1114 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:3028 +#: archaeological_operations/models.py:3293 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 msgid "Year" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:237 -#: archaeological_files/forms.py:662 archaeological_files/models.py:561 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:637 +#: archaeological_files/models.py:595 msgid "Numeric reference" msgstr "" -#: archaeological_files/forms.py:93 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1149 archaeological_operations/forms.py:1103 +#: archaeological_files/forms.py:93 archaeological_files/forms.py:1088 +#: archaeological_files/forms.py:1124 archaeological_operations/forms.py:1103 #: archaeological_operations/forms.py:1201 -#: archaeological_operations/forms.py:1318 -#: archaeological_operations/forms.py:1415 -#: archaeological_operations/forms.py:1480 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:2914 +#: archaeological_operations/forms.py:1343 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1524 +#: archaeological_operations/models.py:598 +#: archaeological_operations/models.py:3031 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:98 archaeological_files/forms.py:1119 -#: archaeological_files/forms.py:1156 archaeological_files/models.py:1396 +#: archaeological_files/forms.py:98 archaeological_files/forms.py:1094 +#: archaeological_files/forms.py:1131 archaeological_files/models.py:1438 #: archaeological_operations/forms.py:476 -#: archaeological_operations/forms.py:1426 -#: archaeological_operations/models.py:2558 ishtar_common/models_common.py:2070 +#: archaeological_operations/forms.py:1470 +#: archaeological_operations/models.py:2675 ishtar_common/models_common.py:2070 #: ishtar_common/models_common.py:3404 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:100 archaeological_files/forms.py:1161 +#: archaeological_files/forms.py:100 archaeological_files/forms.py:1136 msgid "File name" msgstr "" -#: archaeological_files/forms.py:101 archaeological_files/forms.py:209 -#: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:573 +#: archaeological_files/forms.py:101 archaeological_files/forms.py:213 +#: archaeological_files/models.py:430 archaeological_files/models.py:435 +#: archaeological_files/models.py:607 msgid "File type" msgstr "" @@ -2064,41 +2091,52 @@ msgstr "" msgid "Is active?" msgstr "" -#: archaeological_files/forms.py:103 archaeological_files/forms.py:263 -#: archaeological_files/forms.py:540 +#: archaeological_files/forms.py:103 archaeological_files/forms.py:291 +#: archaeological_files/models.py:372 archaeological_files/models.py:757 +#: archaeological_files/templates/ishtar/sheet_file.html:120 +msgid "Development type" +msgstr "" + +#: archaeological_files/forms.py:104 archaeological_files/forms.py:269 msgid "Saisine type" msgstr "" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:262 -#: archaeological_files/forms.py:524 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:622 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:447 +#: archaeological_files/models.py:761 +#: archaeological_files/templates/ishtar/sheet_file.html:121 +msgid "Monitoring justification" +msgstr "" + +#: archaeological_files/forms.py:106 archaeological_files/forms.py:268 +#: archaeological_files/models.py:323 archaeological_files/models.py:434 +#: archaeological_files/models.py:656 msgid "Permit type" msgstr "" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:464 -#: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:130 +#: archaeological_files/forms.py:107 archaeological_files/forms.py:449 +#: archaeological_files/models.py:661 +#: archaeological_files/templates/ishtar/sheet_file.html:133 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" -#: archaeological_files/forms.py:106 archaeological_files/forms.py:653 -#: archaeological_files/models.py:675 archaeological_finds/forms.py:791 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 -#: archaeological_finds/forms.py:2460 +#: archaeological_files/forms.py:108 archaeological_files/forms.py:628 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:801 +#: archaeological_finds/forms.py:1134 archaeological_finds/forms.py:1419 +#: archaeological_finds/forms.py:2472 #: archaeological_finds/forms_treatments.py:194 #: archaeological_finds/forms_treatments.py:745 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:512 #: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1479 -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2928 +#: archaeological_operations/forms.py:1219 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1523 +#: archaeological_operations/models.py:627 +#: archaeological_operations/models.py:1590 +#: archaeological_operations/models.py:3045 #: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 #: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 #: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 @@ -2112,55 +2150,54 @@ msgstr "" msgid "Comment" msgstr "" -#: archaeological_files/forms.py:108 archaeological_files/forms.py:375 -#: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/forms.py:110 archaeological_files/forms.py:378 +#: archaeological_files/forms.py:436 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "" -#: archaeological_files/forms.py:118 archaeological_files/forms.py:345 -#: archaeological_files/forms.py:355 archaeological_files/forms.py:496 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:585 +#: archaeological_files/forms.py:120 archaeological_files/forms.py:356 +#: archaeological_files/forms.py:366 archaeological_files/forms.py:1138 +#: archaeological_files/models.py:619 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:128 archaeological_files/forms.py:1173 +#: archaeological_files/forms.py:130 archaeological_files/forms.py:1148 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:139 archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:1179 #: archaeological_operations/forms.py:528 ishtar_common/forms.py:956 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 +#: archaeological_files/forms.py:149 archaeological_files/forms.py:1187 #: archaeological_finds/forms_treatments.py:578 #: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:534 msgid "Modified by" msgstr "" -#: archaeological_files/forms.py:170 archaeological_files/forms.py:187 +#: archaeological_files/forms.py:174 archaeological_files/forms.py:191 msgid "Archaeological file search" msgstr "" -#: archaeological_files/forms.py:206 +#: archaeological_files/forms.py:210 msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:642 +#: archaeological_files/forms.py:222 archaeological_files/models.py:676 #: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2160 +#: archaeological_operations/models.py:1466 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4646 ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" -#: archaeological_files/forms.py:219 archaeological_files/forms.py:541 -#: archaeological_files/models.py:644 +#: archaeological_files/forms.py:223 archaeological_files/models.py:678 #: archaeological_finds/forms_treatments.py:748 #: archaeological_finds/models_treatments.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:514 @@ -2173,43 +2210,39 @@ msgstr "" msgid "Reception date" msgstr "" -#: archaeological_files/forms.py:228 +#: archaeological_files/forms.py:232 msgid "Reception date cannot be after today." msgstr "" -#: archaeological_files/forms.py:250 -msgid "Another file with this numeric id exists." -msgstr "" - -#: archaeological_files/forms.py:256 +#: archaeological_files/forms.py:262 msgid "Archaeological file - 013 - Preventive - Saisine" msgstr "" -#: archaeological_files/forms.py:277 +#: archaeological_files/forms.py:283 msgid "Planning" msgstr "" -#: archaeological_files/forms.py:278 +#: archaeological_files/forms.py:284 msgid "Archaeological file - 017 - Preventive - Planning" msgstr "" -#: archaeological_files/forms.py:284 +#: archaeological_files/forms.py:290 msgid "Planning name" msgstr "" -#: archaeological_files/forms.py:286 archaeological_files/forms.py:330 -#: archaeological_files/models.py:475 archaeological_files/models.py:639 +#: archaeological_files/forms.py:294 archaeological_files/forms.py:341 +#: archaeological_files/models.py:501 archaeological_files/models.py:673 #: archaeological_operations/forms.py:691 #: archaeological_operations/forms.py:1016 #: archaeological_operations/forms.py:1032 #: archaeological_operations/forms.py:1037 -#: archaeological_operations/forms.py:1368 -#: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:511 -#: archaeological_operations/models.py:1088 -#: archaeological_operations/models.py:1090 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2923 +#: archaeological_operations/forms.py:1375 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:609 +#: archaeological_operations/models.py:1205 +#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1526 +#: archaeological_operations/models.py:3040 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1794 ishtar_common/forms_common.py:1808 #: ishtar_common/forms_common.py:1809 ishtar_common/models.py:2383 @@ -2221,50 +2254,44 @@ msgstr "" msgid "Towns" msgstr "" -#: archaeological_files/forms.py:290 archaeological_files/forms.py:333 -#: archaeological_files/models.py:678 archaeological_operations/models.py:2917 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:344 +#: archaeological_files/models.py:712 archaeological_operations/models.py:3034 #: ishtar_common/models_common.py:2071 msgid "Departments" msgstr "" -#: archaeological_files/forms.py:292 +#: archaeological_files/forms.py:300 msgid "Only relevant when no town is provided." msgstr "" -#: archaeological_files/forms.py:294 archaeological_files/forms.py:335 -#: archaeological_files/models.py:670 +#: archaeological_files/forms.py:302 archaeological_files/forms.py:346 +#: archaeological_files/models.py:704 msgid "Locality" msgstr "" -#: archaeological_files/forms.py:296 archaeological_files/forms.py:337 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:348 msgid "Address (number/street)" msgstr "" -#: archaeological_files/forms.py:297 archaeological_files/forms.py:338 +#: archaeological_files/forms.py:305 archaeological_files/forms.py:349 msgid "Number/street" msgstr "" -#: archaeological_files/forms.py:300 archaeological_files/forms.py:341 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:352 #: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3690 msgid "Postal code" msgstr "" -#: archaeological_files/forms.py:301 archaeological_files/forms.py:736 +#: archaeological_files/forms.py:309 archaeological_files/forms.py:711 msgid "Surfaces" msgstr "" -#: archaeological_files/forms.py:305 archaeological_files/forms.py:811 -#: archaeological_files/models.py:666 archaeological_operations/forms.py:706 -msgid "Total surface (m2)" -msgstr "" - -#: archaeological_files/forms.py:313 archaeological_files/forms.py:532 -#: archaeological_files/forms.py:801 archaeological_files/models.py:668 -msgid "Total developed surface (m2)" +#: archaeological_files/forms.py:321 archaeological_files/models.py:702 +msgid "Total developed surface (m²)" msgstr "" -#: archaeological_files/forms.py:323 +#: archaeological_files/forms.py:334 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 @@ -2273,221 +2300,221 @@ msgstr "" msgid "Address" msgstr "" -#: archaeological_files/forms.py:324 +#: archaeological_files/forms.py:335 msgid "Archaeological file - 015 - Research - Address" msgstr "" -#: archaeological_files/forms.py:328 +#: archaeological_files/forms.py:339 msgid "Project name" msgstr "" -#: archaeological_files/forms.py:346 +#: archaeological_files/forms.py:357 msgid "Archaeological file - 030 - General contractor" msgstr "" -#: archaeological_files/forms.py:401 archaeological_files/forms.py:475 +#: archaeological_files/forms.py:399 archaeological_files/forms.py:464 msgid "Non existing person." msgstr "" -#: archaeological_files/forms.py:408 +#: archaeological_files/forms.py:406 msgid "" "The organization of the person in charge differs from the general contractor." msgstr "" -#: archaeological_files/forms.py:416 archaeological_files/forms.py:425 +#: archaeological_files/forms.py:414 archaeological_files/forms.py:424 msgid "Planning service" msgstr "" -#: archaeological_files/forms.py:417 +#: archaeological_files/forms.py:415 msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:466 archaeological_files/models.py:646 +#: archaeological_files/forms.py:451 archaeological_files/models.py:680 msgid "Date of planning service file" msgstr "" -#: archaeological_files/forms.py:479 +#: archaeological_files/forms.py:468 msgid "" "The organization of the person in charge differs from the planning service." msgstr "" -#: archaeological_files/forms.py:488 -msgid "Preventive informations" -msgstr "" - -#: archaeological_files/forms.py:510 archaeological_files/models.py:606 -msgid "Responsible for planning service" -msgstr "" - -#: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:143 +#: archaeological_files/forms.py:544 +#: archaeological_files/templates/ishtar/sheet_file.html:146 msgid "Research archaeology" msgstr "" -#: archaeological_files/forms.py:559 +#: archaeological_files/forms.py:545 msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:585 archaeological_files/models.py:702 +#: archaeological_files/forms.py:561 archaeological_files/models.py:736 #: archaeological_operations/forms.py:495 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:588 archaeological_files/models.py:686 +#: archaeological_files/forms.py:565 archaeological_files/models.py:720 msgid "Requested operation type" msgstr "" -#: archaeological_files/forms.py:591 +#: archaeological_files/forms.py:569 msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:169 +#: archaeological_files/forms.py:583 archaeological_files/models.py:739 +#: archaeological_files/templates/ishtar/sheet_file.html:172 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:614 archaeological_files/models.py:708 +#: archaeological_files/forms.py:592 archaeological_files/models.py:742 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:615 archaeological_files/models.py:710 +#: archaeological_files/forms.py:593 archaeological_files/models.py:744 msgid "Protected area" msgstr "" -#: archaeological_files/forms.py:628 +#: archaeological_files/forms.py:606 msgid "Instruction" msgstr "" -#: archaeological_files/forms.py:629 +#: archaeological_files/forms.py:607 msgid "Archaeological file - 050 - Instruction" msgstr "" -#: archaeological_files/forms.py:633 +#: archaeological_files/forms.py:611 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:646 archaeological_files/models.py:650 +#: archaeological_files/forms.py:621 archaeological_files/models.py:684 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:654 archaeological_files/models.py:664 +#: archaeological_files/forms.py:629 archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" -#: archaeological_files/forms.py:719 +#: archaeological_files/forms.py:694 msgid "Would you like to close this archaeological file?" msgstr "" -#: archaeological_files/forms.py:724 +#: archaeological_files/forms.py:699 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:703 msgid "Preventive file" msgstr "" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:704 msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:735 ishtar_common/forms_common.py:2225 +#: archaeological_files/forms.py:710 ishtar_common/forms_common.py:2225 #: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "" -#: archaeological_files/forms.py:737 +#: archaeological_files/forms.py:712 msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:760 archaeological_files/models.py:727 +#: archaeological_files/forms.py:735 archaeological_files/models.py:769 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:765 archaeological_files/models.py:730 +#: archaeological_files/forms.py:740 archaeological_files/models.py:772 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:770 archaeological_files/models.py:733 +#: archaeological_files/forms.py:745 archaeological_files/models.py:775 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:785 archaeological_files/models.py:737 +#: archaeological_files/forms.py:760 archaeological_files/models.py:779 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:790 archaeological_files/models.py:738 +#: archaeological_files/forms.py:765 archaeological_files/models.py:780 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:795 archaeological_files/models.py:740 +#: archaeological_files/forms.py:770 archaeological_files/models.py:782 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:818 +#: archaeological_files/forms.py:776 +msgid "Total developed surface (m2)" +msgstr "" + +#: archaeological_files/forms.py:786 archaeological_operations/forms.py:706 +msgid "Total surface (m2)" +msgstr "" + +#: archaeological_files/forms.py:793 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/forms.py:853 archaeological_files/forms.py:855 #: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:295 #: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/forms.py:854 archaeological_files/forms.py:856 #: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:296 #: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:348 msgid "Days" msgstr "" -#: archaeological_files/forms.py:882 archaeological_files/models.py:116 -#: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/forms.py:857 archaeological_files/models.py:118 +#: archaeological_files/models.py:1480 archaeological_files/models.py:1499 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Job" msgstr "" -#: archaeological_files/forms.py:903 archaeological_files/models.py:80 -#: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:723 +#: archaeological_files/forms.py:878 archaeological_files/models.py:82 +#: archaeological_files/models.py:83 archaeological_files/models.py:95 +#: archaeological_files/models.py:208 archaeological_files/models.py:765 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:961 +#: archaeological_files/forms.py:936 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:937 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/forms.py:961 +#: archaeological_files/templates/ishtar/sheet_file.html:282 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:988 +#: archaeological_files/forms.py:963 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/forms.py:969 archaeological_files/forms.py:971 #: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/forms.py:973 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:1112 archaeological_files/forms.py:1148 -#: archaeological_files/forms.py:1278 +#: archaeological_files/forms.py:1087 archaeological_files/forms.py:1123 +#: archaeological_files/forms.py:1253 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 #: archaeological_finds/forms_treatments.py:562 @@ -2500,9 +2527,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 -#: archaeological_operations/forms.py:1414 -#: archaeological_operations/forms.py:1535 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2970 #: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 #: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:619 @@ -2514,84 +2541,84 @@ msgstr "" msgid "Index" msgstr "" -#: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 -#: archaeological_files/forms.py:1267 +#: archaeological_files/forms.py:1089 archaeological_files/forms.py:1125 +#: archaeological_files/forms.py:1242 #: archaeological_finds/forms_treatments.py:563 #: archaeological_finds/forms_treatments.py:610 #: archaeological_finds/forms_treatments.py:821 #: archaeological_finds/forms_treatments.py:873 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1469 -#: archaeological_operations/models.py:2588 -#: archaeological_operations/models.py:2843 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/forms.py:1513 +#: archaeological_operations/models.py:2705 +#: archaeological_operations/models.py:2960 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:1115 +#: archaeological_files/forms.py:1090 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1126 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:822 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/forms.py:1605 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1649 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:1158 +#: archaeological_files/forms.py:1133 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:823 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/forms.py:1476 -#: archaeological_operations/models.py:2912 +#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/models.py:3029 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:1160 +#: archaeological_files/forms.py:1135 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:826 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1478 -#: archaeological_operations/models.py:2910 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/forms.py:1522 +#: archaeological_operations/models.py:3027 msgid "Signature date" msgstr "" -#: archaeological_files/forms.py:1184 +#: archaeological_files/forms.py:1159 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:1186 +#: archaeological_files/forms.py:1161 msgid "File year" msgstr "" -#: archaeological_files/forms.py:1188 +#: archaeological_files/forms.py:1163 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:1191 +#: archaeological_files/forms.py:1166 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:1201 +#: archaeological_files/forms.py:1176 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1265 +#: archaeological_files/forms.py:1240 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:786 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:828 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:643 #: archaeological_operations/forms.py:915 -#: archaeological_operations/models.py:2045 -#: archaeological_operations/models.py:2571 -#: archaeological_operations/models.py:2687 -#: archaeological_operations/models.py:2891 +#: archaeological_operations/models.py:2162 +#: archaeological_operations/models.py:2688 +#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:3008 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "" @@ -2604,19 +2631,20 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3691 +#: archaeological_finds/models_finds.py:3711 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2948 +#: archaeological_operations/models.py:1837 +#: archaeological_operations/models.py:3065 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" 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:1444 -#: archaeological_files/models.py:1463 archaeological_files/models.py:1490 +#: archaeological_files/models.py:90 archaeological_files/models.py:125 +#: archaeological_files/models.py:170 archaeological_files/models.py:186 +#: archaeological_files/models.py:256 archaeological_files/models.py:351 +#: archaeological_files/models.py:363 archaeological_files/models.py:375 +#: archaeological_files/models.py:395 archaeological_files/models.py:1486 +#: archaeological_files/models.py:1505 archaeological_files/models.py:1532 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5395 @@ -2624,210 +2652,222 @@ msgstr "" msgid "Preventive" msgstr "" -#: archaeological_files/models.py:96 +#: archaeological_files/models.py:98 msgid "Ground daily cost" msgstr "" -#: archaeological_files/models.py:97 +#: archaeological_files/models.py:99 msgid "Daily cost" msgstr "" -#: archaeological_files/models.py:99 archaeological_files/models.py:148 +#: archaeological_files/models.py:101 archaeological_files/models.py:150 msgid "Permanent contract" msgstr "" -#: archaeological_files/models.py:102 +#: archaeological_files/models.py:104 msgid "Def. daily number on ground" msgstr "" -#: archaeological_files/models.py:104 +#: archaeological_files/models.py:106 msgid "Def. daily number on study" msgstr "" -#: archaeological_files/models.py:110 +#: archaeological_files/models.py:112 msgid "Child" msgstr "" -#: archaeological_files/models.py:111 +#: archaeological_files/models.py:113 msgid "Auto-add this job when a parent is added" msgstr "" -#: archaeological_files/models.py:117 +#: archaeological_files/models.py:119 msgid "Jobs" msgstr "" -#: archaeological_files/models.py:128 +#: archaeological_files/models.py:130 msgid "fixed-term contract" msgstr "" -#: archaeological_files/models.py:152 +#: archaeological_files/models.py:154 msgid "Fixed-term contract" msgstr "" -#: archaeological_files/models.py:162 +#: archaeological_files/models.py:164 msgid "Generic equipment type" msgstr "" -#: archaeological_files/models.py:163 +#: archaeological_files/models.py:165 msgid "Generic equipment types" msgstr "" -#: archaeological_files/models.py:173 +#: archaeological_files/models.py:175 msgid "Generic type" msgstr "" -#: archaeological_files/models.py:178 +#: archaeological_files/models.py:180 msgid "Equipment/service type" msgstr "" -#: archaeological_files/models.py:179 +#: archaeological_files/models.py:181 msgid "Equipment/service types" msgstr "" -#: archaeological_files/models.py:188 +#: archaeological_files/models.py:190 #: archaeological_operations/templates/ishtar/sheet_operation.html:233 #: na_app/templates/ishtar/sheet_operation.html:229 #: sra_idf_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "" -#: archaeological_files/models.py:189 +#: archaeological_files/models.py:191 msgid "weeks" msgstr "" -#: archaeological_files/models.py:190 +#: archaeological_files/models.py:192 msgid "months" msgstr "" -#: archaeological_files/models.py:191 +#: archaeological_files/models.py:193 msgid "linear m." msgstr "" -#: archaeological_files/models.py:210 +#: archaeological_files/models.py:212 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 +#: archaeological_files/models.py:215 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3255 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:217 ishtar_common/models.py:3258 +#: archaeological_files/models.py:219 ishtar_common/models.py:3258 #: ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." msgstr "" -#: archaeological_files/models.py:223 +#: archaeological_files/models.py:225 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:225 archaeological_files/models.py:281 +#: archaeological_files/models.py:227 archaeological_files/models.py:283 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:226 +#: archaeological_files/models.py:228 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:228 ishtar_common/models_imports.py:1077 +#: archaeological_files/models.py:230 ishtar_common/models_imports.py:1077 msgid "Unit" msgstr "" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:233 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:236 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:236 ishtar_common/models.py:1665 +#: archaeological_files/models.py:238 ishtar_common/models.py:1665 #: ishtar_common/models.py:2083 ishtar_common/models.py:3823 #: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:206 #: ishtar_common/models_imports.py:441 ishtar_common/models_imports.py:952 msgid "Available" msgstr "" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 +#: archaeological_files/models.py:244 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1267 ishtar_common/models.py:2390 #: ishtar_common/models_common.py:748 msgid "Parent" msgstr "" -#: archaeological_files/models.py:243 +#: archaeological_files/models.py:245 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:248 +#: archaeological_files/models.py:250 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:249 +#: archaeological_files/models.py:251 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:301 +#: archaeological_files/models.py:303 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:302 +#: archaeological_files/models.py:304 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:322 +#: archaeological_files/models.py:324 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:335 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:346 +#: archaeological_files/models.py:348 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:349 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:358 +#: archaeological_files/models.py:360 +msgid "Monitoring justification type" +msgstr "" + +#: archaeological_files/models.py:361 +msgid "Monitoring justification types" +msgstr "" + +#: archaeological_files/models.py:373 +msgid "Development types" +msgstr "" + +#: archaeological_files/models.py:384 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:360 +#: archaeological_files/models.py:386 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:362 +#: archaeological_files/models.py:388 msgid "Category" msgstr "" -#: archaeological_files/models.py:366 +#: archaeological_files/models.py:392 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:367 +#: archaeological_files/models.py:393 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1201 -#: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:998 ishtar_common/admin.py:1451 +#: archaeological_files/models.py:431 archaeological_finds/models_finds.py:1217 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1115 ishtar_common/admin.py:1451 #: ishtar_common/forms_common.py:2561 ishtar_common/models.py:2408 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "" -#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1204 -#: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:999 +#: archaeological_files/models.py:432 archaeological_finds/models_finds.py:1220 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1116 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1225 +#: archaeological_files/models.py:441 archaeological_finds/models_finds.py:1241 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2852,49 +2892,49 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:416 -msgid "Total surface (km2)" +#: archaeological_files/models.py:442 +msgid "Total surface (km²)" msgstr "" -#: archaeological_files/models.py:417 -msgid "Total developed surface (km2)" +#: archaeological_files/models.py:443 +msgid "Total developed surface (km²)" msgstr "" -#: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1329 +#: archaeological_files/models.py:512 archaeological_finds/models_finds.py:1345 #: archaeological_finds/models_treatments.py:167 #: archaeological_finds/models_treatments.py:1156 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1142 -#: archaeological_operations/models.py:2711 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1259 +#: archaeological_operations/models.py:2828 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:488 +#: archaeological_files/models.py:514 #: archaeological_finds/models_treatments.py:1153 -#: archaeological_operations/models.py:370 +#: archaeological_operations/models.py:436 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4292 msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:491 +#: archaeological_files/models.py:517 #: archaeological_finds/models_treatments.py:164 -#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:442 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:1166 +#: archaeological_files/models.py:529 archaeological_operations/models.py:1283 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:507 +#: archaeological_files/models.py:533 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_operations/models.py:373 -#: archaeological_operations/models.py:1170 +#: archaeological_operations/models.py:439 +#: archaeological_operations/models.py:1287 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2601 #: ishtar_common/models.py:2863 ishtar_common/models.py:3669 @@ -2902,11 +2942,12 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:510 +#: archaeological_files/models.py:536 #: archaeological_finds/models_treatments.py:170 #: archaeological_finds/models_treatments.py:1159 -#: archaeological_operations/models.py:1176 -#: archaeological_operations/models.py:2722 +#: archaeological_operations/models.py:446 +#: archaeological_operations/models.py:1293 +#: archaeological_operations/models.py:2839 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 #: archaeological_warehouse/models.py:955 ishtar_common/models.py:2604 @@ -2916,51 +2957,61 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:513 +#: archaeological_files/models.py:539 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:542 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:547 +msgctxt "key for text search" +msgid "development-type" +msgstr "" + +#: archaeological_files/models.py:551 +msgctxt "key for text search" +msgid "monitoring-justification" +msgstr "" + +#: archaeological_files/models.py:555 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:526 +#: archaeological_files/models.py:560 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:1658 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2763 +#: archaeological_files/models.py:571 archaeological_operations/models.py:2880 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:542 archaeological_operations/models.py:2767 +#: archaeological_files/models.py:576 archaeological_operations/models.py:2884 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:564 +#: archaeological_files/models.py:598 #: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:606 #: archaeological_finds/forms_treatments.py:635 #: archaeological_finds/forms_treatments.py:706 #: archaeological_finds/models_treatments.py:1200 @@ -2969,9 +3020,9 @@ msgstr "" #: archaeological_operations/forms.py:477 #: archaeological_operations/forms.py:1102 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1774 -#: archaeological_operations/models.py:502 +#: archaeological_operations/forms.py:1342 +#: archaeological_operations/forms.py:1818 +#: archaeological_operations/models.py:599 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 @@ -3014,7 +3065,7 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:577 +#: archaeological_files/models.py:611 #: archaeological_finds/models_treatments.py:1209 #: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 @@ -3027,35 +3078,39 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:625 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:596 +#: archaeological_files/models.py:630 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:610 +#: archaeological_files/models.py:640 +msgid "Responsible for planning service" +msgstr "" + +#: archaeological_files/models.py:644 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:617 +#: archaeological_files/models.py:651 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:632 +#: archaeological_files/models.py:666 msgid "Main town" msgstr "" -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:705 msgid "Main address" msgstr "" -#: archaeological_files/models.py:673 +#: archaeological_files/models.py:707 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:726 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:418 #: archaeological_finds/models_treatments.py:263 @@ -3071,128 +3126,128 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:742 +#: archaeological_files/models.py:784 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:788 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:751 +#: archaeological_files/models.py:793 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:809 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:787 +#: archaeological_files/models.py:829 #: ishtar_common/templates/ishtar/sheet_town.html:124 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:814 +#: archaeological_files/models.py:856 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1067 +#: archaeological_files/models.py:1109 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1073 +#: archaeological_files/models.py:1115 msgid "No town" msgstr "" -#: archaeological_files/models.py:1282 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1324 archaeological_operations/models.py:2097 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1284 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1326 archaeological_operations/models.py:2099 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1294 +#: archaeological_files/models.py:1336 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1338 msgid "plan" msgstr "" -#: archaeological_files/models.py:1305 +#: archaeological_files/models.py:1347 #: archaeological_finds/models_treatments.py:420 #: archaeological_finds/models_treatments.py:1316 -#: archaeological_operations/models.py:2013 +#: archaeological_operations/models.py:2130 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1307 +#: archaeological_files/models.py:1349 #: archaeological_finds/models_treatments.py:422 #: archaeological_finds/models_treatments.py:1318 -#: archaeological_operations/models.py:2015 +#: archaeological_operations/models.py:2132 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1316 +#: archaeological_files/models.py:1358 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1318 +#: archaeological_files/models.py:1360 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1393 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3163 +#: archaeological_files/models.py:1435 archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:3280 msgid "File" msgstr "" -#: archaeological_files/models.py:1412 +#: archaeological_files/models.py:1454 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 +#: archaeological_files/models.py:1456 archaeological_files/models.py:1522 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1416 +#: archaeological_files/models.py:1458 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1418 archaeological_files/models.py:1484 +#: archaeological_files/models.py:1460 archaeological_files/models.py:1526 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1442 +#: archaeological_files/models.py:1484 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1443 +#: archaeological_files/models.py:1485 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1461 +#: archaeological_files/models.py:1503 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1462 +#: archaeological_files/models.py:1504 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1478 +#: archaeological_files/models.py:1520 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1482 +#: archaeological_files/models.py:1524 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1488 +#: archaeological_files/models.py:1530 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1489 +#: archaeological_files/models.py:1531 msgid "Equipment requirements" msgstr "" @@ -3218,9 +3273,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:391 msgid "Planned" msgstr "" @@ -3261,18 +3316,18 @@ msgstr "" msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:176 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:179 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: 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:2949 +#: archaeological_operations/models.py:3066 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3283,15 +3338,15 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:182 +#: archaeological_files/templates/ishtar/sheet_file.html:185 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 -#: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_operations/models.py:2685 -#: archaeological_operations/models.py:2984 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:3101 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 @@ -3300,22 +3355,22 @@ msgstr "" msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/models.py:1470 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:205 +#: archaeological_files/templates/ishtar/sheet_file.html:208 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:209 +#: archaeological_files/templates/ishtar/sheet_file.html:212 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:797 #: ishtar_common/models.py:704 ishtar_common/models.py:3386 @@ -3323,43 +3378,43 @@ msgstr "" msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:225 +#: archaeological_files/templates/ishtar/sheet_file.html:228 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:231 +#: archaeological_files/templates/ishtar/sheet_file.html:234 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:264 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:392 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:291 #: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:297 #: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:349 #: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:312 +#: archaeological_files/templates/ishtar/sheet_file.html:364 +#: archaeological_files/templates/ishtar/sheet_file.html:420 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3370,13 +3425,13 @@ msgstr "" msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:323 +#: archaeological_files/templates/ishtar/sheet_file.html:375 +#: archaeological_files/templates/ishtar/sheet_file.html:427 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:334 msgid "Post-excavation jobs" msgstr "" @@ -3470,326 +3525,336 @@ msgstr "" msgid "Simple find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:354 +#: archaeological_finds/forms.py:356 msgid "Museum identification" msgstr "" -#: archaeological_finds/forms.py:356 archaeological_finds/forms.py:744 -#: archaeological_finds/forms.py:1002 archaeological_finds/forms.py:1341 -#: archaeological_finds/forms.py:1696 archaeological_finds/forms.py:2346 -#: archaeological_finds/models_finds.py:548 -#: archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:754 +#: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1706 archaeological_finds/forms.py:2358 +#: archaeological_finds/models_finds.py:560 +#: archaeological_finds/models_finds.py:2003 msgid "Free ID" msgstr "" -#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1011 -#: archaeological_finds/models_finds.py:1986 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1021 +#: archaeological_finds/models_finds.py:2006 msgid "Museum ID prefix" msgstr "" -#: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1012 -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:1987 +#: archaeological_finds/forms.py:361 archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:1708 archaeological_finds/models_finds.py:2007 msgid "Museum inventory number" msgstr "" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1013 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:1023 +#: archaeological_finds/models_finds.py:2008 msgid "Museum ID suffix" msgstr "" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:363 archaeological_finds/models_finds.py:2009 msgid "Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:746 -#: archaeological_finds/forms.py:1006 archaeological_finds/forms.py:1343 -#: archaeological_finds/forms.py:1697 archaeological_finds/forms.py:2413 -#: archaeological_finds/models_finds.py:1984 ishtar_common/forms_common.py:1409 +#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:756 +#: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1353 +#: archaeological_finds/forms.py:1707 archaeological_finds/forms.py:2425 +#: archaeological_finds/models_finds.py:2004 ishtar_common/forms_common.py:1409 #: ishtar_common/models.py:3253 msgid "Denomination" msgstr "" -#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1700 archaeological_finds/models_finds.py:2138 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1017 +#: archaeological_finds/forms.py:1710 archaeological_finds/models_finds.py:2158 msgid "Previous ID" msgstr "" -#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1014 -#: archaeological_finds/forms.py:1703 archaeological_finds/models_finds.py:1990 +#: archaeological_finds/forms.py:367 archaeological_finds/forms.py:1024 +#: archaeological_finds/forms.py:1713 archaeological_finds/models_finds.py:2010 msgid "Laboratory ID" msgstr "" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1015 -#: archaeological_finds/forms.py:1702 archaeological_finds/models_finds.py:1981 +#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:2001 msgid "Seal number" msgstr "" -#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:1070 +#: archaeological_finds/models_finds.py:2208 msgid "Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2192 +#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1073 +#: archaeological_finds/models_finds.py:2212 msgid "Type of marking" msgstr "" -#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1943 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:1026 +#: archaeological_finds/forms.py:1954 archaeological_finds/models_finds.py:2155 msgid "Marking details" msgstr "" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:980 -#: archaeological_finds/forms.py:1634 archaeological_finds/models_finds.py:428 -#: archaeological_finds/models_finds.py:443 -#: archaeological_finds/models_finds.py:458 -#: archaeological_finds/models_finds.py:473 -#: archaeological_finds/models_finds.py:488 -#: archaeological_finds/models_finds.py:503 +#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:990 +#: archaeological_finds/forms.py:1644 archaeological_finds/models_finds.py:442 +#: archaeological_finds/models_finds.py:457 +#: archaeological_finds/models_finds.py:472 +#: archaeological_finds/models_finds.py:487 +#: archaeological_finds/models_finds.py:502 +#: archaeological_finds/models_finds.py:517 msgid "Museum" msgstr "" -#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:384 archaeological_finds/forms.py:1036 +#: archaeological_finds/models_finds.py:2179 msgid "Owner institution" msgstr "" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/forms.py:387 archaeological_finds/forms.py:1042 +#: archaeological_finds/models_finds.py:2184 msgid "Assigned institution" msgstr "" -#: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:1048 +#: archaeological_finds/models_finds.py:2189 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2171 +#: archaeological_finds/forms.py:392 archaeological_finds/models_finds.py:2191 msgid "Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1053 +#: archaeological_finds/models_finds.py:2194 msgid "Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1055 +#: archaeological_finds/models_finds.py:2196 msgid "Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:397 archaeological_finds/forms.py:1058 +#: archaeological_finds/models_finds.py:2197 msgid "Museum entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:398 archaeological_finds/forms.py:1060 +#: archaeological_finds/models_finds.py:2198 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2179 +#: archaeological_finds/forms.py:399 archaeological_finds/models_finds.py:2199 msgid "Comment on museum entry date" msgstr "" -#: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2183 +#: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1062 +#: archaeological_finds/models_finds.py:2203 msgid "Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2152 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:409 archaeological_finds/forms.py:1075 +#: archaeological_finds/models_finds.py:2172 +#: archaeological_finds/models_finds.py:2219 msgid "Collection" msgstr "" -#: archaeological_finds/forms.py:410 archaeological_finds/forms.py:1067 +#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1077 msgid "Former collections" msgstr "" -#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/forms.py:414 archaeological_finds/forms.py:1082 +#: archaeological_finds/models_finds.py:2227 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:417 archaeological_finds/models_finds.py:2231 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2213 +#: archaeological_finds/forms.py:420 archaeological_finds/models_finds.py:2233 msgid "Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/forms.py:423 archaeological_finds/forms.py:1083 +#: archaeological_finds/models_finds.py:2237 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:425 archaeological_finds/models_finds.py:2239 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2220 +#: archaeological_finds/forms.py:426 archaeological_finds/models_finds.py:2240 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2214 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2234 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2258 +#: archaeological_finds/forms.py:436 archaeological_finds/models_finds.py:2278 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/models.py:629 +#: archaeological_operations/templates/ishtar/sheet_site.html:55 msgid "Public description" msgstr "" -#: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1801 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:439 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:1807 archaeological_finds/models_finds.py:585 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:23 +msgid "Discovery method" +msgstr "" + +#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:763 +#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:2095 msgid "Is complete?" msgstr "" -#: archaeological_finds/forms.py:438 archaeological_finds/forms.py:756 -#: archaeological_finds/forms.py:1085 archaeological_finds/models_finds.py:95 -#: archaeological_finds/models_finds.py:1170 -#: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1998 +#: archaeological_finds/forms.py:443 archaeological_finds/forms.py:766 +#: archaeological_finds/forms.py:1095 archaeological_finds/models_finds.py:95 +#: archaeological_finds/models_finds.py:1186 +#: archaeological_finds/models_finds.py:1187 +#: archaeological_finds/models_finds.py:2018 msgid "Material types" msgstr "" -#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:759 -#: archaeological_finds/forms.py:1810 archaeological_finds/models_finds.py:2002 +#: archaeological_finds/forms.py:446 archaeological_finds/forms.py:769 +#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:2022 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:444 archaeological_finds/forms.py:1088 -#: archaeological_finds/forms.py:1813 archaeological_finds/models_finds.py:2010 +#: archaeological_finds/forms.py:449 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2030 msgid "Technical processes" msgstr "" -#: archaeological_finds/forms.py:448 archaeological_finds/forms.py:1819 -#: archaeological_finds/models_finds.py:2015 +#: archaeological_finds/forms.py:453 archaeological_finds/forms.py:1830 +#: archaeological_finds/models_finds.py:2035 msgid "Comment on the material" msgstr "" -#: archaeological_finds/forms.py:451 archaeological_finds/forms.py:762 -#: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1173 -#: archaeological_finds/models_finds.py:2077 +#: archaeological_finds/forms.py:456 archaeological_finds/forms.py:772 +#: archaeological_finds/forms.py:1102 archaeological_finds/models_finds.py:275 +#: archaeological_finds/models_finds.py:1188 +#: archaeological_finds/models_finds.py:1189 +#: archaeological_finds/models_finds.py:2097 msgid "Object types" msgstr "" -#: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:460 archaeological_finds/forms.py:776 +#: archaeological_finds/forms.py:1837 archaeological_finds/models_finds.py:2101 msgid "Object type quality" msgstr "" -#: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1828 archaeological_finds/models_finds.py:2089 +#: archaeological_finds/forms.py:463 archaeological_finds/forms.py:1106 +#: archaeological_finds/forms.py:1839 archaeological_finds/models_finds.py:2109 msgid "Functional areas" msgstr "" -#: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1835 archaeological_finds/models_finds.py:2095 +#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:1110 +#: archaeological_finds/forms.py:1846 archaeological_finds/models_finds.py:2115 msgid "Technical areas" msgstr "" -#: archaeological_finds/forms.py:465 archaeological_finds/forms.py:768 -#: archaeological_finds/forms.py:1078 archaeological_finds/forms.py:1841 -#: archaeological_finds/forms.py:2352 archaeological_finds/models_finds.py:2022 +#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:778 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1852 +#: archaeological_finds/forms.py:2364 archaeological_finds/models_finds.py:2042 msgid "Number of remains" msgstr "" -#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:770 -#: archaeological_finds/forms.py:1080 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2024 +#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:780 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1854 +#: archaeological_finds/models_finds.py:2044 msgid "Minimum number of individuals (MNI)" msgstr "" -#: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 -#: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1845 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/forms.py:474 archaeological_finds/forms.py:782 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1856 +#: archaeological_finds/models_finds.py:2241 msgid "Inventory quantity" msgstr "" -#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 -#: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1846 -#: archaeological_finds/models_finds.py:2222 +#: archaeological_finds/forms.py:475 archaeological_finds/forms.py:783 +#: archaeological_finds/forms.py:1093 archaeological_finds/forms.py:1857 +#: archaeological_finds/models_finds.py:2242 msgid "Observed quantity" msgstr "" -#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:775 -#: archaeological_finds/models_finds.py:2027 +#: archaeological_finds/forms.py:477 archaeological_finds/forms.py:785 +#: archaeological_finds/models_finds.py:2047 msgid "Comment on quantity" msgstr "" -#: archaeological_finds/forms.py:476 archaeological_finds/forms.py:779 -#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:1992 +#: archaeological_finds/forms.py:481 archaeological_finds/forms.py:789 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2012 msgid "Decoration" msgstr "" -#: archaeological_finds/forms.py:479 archaeological_finds/forms.py:782 -#: archaeological_finds/forms.py:1850 archaeological_finds/models_finds.py:1993 +#: archaeological_finds/forms.py:484 archaeological_finds/forms.py:792 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2013 msgid "Inscription" msgstr "" -#: archaeological_finds/forms.py:482 archaeological_finds/forms.py:785 -#: archaeological_finds/forms.py:1104 archaeological_finds/forms.py:1848 -#: archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:795 +#: archaeological_finds/forms.py:1114 archaeological_finds/forms.py:1859 +#: archaeological_finds/models_finds.py:2015 msgid "Manufacturing place" msgstr "" -#: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 -#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1852 -#: archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/forms.py:490 archaeological_finds/forms.py:798 +#: archaeological_finds/forms.py:1117 archaeological_finds/forms.py:1863 +#: archaeological_finds/models_finds.py:1229 +#: archaeological_finds/models_finds.py:2133 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 -#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1858 -#: archaeological_finds/models_finds.py:2137 +#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:804 +#: archaeological_finds/forms.py:1150 archaeological_finds/forms.py:1869 +#: archaeological_finds/models_finds.py:2157 msgid "Comment on dating" msgstr "" -#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2117 +#: archaeological_finds/forms.py:503 archaeological_finds/forms.py:808 +#: archaeological_finds/forms.py:1871 archaeological_finds/models_finds.py:2137 msgid "Length (cm)" msgstr "" -#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2118 +#: archaeological_finds/forms.py:506 archaeological_finds/forms.py:809 +#: archaeological_finds/forms.py:1872 archaeological_finds/models_finds.py:2138 msgid "Width (cm)" msgstr "" -#: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:810 +#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2139 msgid "Height (cm)" msgstr "" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2122 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:813 +#: archaeological_finds/forms.py:1874 archaeological_finds/models_finds.py:2142 msgid "Thickness (cm)" msgstr "" -#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1864 archaeological_finds/models_finds.py:2120 +#: archaeological_finds/forms.py:515 archaeological_finds/forms.py:811 +#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2140 msgid "Diameter (cm)" msgstr "" -#: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1865 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:518 archaeological_finds/forms.py:812 +#: archaeological_finds/forms.py:1876 archaeological_finds/models_finds.py:2141 msgid "Circumference (cm)" msgstr "" -#: archaeological_finds/forms.py:517 archaeological_finds/forms.py:804 -#: archaeological_finds/forms.py:1866 archaeological_finds/forms.py:2350 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:814 +#: archaeological_finds/forms.py:1877 archaeological_finds/forms.py:2362 +#: archaeological_finds/models_finds.py:2037 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:2351 +#: archaeological_finds/forms.py:524 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:2363 #: archaeological_finds/templates/ishtar/sheet_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3800,141 +3865,141 @@ msgstr "" msgid "Weight (g)" msgstr "" -#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:807 -#: archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:817 +#: archaeological_finds/forms.py:1880 msgid "Clutter long side (cm)" msgstr "" -#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:810 -#: archaeological_finds/forms.py:1873 +#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1884 msgid "Clutter short side (cm)" msgstr "" -#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:1877 +#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:823 +#: archaeological_finds/forms.py:1888 msgid "Clutter height (cm)" msgstr "" -#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1880 archaeological_finds/models_finds.py:2133 +#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2153 msgid "Dimensions comment" msgstr "" -#: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1885 -#: archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2142 +#: archaeological_finds/forms.py:546 archaeological_finds/forms.py:830 +#: archaeological_finds/forms.py:1137 archaeological_finds/forms.py:1896 +#: archaeological_finds/models_finds.py:1230 +#: archaeological_finds/models_finds.py:2162 msgid "Check" msgstr "" -#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1886 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:547 archaeological_finds/forms.py:831 +#: archaeological_finds/forms.py:1138 archaeological_finds/forms.py:1897 +#: archaeological_finds/models_finds.py:2167 msgid "Check date" msgstr "" -#: archaeological_finds/forms.py:600 +#: archaeological_finds/forms.py:606 msgid "Clutter: short side cannot be bigger than the long side." msgstr "" -#: archaeological_finds/forms.py:608 +#: archaeological_finds/forms.py:614 msgid "Find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:694 archaeological_finds/models_finds.py:555 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:50 +#: archaeological_finds/forms.py:701 archaeological_finds/models_finds.py:567 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:697 archaeological_finds/forms.py:1009 -#: archaeological_finds/forms.py:1701 archaeological_finds/models_finds.py:553 +#: archaeological_finds/forms.py:704 archaeological_finds/forms.py:1019 +#: archaeological_finds/forms.py:1711 archaeological_finds/models_finds.py:565 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:701 archaeological_finds/forms.py:1798 -#: archaeological_finds/models_finds.py:566 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:32 +#: archaeological_finds/forms.py:711 archaeological_finds/forms.py:1809 +#: archaeological_finds/models_finds.py:578 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:33 #: 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:704 archaeological_finds/forms.py:1799 -#: archaeological_finds/models_finds.py:569 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:34 +#: archaeological_finds/forms.py:714 archaeological_finds/forms.py:1810 +#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:35 #: 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:707 archaeological_finds/forms.py:1800 -#: archaeological_finds/models_finds.py:573 +#: archaeological_finds/forms.py:717 archaeological_finds/forms.py:1811 +#: archaeological_finds/models_finds.py:589 msgid "Batch/object" msgstr "" -#: archaeological_finds/forms.py:710 +#: archaeological_finds/forms.py:720 msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1883 -#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/forms.py:722 archaeological_finds/forms.py:1894 +#: archaeological_finds/models_finds.py:597 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:728 archaeological_finds/forms.py:2343 +#: archaeological_finds/forms.py:738 archaeological_finds/forms.py:2355 msgid "Resulting find" msgstr "" -#: archaeological_finds/forms.py:729 +#: archaeological_finds/forms.py:739 msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:836 archaeological_finds/forms.py:2358 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2370 msgid "Resulting finds" msgstr "" -#: archaeological_finds/forms.py:837 +#: archaeological_finds/forms.py:847 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "" -#: archaeological_finds/forms.py:842 +#: archaeological_finds/forms.py:852 msgid "Number of resulting finds" msgstr "" -#: archaeological_finds/forms.py:845 +#: archaeological_finds/forms.py:855 msgid "Prefix label for resulting finds" msgstr "" -#: archaeological_finds/forms.py:848 +#: archaeological_finds/forms.py:858 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" msgstr "" -#: archaeological_finds/forms.py:853 +#: archaeological_finds/forms.py:863 msgid "Numbering starting from" msgstr "" -#: archaeological_finds/forms.py:856 +#: archaeological_finds/forms.py:866 msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1321 -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1331 +#: archaeological_finds/forms.py:1398 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1397 +#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1407 msgid "Find - Quick action - Modify" msgstr "" -#: archaeological_finds/forms.py:978 +#: archaeological_finds/forms.py:988 msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:979 archaeological_finds/forms.py:1450 -#: archaeological_finds/forms.py:1621 +#: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1631 #: archaeological_finds/templates/ishtar/sheet_find.html:283 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:309 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3945,256 +4010,256 @@ msgstr "" msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 -#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2240 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1499 +#: archaeological_finds/forms.py:1902 archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:2260 #: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 -#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:1216 -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 +#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:1232 +#: archaeological_finds/models_finds.py:2264 #: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 -#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2227 +#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1493 +#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2247 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" msgstr "" -#: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:1217 -#: archaeological_finds/models_finds.py:2250 +#: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1517 +#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1233 +#: archaeological_finds/models_finds.py:2270 #: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 -#: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2101 +#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1481 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:1227 +#: archaeological_finds/models_finds.py:2121 #: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "" -#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 -#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1131 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 +#: archaeological_finds/models_finds.py:2127 #: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:2256 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1911 archaeological_finds/models_finds.py:2276 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 -#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 -#: archaeological_finds/models_finds.py:2255 +#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1520 +#: archaeological_finds/forms.py:1910 archaeological_finds/models_finds.py:1244 +#: archaeological_finds/models_finds.py:2275 msgid "Insurance value" msgstr "" -#: archaeological_finds/forms.py:1144 +#: archaeological_finds/forms.py:1154 msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1274 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:1284 archaeological_finds/forms.py:1789 -#: archaeological_finds/forms.py:2562 archaeological_finds/forms.py:2567 -#: archaeological_finds/forms.py:2584 archaeological_finds/forms.py:2589 +#: archaeological_finds/forms.py:1294 archaeological_finds/forms.py:1799 +#: archaeological_finds/forms.py:2574 archaeological_finds/forms.py:2579 +#: archaeological_finds/forms.py:2596 archaeological_finds/forms.py:2601 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:933 -#: archaeological_finds/models_finds.py:1862 +#: archaeological_finds/models_finds.py:949 +#: archaeological_finds/models_finds.py:1882 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:420 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1317 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:1314 +#: archaeological_finds/forms.py:1324 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:1318 archaeological_finds/forms.py:1385 +#: archaeological_finds/forms.py:1328 archaeological_finds/forms.py:1395 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1407 archaeological_finds/forms.py:2458 +#: archaeological_finds/forms.py:1417 archaeological_finds/forms.py:2470 #: ishtar_common/models.py:1051 ishtar_common/models.py:2054 #: ishtar_common/models.py:3813 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:1408 archaeological_finds/forms.py:2459 +#: archaeological_finds/forms.py:1418 archaeological_finds/forms.py:2471 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2464 -#: archaeological_finds/forms.py:2506 ishtar_common/models.py:3826 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2518 ishtar_common/models.py:3826 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1420 archaeological_finds/forms.py:2471 -#: archaeological_finds/forms.py:2513 ishtar_common/models.py:3832 +#: archaeological_finds/forms.py:1430 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:2525 ishtar_common/models.py:3832 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1461 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1894 -#: archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/forms.py:1511 archaeological_finds/forms.py:1905 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2255 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1898 -#: archaeological_finds/models_finds.py:1227 -#: archaeological_finds/models_finds.py:2148 +#: archaeological_finds/forms.py:1519 archaeological_finds/forms.py:1909 +#: archaeological_finds/models_finds.py:1243 +#: archaeological_finds/models_finds.py:2168 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2231 +#: archaeological_finds/forms.py:1523 archaeological_finds/forms.py:1901 +#: archaeological_finds/models_finds.py:2251 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1563 +#: archaeological_finds/forms.py:1573 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1569 +#: archaeological_finds/forms.py:1579 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1573 +#: archaeological_finds/forms.py:1583 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1596 +#: archaeological_finds/forms.py:1606 msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:1709 archaeological_finds/models_finds.py:2318 msgid "Complete museum ID" msgstr "" -#: archaeological_finds/forms.py:1705 archaeological_finds/models_finds.py:1150 +#: archaeological_finds/forms.py:1715 archaeological_finds/models_finds.py:1166 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1706 archaeological_finds/models_finds.py:1151 +#: archaeological_finds/forms.py:1716 archaeological_finds/models_finds.py:1167 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1710 +#: archaeological_finds/forms.py:1720 #, fuzzy #| msgid "email address" msgid "Operation - number (index by year)" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1713 +#: archaeological_finds/forms.py:1723 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1716 +#: archaeological_finds/forms.py:1726 #, fuzzy #| msgid "email address" msgid "Operation - Type" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1729 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1722 +#: archaeological_finds/forms.py:1732 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1733 +#: archaeological_finds/forms.py:1743 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1736 +#: archaeological_finds/forms.py:1746 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1740 +#: archaeological_finds/forms.py:1750 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1743 +#: archaeological_finds/forms.py:1753 #, fuzzy #| msgid "email address" msgid "Operation - Remains" msgstr "E-Mail-Adresse" -#: archaeological_finds/forms.py:1746 archaeological_operations/forms.py:472 -#: archaeological_operations/forms.py:1208 ishtar_common/forms_common.py:1570 +#: archaeological_finds/forms.py:1756 archaeological_operations/forms.py:472 +#: archaeological_operations/forms.py:1216 ishtar_common/forms_common.py:1570 #: ishtar_common/models.py:2409 ishtar_common/models.py:3482 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:91 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1749 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1757 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1760 archaeological_warehouse/forms.py:552 +#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1768 archaeological_warehouse/forms.py:560 +#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1781 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1780 +#: archaeological_finds/forms.py:1790 msgid "Context record - Type" msgstr "" -#: archaeological_finds/forms.py:1785 +#: archaeological_finds/forms.py:1795 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1797 +#: archaeological_finds/forms.py:1808 msgid "Base find - Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:1803 archaeological_finds/forms.py:2349 +#: archaeological_finds/forms.py:1814 archaeological_finds/forms.py:2361 #: archaeological_finds/models_finds.py:94 -#: archaeological_finds/models_finds.py:1207 +#: archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 #: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -4202,8 +4267,8 @@ msgstr "" msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:274 -#: archaeological_finds/models_finds.py:1208 +#: archaeological_finds/forms.py:1832 archaeological_finds/models_finds.py:274 +#: archaeological_finds/models_finds.py:1224 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 @@ -4211,112 +4276,112 @@ msgstr "" msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1867 +#: archaeological_finds/forms.py:1878 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1902 +#: archaeological_finds/forms.py:1913 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:1914 msgid "Treatment file end date" msgstr "" -#: archaeological_finds/forms.py:1904 +#: archaeological_finds/forms.py:1915 msgid "Treatment end date" msgstr "" -#: archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1917 msgid "Museum - Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1919 msgid "Museum - Owner institution" msgstr "" -#: archaeological_finds/forms.py:1914 +#: archaeological_finds/forms.py:1925 msgid "Museum - Assigned institution" msgstr "" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1931 msgid "Museum - Custodian institution" msgstr "" -#: archaeological_finds/forms.py:1925 +#: archaeological_finds/forms.py:1936 msgid "Museum - Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:1926 +#: archaeological_finds/forms.py:1937 msgid "Museum - Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:1927 +#: archaeological_finds/forms.py:1938 msgid "Museum - Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:1928 +#: archaeological_finds/forms.py:1939 msgid "Museum - Entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:1929 +#: archaeological_finds/forms.py:1940 msgid "Museum - Entry date end" msgstr "" -#: archaeological_finds/forms.py:1930 +#: archaeological_finds/forms.py:1941 msgid "Museum - Comment on entry date" msgstr "" -#: archaeological_finds/forms.py:1932 +#: archaeological_finds/forms.py:1943 msgid "Museum - Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:1938 +#: archaeological_finds/forms.py:1949 msgid "Museum - Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:1941 +#: archaeological_finds/forms.py:1952 msgid "Museum - Type of marking" msgstr "" -#: archaeological_finds/forms.py:1945 +#: archaeological_finds/forms.py:1956 msgid "Museum - Collection" msgstr "" -#: archaeological_finds/forms.py:1948 +#: archaeological_finds/forms.py:1959 msgid "Museum - Former collection" msgstr "" -#: archaeological_finds/forms.py:1953 +#: archaeological_finds/forms.py:1964 msgid "Museum - Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:1955 +#: archaeological_finds/forms.py:1966 msgid "Museum - Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:1957 +#: archaeological_finds/forms.py:1968 msgid "Museum - Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:1958 +#: archaeological_finds/forms.py:1969 msgid "Museum - Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:1960 +#: archaeological_finds/forms.py:1971 msgid "Museum - Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:1962 +#: archaeological_finds/forms.py:1973 msgid "Museum - Date of allocation" msgstr "" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1974 msgid "Museum - Purchase price" msgstr "" -#: archaeological_finds/forms.py:2035 archaeological_finds/models_finds.py:1167 -#: archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:2047 archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:2085 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4328,11 +4393,11 @@ msgstr "" msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:2042 +#: archaeological_finds/forms.py:2054 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2061 archaeological_finds/models_finds.py:1166 +#: archaeological_finds/forms.py:2073 archaeological_finds/models_finds.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:329 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:355 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4344,47 +4409,47 @@ msgstr "" msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:2080 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2088 archaeological_finds/forms.py:2109 -#: archaeological_finds/forms.py:2165 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2100 archaeological_finds/forms.py:2121 +#: archaeological_finds/forms.py:2177 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:2204 archaeological_finds/forms.py:2367 +#: archaeological_finds/forms.py:2216 archaeological_finds/forms.py:2379 #: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:2227 +#: archaeological_finds/forms.py:2239 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:2348 +#: archaeological_finds/forms.py:2360 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2363 +#: archaeological_finds/forms.py:2375 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2406 +#: archaeological_finds/forms.py:2418 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2418 archaeological_finds/forms.py:2436 +#: archaeological_finds/forms.py:2430 archaeological_finds/forms.py:2448 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2453 +#: archaeological_finds/forms.py:2465 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2456 +#: archaeological_finds/forms.py:2468 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:211 @@ -4417,11 +4482,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2498 archaeological_finds/forms.py:2553 +#: archaeological_finds/forms.py:2510 archaeological_finds/forms.py:2565 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2545 +#: archaeological_finds/forms.py:2557 msgid "Another basket already exists with this name." msgstr "" @@ -4468,8 +4533,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2574 -#: archaeological_operations/models.py:2907 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:3024 ishtar_common/views.py:511 msgid "Treatment" msgstr "" @@ -4566,8 +4631,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1269 #: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2573 -#: archaeological_operations/models.py:2899 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2690 +#: archaeological_operations/models.py:3016 ishtar_common/views.py:510 msgid "Treatment request" msgstr "" @@ -4598,8 +4663,8 @@ msgid "Treatment type is required." msgstr "" #: archaeological_finds/forms_treatments.py:498 -#: archaeological_finds/models_finds.py:2053 -#: archaeological_finds/models_finds.py:3612 +#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:3632 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:852 #: archaeological_finds/templates/ishtar/sheet_find.html:390 @@ -4796,7 +4861,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:90 -#: archaeological_operations/models.py:2578 +#: archaeological_operations/models.py:2695 #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 #: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4027 msgid "Code" @@ -4887,7 +4952,7 @@ msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:187 -#: archaeological_finds/models_finds.py:2273 +#: archaeological_finds/models_finds.py:2293 #: archaeological_finds/models_treatments.py:76 #: archaeological_finds/models_treatments.py:304 #: archaeological_finds/models_treatments.py:316 @@ -5002,101 +5067,109 @@ msgid "Checked types" msgstr "" #: archaeological_finds/models_finds.py:421 -msgid "Collection entry mode type" +msgid "Discovery method type" msgstr "" #: archaeological_finds/models_finds.py:422 +msgid "Discovery method types" +msgstr "" + +#: archaeological_finds/models_finds.py:435 +msgid "Collection entry mode type" +msgstr "" + +#: archaeological_finds/models_finds.py:436 msgid "Collection entry mode types" msgstr "" -#: archaeological_finds/models_finds.py:437 +#: archaeological_finds/models_finds.py:451 msgid "Presence of inventory marking type" msgstr "" -#: archaeological_finds/models_finds.py:438 +#: archaeological_finds/models_finds.py:452 msgid "Presence of inventory marking types" msgstr "" -#: archaeological_finds/models_finds.py:452 +#: archaeological_finds/models_finds.py:466 msgid "Marking type" msgstr "" -#: archaeological_finds/models_finds.py:453 +#: archaeological_finds/models_finds.py:467 msgid "Marking types" msgstr "" -#: archaeological_finds/models_finds.py:467 +#: archaeological_finds/models_finds.py:481 msgid "Museum collection type" msgstr "" -#: archaeological_finds/models_finds.py:468 +#: archaeological_finds/models_finds.py:482 msgid "Museum collection types" msgstr "" -#: archaeological_finds/models_finds.py:482 +#: archaeological_finds/models_finds.py:496 msgid "Inventory conformity type" msgstr "" -#: archaeological_finds/models_finds.py:483 +#: archaeological_finds/models_finds.py:497 msgid "Inventory conformity types" msgstr "" -#: archaeological_finds/models_finds.py:497 +#: archaeological_finds/models_finds.py:511 msgid "Original/reproduction type" msgstr "" -#: archaeological_finds/models_finds.py:498 +#: archaeological_finds/models_finds.py:512 msgid "Original/reproduction types" msgstr "" -#: archaeological_finds/models_finds.py:557 +#: archaeological_finds/models_finds.py:569 msgid "Special interest" msgstr "" -#: archaeological_finds/models_finds.py:579 +#: archaeological_finds/models_finds.py:595 msgid "Material index" msgstr "" -#: archaeological_finds/models_finds.py:584 +#: archaeological_finds/models_finds.py:600 #: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "" -#: archaeological_finds/models_finds.py:586 +#: archaeological_finds/models_finds.py:602 msgid "Short ID" msgstr "" -#: archaeological_finds/models_finds.py:590 -#: archaeological_finds/models_finds.py:597 -#: archaeological_finds/models_finds.py:2302 ishtar_common/models.py:4672 +#: archaeological_finds/models_finds.py:606 +#: archaeological_finds/models_finds.py:613 +#: archaeological_finds/models_finds.py:2322 ishtar_common/models.py:4672 #: ishtar_common/models.py:4679 msgid "Cached value - do not edit" msgstr "" -#: archaeological_finds/models_finds.py:593 +#: archaeological_finds/models_finds.py:609 msgid "Complete ID" msgstr "" -#: archaeological_finds/models_finds.py:614 +#: archaeological_finds/models_finds.py:630 msgid "Concatenation of associated material types codes" msgstr "" -#: archaeological_finds/models_finds.py:620 -#: archaeological_finds/models_finds.py:1974 +#: archaeological_finds/models_finds.py:636 +#: archaeological_finds/models_finds.py:1994 msgid "Base find" msgstr "" -#: archaeological_finds/models_finds.py:904 +#: archaeological_finds/models_finds.py:920 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:905 +#: archaeological_finds/models_finds.py:921 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:912 +#: archaeological_finds/models_finds.py:928 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 #, fuzzy @@ -5104,7 +5177,7 @@ msgstr "" msgid "Associated finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:917 +#: archaeological_finds/models_finds.py:933 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -5117,624 +5190,629 @@ msgstr "E-Mail-Adresse" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:974 archaeological_finds/views.py:539 +#: archaeological_finds/models_finds.py:990 archaeological_finds/views.py:539 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:986 +#: archaeological_finds/models_finds.py:1002 #: archaeological_warehouse/models.py:1946 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:997 +#: archaeological_finds/models_finds.py:1013 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1152 +#: archaeological_finds/models_finds.py:1168 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1173 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1174 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1175 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1177 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1163 +#: archaeological_finds/models_finds.py:1179 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1164 +#: archaeological_finds/models_finds.py:1180 msgid "Base find - Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:1181 msgid "Base find - Discovery date (end)" msgstr "" -#: archaeological_finds/models_finds.py:1194 +#: archaeological_finds/models_finds.py:1210 #: archaeological_operations/forms.py:479 #: archaeological_operations/forms.py:684 -#: archaeological_operations/forms.py:1655 -#: archaeological_operations/forms.py:1723 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1089 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5342 +#: archaeological_operations/forms.py:1699 +#: archaeological_operations/forms.py:1767 +#: archaeological_operations/models.py:1113 +#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1518 ishtar_common/models.py:5342 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" -#: archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:1242 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1311 +#: archaeological_finds/models_finds.py:1327 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1315 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_finds.py:1335 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1322 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1337 archaeological_finds/tests.py:1537 +#: archaeological_finds/models_finds.py:1353 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:1341 ishtar_common/models.py:4378 +#: archaeological_finds/models_finds.py:1357 ishtar_common/models.py:4378 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1345 -#: archaeological_operations/models.py:389 -#: archaeological_operations/models.py:1158 ishtar_common/models.py:4427 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_operations/models.py:474 +#: archaeological_operations/models.py:1275 ishtar_common/models.py:4427 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1354 +#: archaeological_finds/models_finds.py:1370 #: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1359 -#: archaeological_finds/models_finds.py:1895 +#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1915 #: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1364 +#: archaeological_finds/models_finds.py:1380 #: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1368 -#: archaeological_finds/models_finds.py:1890 +#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1910 #: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4386 #: ishtar_common/models.py:4488 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1372 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "context-record-type" msgstr "" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "discovery-comment" msgstr "" -#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1388 archaeological_finds/tests.py:1444 +#: archaeological_finds/models_finds.py:1404 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:1393 +#: archaeological_finds/models_finds.py:1409 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1397 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1401 archaeological_finds/tests.py:1691 +#: archaeological_finds/models_finds.py:1417 archaeological_finds/tests.py:1691 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1405 +#: archaeological_finds/models_finds.py:1421 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1409 +#: archaeological_finds/models_finds.py:1425 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1416 +#: archaeological_finds/models_finds.py:1432 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1420 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1424 ishtar_common/models.py:4409 +#: archaeological_finds/models_finds.py:1440 ishtar_common/models.py:4409 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1428 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1913 #: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1448 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1452 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1440 +#: archaeological_finds/models_finds.py:1456 #: archaeological_finds/wizards.py:462 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1467 #: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1454 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1470 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1456 +#: archaeological_finds/models_finds.py:1472 msgctxt "key for text search" msgid "treatment-file-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "treatment-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1464 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1471 +#: archaeological_finds/models_finds.py:1487 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1474 +#: archaeological_finds/models_finds.py:1490 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1494 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1481 +#: archaeological_finds/models_finds.py:1497 msgctxt "key for text search" msgid "complete-museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1484 +#: archaeological_finds/models_finds.py:1500 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1488 +#: archaeological_finds/models_finds.py:1504 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1491 +#: archaeological_finds/models_finds.py:1507 msgctxt "key for text search" msgid "discovery-date" msgstr "" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1511 msgctxt "key for text search" msgid "discovery-date-taq" msgstr "" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1515 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1518 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1506 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1526 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1533 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1520 +#: archaeological_finds/models_finds.py:1536 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1523 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1534 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1538 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1546 +#: archaeological_finds/models_finds.py:1562 msgctxt "key for text search" msgid "length" msgstr "" -#: archaeological_finds/models_finds.py:1549 +#: archaeological_finds/models_finds.py:1565 msgctxt "key for text search" msgid "width" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "height" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1571 msgctxt "key for text search" msgid "thickness" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1574 msgctxt "key for text search" msgid "diameter" msgstr "" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "circumference" msgstr "" -#: archaeological_finds/models_finds.py:1565 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "volume" msgstr "" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" msgid "weight" msgstr "" -#: archaeological_finds/models_finds.py:1571 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" msgid "clutter-long-side" msgstr "" -#: archaeological_finds/models_finds.py:1575 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" msgid "clutter-short-side" msgstr "" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1595 msgctxt "key for text search" msgid "clutter-height" msgstr "" -#: archaeological_finds/models_finds.py:1583 +#: archaeological_finds/models_finds.py:1599 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1603 +msgctxt "key for text search" +msgid "discovery-method" +msgstr "" + +#: archaeological_finds/models_finds.py:1607 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1591 +#: archaeological_finds/models_finds.py:1611 msgctxt "key for text search" msgid "check-date" msgstr "" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1614 #: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1618 #: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1622 #: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1626 msgctxt "key for text search" msgid "estimated-value" msgstr "" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1630 msgctxt "key for text search" msgid "insurance-value" msgstr "" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1634 msgctxt "key for text search" msgid "appraisal-date" msgstr "" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1642 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1646 msgctxt "key for text search" msgid "technical-area" msgstr "" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1650 msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1654 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:1642 -#: archaeological_operations/models.py:1188 +#: archaeological_finds/models_finds.py:1662 +#: archaeological_operations/models.py:1305 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1193 +#: archaeological_finds/models_finds.py:1666 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1310 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1674 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-remain" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1678 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1662 +#: archaeological_finds/models_finds.py:1682 msgctxt "key for text search" msgid "museum-id-comment" msgstr "" -#: archaeological_finds/models_finds.py:1666 +#: archaeological_finds/models_finds.py:1686 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "" -#: archaeological_finds/models_finds.py:1671 +#: archaeological_finds/models_finds.py:1691 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "" -#: archaeological_finds/models_finds.py:1676 +#: archaeological_finds/models_finds.py:1696 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "" -#: archaeological_finds/models_finds.py:1681 +#: archaeological_finds/models_finds.py:1701 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "" -#: archaeological_finds/models_finds.py:1685 +#: archaeological_finds/models_finds.py:1705 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "" -#: archaeological_finds/models_finds.py:1689 +#: archaeological_finds/models_finds.py:1709 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1713 msgctxt "key for text search" msgid "museum-entry-date" msgstr "" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1717 msgctxt "key for text search" msgid "museum-entry-date-end" msgstr "" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1721 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1725 msgctxt "key for text search" msgid "museum-donor" msgstr "" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1730 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "" -#: archaeological_finds/models_finds.py:1714 +#: archaeological_finds/models_finds.py:1734 msgctxt "key for text search" msgid "museum-marking-type" msgstr "" -#: archaeological_finds/models_finds.py:1718 +#: archaeological_finds/models_finds.py:1738 msgctxt "key for text search" msgid "museum-collection" msgstr "" -#: archaeological_finds/models_finds.py:1723 +#: archaeological_finds/models_finds.py:1743 msgctxt "key for text search" msgid "museum-former-collection" msgstr "" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1748 msgctxt "key for text search" msgid "museum-inventory-entry-year" msgstr "" -#: archaeological_finds/models_finds.py:1732 +#: archaeological_finds/models_finds.py:1752 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "" -#: archaeological_finds/models_finds.py:1737 +#: archaeological_finds/models_finds.py:1757 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "" -#: archaeological_finds/models_finds.py:1741 +#: archaeological_finds/models_finds.py:1761 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "" -#: archaeological_finds/models_finds.py:1745 +#: archaeological_finds/models_finds.py:1765 msgctxt "key for text search" msgid "museum-original-repro" msgstr "" -#: archaeological_finds/models_finds.py:1750 +#: archaeological_finds/models_finds.py:1770 msgctxt "key for text search" msgid "museum-allocation-date" msgstr "" -#: archaeological_finds/models_finds.py:1754 +#: archaeological_finds/models_finds.py:1774 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "" -#: archaeological_finds/models_finds.py:1758 +#: archaeological_finds/models_finds.py:1778 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1762 +#: archaeological_finds/models_finds.py:1782 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1869 -#: archaeological_finds/models_finds.py:2668 +#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:2688 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 #: archaeological_warehouse/views.py:304 ishtar_common/models.py:4526 @@ -5744,19 +5822,19 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1877 +#: archaeological_finds/models_finds.py:1897 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:2018 +#: archaeological_finds/models_finds.py:2038 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2040 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2055 #: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5767,7 +5845,7 @@ msgstr "" msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2042 +#: archaeological_finds/models_finds.py:2062 #: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5778,112 +5856,112 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2060 +#: archaeological_finds/models_finds.py:2080 msgid "Container - first full location" msgstr "" -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:2081 +#: archaeological_finds/models_finds.py:2093 msgid "Updated as long as no packaging is attached" msgstr "" -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/models_finds.py:2092 msgid "Reference container - first full location" msgstr "" -#: archaeological_finds/models_finds.py:2124 +#: archaeological_finds/models_finds.py:2144 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2127 +#: archaeological_finds/models_finds.py:2147 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2130 +#: archaeological_finds/models_finds.py:2150 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2173 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2224 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_finds.py:2296 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2286 +#: archaeological_finds/models_finds.py:2306 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2292 +#: archaeological_finds/models_finds.py:2312 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2332 +#: archaeological_finds/models_finds.py:2352 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2506 +#: archaeological_finds/models_finds.py:2526 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2507 +#: archaeological_finds/models_finds.py:2527 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2508 +#: archaeological_finds/models_finds.py:2528 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2509 +#: archaeological_finds/models_finds.py:2529 #, fuzzy #| msgid "email address" msgid "Complete ID of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2510 +#: archaeological_finds/models_finds.py:2530 #, fuzzy #| msgid "email address" msgid "Label of associated context records" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2641 +#: archaeological_finds/models_finds.py:2661 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2649 +#: archaeological_finds/models_finds.py:2669 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2657 +#: archaeological_finds/models_finds.py:2677 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3135 +#: archaeological_finds/models_finds.py:3155 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3141 +#: archaeological_finds/models_finds.py:3161 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3631 +#: archaeological_finds/models_finds.py:3651 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Current" msgstr "" -#: archaeological_finds/models_finds.py:3632 +#: archaeological_finds/models_finds.py:3652 #: archaeological_finds/models_treatments.py:1198 #: archaeological_finds/templates/ishtar/sheet_find.html:420 #: archaeological_operations/forms.py:1101 #: archaeological_operations/forms.py:1198 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:500 +#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:597 #: archaeological_warehouse/forms.py:343 #: archaeological_warehouse/models.py:2103 ishtar_common/forms_common.py:2150 #: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 @@ -5892,30 +5970,30 @@ msgstr "" msgid "Reference" msgstr "" -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:3653 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Reference/current" msgstr "" -#: archaeological_finds/models_finds.py:3653 +#: archaeological_finds/models_finds.py:3673 msgid "Full location" msgstr "" -#: archaeological_finds/models_finds.py:3654 +#: archaeological_finds/models_finds.py:3674 #, fuzzy #| msgid "email address" msgid "Location type" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:3658 +#: archaeological_finds/models_finds.py:3678 msgid "Find - Treatment" msgstr "" -#: archaeological_finds/models_finds.py:3659 +#: archaeological_finds/models_finds.py:3679 msgid "Find - Treatments" msgstr "" -#: archaeological_finds/models_finds.py:3696 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3716 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2954 #: ishtar_common/models.py:3273 ishtar_common/models.py:3371 @@ -5925,11 +6003,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3704 +#: archaeological_finds/models_finds.py:3724 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3705 +#: archaeological_finds/models_finds.py:3725 msgid "Properties" msgstr "" @@ -5964,7 +6042,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:168 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2830 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" @@ -6135,13 +6213,13 @@ msgstr "" msgid "Internal ID" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:26 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:27 #: man_app/templates/ishtar/sheet_basefind.html:23 #: sra_idf_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:29 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:30 #: man_app/templates/ishtar/sheet_basefind.html:26 #: sra_idf_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery year" @@ -6468,8 +6546,8 @@ msgstr "" #: ishtar_common/forms.py:1211 ishtar_common/forms.py:1290 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:664 ishtar_common/views_item.py:936 -#: ishtar_common/views_item.py:973 ishtar_common/wizards.py:502 +#: ishtar_common/views_item.py:672 ishtar_common/views_item.py:944 +#: ishtar_common/views_item.py:981 ishtar_common/wizards.py:502 msgid "Yes" msgstr "" @@ -6575,7 +6653,7 @@ msgstr "" #: archaeological_operations/forms.py:1043 #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:3198 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6584,20 +6662,20 @@ msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:77 -#: archaeological_operations/models.py:3180 +#: archaeological_operations/models.py:3297 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:80 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/models.py:3299 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:82 -#: archaeological_operations/models.py:3184 -#: archaeological_operations/models.py:3212 -#: archaeological_operations/models.py:3280 +#: archaeological_operations/models.py:3301 +#: archaeological_operations/models.py:3329 +#: archaeological_operations/models.py:3397 msgid "Public domain" msgstr "" @@ -6655,26 +6733,26 @@ msgstr "" #: archaeological_operations/forms.py:461 #: archaeological_operations/forms.py:911 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:1506 +#: archaeological_operations/models.py:2178 msgid "Yearly index" msgstr "" #: archaeological_operations/forms.py:468 #: archaeological_operations/forms.py:702 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1549 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:470 #: archaeological_operations/forms.py:683 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/models.py:1648 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:478 #: archaeological_operations/forms.py:688 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/models.py:1589 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "" @@ -6685,35 +6763,35 @@ msgstr "" #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:739 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2850 +#: archaeological_operations/models.py:1495 +#: archaeological_operations/models.py:2967 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:728 -#: archaeological_operations/forms.py:1659 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:1703 +#: archaeological_operations/models.py:1488 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:736 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/models.py:1586 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:1109 -#: archaeological_operations/forms.py:1204 -#: archaeological_operations/forms.py:1324 -#: archaeological_operations/forms.py:1825 -#: archaeological_operations/models.py:306 -#: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1000 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/forms.py:1208 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1869 +#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:603 +#: archaeological_operations/models.py:1117 +#: archaeological_operations/models.py:1209 +#: archaeological_operations/models.py:1523 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -6724,26 +6802,26 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/models.py:1592 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:516 #: archaeological_operations/forms.py:797 -#: archaeological_operations/models.py:1002 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:1119 +#: archaeological_operations/models.py:1627 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:517 #: archaeological_operations/forms.py:757 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/models.py:1544 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:519 #: archaeological_operations/forms.py:710 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/models.py:1618 msgid "Virtual operation" msgstr "" @@ -6755,16 +6833,16 @@ msgstr "E-Mail-Adresse" #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1667 -#: archaeological_operations/models.py:1003 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:1711 +#: archaeological_operations/models.py:1120 +#: archaeological_operations/models.py:1638 msgid "Documentation provided" msgstr "" #: archaeological_operations/forms.py:543 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1671 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:1715 +#: archaeological_operations/models.py:1633 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "" @@ -6775,16 +6853,16 @@ msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1674 -#: archaeological_operations/models.py:1004 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:1718 +#: archaeological_operations/models.py:1121 +#: archaeological_operations/models.py:1644 msgid "Finds provided" msgstr "" #: archaeological_operations/forms.py:550 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1678 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:1722 +#: archaeological_operations/models.py:1640 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "" @@ -6802,8 +6880,8 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:686 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:1765 +#: archaeological_operations/models.py:1588 msgid "Generic name" msgstr "" @@ -6812,17 +6890,17 @@ msgid "Actors" msgstr "" #: archaeological_operations/forms.py:715 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2868 +#: archaeological_operations/models.py:1479 +#: archaeological_operations/models.py:2985 msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:750 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1681 -#: archaeological_operations/forms.py:1814 -#: archaeological_operations/models.py:523 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:1346 +#: archaeological_operations/forms.py:1725 +#: archaeological_operations/forms.py:1858 +#: archaeological_operations/models.py:640 +#: archaeological_operations/models.py:1502 msgid "Collaborators" msgstr "" @@ -6831,31 +6909,32 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:755 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/models.py:1473 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/models.py:1635 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/models.py:1642 msgid "Deadline for submission of the finds" msgstr "" #: archaeological_operations/forms.py:793 +#: archaeological_operations/forms.py:1353 msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:800 -#: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 +#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:806 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/models.py:1632 msgid "Abstract" msgstr "" @@ -6893,12 +6972,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:956 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/models.py:1651 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:959 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1653 msgid "Official report number" msgstr "" @@ -6907,12 +6986,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:971 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1665 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:977 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/models.py:1673 msgid "Writer of the minutes" msgstr "" @@ -6925,22 +7004,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:986 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:1528 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1532 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:989 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/models.py:1536 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:991 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1540 msgid "Effective man-days" msgstr "" @@ -6953,17 +7032,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/models.py:1560 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/models.py:1564 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1012 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/models.py:1567 msgid "Prescription on geoarchaeological context" msgstr "" @@ -6984,8 +7063,8 @@ msgid "Operation - 050 - Parcels (2)" msgstr "" #: archaeological_operations/forms.py:1134 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1837 msgid "This reference already exists." msgstr "" @@ -7001,150 +7080,202 @@ msgstr "" msgid "Archaeological site - 001 - Search" msgstr "" +#: archaeological_operations/forms.py:1203 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/models.py:600 +#: archaeological_operations/templates/ishtar/sheet_site.html:44 +#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 +msgid "Types" +msgstr "" + +#: archaeological_operations/forms.py:1206 +#: archaeological_operations/forms.py:1372 +#: archaeological_operations/models.py:619 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 +msgid "Discoverer" +msgstr "" + +#: archaeological_operations/forms.py:1211 +#: archaeological_operations/forms.py:1359 +#: archaeological_operations/models.py:616 +#: archaeological_operations/templates/ishtar/sheet_site.html:45 +msgid "Discovery status" +msgstr "" + #: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1360 +#: archaeological_operations/models.py:612 +#: archaeological_operations/templates/ishtar/sheet_site.html:46 +msgid "Current status" +msgstr "" + +#: archaeological_operations/forms.py:1213 +#: archaeological_operations/forms.py:1357 +#: archaeological_operations/models.py:621 +#: archaeological_operations/templates/ishtar/sheet_site.html:47 +msgid "Nature of site" +msgstr "" + +#: archaeological_operations/forms.py:1214 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/models.py:624 +#: archaeological_operations/templates/ishtar/sheet_site.html:48 +msgid "Interpretation level" +msgstr "" + +#: archaeological_operations/forms.py:1221 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1224 -#: archaeological_operations/forms.py:1335 -#: archaeological_operations/models.py:515 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1378 +#: archaeological_operations/models.py:630 +#: archaeological_operations/templates/ishtar/sheet_site.html:86 +msgid "Precise locality" +msgstr "" + +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/models.py:632 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/models.py:518 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1386 +#: archaeological_operations/models.py:635 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1231 -#: archaeological_operations/forms.py:1383 -#: archaeological_operations/models.py:535 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1427 +#: archaeological_operations/models.py:652 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1233 -#: archaeological_operations/forms.py:1385 -#: archaeological_operations/models.py:538 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1429 +#: archaeological_operations/models.py:655 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1387 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1431 +#: archaeological_operations/models.py:644 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1395 -#: archaeological_operations/models.py:529 +#: archaeological_operations/forms.py:1249 +#: archaeological_operations/forms.py:1439 +#: archaeological_operations/models.py:646 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1389 -#: archaeological_operations/models.py:531 +#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/models.py:648 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1391 -#: archaeological_operations/models.py:532 +#: archaeological_operations/forms.py:1254 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/models.py:649 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1245 -#: archaeological_operations/forms.py:1393 -#: archaeological_operations/models.py:533 +#: archaeological_operations/forms.py:1256 +#: archaeological_operations/forms.py:1437 +#: archaeological_operations/models.py:650 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1307 +#: archaeological_operations/forms.py:1323 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1369 -msgid "Archaeological site - 020 - Towns" -msgstr "" +#: archaeological_operations/forms.py:1373 +#, fuzzy +#| msgid "email address" +msgid "Localization" +msgstr "E-Mail-Adresse" -#: archaeological_operations/forms.py:1378 -#: archaeological_operations/templates/ishtar/sheet_site.html:52 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/templates/ishtar/sheet_site.html:60 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1379 +#: archaeological_operations/forms.py:1423 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/views.py:760 +#: archaeological_operations/forms.py:1490 +#: archaeological_operations/views.py:758 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1607 +#: archaeological_operations/forms.py:1674 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1471 -#: archaeological_operations/models.py:2875 +#: archaeological_operations/forms.py:1515 +#: archaeological_operations/models.py:2992 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1489 +#: archaeological_operations/forms.py:1533 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1523 +#: archaeological_operations/forms.py:1567 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1527 +#: archaeological_operations/forms.py:1571 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1540 +#: archaeological_operations/forms.py:1584 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1545 ishtar_common/forms.py:1334 +#: archaeological_operations/forms.py:1589 ishtar_common/forms.py:1334 #: ishtar_common/models.py:2057 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1617 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1591 +#: archaeological_operations/forms.py:1635 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1593 +#: archaeological_operations/forms.py:1637 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1614 +#: archaeological_operations/forms.py:1658 #: archaeological_operations/ishtar_menu.py:112 -#: archaeological_operations/views.py:871 +#: archaeological_operations/views.py:869 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1635 +#: archaeological_operations/forms.py:1679 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1748 +#: archaeological_operations/forms.py:1792 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1804 +#: archaeological_operations/forms.py:1848 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7152,639 +7283,726 @@ msgstr "" msgid "Administrative Act" msgstr "" -#: archaeological_operations/models.py:91 +#: archaeological_operations/models.py:93 msgid "Remain types" msgstr "" -#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:107 msgid "Parent period" msgstr "" -#: archaeological_operations/models.py:112 +#: archaeological_operations/models.py:114 msgid "Type Period" msgstr "" -#: archaeological_operations/models.py:113 +#: archaeological_operations/models.py:115 msgid "Types Period" msgstr "" -#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:130 msgid "Type of report state" msgstr "" -#: archaeological_operations/models.py:129 +#: archaeological_operations/models.py:131 msgid "Types of report state" msgstr "" -#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:141 +msgid "Current status type" +msgstr "" + +#: archaeological_operations/models.py:142 +msgid "Current status types" +msgstr "" + +#: archaeological_operations/models.py:152 +msgid "Discovery status type" +msgstr "" + +#: archaeological_operations/models.py:153 +msgid "Discovery status types" +msgstr "" + +#: archaeological_operations/models.py:163 +msgid "Nature of site type" +msgstr "" + +#: archaeological_operations/models.py:164 +msgid "Nature of site types" +msgstr "" + +#: archaeological_operations/models.py:174 +#, fuzzy +#| msgid "email address" +msgid "Interpretation level type" +msgstr "E-Mail-Adresse" + +#: archaeological_operations/models.py:175 +#, fuzzy +#| msgid "email address" +msgid "Interpretation level types" +msgstr "E-Mail-Adresse" + +#: archaeological_operations/models.py:187 msgid "Type of record quality" msgstr "" -#: archaeological_operations/models.py:147 +#: archaeological_operations/models.py:188 msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:155 ishtar_common/models_imports.py:1070 +#: archaeological_operations/models.py:200 ishtar_common/models_imports.py:1070 msgid "Cultural attribution type" msgstr "" -#: archaeological_operations/models.py:156 +#: archaeological_operations/models.py:201 msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:211 +#, fuzzy +#| msgid "email address" +msgid "Site type" +msgstr "E-Mail-Adresse" + +#: archaeological_operations/models.py:212 +#, fuzzy +#| msgid "email address" +msgid "Site types" +msgstr "E-Mail-Adresse" + +#: archaeological_operations/models.py:449 +msgctxt "key for text search" +msgid "discovery-status" +msgstr "" + +#: archaeological_operations/models.py:453 +msgctxt "key for text search" +msgid "current-status" +msgstr "" + +#: archaeological_operations/models.py:457 +msgctxt "key for text search" +msgid "nature" +msgstr "" + +#: archaeological_operations/models.py:461 +msgctxt "key for text search" +msgid "interpretation-level" +msgstr "" + +#: archaeological_operations/models.py:468 +#: archaeological_operations/models.py:1315 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:395 +#: archaeological_operations/models.py:480 +msgctxt "key for text search" +msgid "discoverer" +msgstr "" + +#: archaeological_operations/models.py:483 +msgctxt "key for text search" +msgid "public-description" +msgstr "" + +#: archaeological_operations/models.py:489 +msgctxt "key for text search" +msgid "locality" +msgstr "" + +#: archaeological_operations/models.py:492 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:495 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:499 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:503 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:410 +#: archaeological_operations/models.py:507 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:511 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:514 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:522 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:429 +#: archaeological_operations/models.py:526 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:433 +#: archaeological_operations/models.py:530 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:581 #, fuzzy #| msgid "email address" msgid "Create associated operation" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:553 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:670 +#: archaeological_operations/models.py:1686 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:565 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:682 +#: archaeological_operations/models.py:1698 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:575 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:692 +#: archaeological_operations/models.py:1607 #: 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:595 +#: archaeological_operations/models.py:712 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:647 +#: archaeological_operations/models.py:764 msgid "Create an operation associated to this site" msgstr "" -#: archaeological_operations/models.py:649 +#: archaeological_operations/models.py:766 msgid "ope." msgstr "" -#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:776 msgid "Create a cluster operation for site associated to many operations" msgstr "" -#: archaeological_operations/models.py:661 +#: archaeological_operations/models.py:778 msgid "top ope." msgstr "" -#: archaeological_operations/models.py:814 ishtar_common/forms.py:1210 +#: archaeological_operations/models.py:931 ishtar_common/forms.py:1210 #: ishtar_common/models.py:5470 ishtar_common/models.py:5631 -#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1817 +#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1825 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:816 +#: archaeological_operations/models.py:933 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1188 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1189 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1190 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1191 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1192 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1193 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1077 +#: archaeological_operations/models.py:1194 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1078 +#: archaeological_operations/models.py:1195 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1079 +#: archaeological_operations/models.py:1196 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1080 +#: archaeological_operations/models.py:1197 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1081 +#: archaeological_operations/models.py:1198 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:1199 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:1204 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:1261 msgctxt "key for text search" msgid "yearly-index" msgstr "" -#: archaeological_operations/models.py:1147 +#: archaeological_operations/models.py:1264 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operation-old-code" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1173 +#: archaeological_operations/models.py:1290 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1180 +#: archaeological_operations/models.py:1297 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1300 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1204 +#: archaeological_operations/models.py:1321 msgctxt "key for text search" msgid "start" msgstr "" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1324 msgctxt "key for text search" msgid "end" msgstr "" -#: archaeological_operations/models.py:1211 +#: archaeological_operations/models.py:1328 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1217 +#: archaeological_operations/models.py:1334 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "operator-reference" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1220 +#: archaeological_operations/models.py:1337 msgctxt "key for text search" msgid "has-archeo-file" msgstr "" -#: archaeological_operations/models.py:1224 +#: archaeological_operations/models.py:1341 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1344 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1348 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1235 +#: archaeological_operations/models.py:1352 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1239 +#: archaeological_operations/models.py:1356 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1365 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "" -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1369 msgctxt "key for text search" msgid "documentation-provided" msgstr "" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1373 #, fuzzy #| msgid "email address" msgctxt "key for text search" msgid "documentation-deadline" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1377 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "" -#: archaeological_operations/models.py:1264 +#: archaeological_operations/models.py:1381 msgctxt "key for text search" msgid "finds-provided" msgstr "" -#: archaeological_operations/models.py:1271 +#: archaeological_operations/models.py:1388 msgctxt "key for text search" msgid "finds-deadline" msgstr "" -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1392 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4405 +#: archaeological_operations/models.py:1430 ishtar_common/models.py:4405 #: ishtar_common/models.py:4491 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1521 ishtar_common/models_common.py:3395 +msgid "Surface (m2)" +msgstr "" + +#: archaeological_operations/models.py:1613 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1621 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1657 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1680 #, fuzzy #| msgid "email address" msgid "Cached label" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1591 -#: archaeological_operations/templates/ishtar/sheet_site.html:85 +#: archaeological_operations/models.py:1708 +#: archaeological_operations/templates/ishtar/sheet_site.html:94 #: ishtar_common/models.py:1006 #: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:129 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1748 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1749 msgid "List of containers with finds related to this operation" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1750 msgid "List of containers with documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1751 msgid "List of containers with finds or documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1868 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1963 #, fuzzy #| msgid "email address" msgid "No associated town" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1978 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:2121 msgid "context record" msgstr "" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2163 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:2094 -#: archaeological_operations/models.py:3100 +#: archaeological_operations/models.py:2211 +#: archaeological_operations/models.py:3217 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2155 +#: archaeological_operations/models.py:2272 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2165 +#: archaeological_operations/models.py:2282 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2173 +#: archaeological_operations/models.py:2290 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2298 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2235 +#: archaeological_operations/models.py:2352 #: 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:2296 -#: archaeological_operations/models.py:2375 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2492 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2340 +#: archaeological_operations/models.py:2457 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2502 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2484 +#: archaeological_operations/models.py:2601 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2485 +#: archaeological_operations/models.py:2602 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2627 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2628 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2577 +#: archaeological_operations/models.py:2694 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2582 +#: archaeological_operations/models.py:2699 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2585 +#: archaeological_operations/models.py:2702 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2589 +#: archaeological_operations/models.py:2706 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2832 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2842 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2728 +#: archaeological_operations/models.py:2845 #: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2732 +#: archaeological_operations/models.py:2849 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2861 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2865 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2752 +#: archaeological_operations/models.py:2869 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2755 +#: archaeological_operations/models.py:2872 msgctxt "key for text search" msgid "signature" msgstr "" -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:2876 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2888 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2892 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2778 +#: archaeological_operations/models.py:2895 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2782 +#: archaeological_operations/models.py:2899 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2903 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2907 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2911 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2915 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2918 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:2921 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2808 +#: archaeological_operations/models.py:2925 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2812 +#: archaeological_operations/models.py:2929 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2816 +#: archaeological_operations/models.py:2933 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2937 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2824 +#: archaeological_operations/models.py:2941 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2858 +#: archaeological_operations/models.py:2975 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2920 +#: archaeological_operations/models.py:3037 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2926 +#: archaeological_operations/models.py:3043 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:3191 +#: archaeological_operations/models.py:3308 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3193 ishtar_common/models.py:2644 +#: archaeological_operations/models.py:3310 ishtar_common/models.py:2644 #: ishtar_common/models.py:2949 ishtar_common/models.py:3956 #: ishtar_common/models_common.py:3421 ishtar_common/models_common.py:3456 #: ishtar_common/models_common.py:4394 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3485 ishtar_common/models.py:3821 +#: archaeological_operations/models.py:3602 ishtar_common/models.py:3821 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3500 +#: archaeological_operations/models.py:3617 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3501 +#: archaeological_operations/models.py:3618 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3523 ishtar_common/models.py:5338 +#: archaeological_operations/models.py:3640 ishtar_common/models.py:5338 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3526 +#: archaeological_operations/models.py:3643 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3527 +#: archaeological_operations/models.py:3644 msgid "Operation types old" msgstr "" @@ -8032,23 +8250,23 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:693 ishtar_common/models.py:1015 +#: archaeological_operations/views.py:691 ishtar_common/models.py:1015 msgid "Site deletion" msgstr "" -#: archaeological_operations/views.py:773 +#: archaeological_operations/views.py:771 msgid "Operation: new administrative act" msgstr "" -#: archaeological_operations/views.py:790 +#: archaeological_operations/views.py:788 msgid "Operation: administrative act modification" msgstr "" -#: archaeological_operations/views.py:825 +#: archaeological_operations/views.py:823 msgid "Operation: administrative act deletion" msgstr "" -#: archaeological_operations/views.py:945 +#: archaeological_operations/views.py:943 msgid "" "Syntax error on the source template \"{}\" - contact your administrator and " "ask him to check the syntax of this document." @@ -8831,12 +9049,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:665 ishtar_common/views_item.py:1635 +#: ishtar_common/views_item.py:673 ishtar_common/views_item.py:1643 msgid "True" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1637 +#: ishtar_common/views_item.py:1645 msgid "False" msgstr "" @@ -11642,10 +11860,6 @@ msgstr "" msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 -msgid "Types" -msgstr "" - #: ishtar_common/models.py:2944 msgid "Is attached to" msgstr "" @@ -13961,8 +14175,8 @@ msgstr "" msgid ", " msgstr "" -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2808 -#: ishtar_common/utils.py:2816 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2801 +#: ishtar_common/utils.py:2809 msgid "." msgstr "" @@ -14701,37 +14915,47 @@ msgid "Operations associees en tant que rapporteur CIRA" msgstr "" #: ishtar_common/templates/ishtar/sheet_person.html:103 -msgid "Associated archaeological sites as collaborator" +msgid "Associated archaeological sites as discoverer" msgstr "" #: ishtar_common/templates/ishtar/sheet_person.html:108 +msgid "Associated archaeological sites as collaborator" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:113 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:118 +#: ishtar_common/templates/ishtar/sheet_person.html:123 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:140 +#: ishtar_common/templates/ishtar/sheet_person.html:128 +#, fuzzy +#| msgid "email address" +msgid "Associated context records as excavator" +msgstr "E-Mail-Adresse" + +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "In charge of treatments" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:145 +#: ishtar_common/templates/ishtar/sheet_person.html:155 msgid "In charge of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:150 +#: ishtar_common/templates/ishtar/sheet_person.html:160 msgid "Applicant of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:155 +#: ishtar_common/templates/ishtar/sheet_person.html:165 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "" @@ -15303,47 +15527,47 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:219 ishtar_common/views.py:126 +#: ishtar_common/utils.py:218 ishtar_common/views.py:126 msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:1019 +#: ishtar_common/utils.py:1018 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:1099 +#: ishtar_common/utils.py:1098 msgid "Information" msgstr "" -#: ishtar_common/utils.py:1100 +#: ishtar_common/utils.py:1099 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1999 +#: ishtar_common/utils.py:1992 msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/utils.py:2785 +#: ishtar_common/utils.py:2778 msgid "uppercase letter" msgstr "" -#: ishtar_common/utils.py:2786 +#: ishtar_common/utils.py:2779 msgid "lowercase letter" msgstr "" -#: ishtar_common/utils.py:2787 +#: ishtar_common/utils.py:2780 msgid "number" msgstr "" -#: ishtar_common/utils.py:2788 +#: ishtar_common/utils.py:2781 msgid "punctuation sign" msgstr "" -#: ishtar_common/utils.py:2807 +#: ishtar_common/utils.py:2800 msgid "This password must contain one of this character: " msgstr "" -#: ishtar_common/utils.py:2813 +#: ishtar_common/utils.py:2806 msgid "Your password must contain each of these characters: " msgstr "" @@ -15387,8 +15611,8 @@ msgstr "" msgid "New biographical note" msgstr "" -#: ishtar_common/views.py:1166 ishtar_common/views_item.py:230 -#: ishtar_common/views_item.py:273 ishtar_common/views_item.py:290 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:238 +#: ishtar_common/views_item.py:281 ishtar_common/views_item.py:298 msgid "Operation not permitted." msgstr "" @@ -15520,17 +15744,17 @@ msgstr "" msgid "Delete geographic item" msgstr "" -#: ishtar_common/views_item.py:239 +#: ishtar_common/views_item.py:247 #, python-format msgid "New %s" msgstr "" -#: ishtar_common/views_item.py:302 +#: ishtar_common/views_item.py:310 #, python-format msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:1044 +#: ishtar_common/views_item.py:1052 msgctxt "key for text search" msgid "today" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 56b081229..e73ca0a6b 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-09-17 11:29+0200\n" +"POT-Creation-Date: 2024-09-20 15:25+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" @@ -18,25 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: archaeological_context_records/forms.py:77 -#: archaeological_context_records/forms.py:83 -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/models.py:835 +#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:84 +#: archaeological_context_records/models.py:576 +#: archaeological_context_records/models.py:842 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2739 +#: archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2759 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:386 -#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1227 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2572 -#: archaeological_operations/models.py:2688 -#: archaeological_operations/models.py:2883 -#: archaeological_operations/models.py:3173 +#: archaeological_operations/models.py:1707 +#: archaeological_operations/models.py:2671 +#: archaeological_operations/models.py:2689 +#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:3000 +#: archaeological_operations/models.py:3290 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 @@ -47,97 +47,97 @@ msgstr "" msgid "Operation" msgstr "" -#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:79 msgid "Context record - 010 - Operation choice" msgstr "" -#: archaeological_context_records/forms.py:93 +#: archaeological_context_records/forms.py:94 msgid "Dating - period" msgstr "" -#: archaeological_context_records/forms.py:94 +#: archaeological_context_records/forms.py:95 msgid "Dating - precise" msgstr "" -#: archaeological_context_records/forms.py:95 +#: archaeological_context_records/forms.py:96 msgid "Dating - start date" msgstr "" -#: archaeological_context_records/forms.py:96 +#: archaeological_context_records/forms.py:97 msgid "Dating - end date" msgstr "" -#: archaeological_context_records/forms.py:98 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "" -#: archaeological_context_records/forms.py:100 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "" -#: archaeological_context_records/forms.py:129 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "" -#: archaeological_context_records/forms.py:133 archaeological_files/forms.py:88 -#: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 -#: archaeological_finds/forms.py:1693 archaeological_finds/forms.py:2409 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:88 +#: archaeological_files/forms.py:1079 archaeological_files/forms.py:1115 +#: archaeological_finds/forms.py:1703 archaeological_finds/forms.py:2421 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:557 #: archaeological_finds/forms_treatments.py:632 #: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:458 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1453 #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" msgstr "" -#: archaeological_context_records/forms.py:136 -#: archaeological_context_records/forms.py:316 -#: archaeological_context_records/forms.py:624 -#: archaeological_context_records/forms.py:678 -#: archaeological_context_records/models.py:847 -#: archaeological_context_records/models.py:1514 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/forms.py:639 +#: archaeological_context_records/forms.py:693 +#: archaeological_context_records/models.py:854 +#: archaeological_context_records/models.py:1525 msgid "ID" msgstr "" -#: archaeological_context_records/forms.py:140 -#: archaeological_operations/forms.py:1716 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1760 msgid "Code PATRIARCHE" msgstr "" -#: archaeological_context_records/forms.py:142 +#: archaeological_context_records/forms.py:143 msgid "Operation - name" msgstr "" -#: archaeological_context_records/forms.py:143 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2526 msgid "Operation - year" msgstr "" -#: archaeological_context_records/forms.py:145 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "" -#: archaeological_context_records/forms.py:148 -#: archaeological_context_records/forms.py:794 -#: archaeological_context_records/models.py:841 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:817 +#: archaeological_context_records/models.py:848 #: archaeological_operations/forms.py:521 -#: archaeological_operations/models.py:574 ishtar_common/models.py:5563 +#: archaeological_operations/models.py:691 ishtar_common/models.py:5563 msgid "Archaeological site" msgstr "" -#: archaeological_context_records/forms.py:156 -#: archaeological_finds/forms.py:1782 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1792 msgid "Search within related operations" msgstr "" -#: archaeological_context_records/forms.py:158 -#: archaeological_files/templates/ishtar/sheet_file.html:188 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_context_records/forms.py:159 +#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:717 #: archaeological_finds/models_treatments.py:140 @@ -195,22 +195,29 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_context_records/forms.py:159 -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/forms.py:791 -#: archaeological_context_records/models.py:578 -#: archaeological_context_records/models.py:931 ishtar_common/admin.py:797 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:858 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +msgid "Excavator" +msgstr "" + +#: archaeological_context_records/forms.py:166 +#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:810 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:942 ishtar_common/admin.py:797 #: ishtar_common/models.py:3389 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:160 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/forms.py:792 -#: archaeological_context_records/models.py:577 -#: archaeological_context_records/models.py:923 -#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:741 -#: archaeological_finds/forms.py:975 +#: archaeological_context_records/forms.py:167 +#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:811 +#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:934 +#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:751 +#: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:145 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:98 #: cd17_app/templates/ishtar/sheet_find.html:155 @@ -225,38 +232,42 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:162 -#: archaeological_context_records/models.py:888 -#: archaeological_finds/forms.py:489 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2049 -#: archaeological_operations/forms.py:1206 -#: archaeological_operations/models.py:508 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/models.py:899 +#: archaeological_finds/forms.py:494 archaeological_finds/forms.py:1146 +#: archaeological_finds/forms.py:1867 archaeological_finds/models_finds.py:2069 +#: archaeological_operations/forms.py:1210 +#: archaeological_operations/models.py:606 msgid "Cultural attribution" msgstr "" -#: archaeological_context_records/forms.py:163 -#: archaeological_context_records/forms.py:330 -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:170 +#: archaeological_context_records/forms.py:345 +#: archaeological_context_records/forms.py:808 #: ishtar_common/forms_common.py:1992 ishtar_common/templates/welcome.html:12 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:164 -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/forms.py:345 -#: archaeological_context_records/models.py:848 -#: archaeological_context_records/models.py:1517 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 -#: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 -#: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:976 -#: archaeological_finds/forms.py:1076 archaeological_finds/forms.py:1796 +#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:337 +#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/models.py:855 +#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: archaeological_finds/forms.py:428 archaeological_finds/forms.py:433 +#: archaeological_finds/forms.py:593 archaeological_finds/forms.py:758 +#: archaeological_finds/forms.py:760 archaeological_finds/forms.py:986 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1806 #: archaeological_finds/forms_treatments.py:192 -#: archaeological_finds/models_finds.py:554 -#: archaeological_finds/models_finds.py:1991 +#: archaeological_finds/models_finds.py:566 +#: archaeological_finds/models_finds.py:2011 #: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 +#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/models.py:628 +#: archaeological_operations/templates/ishtar/sheet_site.html:54 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2164 ishtar_common/forms_common.py:2440 #: ishtar_common/models.py:1056 ishtar_common/models.py:4652 @@ -270,113 +281,115 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:165 -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:849 -#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1853 -#: archaeological_finds/models_finds.py:2136 +#: archaeological_context_records/forms.py:172 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:856 +#: archaeological_finds/forms.py:492 archaeological_finds/forms.py:1864 +#: archaeological_finds/models_finds.py:2156 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:166 -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:885 +#: archaeological_context_records/forms.py:173 +#: archaeological_context_records/forms.py:352 +#: archaeological_context_records/models.py:896 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:516 -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/forms.py:174 +#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/models.py:897 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:195 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:196 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:307 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/forms.py:679 -#: archaeological_context_records/models.py:564 +#: archaeological_context_records/forms.py:175 +#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:641 +#: archaeological_context_records/forms.py:694 #: archaeological_context_records/models.py:565 -#: archaeological_context_records/models.py:819 -#: archaeological_context_records/models.py:1516 +#: archaeological_context_records/models.py:566 +#: archaeological_context_records/models.py:826 +#: archaeological_context_records/models.py:1527 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 -#: archaeological_finds/models_finds.py:1156 +#: archaeological_files/forms.py:95 archaeological_files/forms.py:1128 +#: archaeological_finds/models_finds.py:1172 #: archaeological_operations/forms.py:473 #: archaeological_operations/forms.py:1046 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:3197 -#: archaeological_operations/models.py:3491 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3608 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" -#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:176 #: archaeological_operations/forms.py:546 msgid "Has finds" msgstr "" -#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:178 #: archaeological_operations/forms.py:511 msgid "Search within relations" msgstr "" -#: archaeological_context_records/forms.py:173 -#: archaeological_context_records/forms.py:324 -#: archaeological_context_records/models.py:579 -#: archaeological_context_records/models.py:936 +#: archaeological_context_records/forms.py:180 +#: archaeological_context_records/forms.py:339 +#: archaeological_context_records/models.py:580 +#: archaeological_context_records/models.py:947 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:174 -#: archaeological_context_records/forms.py:348 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/forms.py:181 +#: archaeological_context_records/forms.py:363 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:147 msgid "Structure" msgstr "" -#: archaeological_context_records/forms.py:175 -#: archaeological_context_records/forms.py:354 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/forms.py:182 +#: archaeological_context_records/forms.py:369 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:148 msgid "Texture" msgstr "" -#: archaeological_context_records/forms.py:176 -#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/forms.py:183 +#: archaeological_context_records/forms.py:375 +#: archaeological_context_records/forms.py:815 msgid "Inclusions" msgstr "" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:366 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/forms.py:184 +#: archaeological_context_records/forms.py:381 +#: archaeological_context_records/forms.py:814 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 msgid "Colors" msgstr "" -#: archaeological_context_records/forms.py:178 -#: archaeological_context_records/forms.py:371 -#: archaeological_context_records/models.py:874 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/forms.py:185 +#: archaeological_context_records/forms.py:386 +#: archaeological_context_records/models.py:885 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 msgid "Details on color" msgstr "" -#: archaeological_context_records/forms.py:217 -#: archaeological_context_records/forms.py:238 +#: archaeological_context_records/forms.py:224 +#: archaeological_context_records/forms.py:245 #: archaeological_context_records/views.py:115 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:287 -#: archaeological_files/forms.py:205 +#: archaeological_context_records/forms.py:294 +#: archaeological_files/forms.py:209 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:651 #: archaeological_operations/forms.py:677 -#: archaeological_operations/forms.py:1306 -#: archaeological_operations/forms.py:1466 +#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1510 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -391,21 +404,21 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:288 +#: archaeological_context_records/forms.py:295 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:616 -#: archaeological_context_records/forms.py:680 -#: archaeological_context_records/forms.py:783 -#: archaeological_context_records/models.py:561 +#: archaeological_context_records/forms.py:316 +#: archaeological_context_records/forms.py:631 +#: archaeological_context_records/forms.py:695 +#: archaeological_context_records/forms.py:802 #: archaeological_context_records/models.py:562 -#: archaeological_context_records/models.py:827 -#: archaeological_finds/models_finds.py:1153 +#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:834 +#: archaeological_finds/models_finds.py:1169 #: archaeological_operations/forms.py:72 archaeological_operations/forms.py:210 #: archaeological_operations/forms.py:1018 -#: archaeological_operations/models.py:3178 +#: archaeological_operations/models.py:3295 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 @@ -415,37 +428,37 @@ msgstr "" msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:313 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:321 +#: archaeological_context_records/forms.py:636 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:318 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:682 -#: archaeological_context_records/models.py:566 -#: archaeological_context_records/models.py:574 -#: archaeological_context_records/models.py:879 -#: archaeological_context_records/models.py:1515 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/forms.py:642 +#: archaeological_context_records/forms.py:697 +#: archaeological_context_records/models.py:567 +#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:890 +#: archaeological_context_records/models.py:1526 msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:850 +#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/models.py:861 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:336 -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:248 -#: archaeological_files/models.py:629 +#: archaeological_context_records/forms.py:351 +#: archaeological_context_records/models.py:862 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_files/models.py:663 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:660 #: archaeological_finds/forms_treatments.py:753 #: archaeological_finds/models_treatments.py:276 #: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:1350 +#: archaeological_operations/models.py:1467 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1043 ishtar_common/forms.py:1044 #: na_app/templates/ishtar/sheet_operation.html:204 @@ -453,8 +466,8 @@ msgstr "" msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:339 -#: archaeological_context_records/models.py:864 +#: archaeological_context_records/forms.py:354 +#: archaeological_context_records/models.py:875 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:237 #: archaeological_finds/models_treatments.py:851 @@ -464,10 +477,10 @@ msgstr "" msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:372 +#: archaeological_context_records/forms.py:387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:155 -#: archaeological_finds/forms.py:496 archaeological_finds/forms.py:797 -#: archaeological_finds/forms.py:1604 +#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:807 +#: archaeological_finds/forms.py:1614 #: archaeological_finds/templates/ishtar/sheet_find.html:196 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:175 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -478,65 +491,66 @@ msgstr "" msgid "Dimensions" msgstr "" -#: archaeological_context_records/forms.py:376 +#: archaeological_context_records/forms.py:391 +#: archaeological_files/forms.py:313 archaeological_files/models.py:700 msgid "Total surface (m²)" msgstr "" -#: archaeological_context_records/forms.py:382 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/forms.py:397 +#: archaeological_context_records/models.py:863 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:383 -#: archaeological_context_records/models.py:853 +#: archaeological_context_records/forms.py:398 +#: archaeological_context_records/models.py:864 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 msgid "Excavated length (m)" msgstr "" -#: archaeological_context_records/forms.py:384 -#: archaeological_context_records/models.py:854 +#: archaeological_context_records/forms.py:399 +#: archaeological_context_records/models.py:865 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:385 -#: archaeological_context_records/models.py:855 +#: archaeological_context_records/forms.py:400 +#: archaeological_context_records/models.py:866 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:168 msgid "Excavated width (m)" msgstr "" -#: archaeological_context_records/forms.py:386 -#: archaeological_context_records/models.py:856 +#: archaeological_context_records/forms.py:401 +#: archaeological_context_records/models.py:867 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:387 -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/forms.py:402 +#: archaeological_context_records/models.py:868 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:388 -#: archaeological_context_records/models.py:858 +#: archaeological_context_records/forms.py:403 +#: archaeological_context_records/models.py:869 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:390 -#: archaeological_context_records/models.py:860 +#: archaeological_context_records/forms.py:405 +#: archaeological_context_records/models.py:871 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:477 +#: archaeological_context_records/forms.py:492 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:482 +#: archaeological_context_records/forms.py:497 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:487 -#: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:156 -#: archaeological_finds/forms.py:1541 archaeological_finds/forms.py:1562 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/models.py:157 +#: archaeological_finds/forms.py:1551 archaeological_finds/forms.py:1572 +#: archaeological_finds/models_finds.py:2066 #: archaeological_finds/templates/ishtar/sheet_find.html:247 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:195 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -547,11 +561,11 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:494 -#: archaeological_context_records/models.py:108 -#: archaeological_context_records/models.py:576 -#: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1548 -#: archaeological_finds/models_finds.py:1206 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:109 +#: archaeological_context_records/models.py:577 +#: archaeological_finds/forms.py:1143 archaeological_finds/forms.py:1558 +#: archaeological_finds/models_finds.py:1222 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 #: archaeological_operations/forms.py:803 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 @@ -569,15 +583,15 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:495 -#: archaeological_context_records/models.py:110 -#: archaeological_files/forms.py:775 archaeological_files/models.py:76 -#: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms.py:1550 +#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/models.py:111 +#: archaeological_files/forms.py:750 archaeological_files/models.py:78 +#: archaeological_files/models.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:193 +#: archaeological_finds/forms.py:1560 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:751 -#: archaeological_finds/models_finds.py:3700 +#: archaeological_finds/models_finds.py:3720 #: archaeological_finds/models_treatments.py:275 #: archaeological_finds/models_treatments.py:849 #: archaeological_finds/templates/ishtar/sheet_find.html:438 @@ -588,9 +602,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 #: archaeological_operations/forms.py:508 #: archaeological_operations/forms.py:752 -#: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3495 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:3612 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -615,11 +629,11 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:496 -#: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:664 archaeological_files/forms.py:780 -#: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3701 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:112 +#: archaeological_files/forms.py:639 archaeological_files/forms.py:755 +#: archaeological_files/models.py:79 archaeological_files/models.py:778 +#: archaeological_finds/forms.py:1561 archaeological_finds/models_finds.py:3721 #: archaeological_finds/models_treatments.py:850 #: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_finds/templates/ishtar/sheet_find.html:477 @@ -629,8 +643,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3496 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:3613 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -661,9 +675,9 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:497 -#: archaeological_context_records/models.py:121 -#: archaeological_finds/forms.py:1552 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:122 +#: archaeological_finds/forms.py:1562 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: cd17_app/templates/ishtar/sheet_find.html:233 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 @@ -674,10 +688,10 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:498 -#: archaeological_context_records/models.py:83 -#: archaeological_context_records/models.py:114 -#: archaeological_finds/forms.py:1549 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:115 +#: archaeological_finds/forms.py:1559 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: cd17_app/templates/ishtar/sheet_find.html:232 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 @@ -688,148 +702,156 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:499 -#: archaeological_context_records/models.py:126 -#: archaeological_finds/forms.py:1553 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:127 +#: archaeological_finds/forms.py:1563 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/forms.py:525 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:532 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:211 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:212 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:536 -#: archaeological_context_records/models.py:891 +#: archaeological_context_records/forms.py:551 +#: archaeological_context_records/models.py:902 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:900 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/models.py:911 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:906 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/models.py:917 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:915 +#: archaeological_context_records/forms.py:554 +#: archaeological_context_records/models.py:926 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:541 +#: archaeological_context_records/forms.py:556 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/forms.py:1327 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1368 +#: archaeological_operations/forms.py:1864 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:561 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:574 #: archaeological_operations/forms.py:586 #: archaeological_operations/forms.py:599 #: archaeological_operations/views.py:197 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:579 #: archaeological_operations/forms.py:379 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:570 +#: archaeological_context_records/forms.py:585 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:580 +#: archaeological_context_records/forms.py:595 msgid "You should select a context record and a relation type." msgstr "" -#: archaeological_context_records/forms.py:581 +#: archaeological_context_records/forms.py:596 msgid "A context record cannot be related to himself." msgstr "" -#: archaeological_context_records/forms.py:584 +#: archaeological_context_records/forms.py:599 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1645 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1656 #: archaeological_context_records/views.py:253 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 -#: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 -#: archaeological_finds/forms.py:1774 archaeological_finds/models_finds.py:1149 -#: archaeological_finds/models_finds.py:2731 +#: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:1784 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2751 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1842 #: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5564 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:610 +#: archaeological_context_records/forms.py:625 msgid "Context records - Relations" msgstr "" -#: archaeological_context_records/forms.py:611 +#: archaeological_context_records/forms.py:626 msgid "Context record - Relations" msgstr "" -#: archaeological_context_records/forms.py:714 -#: archaeological_finds/forms.py:1355 archaeological_finds/forms.py:1380 -#: archaeological_operations/forms.py:1786 ishtar_common/forms_common.py:2701 +#: archaeological_context_records/forms.py:729 +#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1390 +#: archaeological_operations/forms.py:1830 ishtar_common/forms_common.py:2701 #: ishtar_common/models.py:3545 ishtar_common/models.py:3919 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:744 +#: archaeological_context_records/forms.py:759 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:769 -#: archaeological_context_records/models.py:1406 -#: archaeological_context_records/models.py:1445 -#: archaeological_context_records/models.py:1513 +#: archaeological_context_records/forms.py:788 +#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1524 #: archaeological_operations/forms.py:383 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:773 +#: archaeological_context_records/forms.py:792 #: 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:781 +#: archaeological_context_records/forms.py:800 msgid "Unit type" msgstr "" -#: archaeological_context_records/forms.py:790 +#: archaeological_context_records/forms.py:809 msgid "Excavation technic" msgstr "" -#: archaeological_context_records/forms.py:802 +#: archaeological_context_records/forms.py:812 +msgid "Structures" +msgstr "" + +#: archaeological_context_records/forms.py:813 +msgid "Textures" +msgstr "" + +#: archaeological_context_records/forms.py:825 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:831 +#: archaeological_context_records/forms.py:858 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:850 +#: archaeological_context_records/forms.py:877 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -911,61 +933,61 @@ msgstr "" msgid "Deletion" msgstr "" -#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:85 msgid "Dating types" msgstr "" -#: archaeological_context_records/models.py:94 +#: archaeological_context_records/models.py:95 msgid "Dating quality type" msgstr "" -#: archaeological_context_records/models.py:95 +#: archaeological_context_records/models.py:96 msgid "Dating quality types" msgstr "" -#: archaeological_context_records/models.py:130 +#: archaeological_context_records/models.py:131 #: archaeological_context_records/tests.py:935 #: archaeological_finds/tests.py:1520 archaeological_finds/tests.py:1749 msgctxt "key for text search" msgid "datings-period" msgstr "" -#: archaeological_context_records/models.py:134 +#: archaeological_context_records/models.py:135 msgctxt "key for text search" msgid "datings-precise" msgstr "" -#: archaeological_context_records/models.py:138 +#: archaeological_context_records/models.py:139 msgctxt "key for text search" msgid "datings-start" msgstr "" -#: archaeological_context_records/models.py:142 +#: archaeological_context_records/models.py:143 msgctxt "key for text search" msgid "datings-end" msgstr "" -#: archaeological_context_records/models.py:146 +#: archaeological_context_records/models.py:147 msgctxt "key for text search" msgid "datings-type" msgstr "" -#: archaeological_context_records/models.py:150 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "" -#: archaeological_context_records/models.py:157 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "" -#: archaeological_context_records/models.py:273 -#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 +#: archaeological_context_records/models.py:274 +#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:613 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2308 -#: archaeological_finds/models_finds.py:3605 -#: archaeological_finds/models_finds.py:3645 -#: archaeological_finds/models_finds.py:3688 +#: archaeological_finds/models_finds.py:2328 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/models_finds.py:3665 +#: archaeological_finds/models_finds.py:3708 #: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 @@ -978,24 +1000,24 @@ msgstr "" msgid "Find" msgstr "" -#: archaeological_context_records/models.py:298 -#: archaeological_context_records/models.py:321 -#: 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:105 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 +#: archaeological_files/models.py:77 archaeological_files/models.py:107 +#: archaeological_files/models.py:161 archaeological_files/models.py:177 +#: archaeological_files/models.py:237 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:259 #: archaeological_finds/models_finds.py:335 #: archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1982 +#: archaeological_finds/models_finds.py:2002 #: archaeological_finds/models_treatments.py:67 #: archaeological_finds/models_treatments.py:843 -#: archaeological_operations/models.py:100 -#: archaeological_operations/models.py:125 -#: archaeological_operations/models.py:143 -#: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3522 +#: archaeological_operations/models.py:102 +#: archaeological_operations/models.py:127 +#: archaeological_operations/models.py:184 +#: archaeological_operations/models.py:197 +#: archaeological_operations/models.py:3639 #: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:681 #: ishtar_common/models.py:737 ishtar_common/models.py:788 @@ -1007,215 +1029,215 @@ msgstr "" msgid "Order" msgstr "" -#: archaeological_context_records/models.py:301 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "" -#: archaeological_context_records/models.py:308 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "" -#: archaeological_context_records/models.py:309 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "" -#: archaeological_context_records/models.py:324 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "" -#: archaeological_context_records/models.py:325 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "" -#: archaeological_context_records/models.py:338 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "" -#: archaeological_context_records/models.py:339 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "" -#: archaeological_context_records/models.py:352 +#: archaeological_context_records/models.py:353 msgid "Structure Type" msgstr "" -#: archaeological_context_records/models.py:353 +#: archaeological_context_records/models.py:354 msgid "Structure Types" msgstr "" -#: archaeological_context_records/models.py:366 +#: archaeological_context_records/models.py:367 msgid "Texture Type" msgstr "" -#: archaeological_context_records/models.py:367 +#: archaeological_context_records/models.py:368 msgid "Texture Types" msgstr "" -#: archaeological_context_records/models.py:380 +#: archaeological_context_records/models.py:381 msgid "Color Type" msgstr "" -#: archaeological_context_records/models.py:381 +#: archaeological_context_records/models.py:382 msgid "Color Types" msgstr "" -#: archaeological_context_records/models.py:394 +#: archaeological_context_records/models.py:395 msgid "Inclusion Type" msgstr "" -#: archaeological_context_records/models.py:395 +#: archaeological_context_records/models.py:396 msgid "Inclusion Types" msgstr "" -#: archaeological_context_records/models.py:408 +#: archaeological_context_records/models.py:409 msgid "Excavation technique type" msgstr "" -#: archaeological_context_records/models.py:409 +#: archaeological_context_records/models.py:410 msgid "Excavation technique types" msgstr "" -#: archaeological_context_records/models.py:419 +#: archaeological_context_records/models.py:420 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "" -#: archaeological_context_records/models.py:420 +#: archaeological_context_records/models.py:421 msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:553 #: archaeological_context_records/models.py:554 -#: archaeological_context_records/models.py:1518 -#: archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1169 +#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:1529 +#: archaeological_finds/models_finds.py:1184 +#: archaeological_finds/models_finds.py:1185 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1106 -#: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/models.py:305 -#: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1001 -#: archaeological_operations/models.py:1091 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/forms.py:1207 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:601 +#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1208 +#: archaeological_operations/models.py:1529 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:556 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:556 #: archaeological_context_records/models.py:557 +#: archaeological_context_records/models.py:558 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:558 +#: archaeological_context_records/models.py:559 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:559 -#: archaeological_finds/models_finds.py:1154 +#: archaeological_context_records/models.py:560 +#: archaeological_finds/models_finds.py:1170 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:560 +#: archaeological_context_records/models.py:561 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:564 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:580 -#: archaeological_finds/models_finds.py:1218 -#: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:1005 +#: archaeological_context_records/models.py:581 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1122 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1219 -#: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:1006 +#: archaeological_context_records/models.py:582 +#: archaeological_finds/models_finds.py:1235 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1123 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:631 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:632 +#: archaeological_context_records/models.py:634 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:495 archaeological_finds/models_finds.py:1325 -#: archaeological_operations/models.py:386 -#: archaeological_operations/models.py:1155 +#: archaeological_files/models.py:521 archaeological_finds/models_finds.py:1341 +#: archaeological_operations/models.py:471 +#: archaeological_operations/models.py:1272 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4422 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:635 ishtar_common/models.py:4382 +#: archaeological_context_records/models.py:637 ishtar_common/models.py:4382 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:640 +#: archaeological_finds/models_finds.py:1670 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:642 -#: archaeological_operations/models.py:1151 -#: archaeological_operations/models.py:2718 +#: archaeological_context_records/models.py:644 +#: archaeological_operations/models.py:1268 +#: archaeological_operations/models.py:2835 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:646 -#: archaeological_finds/models_finds.py:1333 +#: archaeological_context_records/models.py:648 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:650 -#: archaeological_context_records/models.py:761 -#: archaeological_finds/models_finds.py:1443 -#: archaeological_finds/models_finds.py:1886 -#: archaeological_operations/models.py:421 -#: archaeological_operations/models.py:448 ishtar_common/models.py:4373 +#: archaeological_context_records/models.py:652 +#: archaeological_context_records/models.py:768 +#: archaeological_finds/models_finds.py:1459 +#: archaeological_finds/models_finds.py:1906 +#: archaeological_operations/models.py:518 +#: archaeological_operations/models.py:545 ishtar_common/models.py:4373 #: ishtar_common/models.py:4484 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:654 -#: archaeological_context_records/models.py:764 -#: archaeological_finds/models_finds.py:1349 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:1312 +#: archaeological_context_records/models.py:656 +#: archaeological_context_records/models.py:771 +#: archaeological_finds/models_finds.py:1365 +#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1429 #: archaeological_warehouse/models.py:989 ishtar_common/models.py:4414 #: ishtar_common/models.py:4493 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:659 +#: archaeological_context_records/models.py:661 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1380 +#: archaeological_finds/models_finds.py:1396 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:663 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1201 +#: archaeological_context_records/models.py:665 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1318 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1224,216 +1246,220 @@ msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:667 +#: archaeological_context_records/models.py:669 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:670 +#: archaeological_context_records/models.py:672 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:673 -#: archaeological_files/models.py:498 archaeological_operations/models.py:1161 -#: archaeological_operations/models.py:2736 +#: archaeological_context_records/models.py:675 +#: archaeological_files/models.py:524 archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:2853 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:677 -#: archaeological_operations/models.py:1267 +#: archaeological_context_records/models.py:679 +#: archaeological_operations/models.py:1384 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:680 +#: archaeological_context_records/models.py:682 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:684 +#: archaeological_context_records/models.py:686 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:688 -#: archaeological_finds/models_finds.py:1618 -#: archaeological_operations/models.py:437 +#: archaeological_context_records/models.py:690 +#: archaeological_finds/models_finds.py:1638 +#: archaeological_operations/models.py:534 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_context_records/models.py:692 +#: archaeological_context_records/models.py:694 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:698 msgctxt "key for text search" msgid "documentation" msgstr "" -#: archaeological_context_records/models.py:700 -#: archaeological_finds/models_finds.py:1413 archaeological_finds/tests.py:1586 -#: ishtar_common/models.py:4300 +#: archaeological_context_records/models.py:702 +#: archaeological_finds/models_finds.py:1429 archaeological_finds/tests.py:1586 +#: archaeological_operations/models.py:477 ishtar_common/models.py:4300 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_context_records/models.py:704 +#: archaeological_context_records/models.py:706 msgctxt "key for text search" msgid "filling" msgstr "" -#: archaeological_context_records/models.py:708 +#: archaeological_context_records/models.py:710 msgctxt "key for text search" msgid "interpretation" msgstr "" -#: archaeological_context_records/models.py:712 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:1531 -#: archaeological_operations/models.py:392 -#: archaeological_operations/models.py:1214 -#: archaeological_operations/models.py:2828 +#: archaeological_context_records/models.py:714 +#: archaeological_files/models.py:564 archaeological_finds/models_finds.py:1547 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:1331 +#: archaeological_operations/models.py:2945 #: archaeological_warehouse/models.py:972 ishtar_common/models.py:4363 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:718 msgctxt "key for text search" msgid "structure" msgstr "" -#: archaeological_context_records/models.py:720 +#: archaeological_context_records/models.py:722 msgctxt "key for text search" msgid "texture" msgstr "" -#: archaeological_context_records/models.py:724 +#: archaeological_context_records/models.py:726 msgctxt "key for text search" msgid "inclusion" msgstr "" -#: archaeological_context_records/models.py:728 +#: archaeological_context_records/models.py:730 msgctxt "key for text search" msgid "color" msgstr "" -#: archaeological_context_records/models.py:732 +#: archaeological_context_records/models.py:734 msgctxt "key for text search" msgid "color-details" msgstr "" -#: archaeological_context_records/models.py:779 -#: archaeological_finds/models_finds.py:1845 -#: archaeological_operations/models.py:467 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:738 +msgctxt "key for text search" +msgid "excavator" +msgstr "" + +#: archaeological_context_records/models.py:786 +#: archaeological_finds/models_finds.py:1865 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1412 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:786 -#: archaeological_finds/models_finds.py:1838 -#: archaeological_operations/models.py:474 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:793 +#: archaeological_finds/models_finds.py:1858 +#: archaeological_operations/models.py:571 +#: archaeological_operations/models.py:1405 #: archaeological_warehouse/models.py:377 #: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2619 #: ishtar_common/models.py:2900 ishtar_common/models.py:4510 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:796 -#: archaeological_context_records/models.py:1178 +#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:1189 #: archaeological_context_records/views.py:277 #: archaeological_context_records/views.py:292 -#: archaeological_finds/models_finds.py:926 -#: archaeological_finds/models_finds.py:1855 -#: archaeological_finds/models_finds.py:2633 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:942 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/models_finds.py:2653 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 -#: archaeological_operations/models.py:672 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2036 -#: archaeological_operations/views.py:1027 -#: archaeological_operations/views.py:1042 -#: archaeological_operations/views.py:1049 -#: archaeological_operations/views.py:1066 ishtar_common/admin.py:1722 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:589 +#: archaeological_operations/models.py:789 +#: archaeological_operations/models.py:1422 +#: archaeological_operations/models.py:2153 +#: archaeological_operations/views.py:1025 +#: archaeological_operations/views.py:1040 +#: archaeological_operations/views.py:1047 +#: archaeological_operations/views.py:1064 ishtar_common/admin.py:1722 #: ishtar_common/admin.py:1865 ishtar_common/models.py:4519 #: ishtar_common/models.py:4898 ishtar_common/views.py:3154 #: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:813 -#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:549 -#: archaeological_finds/models_finds.py:1976 +#: archaeological_context_records/models.py:820 +#: archaeological_files/models.py:601 archaeological_finds/models_finds.py:561 +#: archaeological_finds/models_finds.py:1996 #: archaeological_finds/models_treatments.py:270 -#: archaeological_operations/models.py:3186 +#: archaeological_operations/models.py:3303 #: archaeological_warehouse/models.py:439 #: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4545 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:815 -#: archaeological_files/models.py:570 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:1978 -#: archaeological_operations/models.py:3189 +#: archaeological_context_records/models.py:822 +#: archaeological_files/models.py:604 archaeological_finds/models_finds.py:563 +#: archaeological_finds/models_finds.py:1998 +#: archaeological_operations/models.py:3306 #: archaeological_warehouse/models.py:441 #: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:862 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3395 -msgid "Surface (m2)" +#: archaeological_context_records/models.py:873 +msgid "Surface (m²)" msgstr "" -#: archaeological_context_records/models.py:867 +#: archaeological_context_records/models.py:878 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:876 +#: archaeological_context_records/models.py:887 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:895 +#: archaeological_context_records/models.py:906 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:903 +#: archaeological_context_records/models.py:914 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:910 +#: archaeological_context_records/models.py:921 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:918 +#: archaeological_context_records/models.py:929 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:945 +#: archaeological_context_records/models.py:956 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2261 +#: archaeological_files/models.py:798 archaeological_finds/models_finds.py:2281 #: archaeological_finds/models_treatments.py:290 #: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2932 +#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:1595 +#: archaeological_operations/models.py:3049 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:95 +#: archaeological_operations/templates/ishtar/sheet_site.html:104 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 @@ -1447,7 +1473,7 @@ msgstr "" #: ishtar_common/models.py:4696 ishtar_common/models_common.py:3424 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:161 +#: ishtar_common/templates/ishtar/sheet_person.html:171 #: ishtar_common/templates/ishtar/sheet_town.html:119 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1460,139 +1486,139 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:952 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2267 +#: archaeological_context_records/models.py:963 +#: archaeological_files/models.py:804 archaeological_finds/models_finds.py:2287 #: archaeological_finds/models_treatments.py:296 #: archaeological_finds/models_treatments.py:1255 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2939 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1601 +#: archaeological_operations/models.py:3056 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2402 #: ishtar_common/models_common.py:3430 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:957 -#: archaeological_finds/models_finds.py:2280 -#: archaeological_operations/models.py:559 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:968 +#: archaeological_finds/models_finds.py:2300 +#: archaeological_operations/models.py:676 +#: archaeological_operations/models.py:1692 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:960 -#: archaeological_context_records/models.py:966 -#: archaeological_finds/models_finds.py:2283 -#: archaeological_finds/models_finds.py:2289 -#: archaeological_finds/models_finds.py:2295 -#: archaeological_operations/models.py:556 -#: archaeological_operations/models.py:562 -#: archaeological_operations/models.py:568 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 +#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:977 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_finds/models_finds.py:2315 +#: archaeological_operations/models.py:673 +#: archaeological_operations/models.py:679 +#: archaeological_operations/models.py:685 +#: archaeological_operations/models.py:1683 +#: archaeological_operations/models.py:1689 +#: archaeological_operations/models.py:1695 +#: archaeological_operations/models.py:1701 #: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4398 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:974 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:970 -#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:981 +#: archaeological_context_records/models.py:982 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:562 +#: archaeological_finds/models_finds.py:574 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:992 +#: archaeological_context_records/models.py:1003 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:1027 -#: archaeological_finds/models_finds.py:2505 +#: archaeological_context_records/models.py:1038 +#: archaeological_finds/models_finds.py:2525 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1155 +#: archaeological_context_records/models.py:1166 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1157 +#: archaeological_context_records/models.py:1168 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1166 -#: archaeological_operations/models.py:2024 +#: archaeological_context_records/models.py:1177 +#: archaeological_operations/models.py:2141 msgid "Modify relations" msgstr "" -#: archaeological_context_records/models.py:1168 -#: archaeological_operations/models.py:2026 +#: archaeological_context_records/models.py:1179 +#: archaeological_operations/models.py:2143 msgid "relations" msgstr "" -#: archaeological_context_records/models.py:1352 -#: archaeological_finds/models_finds.py:621 +#: archaeological_context_records/models.py:1363 +#: archaeological_finds/models_finds.py:637 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1407 +#: archaeological_context_records/models.py:1418 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1440 +#: archaeological_context_records/models.py:1451 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1441 +#: archaeological_context_records/models.py:1452 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1442 +#: archaeological_context_records/models.py:1453 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1443 +#: archaeological_context_records/models.py:1454 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1444 +#: archaeological_context_records/models.py:1455 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1446 +#: archaeological_context_records/models.py:1457 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1447 +#: archaeological_context_records/models.py:1458 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1448 +#: archaeological_context_records/models.py:1459 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1449 +#: archaeological_context_records/models.py:1460 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1450 +#: archaeological_context_records/models.py:1461 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:1470 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:1471 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1651 +#: archaeological_context_records/models.py:1662 msgid "Context record parent" msgstr "" @@ -1638,7 +1664,7 @@ msgid "Identification / Description" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:208 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:209 msgid "Datations" msgstr "" @@ -1647,8 +1673,8 @@ msgid "Operation / Archaeological site" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 -#: archaeological_finds/forms.py:2206 archaeological_finds/models_finds.py:97 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:280 +#: archaeological_finds/forms.py:2218 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 #: archaeological_finds/models_finds.py:239 @@ -1664,18 +1690,19 @@ msgstr "" #: archaeological_finds/models_finds.py:383 #: archaeological_finds/models_finds.py:398 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:631 -#: archaeological_finds/models_finds.py:870 -#: archaeological_finds/models_finds.py:939 -#: archaeological_finds/models_finds.py:2309 -#: archaeological_finds/models_finds.py:2320 -#: archaeological_finds/models_finds.py:3709 +#: archaeological_finds/models_finds.py:427 +#: archaeological_finds/models_finds.py:647 +#: archaeological_finds/models_finds.py:886 +#: archaeological_finds/models_finds.py:955 +#: archaeological_finds/models_finds.py:2329 +#: archaeological_finds/models_finds.py:2340 +#: archaeological_finds/models_finds.py:3729 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_operations/templates/ishtar/sheet_site.html:100 #: archaeological_warehouse/templates/ishtar/sheet_container.html:195 #: archaeological_warehouse/templates/ishtar/sheet_container.html:242 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 @@ -1708,7 +1735,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:103 +#: archaeological_operations/templates/ishtar/sheet_site.html:112 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1763,13 +1790,13 @@ msgstr "" msgid "Complete identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 msgid "Inclusion" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_files/templates/ishtar/sheet_file.html:272 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1779,11 +1806,11 @@ msgid "Surface" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 -#: archaeological_files/forms.py:283 +#: archaeological_files/forms.py:289 #: archaeological_files/templates/ishtar/sheet_file.html:88 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:59 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_operations/templates/ishtar/sheet_site.html:74 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:110 #: man_app/templates/ishtar/sheet_basefind.html:56 @@ -1793,25 +1820,25 @@ msgstr "" msgid "Geographic localisation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:239 -#: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 -#: archaeological_finds/forms.py:977 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:242 +#: archaeological_finds/forms.py:545 archaeological_finds/forms.py:829 +#: archaeological_finds/forms.py:987 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:71 #: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 -#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_operations/templates/ishtar/sheet_site.html:117 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 -#: ishtar_common/templates/ishtar/sheet_person.html:166 +#: ishtar_common/templates/ishtar/sheet_person.html:176 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1822,22 +1849,22 @@ msgstr "" msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:231 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:236 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 msgid "Numerical reference" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:242 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:141 #: archaeological_finds/models_treatments.py:230 @@ -1872,7 +1899,7 @@ msgstr "" msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 @@ -1880,14 +1907,14 @@ msgstr "" msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:250 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:251 #: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 @@ -1895,41 +1922,41 @@ msgstr "" msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:262 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:284 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:285 msgid "No associated finds." msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:301 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:307 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:308 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:315 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:316 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:323 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:324 msgid "Diagram of stratigraphic relations - full" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:339 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:340 msgid "Document from this context record" msgstr "" @@ -1946,31 +1973,31 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:259 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:2119 msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:139 +#: archaeological_files/admin.py:141 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:143 +#: archaeological_files/admin.py:145 msgid "To" msgstr "" -#: archaeological_files/admin.py:160 archaeological_files/tests.py:301 +#: archaeological_files/admin.py:162 archaeological_files/tests.py:301 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:180 +#: archaeological_files/admin.py:182 msgid "Cannot change price agreement." msgstr "" -#: archaeological_files/admin.py:212 +#: archaeological_files/admin.py:214 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:216 +#: archaeological_files/admin.py:218 msgid "{} item(s) already in database." msgstr "" @@ -1978,12 +2005,12 @@ msgstr "" msgid "File - 001 - Search" msgstr "" -#: archaeological_files/forms.py:91 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:234 archaeological_files/forms.py:656 -#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:212 -#: archaeological_finds/forms.py:1708 +#: archaeological_files/forms.py:91 archaeological_files/forms.py:215 +#: archaeological_files/forms.py:631 archaeological_files/forms.py:1086 +#: archaeological_files/forms.py:1122 archaeological_files/models.py:429 +#: archaeological_files/models.py:593 +#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_finds/forms.py:1718 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:407 @@ -1991,57 +2018,57 @@ msgstr "" #: archaeological_finds/forms_treatments.py:637 #: archaeological_finds/forms_treatments.py:708 #: archaeological_finds/forms_treatments.py:819 -#: archaeological_finds/models_finds.py:1200 +#: archaeological_finds/models_finds.py:1216 #: archaeological_finds/models_treatments.py:215 #: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:74 archaeological_operations/forms.py:460 #: archaeological_operations/forms.py:697 -#: archaeological_operations/forms.py:1413 -#: archaeological_operations/forms.py:1718 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2686 -#: archaeological_operations/models.py:2911 -#: archaeological_operations/models.py:3176 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1762 +#: archaeological_operations/models.py:1114 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:3028 +#: archaeological_operations/models.py:3293 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 msgid "Year" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:237 -#: archaeological_files/forms.py:662 archaeological_files/models.py:561 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:637 +#: archaeological_files/models.py:595 msgid "Numeric reference" msgstr "" -#: archaeological_files/forms.py:93 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1149 archaeological_operations/forms.py:1103 +#: archaeological_files/forms.py:93 archaeological_files/forms.py:1088 +#: archaeological_files/forms.py:1124 archaeological_operations/forms.py:1103 #: archaeological_operations/forms.py:1201 -#: archaeological_operations/forms.py:1318 -#: archaeological_operations/forms.py:1415 -#: archaeological_operations/forms.py:1480 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:2914 +#: archaeological_operations/forms.py:1343 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1524 +#: archaeological_operations/models.py:598 +#: archaeological_operations/models.py:3031 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:98 archaeological_files/forms.py:1119 -#: archaeological_files/forms.py:1156 archaeological_files/models.py:1396 +#: archaeological_files/forms.py:98 archaeological_files/forms.py:1094 +#: archaeological_files/forms.py:1131 archaeological_files/models.py:1438 #: archaeological_operations/forms.py:476 -#: archaeological_operations/forms.py:1426 -#: archaeological_operations/models.py:2558 ishtar_common/models_common.py:2070 +#: archaeological_operations/forms.py:1470 +#: archaeological_operations/models.py:2675 ishtar_common/models_common.py:2070 #: ishtar_common/models_common.py:3404 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:100 archaeological_files/forms.py:1161 +#: archaeological_files/forms.py:100 archaeological_files/forms.py:1136 msgid "File name" msgstr "" -#: archaeological_files/forms.py:101 archaeological_files/forms.py:209 -#: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:573 +#: archaeological_files/forms.py:101 archaeological_files/forms.py:213 +#: archaeological_files/models.py:430 archaeological_files/models.py:435 +#: archaeological_files/models.py:607 msgid "File type" msgstr "" @@ -2049,41 +2076,52 @@ msgstr "" msgid "Is active?" msgstr "" -#: archaeological_files/forms.py:103 archaeological_files/forms.py:263 -#: archaeological_files/forms.py:540 +#: archaeological_files/forms.py:103 archaeological_files/forms.py:291 +#: archaeological_files/models.py:372 archaeological_files/models.py:757 +#: archaeological_files/templates/ishtar/sheet_file.html:120 +msgid "Development type" +msgstr "" + +#: archaeological_files/forms.py:104 archaeological_files/forms.py:269 msgid "Saisine type" msgstr "" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:262 -#: archaeological_files/forms.py:524 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:622 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:447 +#: archaeological_files/models.py:761 +#: archaeological_files/templates/ishtar/sheet_file.html:121 +msgid "Monitoring justification" +msgstr "" + +#: archaeological_files/forms.py:106 archaeological_files/forms.py:268 +#: archaeological_files/models.py:323 archaeological_files/models.py:434 +#: archaeological_files/models.py:656 msgid "Permit type" msgstr "" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:464 -#: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:130 +#: archaeological_files/forms.py:107 archaeological_files/forms.py:449 +#: archaeological_files/models.py:661 +#: archaeological_files/templates/ishtar/sheet_file.html:133 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" -#: archaeological_files/forms.py:106 archaeological_files/forms.py:653 -#: archaeological_files/models.py:675 archaeological_finds/forms.py:791 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 -#: archaeological_finds/forms.py:2460 +#: archaeological_files/forms.py:108 archaeological_files/forms.py:628 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:801 +#: archaeological_finds/forms.py:1134 archaeological_finds/forms.py:1419 +#: archaeological_finds/forms.py:2472 #: archaeological_finds/forms_treatments.py:194 #: archaeological_finds/forms_treatments.py:745 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:512 #: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1479 -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2928 +#: archaeological_operations/forms.py:1219 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1523 +#: archaeological_operations/models.py:627 +#: archaeological_operations/models.py:1590 +#: archaeological_operations/models.py:3045 #: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 #: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 #: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 @@ -2097,55 +2135,54 @@ msgstr "" msgid "Comment" msgstr "" -#: archaeological_files/forms.py:108 archaeological_files/forms.py:375 -#: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/forms.py:110 archaeological_files/forms.py:378 +#: archaeological_files/forms.py:436 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "" -#: archaeological_files/forms.py:118 archaeological_files/forms.py:345 -#: archaeological_files/forms.py:355 archaeological_files/forms.py:496 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:585 +#: archaeological_files/forms.py:120 archaeological_files/forms.py:356 +#: archaeological_files/forms.py:366 archaeological_files/forms.py:1138 +#: archaeological_files/models.py:619 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:128 archaeological_files/forms.py:1173 +#: archaeological_files/forms.py:130 archaeological_files/forms.py:1148 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:139 archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:1179 #: archaeological_operations/forms.py:528 ishtar_common/forms.py:956 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 +#: archaeological_files/forms.py:149 archaeological_files/forms.py:1187 #: archaeological_finds/forms_treatments.py:578 #: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:534 msgid "Modified by" msgstr "" -#: archaeological_files/forms.py:170 archaeological_files/forms.py:187 +#: archaeological_files/forms.py:174 archaeological_files/forms.py:191 msgid "Archaeological file search" msgstr "" -#: archaeological_files/forms.py:206 +#: archaeological_files/forms.py:210 msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:642 +#: archaeological_files/forms.py:222 archaeological_files/models.py:676 #: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2160 +#: archaeological_operations/models.py:1466 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4646 ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" -#: archaeological_files/forms.py:219 archaeological_files/forms.py:541 -#: archaeological_files/models.py:644 +#: archaeological_files/forms.py:223 archaeological_files/models.py:678 #: archaeological_finds/forms_treatments.py:748 #: archaeological_finds/models_treatments.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:514 @@ -2158,43 +2195,39 @@ msgstr "" msgid "Reception date" msgstr "" -#: archaeological_files/forms.py:228 +#: archaeological_files/forms.py:232 msgid "Reception date cannot be after today." msgstr "" -#: archaeological_files/forms.py:250 -msgid "Another file with this numeric id exists." -msgstr "" - -#: archaeological_files/forms.py:256 +#: archaeological_files/forms.py:262 msgid "Archaeological file - 013 - Preventive - Saisine" msgstr "" -#: archaeological_files/forms.py:277 +#: archaeological_files/forms.py:283 msgid "Planning" msgstr "" -#: archaeological_files/forms.py:278 +#: archaeological_files/forms.py:284 msgid "Archaeological file - 017 - Preventive - Planning" msgstr "" -#: archaeological_files/forms.py:284 +#: archaeological_files/forms.py:290 msgid "Planning name" msgstr "" -#: archaeological_files/forms.py:286 archaeological_files/forms.py:330 -#: archaeological_files/models.py:475 archaeological_files/models.py:639 +#: archaeological_files/forms.py:294 archaeological_files/forms.py:341 +#: archaeological_files/models.py:501 archaeological_files/models.py:673 #: archaeological_operations/forms.py:691 #: archaeological_operations/forms.py:1016 #: archaeological_operations/forms.py:1032 #: archaeological_operations/forms.py:1037 -#: archaeological_operations/forms.py:1368 -#: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:511 -#: archaeological_operations/models.py:1088 -#: archaeological_operations/models.py:1090 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2923 +#: archaeological_operations/forms.py:1375 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:609 +#: archaeological_operations/models.py:1205 +#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1526 +#: archaeological_operations/models.py:3040 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1794 ishtar_common/forms_common.py:1808 #: ishtar_common/forms_common.py:1809 ishtar_common/models.py:2383 @@ -2206,50 +2239,44 @@ msgstr "" msgid "Towns" msgstr "" -#: archaeological_files/forms.py:290 archaeological_files/forms.py:333 -#: archaeological_files/models.py:678 archaeological_operations/models.py:2917 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:344 +#: archaeological_files/models.py:712 archaeological_operations/models.py:3034 #: ishtar_common/models_common.py:2071 msgid "Departments" msgstr "" -#: archaeological_files/forms.py:292 +#: archaeological_files/forms.py:300 msgid "Only relevant when no town is provided." msgstr "" -#: archaeological_files/forms.py:294 archaeological_files/forms.py:335 -#: archaeological_files/models.py:670 +#: archaeological_files/forms.py:302 archaeological_files/forms.py:346 +#: archaeological_files/models.py:704 msgid "Locality" msgstr "" -#: archaeological_files/forms.py:296 archaeological_files/forms.py:337 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:348 msgid "Address (number/street)" msgstr "" -#: archaeological_files/forms.py:297 archaeological_files/forms.py:338 +#: archaeological_files/forms.py:305 archaeological_files/forms.py:349 msgid "Number/street" msgstr "" -#: archaeological_files/forms.py:300 archaeological_files/forms.py:341 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:352 #: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3690 msgid "Postal code" msgstr "" -#: archaeological_files/forms.py:301 archaeological_files/forms.py:736 +#: archaeological_files/forms.py:309 archaeological_files/forms.py:711 msgid "Surfaces" msgstr "" -#: archaeological_files/forms.py:305 archaeological_files/forms.py:811 -#: archaeological_files/models.py:666 archaeological_operations/forms.py:706 -msgid "Total surface (m2)" -msgstr "" - -#: archaeological_files/forms.py:313 archaeological_files/forms.py:532 -#: archaeological_files/forms.py:801 archaeological_files/models.py:668 -msgid "Total developed surface (m2)" +#: archaeological_files/forms.py:321 archaeological_files/models.py:702 +msgid "Total developed surface (m²)" msgstr "" -#: archaeological_files/forms.py:323 +#: archaeological_files/forms.py:334 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 @@ -2258,221 +2285,221 @@ msgstr "" msgid "Address" msgstr "" -#: archaeological_files/forms.py:324 +#: archaeological_files/forms.py:335 msgid "Archaeological file - 015 - Research - Address" msgstr "" -#: archaeological_files/forms.py:328 +#: archaeological_files/forms.py:339 msgid "Project name" msgstr "" -#: archaeological_files/forms.py:346 +#: archaeological_files/forms.py:357 msgid "Archaeological file - 030 - General contractor" msgstr "" -#: archaeological_files/forms.py:401 archaeological_files/forms.py:475 +#: archaeological_files/forms.py:399 archaeological_files/forms.py:464 msgid "Non existing person." msgstr "" -#: archaeological_files/forms.py:408 +#: archaeological_files/forms.py:406 msgid "" "The organization of the person in charge differs from the general contractor." msgstr "" -#: archaeological_files/forms.py:416 archaeological_files/forms.py:425 +#: archaeological_files/forms.py:414 archaeological_files/forms.py:424 msgid "Planning service" msgstr "" -#: archaeological_files/forms.py:417 +#: archaeological_files/forms.py:415 msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:466 archaeological_files/models.py:646 +#: archaeological_files/forms.py:451 archaeological_files/models.py:680 msgid "Date of planning service file" msgstr "" -#: archaeological_files/forms.py:479 +#: archaeological_files/forms.py:468 msgid "" "The organization of the person in charge differs from the planning service." msgstr "" -#: archaeological_files/forms.py:488 -msgid "Preventive informations" -msgstr "" - -#: archaeological_files/forms.py:510 archaeological_files/models.py:606 -msgid "Responsible for planning service" -msgstr "" - -#: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:143 +#: archaeological_files/forms.py:544 +#: archaeological_files/templates/ishtar/sheet_file.html:146 msgid "Research archaeology" msgstr "" -#: archaeological_files/forms.py:559 +#: archaeological_files/forms.py:545 msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:585 archaeological_files/models.py:702 +#: archaeological_files/forms.py:561 archaeological_files/models.py:736 #: archaeological_operations/forms.py:495 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:588 archaeological_files/models.py:686 +#: archaeological_files/forms.py:565 archaeological_files/models.py:720 msgid "Requested operation type" msgstr "" -#: archaeological_files/forms.py:591 +#: archaeological_files/forms.py:569 msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:169 +#: archaeological_files/forms.py:583 archaeological_files/models.py:739 +#: archaeological_files/templates/ishtar/sheet_file.html:172 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:614 archaeological_files/models.py:708 +#: archaeological_files/forms.py:592 archaeological_files/models.py:742 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:615 archaeological_files/models.py:710 +#: archaeological_files/forms.py:593 archaeological_files/models.py:744 msgid "Protected area" msgstr "" -#: archaeological_files/forms.py:628 +#: archaeological_files/forms.py:606 msgid "Instruction" msgstr "" -#: archaeological_files/forms.py:629 +#: archaeological_files/forms.py:607 msgid "Archaeological file - 050 - Instruction" msgstr "" -#: archaeological_files/forms.py:633 +#: archaeological_files/forms.py:611 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:646 archaeological_files/models.py:650 +#: archaeological_files/forms.py:621 archaeological_files/models.py:684 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:654 archaeological_files/models.py:664 +#: archaeological_files/forms.py:629 archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" -#: archaeological_files/forms.py:719 +#: archaeological_files/forms.py:694 msgid "Would you like to close this archaeological file?" msgstr "" -#: archaeological_files/forms.py:724 +#: archaeological_files/forms.py:699 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:703 msgid "Preventive file" msgstr "" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:704 msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:735 ishtar_common/forms_common.py:2225 +#: archaeological_files/forms.py:710 ishtar_common/forms_common.py:2225 #: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "" -#: archaeological_files/forms.py:737 +#: archaeological_files/forms.py:712 msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:760 archaeological_files/models.py:727 +#: archaeological_files/forms.py:735 archaeological_files/models.py:769 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:765 archaeological_files/models.py:730 +#: archaeological_files/forms.py:740 archaeological_files/models.py:772 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:770 archaeological_files/models.py:733 +#: archaeological_files/forms.py:745 archaeological_files/models.py:775 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:785 archaeological_files/models.py:737 +#: archaeological_files/forms.py:760 archaeological_files/models.py:779 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:790 archaeological_files/models.py:738 +#: archaeological_files/forms.py:765 archaeological_files/models.py:780 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:795 archaeological_files/models.py:740 +#: archaeological_files/forms.py:770 archaeological_files/models.py:782 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:818 +#: archaeological_files/forms.py:776 +msgid "Total developed surface (m2)" +msgstr "" + +#: archaeological_files/forms.py:786 archaeological_operations/forms.py:706 +msgid "Total surface (m2)" +msgstr "" + +#: archaeological_files/forms.py:793 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/forms.py:853 archaeological_files/forms.py:855 #: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:295 #: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/forms.py:854 archaeological_files/forms.py:856 #: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:296 #: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:348 msgid "Days" msgstr "" -#: archaeological_files/forms.py:882 archaeological_files/models.py:116 -#: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/forms.py:857 archaeological_files/models.py:118 +#: archaeological_files/models.py:1480 archaeological_files/models.py:1499 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Job" msgstr "" -#: archaeological_files/forms.py:903 archaeological_files/models.py:80 -#: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:723 +#: archaeological_files/forms.py:878 archaeological_files/models.py:82 +#: archaeological_files/models.py:83 archaeological_files/models.py:95 +#: archaeological_files/models.py:208 archaeological_files/models.py:765 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:961 +#: archaeological_files/forms.py:936 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:937 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/forms.py:961 +#: archaeological_files/templates/ishtar/sheet_file.html:282 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:988 +#: archaeological_files/forms.py:963 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/forms.py:969 archaeological_files/forms.py:971 #: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/forms.py:973 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:1112 archaeological_files/forms.py:1148 -#: archaeological_files/forms.py:1278 +#: archaeological_files/forms.py:1087 archaeological_files/forms.py:1123 +#: archaeological_files/forms.py:1253 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 #: archaeological_finds/forms_treatments.py:562 @@ -2485,9 +2512,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 -#: archaeological_operations/forms.py:1414 -#: archaeological_operations/forms.py:1535 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2970 #: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 #: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:619 @@ -2499,84 +2526,84 @@ msgstr "" msgid "Index" msgstr "" -#: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 -#: archaeological_files/forms.py:1267 +#: archaeological_files/forms.py:1089 archaeological_files/forms.py:1125 +#: archaeological_files/forms.py:1242 #: archaeological_finds/forms_treatments.py:563 #: archaeological_finds/forms_treatments.py:610 #: archaeological_finds/forms_treatments.py:821 #: archaeological_finds/forms_treatments.py:873 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1469 -#: archaeological_operations/models.py:2588 -#: archaeological_operations/models.py:2843 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/forms.py:1513 +#: archaeological_operations/models.py:2705 +#: archaeological_operations/models.py:2960 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:1115 +#: archaeological_files/forms.py:1090 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1126 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:822 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/forms.py:1605 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1649 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:1158 +#: archaeological_files/forms.py:1133 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:823 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/forms.py:1476 -#: archaeological_operations/models.py:2912 +#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/models.py:3029 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:1160 +#: archaeological_files/forms.py:1135 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:826 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1478 -#: archaeological_operations/models.py:2910 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/forms.py:1522 +#: archaeological_operations/models.py:3027 msgid "Signature date" msgstr "" -#: archaeological_files/forms.py:1184 +#: archaeological_files/forms.py:1159 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:1186 +#: archaeological_files/forms.py:1161 msgid "File year" msgstr "" -#: archaeological_files/forms.py:1188 +#: archaeological_files/forms.py:1163 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:1191 +#: archaeological_files/forms.py:1166 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:1201 +#: archaeological_files/forms.py:1176 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1265 +#: archaeological_files/forms.py:1240 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:786 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:828 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:643 #: archaeological_operations/forms.py:915 -#: archaeological_operations/models.py:2045 -#: archaeological_operations/models.py:2571 -#: archaeological_operations/models.py:2687 -#: archaeological_operations/models.py:2891 +#: archaeological_operations/models.py:2162 +#: archaeological_operations/models.py:2688 +#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:3008 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "" @@ -2589,19 +2616,20 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3691 +#: archaeological_finds/models_finds.py:3711 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2948 +#: archaeological_operations/models.py:1837 +#: archaeological_operations/models.py:3065 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" 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:1444 -#: archaeological_files/models.py:1463 archaeological_files/models.py:1490 +#: archaeological_files/models.py:90 archaeological_files/models.py:125 +#: archaeological_files/models.py:170 archaeological_files/models.py:186 +#: archaeological_files/models.py:256 archaeological_files/models.py:351 +#: archaeological_files/models.py:363 archaeological_files/models.py:375 +#: archaeological_files/models.py:395 archaeological_files/models.py:1486 +#: archaeological_files/models.py:1505 archaeological_files/models.py:1532 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5395 @@ -2609,210 +2637,222 @@ msgstr "" msgid "Preventive" msgstr "" -#: archaeological_files/models.py:96 +#: archaeological_files/models.py:98 msgid "Ground daily cost" msgstr "" -#: archaeological_files/models.py:97 +#: archaeological_files/models.py:99 msgid "Daily cost" msgstr "" -#: archaeological_files/models.py:99 archaeological_files/models.py:148 +#: archaeological_files/models.py:101 archaeological_files/models.py:150 msgid "Permanent contract" msgstr "" -#: archaeological_files/models.py:102 +#: archaeological_files/models.py:104 msgid "Def. daily number on ground" msgstr "" -#: archaeological_files/models.py:104 +#: archaeological_files/models.py:106 msgid "Def. daily number on study" msgstr "" -#: archaeological_files/models.py:110 +#: archaeological_files/models.py:112 msgid "Child" msgstr "" -#: archaeological_files/models.py:111 +#: archaeological_files/models.py:113 msgid "Auto-add this job when a parent is added" msgstr "" -#: archaeological_files/models.py:117 +#: archaeological_files/models.py:119 msgid "Jobs" msgstr "" -#: archaeological_files/models.py:128 +#: archaeological_files/models.py:130 msgid "fixed-term contract" msgstr "" -#: archaeological_files/models.py:152 +#: archaeological_files/models.py:154 msgid "Fixed-term contract" msgstr "" -#: archaeological_files/models.py:162 +#: archaeological_files/models.py:164 msgid "Generic equipment type" msgstr "" -#: archaeological_files/models.py:163 +#: archaeological_files/models.py:165 msgid "Generic equipment types" msgstr "" -#: archaeological_files/models.py:173 +#: archaeological_files/models.py:175 msgid "Generic type" msgstr "" -#: archaeological_files/models.py:178 +#: archaeological_files/models.py:180 msgid "Equipment/service type" msgstr "" -#: archaeological_files/models.py:179 +#: archaeological_files/models.py:181 msgid "Equipment/service types" msgstr "" -#: archaeological_files/models.py:188 +#: archaeological_files/models.py:190 #: archaeological_operations/templates/ishtar/sheet_operation.html:233 #: na_app/templates/ishtar/sheet_operation.html:229 #: sra_idf_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "" -#: archaeological_files/models.py:189 +#: archaeological_files/models.py:191 msgid "weeks" msgstr "" -#: archaeological_files/models.py:190 +#: archaeological_files/models.py:192 msgid "months" msgstr "" -#: archaeological_files/models.py:191 +#: archaeological_files/models.py:193 msgid "linear m." msgstr "" -#: archaeological_files/models.py:210 +#: archaeological_files/models.py:212 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 +#: archaeological_files/models.py:215 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3255 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:217 ishtar_common/models.py:3258 +#: archaeological_files/models.py:219 ishtar_common/models.py:3258 #: ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." msgstr "" -#: archaeological_files/models.py:223 +#: archaeological_files/models.py:225 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:225 archaeological_files/models.py:281 +#: archaeological_files/models.py:227 archaeological_files/models.py:283 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:226 +#: archaeological_files/models.py:228 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:228 ishtar_common/models_imports.py:1077 +#: archaeological_files/models.py:230 ishtar_common/models_imports.py:1077 msgid "Unit" msgstr "" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:233 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:236 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:236 ishtar_common/models.py:1665 +#: archaeological_files/models.py:238 ishtar_common/models.py:1665 #: ishtar_common/models.py:2083 ishtar_common/models.py:3823 #: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:206 #: ishtar_common/models_imports.py:441 ishtar_common/models_imports.py:952 msgid "Available" msgstr "" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 +#: archaeological_files/models.py:244 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1267 ishtar_common/models.py:2390 #: ishtar_common/models_common.py:748 msgid "Parent" msgstr "" -#: archaeological_files/models.py:243 +#: archaeological_files/models.py:245 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:248 +#: archaeological_files/models.py:250 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:249 +#: archaeological_files/models.py:251 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:301 +#: archaeological_files/models.py:303 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:302 +#: archaeological_files/models.py:304 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:322 +#: archaeological_files/models.py:324 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:335 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:346 +#: archaeological_files/models.py:348 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:349 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:358 +#: archaeological_files/models.py:360 +msgid "Monitoring justification type" +msgstr "" + +#: archaeological_files/models.py:361 +msgid "Monitoring justification types" +msgstr "" + +#: archaeological_files/models.py:373 +msgid "Development types" +msgstr "" + +#: archaeological_files/models.py:384 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:360 +#: archaeological_files/models.py:386 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:362 +#: archaeological_files/models.py:388 msgid "Category" msgstr "" -#: archaeological_files/models.py:366 +#: archaeological_files/models.py:392 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:367 +#: archaeological_files/models.py:393 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1201 -#: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:998 ishtar_common/admin.py:1451 +#: archaeological_files/models.py:431 archaeological_finds/models_finds.py:1217 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1115 ishtar_common/admin.py:1451 #: ishtar_common/forms_common.py:2561 ishtar_common/models.py:2408 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "" -#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1204 -#: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:999 +#: archaeological_files/models.py:432 archaeological_finds/models_finds.py:1220 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1116 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1225 +#: archaeological_files/models.py:441 archaeological_finds/models_finds.py:1241 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2837,49 +2877,49 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:416 -msgid "Total surface (km2)" +#: archaeological_files/models.py:442 +msgid "Total surface (km²)" msgstr "" -#: archaeological_files/models.py:417 -msgid "Total developed surface (km2)" +#: archaeological_files/models.py:443 +msgid "Total developed surface (km²)" msgstr "" -#: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1329 +#: archaeological_files/models.py:512 archaeological_finds/models_finds.py:1345 #: archaeological_finds/models_treatments.py:167 #: archaeological_finds/models_treatments.py:1156 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1142 -#: archaeological_operations/models.py:2711 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1259 +#: archaeological_operations/models.py:2828 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:488 +#: archaeological_files/models.py:514 #: archaeological_finds/models_treatments.py:1153 -#: archaeological_operations/models.py:370 +#: archaeological_operations/models.py:436 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4292 msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:491 +#: archaeological_files/models.py:517 #: archaeological_finds/models_treatments.py:164 -#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:442 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:1166 +#: archaeological_files/models.py:529 archaeological_operations/models.py:1283 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:507 +#: archaeological_files/models.py:533 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_operations/models.py:373 -#: archaeological_operations/models.py:1170 +#: archaeological_operations/models.py:439 +#: archaeological_operations/models.py:1287 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2601 #: ishtar_common/models.py:2863 ishtar_common/models.py:3669 @@ -2887,11 +2927,12 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:510 +#: archaeological_files/models.py:536 #: archaeological_finds/models_treatments.py:170 #: archaeological_finds/models_treatments.py:1159 -#: archaeological_operations/models.py:1176 -#: archaeological_operations/models.py:2722 +#: archaeological_operations/models.py:446 +#: archaeological_operations/models.py:1293 +#: archaeological_operations/models.py:2839 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 #: archaeological_warehouse/models.py:955 ishtar_common/models.py:2604 @@ -2901,51 +2942,61 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:513 +#: archaeological_files/models.py:539 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:542 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:547 +msgctxt "key for text search" +msgid "development-type" +msgstr "" + +#: archaeological_files/models.py:551 +msgctxt "key for text search" +msgid "monitoring-justification" +msgstr "" + +#: archaeological_files/models.py:555 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:526 +#: archaeological_files/models.py:560 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:1658 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2763 +#: archaeological_files/models.py:571 archaeological_operations/models.py:2880 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:542 archaeological_operations/models.py:2767 +#: archaeological_files/models.py:576 archaeological_operations/models.py:2884 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:564 +#: archaeological_files/models.py:598 #: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:606 #: archaeological_finds/forms_treatments.py:635 #: archaeological_finds/forms_treatments.py:706 #: archaeological_finds/models_treatments.py:1200 @@ -2954,9 +3005,9 @@ msgstr "" #: archaeological_operations/forms.py:477 #: archaeological_operations/forms.py:1102 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1774 -#: archaeological_operations/models.py:502 +#: archaeological_operations/forms.py:1342 +#: archaeological_operations/forms.py:1818 +#: archaeological_operations/models.py:599 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 @@ -2999,7 +3050,7 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:577 +#: archaeological_files/models.py:611 #: archaeological_finds/models_treatments.py:1209 #: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 @@ -3012,35 +3063,39 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:625 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:596 +#: archaeological_files/models.py:630 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:610 +#: archaeological_files/models.py:640 +msgid "Responsible for planning service" +msgstr "" + +#: archaeological_files/models.py:644 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:617 +#: archaeological_files/models.py:651 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:632 +#: archaeological_files/models.py:666 msgid "Main town" msgstr "" -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:705 msgid "Main address" msgstr "" -#: archaeological_files/models.py:673 +#: archaeological_files/models.py:707 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:726 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:418 #: archaeological_finds/models_treatments.py:263 @@ -3056,128 +3111,128 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:742 +#: archaeological_files/models.py:784 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:788 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:751 +#: archaeological_files/models.py:793 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:809 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:787 +#: archaeological_files/models.py:829 #: ishtar_common/templates/ishtar/sheet_town.html:124 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:814 +#: archaeological_files/models.py:856 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1067 +#: archaeological_files/models.py:1109 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1073 +#: archaeological_files/models.py:1115 msgid "No town" msgstr "" -#: archaeological_files/models.py:1282 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1324 archaeological_operations/models.py:2097 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1284 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1326 archaeological_operations/models.py:2099 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1294 +#: archaeological_files/models.py:1336 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1338 msgid "plan" msgstr "" -#: archaeological_files/models.py:1305 +#: archaeological_files/models.py:1347 #: archaeological_finds/models_treatments.py:420 #: archaeological_finds/models_treatments.py:1316 -#: archaeological_operations/models.py:2013 +#: archaeological_operations/models.py:2130 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1307 +#: archaeological_files/models.py:1349 #: archaeological_finds/models_treatments.py:422 #: archaeological_finds/models_treatments.py:1318 -#: archaeological_operations/models.py:2015 +#: archaeological_operations/models.py:2132 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1316 +#: archaeological_files/models.py:1358 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1318 +#: archaeological_files/models.py:1360 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1393 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3163 +#: archaeological_files/models.py:1435 archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:3280 msgid "File" msgstr "" -#: archaeological_files/models.py:1412 +#: archaeological_files/models.py:1454 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 +#: archaeological_files/models.py:1456 archaeological_files/models.py:1522 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1416 +#: archaeological_files/models.py:1458 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1418 archaeological_files/models.py:1484 +#: archaeological_files/models.py:1460 archaeological_files/models.py:1526 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1442 +#: archaeological_files/models.py:1484 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1443 +#: archaeological_files/models.py:1485 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1461 +#: archaeological_files/models.py:1503 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1462 +#: archaeological_files/models.py:1504 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1478 +#: archaeological_files/models.py:1520 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1482 +#: archaeological_files/models.py:1524 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1488 +#: archaeological_files/models.py:1530 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1489 +#: archaeological_files/models.py:1531 msgid "Equipment requirements" msgstr "" @@ -3203,9 +3258,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:391 msgid "Planned" msgstr "" @@ -3246,18 +3301,18 @@ msgstr "" msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:176 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:179 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: 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:2949 +#: archaeological_operations/models.py:3066 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3268,15 +3323,15 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:182 +#: archaeological_files/templates/ishtar/sheet_file.html:185 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 -#: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_operations/models.py:2685 -#: archaeological_operations/models.py:2984 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:3101 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 @@ -3285,22 +3340,22 @@ msgstr "" msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/models.py:1470 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:205 +#: archaeological_files/templates/ishtar/sheet_file.html:208 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:209 +#: archaeological_files/templates/ishtar/sheet_file.html:212 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:797 #: ishtar_common/models.py:704 ishtar_common/models.py:3386 @@ -3308,43 +3363,43 @@ msgstr "" msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:225 +#: archaeological_files/templates/ishtar/sheet_file.html:228 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:231 +#: archaeological_files/templates/ishtar/sheet_file.html:234 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:264 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:392 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:291 #: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:297 #: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:349 #: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:312 +#: archaeological_files/templates/ishtar/sheet_file.html:364 +#: archaeological_files/templates/ishtar/sheet_file.html:420 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3355,13 +3410,13 @@ msgstr "" msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:323 +#: archaeological_files/templates/ishtar/sheet_file.html:375 +#: archaeological_files/templates/ishtar/sheet_file.html:427 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:334 msgid "Post-excavation jobs" msgstr "" @@ -3455,326 +3510,336 @@ msgstr "" msgid "Simple find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:354 +#: archaeological_finds/forms.py:356 msgid "Museum identification" msgstr "" -#: archaeological_finds/forms.py:356 archaeological_finds/forms.py:744 -#: archaeological_finds/forms.py:1002 archaeological_finds/forms.py:1341 -#: archaeological_finds/forms.py:1696 archaeological_finds/forms.py:2346 -#: archaeological_finds/models_finds.py:548 -#: archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:754 +#: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1706 archaeological_finds/forms.py:2358 +#: archaeological_finds/models_finds.py:560 +#: archaeological_finds/models_finds.py:2003 msgid "Free ID" msgstr "" -#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1011 -#: archaeological_finds/models_finds.py:1986 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1021 +#: archaeological_finds/models_finds.py:2006 msgid "Museum ID prefix" msgstr "" -#: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1012 -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:1987 +#: archaeological_finds/forms.py:361 archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:1708 archaeological_finds/models_finds.py:2007 msgid "Museum inventory number" msgstr "" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1013 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:1023 +#: archaeological_finds/models_finds.py:2008 msgid "Museum ID suffix" msgstr "" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:363 archaeological_finds/models_finds.py:2009 msgid "Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:746 -#: archaeological_finds/forms.py:1006 archaeological_finds/forms.py:1343 -#: archaeological_finds/forms.py:1697 archaeological_finds/forms.py:2413 -#: archaeological_finds/models_finds.py:1984 ishtar_common/forms_common.py:1409 +#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:756 +#: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1353 +#: archaeological_finds/forms.py:1707 archaeological_finds/forms.py:2425 +#: archaeological_finds/models_finds.py:2004 ishtar_common/forms_common.py:1409 #: ishtar_common/models.py:3253 msgid "Denomination" msgstr "" -#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1700 archaeological_finds/models_finds.py:2138 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1017 +#: archaeological_finds/forms.py:1710 archaeological_finds/models_finds.py:2158 msgid "Previous ID" msgstr "" -#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1014 -#: archaeological_finds/forms.py:1703 archaeological_finds/models_finds.py:1990 +#: archaeological_finds/forms.py:367 archaeological_finds/forms.py:1024 +#: archaeological_finds/forms.py:1713 archaeological_finds/models_finds.py:2010 msgid "Laboratory ID" msgstr "" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1015 -#: archaeological_finds/forms.py:1702 archaeological_finds/models_finds.py:1981 +#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:2001 msgid "Seal number" msgstr "" -#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:1070 +#: archaeological_finds/models_finds.py:2208 msgid "Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2192 +#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1073 +#: archaeological_finds/models_finds.py:2212 msgid "Type of marking" msgstr "" -#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1943 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:1026 +#: archaeological_finds/forms.py:1954 archaeological_finds/models_finds.py:2155 msgid "Marking details" msgstr "" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:980 -#: archaeological_finds/forms.py:1634 archaeological_finds/models_finds.py:428 -#: archaeological_finds/models_finds.py:443 -#: archaeological_finds/models_finds.py:458 -#: archaeological_finds/models_finds.py:473 -#: archaeological_finds/models_finds.py:488 -#: archaeological_finds/models_finds.py:503 +#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:990 +#: archaeological_finds/forms.py:1644 archaeological_finds/models_finds.py:442 +#: archaeological_finds/models_finds.py:457 +#: archaeological_finds/models_finds.py:472 +#: archaeological_finds/models_finds.py:487 +#: archaeological_finds/models_finds.py:502 +#: archaeological_finds/models_finds.py:517 msgid "Museum" msgstr "" -#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:384 archaeological_finds/forms.py:1036 +#: archaeological_finds/models_finds.py:2179 msgid "Owner institution" msgstr "" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/forms.py:387 archaeological_finds/forms.py:1042 +#: archaeological_finds/models_finds.py:2184 msgid "Assigned institution" msgstr "" -#: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:1048 +#: archaeological_finds/models_finds.py:2189 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2171 +#: archaeological_finds/forms.py:392 archaeological_finds/models_finds.py:2191 msgid "Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1053 +#: archaeological_finds/models_finds.py:2194 msgid "Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1055 +#: archaeological_finds/models_finds.py:2196 msgid "Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:397 archaeological_finds/forms.py:1058 +#: archaeological_finds/models_finds.py:2197 msgid "Museum entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:398 archaeological_finds/forms.py:1060 +#: archaeological_finds/models_finds.py:2198 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2179 +#: archaeological_finds/forms.py:399 archaeological_finds/models_finds.py:2199 msgid "Comment on museum entry date" msgstr "" -#: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2183 +#: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1062 +#: archaeological_finds/models_finds.py:2203 msgid "Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2152 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:409 archaeological_finds/forms.py:1075 +#: archaeological_finds/models_finds.py:2172 +#: archaeological_finds/models_finds.py:2219 msgid "Collection" msgstr "" -#: archaeological_finds/forms.py:410 archaeological_finds/forms.py:1067 +#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1077 msgid "Former collections" msgstr "" -#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/forms.py:414 archaeological_finds/forms.py:1082 +#: archaeological_finds/models_finds.py:2227 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:417 archaeological_finds/models_finds.py:2231 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2213 +#: archaeological_finds/forms.py:420 archaeological_finds/models_finds.py:2233 msgid "Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/forms.py:423 archaeological_finds/forms.py:1083 +#: archaeological_finds/models_finds.py:2237 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:425 archaeological_finds/models_finds.py:2239 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2220 +#: archaeological_finds/forms.py:426 archaeological_finds/models_finds.py:2240 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2214 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2234 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2258 +#: archaeological_finds/forms.py:436 archaeological_finds/models_finds.py:2278 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/models.py:629 +#: archaeological_operations/templates/ishtar/sheet_site.html:55 msgid "Public description" msgstr "" -#: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1801 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:439 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:1807 archaeological_finds/models_finds.py:585 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:23 +msgid "Discovery method" +msgstr "" + +#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:763 +#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:2095 msgid "Is complete?" msgstr "" -#: archaeological_finds/forms.py:438 archaeological_finds/forms.py:756 -#: archaeological_finds/forms.py:1085 archaeological_finds/models_finds.py:95 -#: archaeological_finds/models_finds.py:1170 -#: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1998 +#: archaeological_finds/forms.py:443 archaeological_finds/forms.py:766 +#: archaeological_finds/forms.py:1095 archaeological_finds/models_finds.py:95 +#: archaeological_finds/models_finds.py:1186 +#: archaeological_finds/models_finds.py:1187 +#: archaeological_finds/models_finds.py:2018 msgid "Material types" msgstr "" -#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:759 -#: archaeological_finds/forms.py:1810 archaeological_finds/models_finds.py:2002 +#: archaeological_finds/forms.py:446 archaeological_finds/forms.py:769 +#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:2022 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:444 archaeological_finds/forms.py:1088 -#: archaeological_finds/forms.py:1813 archaeological_finds/models_finds.py:2010 +#: archaeological_finds/forms.py:449 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2030 msgid "Technical processes" msgstr "" -#: archaeological_finds/forms.py:448 archaeological_finds/forms.py:1819 -#: archaeological_finds/models_finds.py:2015 +#: archaeological_finds/forms.py:453 archaeological_finds/forms.py:1830 +#: archaeological_finds/models_finds.py:2035 msgid "Comment on the material" msgstr "" -#: archaeological_finds/forms.py:451 archaeological_finds/forms.py:762 -#: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1173 -#: archaeological_finds/models_finds.py:2077 +#: archaeological_finds/forms.py:456 archaeological_finds/forms.py:772 +#: archaeological_finds/forms.py:1102 archaeological_finds/models_finds.py:275 +#: archaeological_finds/models_finds.py:1188 +#: archaeological_finds/models_finds.py:1189 +#: archaeological_finds/models_finds.py:2097 msgid "Object types" msgstr "" -#: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:460 archaeological_finds/forms.py:776 +#: archaeological_finds/forms.py:1837 archaeological_finds/models_finds.py:2101 msgid "Object type quality" msgstr "" -#: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1828 archaeological_finds/models_finds.py:2089 +#: archaeological_finds/forms.py:463 archaeological_finds/forms.py:1106 +#: archaeological_finds/forms.py:1839 archaeological_finds/models_finds.py:2109 msgid "Functional areas" msgstr "" -#: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1835 archaeological_finds/models_finds.py:2095 +#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:1110 +#: archaeological_finds/forms.py:1846 archaeological_finds/models_finds.py:2115 msgid "Technical areas" msgstr "" -#: archaeological_finds/forms.py:465 archaeological_finds/forms.py:768 -#: archaeological_finds/forms.py:1078 archaeological_finds/forms.py:1841 -#: archaeological_finds/forms.py:2352 archaeological_finds/models_finds.py:2022 +#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:778 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1852 +#: archaeological_finds/forms.py:2364 archaeological_finds/models_finds.py:2042 msgid "Number of remains" msgstr "" -#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:770 -#: archaeological_finds/forms.py:1080 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2024 +#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:780 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1854 +#: archaeological_finds/models_finds.py:2044 msgid "Minimum number of individuals (MNI)" msgstr "" -#: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 -#: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1845 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/forms.py:474 archaeological_finds/forms.py:782 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1856 +#: archaeological_finds/models_finds.py:2241 msgid "Inventory quantity" msgstr "" -#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 -#: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1846 -#: archaeological_finds/models_finds.py:2222 +#: archaeological_finds/forms.py:475 archaeological_finds/forms.py:783 +#: archaeological_finds/forms.py:1093 archaeological_finds/forms.py:1857 +#: archaeological_finds/models_finds.py:2242 msgid "Observed quantity" msgstr "" -#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:775 -#: archaeological_finds/models_finds.py:2027 +#: archaeological_finds/forms.py:477 archaeological_finds/forms.py:785 +#: archaeological_finds/models_finds.py:2047 msgid "Comment on quantity" msgstr "" -#: archaeological_finds/forms.py:476 archaeological_finds/forms.py:779 -#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:1992 +#: archaeological_finds/forms.py:481 archaeological_finds/forms.py:789 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2012 msgid "Decoration" msgstr "" -#: archaeological_finds/forms.py:479 archaeological_finds/forms.py:782 -#: archaeological_finds/forms.py:1850 archaeological_finds/models_finds.py:1993 +#: archaeological_finds/forms.py:484 archaeological_finds/forms.py:792 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2013 msgid "Inscription" msgstr "" -#: archaeological_finds/forms.py:482 archaeological_finds/forms.py:785 -#: archaeological_finds/forms.py:1104 archaeological_finds/forms.py:1848 -#: archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:795 +#: archaeological_finds/forms.py:1114 archaeological_finds/forms.py:1859 +#: archaeological_finds/models_finds.py:2015 msgid "Manufacturing place" msgstr "" -#: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 -#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1852 -#: archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/forms.py:490 archaeological_finds/forms.py:798 +#: archaeological_finds/forms.py:1117 archaeological_finds/forms.py:1863 +#: archaeological_finds/models_finds.py:1229 +#: archaeological_finds/models_finds.py:2133 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 -#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1858 -#: archaeological_finds/models_finds.py:2137 +#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:804 +#: archaeological_finds/forms.py:1150 archaeological_finds/forms.py:1869 +#: archaeological_finds/models_finds.py:2157 msgid "Comment on dating" msgstr "" -#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2117 +#: archaeological_finds/forms.py:503 archaeological_finds/forms.py:808 +#: archaeological_finds/forms.py:1871 archaeological_finds/models_finds.py:2137 msgid "Length (cm)" msgstr "" -#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2118 +#: archaeological_finds/forms.py:506 archaeological_finds/forms.py:809 +#: archaeological_finds/forms.py:1872 archaeological_finds/models_finds.py:2138 msgid "Width (cm)" msgstr "" -#: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:810 +#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2139 msgid "Height (cm)" msgstr "" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2122 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:813 +#: archaeological_finds/forms.py:1874 archaeological_finds/models_finds.py:2142 msgid "Thickness (cm)" msgstr "" -#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1864 archaeological_finds/models_finds.py:2120 +#: archaeological_finds/forms.py:515 archaeological_finds/forms.py:811 +#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2140 msgid "Diameter (cm)" msgstr "" -#: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1865 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:518 archaeological_finds/forms.py:812 +#: archaeological_finds/forms.py:1876 archaeological_finds/models_finds.py:2141 msgid "Circumference (cm)" msgstr "" -#: archaeological_finds/forms.py:517 archaeological_finds/forms.py:804 -#: archaeological_finds/forms.py:1866 archaeological_finds/forms.py:2350 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:814 +#: archaeological_finds/forms.py:1877 archaeological_finds/forms.py:2362 +#: archaeological_finds/models_finds.py:2037 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:2351 +#: archaeological_finds/forms.py:524 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:2363 #: archaeological_finds/templates/ishtar/sheet_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3785,141 +3850,141 @@ msgstr "" msgid "Weight (g)" msgstr "" -#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:807 -#: archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:817 +#: archaeological_finds/forms.py:1880 msgid "Clutter long side (cm)" msgstr "" -#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:810 -#: archaeological_finds/forms.py:1873 +#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1884 msgid "Clutter short side (cm)" msgstr "" -#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:1877 +#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:823 +#: archaeological_finds/forms.py:1888 msgid "Clutter height (cm)" msgstr "" -#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1880 archaeological_finds/models_finds.py:2133 +#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2153 msgid "Dimensions comment" msgstr "" -#: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1885 -#: archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2142 +#: archaeological_finds/forms.py:546 archaeological_finds/forms.py:830 +#: archaeological_finds/forms.py:1137 archaeological_finds/forms.py:1896 +#: archaeological_finds/models_finds.py:1230 +#: archaeological_finds/models_finds.py:2162 msgid "Check" msgstr "" -#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1886 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:547 archaeological_finds/forms.py:831 +#: archaeological_finds/forms.py:1138 archaeological_finds/forms.py:1897 +#: archaeological_finds/models_finds.py:2167 msgid "Check date" msgstr "" -#: archaeological_finds/forms.py:600 +#: archaeological_finds/forms.py:606 msgid "Clutter: short side cannot be bigger than the long side." msgstr "" -#: archaeological_finds/forms.py:608 +#: archaeological_finds/forms.py:614 msgid "Find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:694 archaeological_finds/models_finds.py:555 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:50 +#: archaeological_finds/forms.py:701 archaeological_finds/models_finds.py:567 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:697 archaeological_finds/forms.py:1009 -#: archaeological_finds/forms.py:1701 archaeological_finds/models_finds.py:553 +#: archaeological_finds/forms.py:704 archaeological_finds/forms.py:1019 +#: archaeological_finds/forms.py:1711 archaeological_finds/models_finds.py:565 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:701 archaeological_finds/forms.py:1798 -#: archaeological_finds/models_finds.py:566 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:32 +#: archaeological_finds/forms.py:711 archaeological_finds/forms.py:1809 +#: archaeological_finds/models_finds.py:578 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:33 #: 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:704 archaeological_finds/forms.py:1799 -#: archaeological_finds/models_finds.py:569 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:34 +#: archaeological_finds/forms.py:714 archaeological_finds/forms.py:1810 +#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:35 #: 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:707 archaeological_finds/forms.py:1800 -#: archaeological_finds/models_finds.py:573 +#: archaeological_finds/forms.py:717 archaeological_finds/forms.py:1811 +#: archaeological_finds/models_finds.py:589 msgid "Batch/object" msgstr "" -#: archaeological_finds/forms.py:710 +#: archaeological_finds/forms.py:720 msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1883 -#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/forms.py:722 archaeological_finds/forms.py:1894 +#: archaeological_finds/models_finds.py:597 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:728 archaeological_finds/forms.py:2343 +#: archaeological_finds/forms.py:738 archaeological_finds/forms.py:2355 msgid "Resulting find" msgstr "" -#: archaeological_finds/forms.py:729 +#: archaeological_finds/forms.py:739 msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:836 archaeological_finds/forms.py:2358 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2370 msgid "Resulting finds" msgstr "" -#: archaeological_finds/forms.py:837 +#: archaeological_finds/forms.py:847 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "" -#: archaeological_finds/forms.py:842 +#: archaeological_finds/forms.py:852 msgid "Number of resulting finds" msgstr "" -#: archaeological_finds/forms.py:845 +#: archaeological_finds/forms.py:855 msgid "Prefix label for resulting finds" msgstr "" -#: archaeological_finds/forms.py:848 +#: archaeological_finds/forms.py:858 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" msgstr "" -#: archaeological_finds/forms.py:853 +#: archaeological_finds/forms.py:863 msgid "Numbering starting from" msgstr "" -#: archaeological_finds/forms.py:856 +#: archaeological_finds/forms.py:866 msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1321 -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1331 +#: archaeological_finds/forms.py:1398 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1397 +#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1407 msgid "Find - Quick action - Modify" msgstr "" -#: archaeological_finds/forms.py:978 +#: archaeological_finds/forms.py:988 msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:979 archaeological_finds/forms.py:1450 -#: archaeological_finds/forms.py:1621 +#: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1631 #: archaeological_finds/templates/ishtar/sheet_find.html:283 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:309 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3930,250 +3995,250 @@ msgstr "" msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 -#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2240 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1499 +#: archaeological_finds/forms.py:1902 archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:2260 #: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 -#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:1216 -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 +#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:1232 +#: archaeological_finds/models_finds.py:2264 #: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 -#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2227 +#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1493 +#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2247 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" msgstr "" -#: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:1217 -#: archaeological_finds/models_finds.py:2250 +#: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1517 +#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1233 +#: archaeological_finds/models_finds.py:2270 #: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 -#: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2101 +#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1481 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:1227 +#: archaeological_finds/models_finds.py:2121 #: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "" -#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 -#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1131 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 +#: archaeological_finds/models_finds.py:2127 #: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:2256 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1911 archaeological_finds/models_finds.py:2276 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 -#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 -#: archaeological_finds/models_finds.py:2255 +#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1520 +#: archaeological_finds/forms.py:1910 archaeological_finds/models_finds.py:1244 +#: archaeological_finds/models_finds.py:2275 msgid "Insurance value" msgstr "" -#: archaeological_finds/forms.py:1144 +#: archaeological_finds/forms.py:1154 msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1274 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:1284 archaeological_finds/forms.py:1789 -#: archaeological_finds/forms.py:2562 archaeological_finds/forms.py:2567 -#: archaeological_finds/forms.py:2584 archaeological_finds/forms.py:2589 +#: archaeological_finds/forms.py:1294 archaeological_finds/forms.py:1799 +#: archaeological_finds/forms.py:2574 archaeological_finds/forms.py:2579 +#: archaeological_finds/forms.py:2596 archaeological_finds/forms.py:2601 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:933 -#: archaeological_finds/models_finds.py:1862 +#: archaeological_finds/models_finds.py:949 +#: archaeological_finds/models_finds.py:1882 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:420 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1317 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:1314 +#: archaeological_finds/forms.py:1324 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:1318 archaeological_finds/forms.py:1385 +#: archaeological_finds/forms.py:1328 archaeological_finds/forms.py:1395 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1407 archaeological_finds/forms.py:2458 +#: archaeological_finds/forms.py:1417 archaeological_finds/forms.py:2470 #: ishtar_common/models.py:1051 ishtar_common/models.py:2054 #: ishtar_common/models.py:3813 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:1408 archaeological_finds/forms.py:2459 +#: archaeological_finds/forms.py:1418 archaeological_finds/forms.py:2471 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2464 -#: archaeological_finds/forms.py:2506 ishtar_common/models.py:3826 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2518 ishtar_common/models.py:3826 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1420 archaeological_finds/forms.py:2471 -#: archaeological_finds/forms.py:2513 ishtar_common/models.py:3832 +#: archaeological_finds/forms.py:1430 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:2525 ishtar_common/models.py:3832 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1461 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1894 -#: archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/forms.py:1511 archaeological_finds/forms.py:1905 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2255 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1898 -#: archaeological_finds/models_finds.py:1227 -#: archaeological_finds/models_finds.py:2148 +#: archaeological_finds/forms.py:1519 archaeological_finds/forms.py:1909 +#: archaeological_finds/models_finds.py:1243 +#: archaeological_finds/models_finds.py:2168 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2231 +#: archaeological_finds/forms.py:1523 archaeological_finds/forms.py:1901 +#: archaeological_finds/models_finds.py:2251 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1563 +#: archaeological_finds/forms.py:1573 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1569 +#: archaeological_finds/forms.py:1579 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1573 +#: archaeological_finds/forms.py:1583 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1596 +#: archaeological_finds/forms.py:1606 msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:1709 archaeological_finds/models_finds.py:2318 msgid "Complete museum ID" msgstr "" -#: archaeological_finds/forms.py:1705 archaeological_finds/models_finds.py:1150 +#: archaeological_finds/forms.py:1715 archaeological_finds/models_finds.py:1166 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1706 archaeological_finds/models_finds.py:1151 +#: archaeological_finds/forms.py:1716 archaeological_finds/models_finds.py:1167 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1710 +#: archaeological_finds/forms.py:1720 msgid "Operation - number (index by year)" msgstr "" -#: archaeological_finds/forms.py:1713 +#: archaeological_finds/forms.py:1723 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1716 +#: archaeological_finds/forms.py:1726 msgid "Operation - Type" msgstr "" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1729 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1722 +#: archaeological_finds/forms.py:1732 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1733 +#: archaeological_finds/forms.py:1743 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1736 +#: archaeological_finds/forms.py:1746 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1740 +#: archaeological_finds/forms.py:1750 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1743 +#: archaeological_finds/forms.py:1753 msgid "Operation - Remains" msgstr "" -#: archaeological_finds/forms.py:1746 archaeological_operations/forms.py:472 -#: archaeological_operations/forms.py:1208 ishtar_common/forms_common.py:1570 +#: archaeological_finds/forms.py:1756 archaeological_operations/forms.py:472 +#: archaeological_operations/forms.py:1216 ishtar_common/forms_common.py:1570 #: ishtar_common/models.py:2409 ishtar_common/models.py:3482 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:91 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1749 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1757 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1760 archaeological_warehouse/forms.py:552 +#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1768 archaeological_warehouse/forms.py:560 +#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1781 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1780 +#: archaeological_finds/forms.py:1790 msgid "Context record - Type" msgstr "" -#: archaeological_finds/forms.py:1785 +#: archaeological_finds/forms.py:1795 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1797 +#: archaeological_finds/forms.py:1808 msgid "Base find - Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:1803 archaeological_finds/forms.py:2349 +#: archaeological_finds/forms.py:1814 archaeological_finds/forms.py:2361 #: archaeological_finds/models_finds.py:94 -#: archaeological_finds/models_finds.py:1207 +#: archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 #: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -4181,8 +4246,8 @@ msgstr "" msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:274 -#: archaeological_finds/models_finds.py:1208 +#: archaeological_finds/forms.py:1832 archaeological_finds/models_finds.py:274 +#: archaeological_finds/models_finds.py:1224 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 @@ -4190,112 +4255,112 @@ msgstr "" msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1867 +#: archaeological_finds/forms.py:1878 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1902 +#: archaeological_finds/forms.py:1913 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:1914 msgid "Treatment file end date" msgstr "" -#: archaeological_finds/forms.py:1904 +#: archaeological_finds/forms.py:1915 msgid "Treatment end date" msgstr "" -#: archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1917 msgid "Museum - Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1919 msgid "Museum - Owner institution" msgstr "" -#: archaeological_finds/forms.py:1914 +#: archaeological_finds/forms.py:1925 msgid "Museum - Assigned institution" msgstr "" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1931 msgid "Museum - Custodian institution" msgstr "" -#: archaeological_finds/forms.py:1925 +#: archaeological_finds/forms.py:1936 msgid "Museum - Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:1926 +#: archaeological_finds/forms.py:1937 msgid "Museum - Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:1927 +#: archaeological_finds/forms.py:1938 msgid "Museum - Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:1928 +#: archaeological_finds/forms.py:1939 msgid "Museum - Entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:1929 +#: archaeological_finds/forms.py:1940 msgid "Museum - Entry date end" msgstr "" -#: archaeological_finds/forms.py:1930 +#: archaeological_finds/forms.py:1941 msgid "Museum - Comment on entry date" msgstr "" -#: archaeological_finds/forms.py:1932 +#: archaeological_finds/forms.py:1943 msgid "Museum - Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:1938 +#: archaeological_finds/forms.py:1949 msgid "Museum - Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:1941 +#: archaeological_finds/forms.py:1952 msgid "Museum - Type of marking" msgstr "" -#: archaeological_finds/forms.py:1945 +#: archaeological_finds/forms.py:1956 msgid "Museum - Collection" msgstr "" -#: archaeological_finds/forms.py:1948 +#: archaeological_finds/forms.py:1959 msgid "Museum - Former collection" msgstr "" -#: archaeological_finds/forms.py:1953 +#: archaeological_finds/forms.py:1964 msgid "Museum - Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:1955 +#: archaeological_finds/forms.py:1966 msgid "Museum - Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:1957 +#: archaeological_finds/forms.py:1968 msgid "Museum - Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:1958 +#: archaeological_finds/forms.py:1969 msgid "Museum - Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:1960 +#: archaeological_finds/forms.py:1971 msgid "Museum - Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:1962 +#: archaeological_finds/forms.py:1973 msgid "Museum - Date of allocation" msgstr "" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1974 msgid "Museum - Purchase price" msgstr "" -#: archaeological_finds/forms.py:2035 archaeological_finds/models_finds.py:1167 -#: archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:2047 archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:2085 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4307,11 +4372,11 @@ msgstr "" msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:2042 +#: archaeological_finds/forms.py:2054 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2061 archaeological_finds/models_finds.py:1166 +#: archaeological_finds/forms.py:2073 archaeological_finds/models_finds.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:329 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:355 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4323,47 +4388,47 @@ msgstr "" msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:2080 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2088 archaeological_finds/forms.py:2109 -#: archaeological_finds/forms.py:2165 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2100 archaeological_finds/forms.py:2121 +#: archaeological_finds/forms.py:2177 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:2204 archaeological_finds/forms.py:2367 +#: archaeological_finds/forms.py:2216 archaeological_finds/forms.py:2379 #: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:2227 +#: archaeological_finds/forms.py:2239 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:2348 +#: archaeological_finds/forms.py:2360 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2363 +#: archaeological_finds/forms.py:2375 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2406 +#: archaeological_finds/forms.py:2418 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2418 archaeological_finds/forms.py:2436 +#: archaeological_finds/forms.py:2430 archaeological_finds/forms.py:2448 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2453 +#: archaeological_finds/forms.py:2465 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2456 +#: archaeological_finds/forms.py:2468 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:211 @@ -4396,11 +4461,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2498 archaeological_finds/forms.py:2553 +#: archaeological_finds/forms.py:2510 archaeological_finds/forms.py:2565 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2545 +#: archaeological_finds/forms.py:2557 msgid "Another basket already exists with this name." msgstr "" @@ -4447,8 +4512,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2574 -#: archaeological_operations/models.py:2907 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:3024 ishtar_common/views.py:511 msgid "Treatment" msgstr "" @@ -4545,8 +4610,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1269 #: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2573 -#: archaeological_operations/models.py:2899 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2690 +#: archaeological_operations/models.py:3016 ishtar_common/views.py:510 msgid "Treatment request" msgstr "" @@ -4577,8 +4642,8 @@ msgid "Treatment type is required." msgstr "" #: archaeological_finds/forms_treatments.py:498 -#: archaeological_finds/models_finds.py:2053 -#: archaeological_finds/models_finds.py:3612 +#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:3632 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:852 #: archaeological_finds/templates/ishtar/sheet_find.html:390 @@ -4775,7 +4840,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:90 -#: archaeological_operations/models.py:2578 +#: archaeological_operations/models.py:2695 #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 #: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4027 msgid "Code" @@ -4866,7 +4931,7 @@ msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:187 -#: archaeological_finds/models_finds.py:2273 +#: archaeological_finds/models_finds.py:2293 #: archaeological_finds/models_treatments.py:76 #: archaeological_finds/models_treatments.py:304 #: archaeological_finds/models_treatments.py:316 @@ -4981,107 +5046,115 @@ msgid "Checked types" msgstr "" #: archaeological_finds/models_finds.py:421 -msgid "Collection entry mode type" +msgid "Discovery method type" msgstr "" #: archaeological_finds/models_finds.py:422 +msgid "Discovery method types" +msgstr "" + +#: archaeological_finds/models_finds.py:435 +msgid "Collection entry mode type" +msgstr "" + +#: archaeological_finds/models_finds.py:436 msgid "Collection entry mode types" msgstr "" -#: archaeological_finds/models_finds.py:437 +#: archaeological_finds/models_finds.py:451 msgid "Presence of inventory marking type" msgstr "" -#: archaeological_finds/models_finds.py:438 +#: archaeological_finds/models_finds.py:452 msgid "Presence of inventory marking types" msgstr "" -#: archaeological_finds/models_finds.py:452 +#: archaeological_finds/models_finds.py:466 msgid "Marking type" msgstr "" -#: archaeological_finds/models_finds.py:453 +#: archaeological_finds/models_finds.py:467 msgid "Marking types" msgstr "" -#: archaeological_finds/models_finds.py:467 +#: archaeological_finds/models_finds.py:481 msgid "Museum collection type" msgstr "" -#: archaeological_finds/models_finds.py:468 +#: archaeological_finds/models_finds.py:482 msgid "Museum collection types" msgstr "" -#: archaeological_finds/models_finds.py:482 +#: archaeological_finds/models_finds.py:496 msgid "Inventory conformity type" msgstr "" -#: archaeological_finds/models_finds.py:483 +#: archaeological_finds/models_finds.py:497 msgid "Inventory conformity types" msgstr "" -#: archaeological_finds/models_finds.py:497 +#: archaeological_finds/models_finds.py:511 msgid "Original/reproduction type" msgstr "" -#: archaeological_finds/models_finds.py:498 +#: archaeological_finds/models_finds.py:512 msgid "Original/reproduction types" msgstr "" -#: archaeological_finds/models_finds.py:557 +#: archaeological_finds/models_finds.py:569 msgid "Special interest" msgstr "" -#: archaeological_finds/models_finds.py:579 +#: archaeological_finds/models_finds.py:595 msgid "Material index" msgstr "" -#: archaeological_finds/models_finds.py:584 +#: archaeological_finds/models_finds.py:600 #: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "" -#: archaeological_finds/models_finds.py:586 +#: archaeological_finds/models_finds.py:602 msgid "Short ID" msgstr "" -#: archaeological_finds/models_finds.py:590 -#: archaeological_finds/models_finds.py:597 -#: archaeological_finds/models_finds.py:2302 ishtar_common/models.py:4672 +#: archaeological_finds/models_finds.py:606 +#: archaeological_finds/models_finds.py:613 +#: archaeological_finds/models_finds.py:2322 ishtar_common/models.py:4672 #: ishtar_common/models.py:4679 msgid "Cached value - do not edit" msgstr "" -#: archaeological_finds/models_finds.py:593 +#: archaeological_finds/models_finds.py:609 msgid "Complete ID" msgstr "" -#: archaeological_finds/models_finds.py:614 +#: archaeological_finds/models_finds.py:630 msgid "Concatenation of associated material types codes" msgstr "" -#: archaeological_finds/models_finds.py:620 -#: archaeological_finds/models_finds.py:1974 +#: archaeological_finds/models_finds.py:636 +#: archaeological_finds/models_finds.py:1994 msgid "Base find" msgstr "" -#: archaeological_finds/models_finds.py:904 +#: archaeological_finds/models_finds.py:920 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:905 +#: archaeological_finds/models_finds.py:921 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:912 +#: archaeological_finds/models_finds.py:928 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 msgid "Associated finds" msgstr "" -#: archaeological_finds/models_finds.py:917 +#: archaeological_finds/models_finds.py:933 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -5094,620 +5167,625 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:974 archaeological_finds/views.py:539 +#: archaeological_finds/models_finds.py:990 archaeological_finds/views.py:539 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:986 +#: archaeological_finds/models_finds.py:1002 #: archaeological_warehouse/models.py:1946 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:997 +#: archaeological_finds/models_finds.py:1013 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1152 +#: archaeological_finds/models_finds.py:1168 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1173 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1174 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1175 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1177 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1163 +#: archaeological_finds/models_finds.py:1179 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1164 +#: archaeological_finds/models_finds.py:1180 msgid "Base find - Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:1181 msgid "Base find - Discovery date (end)" msgstr "" -#: archaeological_finds/models_finds.py:1194 +#: archaeological_finds/models_finds.py:1210 #: archaeological_operations/forms.py:479 #: archaeological_operations/forms.py:684 -#: archaeological_operations/forms.py:1655 -#: archaeological_operations/forms.py:1723 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1089 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5342 +#: archaeological_operations/forms.py:1699 +#: archaeological_operations/forms.py:1767 +#: archaeological_operations/models.py:1113 +#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1518 ishtar_common/models.py:5342 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" -#: archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:1242 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1311 +#: archaeological_finds/models_finds.py:1327 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1315 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_finds.py:1335 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1322 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1337 archaeological_finds/tests.py:1537 +#: archaeological_finds/models_finds.py:1353 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:1341 ishtar_common/models.py:4378 +#: archaeological_finds/models_finds.py:1357 ishtar_common/models.py:4378 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1345 -#: archaeological_operations/models.py:389 -#: archaeological_operations/models.py:1158 ishtar_common/models.py:4427 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_operations/models.py:474 +#: archaeological_operations/models.py:1275 ishtar_common/models.py:4427 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1354 +#: archaeological_finds/models_finds.py:1370 #: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1359 -#: archaeological_finds/models_finds.py:1895 +#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1915 #: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1364 +#: archaeological_finds/models_finds.py:1380 #: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1368 -#: archaeological_finds/models_finds.py:1890 +#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1910 #: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4386 #: ishtar_common/models.py:4488 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1372 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "context-record-type" msgstr "" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "discovery-comment" msgstr "" -#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1388 archaeological_finds/tests.py:1444 +#: archaeological_finds/models_finds.py:1404 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:1393 +#: archaeological_finds/models_finds.py:1409 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1397 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1401 archaeological_finds/tests.py:1691 +#: archaeological_finds/models_finds.py:1417 archaeological_finds/tests.py:1691 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1405 +#: archaeological_finds/models_finds.py:1421 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1409 +#: archaeological_finds/models_finds.py:1425 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1416 +#: archaeological_finds/models_finds.py:1432 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1420 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1424 ishtar_common/models.py:4409 +#: archaeological_finds/models_finds.py:1440 ishtar_common/models.py:4409 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1428 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1913 #: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1448 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1452 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1440 +#: archaeological_finds/models_finds.py:1456 #: archaeological_finds/wizards.py:462 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1467 #: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1454 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1470 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1456 +#: archaeological_finds/models_finds.py:1472 msgctxt "key for text search" msgid "treatment-file-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "treatment-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1464 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1471 +#: archaeological_finds/models_finds.py:1487 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1474 +#: archaeological_finds/models_finds.py:1490 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1494 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1481 +#: archaeological_finds/models_finds.py:1497 msgctxt "key for text search" msgid "complete-museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1484 +#: archaeological_finds/models_finds.py:1500 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1488 +#: archaeological_finds/models_finds.py:1504 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1491 +#: archaeological_finds/models_finds.py:1507 msgctxt "key for text search" msgid "discovery-date" msgstr "" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1511 msgctxt "key for text search" msgid "discovery-date-taq" msgstr "" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1515 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1518 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1506 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1526 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1533 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1520 +#: archaeological_finds/models_finds.py:1536 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1523 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1534 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1538 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1546 +#: archaeological_finds/models_finds.py:1562 msgctxt "key for text search" msgid "length" msgstr "" -#: archaeological_finds/models_finds.py:1549 +#: archaeological_finds/models_finds.py:1565 msgctxt "key for text search" msgid "width" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "height" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1571 msgctxt "key for text search" msgid "thickness" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1574 msgctxt "key for text search" msgid "diameter" msgstr "" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "circumference" msgstr "" -#: archaeological_finds/models_finds.py:1565 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "volume" msgstr "" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" msgid "weight" msgstr "" -#: archaeological_finds/models_finds.py:1571 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" msgid "clutter-long-side" msgstr "" -#: archaeological_finds/models_finds.py:1575 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" msgid "clutter-short-side" msgstr "" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1595 msgctxt "key for text search" msgid "clutter-height" msgstr "" -#: archaeological_finds/models_finds.py:1583 +#: archaeological_finds/models_finds.py:1599 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1603 +msgctxt "key for text search" +msgid "discovery-method" +msgstr "" + +#: archaeological_finds/models_finds.py:1607 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1591 +#: archaeological_finds/models_finds.py:1611 msgctxt "key for text search" msgid "check-date" msgstr "" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1614 #: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1618 #: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1622 #: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1626 msgctxt "key for text search" msgid "estimated-value" msgstr "" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1630 msgctxt "key for text search" msgid "insurance-value" msgstr "" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1634 msgctxt "key for text search" msgid "appraisal-date" msgstr "" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1642 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1646 msgctxt "key for text search" msgid "technical-area" msgstr "" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1650 msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1654 archaeological_finds/tests.py:1631 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1642 -#: archaeological_operations/models.py:1188 +#: archaeological_finds/models_finds.py:1662 +#: archaeological_operations/models.py:1305 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1193 +#: archaeological_finds/models_finds.py:1666 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1310 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1674 msgctxt "key for text search" msgid "operation-remain" msgstr "" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1678 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1662 +#: archaeological_finds/models_finds.py:1682 msgctxt "key for text search" msgid "museum-id-comment" msgstr "" -#: archaeological_finds/models_finds.py:1666 +#: archaeological_finds/models_finds.py:1686 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "" -#: archaeological_finds/models_finds.py:1671 +#: archaeological_finds/models_finds.py:1691 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "" -#: archaeological_finds/models_finds.py:1676 +#: archaeological_finds/models_finds.py:1696 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "" -#: archaeological_finds/models_finds.py:1681 +#: archaeological_finds/models_finds.py:1701 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "" -#: archaeological_finds/models_finds.py:1685 +#: archaeological_finds/models_finds.py:1705 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "" -#: archaeological_finds/models_finds.py:1689 +#: archaeological_finds/models_finds.py:1709 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1713 msgctxt "key for text search" msgid "museum-entry-date" msgstr "" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1717 msgctxt "key for text search" msgid "museum-entry-date-end" msgstr "" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1721 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1725 msgctxt "key for text search" msgid "museum-donor" msgstr "" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1730 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "" -#: archaeological_finds/models_finds.py:1714 +#: archaeological_finds/models_finds.py:1734 msgctxt "key for text search" msgid "museum-marking-type" msgstr "" -#: archaeological_finds/models_finds.py:1718 +#: archaeological_finds/models_finds.py:1738 msgctxt "key for text search" msgid "museum-collection" msgstr "" -#: archaeological_finds/models_finds.py:1723 +#: archaeological_finds/models_finds.py:1743 msgctxt "key for text search" msgid "museum-former-collection" msgstr "" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1748 msgctxt "key for text search" msgid "museum-inventory-entry-year" msgstr "" -#: archaeological_finds/models_finds.py:1732 +#: archaeological_finds/models_finds.py:1752 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "" -#: archaeological_finds/models_finds.py:1737 +#: archaeological_finds/models_finds.py:1757 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "" -#: archaeological_finds/models_finds.py:1741 +#: archaeological_finds/models_finds.py:1761 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "" -#: archaeological_finds/models_finds.py:1745 +#: archaeological_finds/models_finds.py:1765 msgctxt "key for text search" msgid "museum-original-repro" msgstr "" -#: archaeological_finds/models_finds.py:1750 +#: archaeological_finds/models_finds.py:1770 msgctxt "key for text search" msgid "museum-allocation-date" msgstr "" -#: archaeological_finds/models_finds.py:1754 +#: archaeological_finds/models_finds.py:1774 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "" -#: archaeological_finds/models_finds.py:1758 +#: archaeological_finds/models_finds.py:1778 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1762 +#: archaeological_finds/models_finds.py:1782 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1869 -#: archaeological_finds/models_finds.py:2668 +#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:2688 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 #: archaeological_warehouse/views.py:304 ishtar_common/models.py:4526 @@ -5717,19 +5795,19 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1877 +#: archaeological_finds/models_finds.py:1897 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:2018 +#: archaeological_finds/models_finds.py:2038 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2040 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2055 #: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5740,7 +5818,7 @@ msgstr "" msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2042 +#: archaeological_finds/models_finds.py:2062 #: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5751,108 +5829,108 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2060 +#: archaeological_finds/models_finds.py:2080 msgid "Container - first full location" msgstr "" -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:2081 +#: archaeological_finds/models_finds.py:2093 msgid "Updated as long as no packaging is attached" msgstr "" -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/models_finds.py:2092 msgid "Reference container - first full location" msgstr "" -#: archaeological_finds/models_finds.py:2124 +#: archaeological_finds/models_finds.py:2144 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2127 +#: archaeological_finds/models_finds.py:2147 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2130 +#: archaeological_finds/models_finds.py:2150 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2173 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2224 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_finds.py:2296 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2286 +#: archaeological_finds/models_finds.py:2306 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2292 +#: archaeological_finds/models_finds.py:2312 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2332 +#: archaeological_finds/models_finds.py:2352 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2506 +#: archaeological_finds/models_finds.py:2526 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2507 +#: archaeological_finds/models_finds.py:2527 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2508 +#: archaeological_finds/models_finds.py:2528 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2509 +#: archaeological_finds/models_finds.py:2529 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2510 +#: archaeological_finds/models_finds.py:2530 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2641 +#: archaeological_finds/models_finds.py:2661 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2649 +#: archaeological_finds/models_finds.py:2669 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2657 +#: archaeological_finds/models_finds.py:2677 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3135 +#: archaeological_finds/models_finds.py:3155 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3141 +#: archaeological_finds/models_finds.py:3161 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3631 +#: archaeological_finds/models_finds.py:3651 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Current" msgstr "" -#: archaeological_finds/models_finds.py:3632 +#: archaeological_finds/models_finds.py:3652 #: archaeological_finds/models_treatments.py:1198 #: archaeological_finds/templates/ishtar/sheet_find.html:420 #: archaeological_operations/forms.py:1101 #: archaeological_operations/forms.py:1198 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:500 +#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:597 #: archaeological_warehouse/forms.py:343 #: archaeological_warehouse/models.py:2103 ishtar_common/forms_common.py:2150 #: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 @@ -5861,28 +5939,28 @@ msgstr "" msgid "Reference" msgstr "" -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:3653 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Reference/current" msgstr "" -#: archaeological_finds/models_finds.py:3653 +#: archaeological_finds/models_finds.py:3673 msgid "Full location" msgstr "" -#: archaeological_finds/models_finds.py:3654 +#: archaeological_finds/models_finds.py:3674 msgid "Location type" msgstr "" -#: archaeological_finds/models_finds.py:3658 +#: archaeological_finds/models_finds.py:3678 msgid "Find - Treatment" msgstr "" -#: archaeological_finds/models_finds.py:3659 +#: archaeological_finds/models_finds.py:3679 msgid "Find - Treatments" msgstr "" -#: archaeological_finds/models_finds.py:3696 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3716 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2954 #: ishtar_common/models.py:3273 ishtar_common/models.py:3371 @@ -5892,11 +5970,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3704 +#: archaeological_finds/models_finds.py:3724 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3705 +#: archaeological_finds/models_finds.py:3725 msgid "Properties" msgstr "" @@ -5931,7 +6009,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:168 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2830 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" @@ -6102,13 +6180,13 @@ msgstr "" msgid "Internal ID" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:26 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:27 #: man_app/templates/ishtar/sheet_basefind.html:23 #: sra_idf_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:29 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:30 #: man_app/templates/ishtar/sheet_basefind.html:26 #: sra_idf_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery year" @@ -6435,8 +6513,8 @@ msgstr "" #: ishtar_common/forms.py:1211 ishtar_common/forms.py:1290 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:664 ishtar_common/views_item.py:936 -#: ishtar_common/views_item.py:973 ishtar_common/wizards.py:502 +#: ishtar_common/views_item.py:672 ishtar_common/views_item.py:944 +#: ishtar_common/views_item.py:981 ishtar_common/wizards.py:502 msgid "Yes" msgstr "" @@ -6542,7 +6620,7 @@ msgstr "" #: archaeological_operations/forms.py:1043 #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:3198 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6551,20 +6629,20 @@ msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:77 -#: archaeological_operations/models.py:3180 +#: archaeological_operations/models.py:3297 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:80 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/models.py:3299 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:82 -#: archaeological_operations/models.py:3184 -#: archaeological_operations/models.py:3212 -#: archaeological_operations/models.py:3280 +#: archaeological_operations/models.py:3301 +#: archaeological_operations/models.py:3329 +#: archaeological_operations/models.py:3397 msgid "Public domain" msgstr "" @@ -6618,26 +6696,26 @@ msgstr "" #: archaeological_operations/forms.py:461 #: archaeological_operations/forms.py:911 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:1506 +#: archaeological_operations/models.py:2178 msgid "Yearly index" msgstr "" #: archaeological_operations/forms.py:468 #: archaeological_operations/forms.py:702 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1549 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:470 #: archaeological_operations/forms.py:683 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/models.py:1648 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:478 #: archaeological_operations/forms.py:688 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/models.py:1589 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "" @@ -6648,35 +6726,35 @@ msgstr "" #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:739 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2850 +#: archaeological_operations/models.py:1495 +#: archaeological_operations/models.py:2967 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:728 -#: archaeological_operations/forms.py:1659 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:1703 +#: archaeological_operations/models.py:1488 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:736 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/models.py:1586 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:1109 -#: archaeological_operations/forms.py:1204 -#: archaeological_operations/forms.py:1324 -#: archaeological_operations/forms.py:1825 -#: archaeological_operations/models.py:306 -#: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1000 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/forms.py:1208 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1869 +#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:603 +#: archaeological_operations/models.py:1117 +#: archaeological_operations/models.py:1209 +#: archaeological_operations/models.py:1523 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -6687,26 +6765,26 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/models.py:1592 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:516 #: archaeological_operations/forms.py:797 -#: archaeological_operations/models.py:1002 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:1119 +#: archaeological_operations/models.py:1627 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:517 #: archaeological_operations/forms.py:757 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/models.py:1544 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:519 #: archaeological_operations/forms.py:710 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/models.py:1618 msgid "Virtual operation" msgstr "" @@ -6716,16 +6794,16 @@ msgstr "" #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1667 -#: archaeological_operations/models.py:1003 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:1711 +#: archaeological_operations/models.py:1120 +#: archaeological_operations/models.py:1638 msgid "Documentation provided" msgstr "" #: archaeological_operations/forms.py:543 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1671 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:1715 +#: archaeological_operations/models.py:1633 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "" @@ -6736,16 +6814,16 @@ msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1674 -#: archaeological_operations/models.py:1004 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:1718 +#: archaeological_operations/models.py:1121 +#: archaeological_operations/models.py:1644 msgid "Finds provided" msgstr "" #: archaeological_operations/forms.py:550 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1678 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:1722 +#: archaeological_operations/models.py:1640 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "" @@ -6763,8 +6841,8 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:686 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:1765 +#: archaeological_operations/models.py:1588 msgid "Generic name" msgstr "" @@ -6773,17 +6851,17 @@ msgid "Actors" msgstr "" #: archaeological_operations/forms.py:715 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2868 +#: archaeological_operations/models.py:1479 +#: archaeological_operations/models.py:2985 msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:750 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1681 -#: archaeological_operations/forms.py:1814 -#: archaeological_operations/models.py:523 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:1346 +#: archaeological_operations/forms.py:1725 +#: archaeological_operations/forms.py:1858 +#: archaeological_operations/models.py:640 +#: archaeological_operations/models.py:1502 msgid "Collaborators" msgstr "" @@ -6792,31 +6870,32 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:755 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/models.py:1473 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/models.py:1635 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/models.py:1642 msgid "Deadline for submission of the finds" msgstr "" #: archaeological_operations/forms.py:793 +#: archaeological_operations/forms.py:1353 msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:800 -#: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 +#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:806 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/models.py:1632 msgid "Abstract" msgstr "" @@ -6852,12 +6931,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:956 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/models.py:1651 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:959 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1653 msgid "Official report number" msgstr "" @@ -6866,12 +6945,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:971 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1665 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:977 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/models.py:1673 msgid "Writer of the minutes" msgstr "" @@ -6884,22 +6963,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:986 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:1528 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1532 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:989 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/models.py:1536 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:991 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1540 msgid "Effective man-days" msgstr "" @@ -6912,17 +6991,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/models.py:1560 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/models.py:1564 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1012 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/models.py:1567 msgid "Prescription on geoarchaeological context" msgstr "" @@ -6943,8 +7022,8 @@ msgid "Operation - 050 - Parcels (2)" msgstr "" #: archaeological_operations/forms.py:1134 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1837 msgid "This reference already exists." msgstr "" @@ -6960,150 +7039,200 @@ msgstr "" msgid "Archaeological site - 001 - Search" msgstr "" +#: archaeological_operations/forms.py:1203 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/models.py:600 +#: archaeological_operations/templates/ishtar/sheet_site.html:44 +#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 +msgid "Types" +msgstr "" + +#: archaeological_operations/forms.py:1206 +#: archaeological_operations/forms.py:1372 +#: archaeological_operations/models.py:619 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 +msgid "Discoverer" +msgstr "" + +#: archaeological_operations/forms.py:1211 +#: archaeological_operations/forms.py:1359 +#: archaeological_operations/models.py:616 +#: archaeological_operations/templates/ishtar/sheet_site.html:45 +msgid "Discovery status" +msgstr "" + #: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1360 +#: archaeological_operations/models.py:612 +#: archaeological_operations/templates/ishtar/sheet_site.html:46 +msgid "Current status" +msgstr "" + +#: archaeological_operations/forms.py:1213 +#: archaeological_operations/forms.py:1357 +#: archaeological_operations/models.py:621 +#: archaeological_operations/templates/ishtar/sheet_site.html:47 +msgid "Nature of site" +msgstr "" + +#: archaeological_operations/forms.py:1214 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/models.py:624 +#: archaeological_operations/templates/ishtar/sheet_site.html:48 +msgid "Interpretation level" +msgstr "" + +#: archaeological_operations/forms.py:1221 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1224 -#: archaeological_operations/forms.py:1335 -#: archaeological_operations/models.py:515 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1378 +#: archaeological_operations/models.py:630 +#: archaeological_operations/templates/ishtar/sheet_site.html:86 +msgid "Precise locality" +msgstr "" + +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/models.py:632 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/models.py:518 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1386 +#: archaeological_operations/models.py:635 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1231 -#: archaeological_operations/forms.py:1383 -#: archaeological_operations/models.py:535 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1427 +#: archaeological_operations/models.py:652 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1233 -#: archaeological_operations/forms.py:1385 -#: archaeological_operations/models.py:538 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1429 +#: archaeological_operations/models.py:655 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1387 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1431 +#: archaeological_operations/models.py:644 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1395 -#: archaeological_operations/models.py:529 +#: archaeological_operations/forms.py:1249 +#: archaeological_operations/forms.py:1439 +#: archaeological_operations/models.py:646 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1389 -#: archaeological_operations/models.py:531 +#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/models.py:648 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1391 -#: archaeological_operations/models.py:532 +#: archaeological_operations/forms.py:1254 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/models.py:649 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1245 -#: archaeological_operations/forms.py:1393 -#: archaeological_operations/models.py:533 +#: archaeological_operations/forms.py:1256 +#: archaeological_operations/forms.py:1437 +#: archaeological_operations/models.py:650 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1307 +#: archaeological_operations/forms.py:1323 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1369 -msgid "Archaeological site - 020 - Towns" +#: archaeological_operations/forms.py:1373 +msgid "Localization" msgstr "" -#: archaeological_operations/forms.py:1378 -#: archaeological_operations/templates/ishtar/sheet_site.html:52 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/templates/ishtar/sheet_site.html:60 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1379 +#: archaeological_operations/forms.py:1423 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/views.py:760 +#: archaeological_operations/forms.py:1490 +#: archaeological_operations/views.py:758 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1607 +#: archaeological_operations/forms.py:1674 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1471 -#: archaeological_operations/models.py:2875 +#: archaeological_operations/forms.py:1515 +#: archaeological_operations/models.py:2992 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1489 +#: archaeological_operations/forms.py:1533 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1523 +#: archaeological_operations/forms.py:1567 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1527 +#: archaeological_operations/forms.py:1571 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1540 +#: archaeological_operations/forms.py:1584 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1545 ishtar_common/forms.py:1334 +#: archaeological_operations/forms.py:1589 ishtar_common/forms.py:1334 #: ishtar_common/models.py:2057 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1617 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1591 +#: archaeological_operations/forms.py:1635 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1593 +#: archaeological_operations/forms.py:1637 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1614 +#: archaeological_operations/forms.py:1658 #: archaeological_operations/ishtar_menu.py:112 -#: archaeological_operations/views.py:871 +#: archaeological_operations/views.py:869 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1635 +#: archaeological_operations/forms.py:1679 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1748 +#: archaeological_operations/forms.py:1792 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1804 +#: archaeological_operations/forms.py:1848 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7111,627 +7240,706 @@ msgstr "" msgid "Administrative Act" msgstr "" -#: archaeological_operations/models.py:91 +#: archaeological_operations/models.py:93 msgid "Remain types" msgstr "" -#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:107 msgid "Parent period" msgstr "" -#: archaeological_operations/models.py:112 +#: archaeological_operations/models.py:114 msgid "Type Period" msgstr "" -#: archaeological_operations/models.py:113 +#: archaeological_operations/models.py:115 msgid "Types Period" msgstr "" -#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:130 msgid "Type of report state" msgstr "" -#: archaeological_operations/models.py:129 +#: archaeological_operations/models.py:131 msgid "Types of report state" msgstr "" -#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:141 +msgid "Current status type" +msgstr "" + +#: archaeological_operations/models.py:142 +msgid "Current status types" +msgstr "" + +#: archaeological_operations/models.py:152 +msgid "Discovery status type" +msgstr "" + +#: archaeological_operations/models.py:153 +msgid "Discovery status types" +msgstr "" + +#: archaeological_operations/models.py:163 +msgid "Nature of site type" +msgstr "" + +#: archaeological_operations/models.py:164 +msgid "Nature of site types" +msgstr "" + +#: archaeological_operations/models.py:174 +msgid "Interpretation level type" +msgstr "" + +#: archaeological_operations/models.py:175 +msgid "Interpretation level types" +msgstr "" + +#: archaeological_operations/models.py:187 msgid "Type of record quality" msgstr "" -#: archaeological_operations/models.py:147 +#: archaeological_operations/models.py:188 msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:155 ishtar_common/models_imports.py:1070 +#: archaeological_operations/models.py:200 ishtar_common/models_imports.py:1070 msgid "Cultural attribution type" msgstr "" -#: archaeological_operations/models.py:156 +#: archaeological_operations/models.py:201 msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:211 +msgid "Site type" +msgstr "" + +#: archaeological_operations/models.py:212 +msgid "Site types" +msgstr "" + +#: archaeological_operations/models.py:449 +msgctxt "key for text search" +msgid "discovery-status" +msgstr "" + +#: archaeological_operations/models.py:453 +msgctxt "key for text search" +msgid "current-status" +msgstr "" + +#: archaeological_operations/models.py:457 +msgctxt "key for text search" +msgid "nature" +msgstr "" + +#: archaeological_operations/models.py:461 +msgctxt "key for text search" +msgid "interpretation-level" +msgstr "" + +#: archaeological_operations/models.py:468 +#: archaeological_operations/models.py:1315 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:395 +#: archaeological_operations/models.py:480 +msgctxt "key for text search" +msgid "discoverer" +msgstr "" + +#: archaeological_operations/models.py:483 +msgctxt "key for text search" +msgid "public-description" +msgstr "" + +#: archaeological_operations/models.py:489 +msgctxt "key for text search" +msgid "locality" +msgstr "" + +#: archaeological_operations/models.py:492 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:495 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:499 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:503 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:410 +#: archaeological_operations/models.py:507 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:511 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:514 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:522 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:429 +#: archaeological_operations/models.py:526 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:433 +#: archaeological_operations/models.py:530 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:581 msgid "Create associated operation" msgstr "" -#: archaeological_operations/models.py:553 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:670 +#: archaeological_operations/models.py:1686 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:565 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:682 +#: archaeological_operations/models.py:1698 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:575 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:692 +#: archaeological_operations/models.py:1607 #: 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:595 +#: archaeological_operations/models.py:712 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:647 +#: archaeological_operations/models.py:764 msgid "Create an operation associated to this site" msgstr "" -#: archaeological_operations/models.py:649 +#: archaeological_operations/models.py:766 msgid "ope." msgstr "" -#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:776 msgid "Create a cluster operation for site associated to many operations" msgstr "" -#: archaeological_operations/models.py:661 +#: archaeological_operations/models.py:778 msgid "top ope." msgstr "" -#: archaeological_operations/models.py:814 ishtar_common/forms.py:1210 +#: archaeological_operations/models.py:931 ishtar_common/forms.py:1210 #: ishtar_common/models.py:5470 ishtar_common/models.py:5631 -#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1817 +#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1825 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:816 +#: archaeological_operations/models.py:933 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1188 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1189 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1190 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1191 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1192 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1193 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1077 +#: archaeological_operations/models.py:1194 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1078 +#: archaeological_operations/models.py:1195 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1079 +#: archaeological_operations/models.py:1196 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1080 +#: archaeological_operations/models.py:1197 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1081 +#: archaeological_operations/models.py:1198 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:1199 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:1204 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:1261 msgctxt "key for text search" msgid "yearly-index" msgstr "" -#: archaeological_operations/models.py:1147 +#: archaeological_operations/models.py:1264 msgctxt "key for text search" msgid "operation-old-code" msgstr "" -#: archaeological_operations/models.py:1173 +#: archaeological_operations/models.py:1290 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1180 +#: archaeological_operations/models.py:1297 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1300 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1204 +#: archaeological_operations/models.py:1321 msgctxt "key for text search" msgid "start" msgstr "" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1324 msgctxt "key for text search" msgid "end" msgstr "" -#: archaeological_operations/models.py:1211 +#: archaeological_operations/models.py:1328 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1217 +#: archaeological_operations/models.py:1334 msgctxt "key for text search" msgid "operator-reference" msgstr "" -#: archaeological_operations/models.py:1220 +#: archaeological_operations/models.py:1337 msgctxt "key for text search" msgid "has-archeo-file" msgstr "" -#: archaeological_operations/models.py:1224 +#: archaeological_operations/models.py:1341 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1344 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1348 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1235 +#: archaeological_operations/models.py:1352 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1239 +#: archaeological_operations/models.py:1356 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1365 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "" -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1369 msgctxt "key for text search" msgid "documentation-provided" msgstr "" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1373 msgctxt "key for text search" msgid "documentation-deadline" msgstr "" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1377 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "" -#: archaeological_operations/models.py:1264 +#: archaeological_operations/models.py:1381 msgctxt "key for text search" msgid "finds-provided" msgstr "" -#: archaeological_operations/models.py:1271 +#: archaeological_operations/models.py:1388 msgctxt "key for text search" msgid "finds-deadline" msgstr "" -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1392 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4405 +#: archaeological_operations/models.py:1430 ishtar_common/models.py:4405 #: ishtar_common/models.py:4491 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1521 ishtar_common/models_common.py:3395 +msgid "Surface (m2)" +msgstr "" + +#: archaeological_operations/models.py:1613 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1621 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1657 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1680 msgid "Cached label" msgstr "" -#: archaeological_operations/models.py:1591 -#: archaeological_operations/templates/ishtar/sheet_site.html:85 +#: archaeological_operations/models.py:1708 +#: archaeological_operations/templates/ishtar/sheet_site.html:94 #: ishtar_common/models.py:1006 #: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:129 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1748 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1749 msgid "List of containers with finds related to this operation" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1750 msgid "List of containers with documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1751 msgid "List of containers with finds or documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1868 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1963 msgid "No associated town" msgstr "" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1978 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:2121 msgid "context record" msgstr "" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2163 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:2094 -#: archaeological_operations/models.py:3100 +#: archaeological_operations/models.py:2211 +#: archaeological_operations/models.py:3217 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2155 +#: archaeological_operations/models.py:2272 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2165 +#: archaeological_operations/models.py:2282 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2173 +#: archaeological_operations/models.py:2290 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2298 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2235 +#: archaeological_operations/models.py:2352 #: 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:2296 -#: archaeological_operations/models.py:2375 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2492 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2340 +#: archaeological_operations/models.py:2457 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2502 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2484 +#: archaeological_operations/models.py:2601 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2485 +#: archaeological_operations/models.py:2602 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2627 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2628 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2577 +#: archaeological_operations/models.py:2694 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2582 +#: archaeological_operations/models.py:2699 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2585 +#: archaeological_operations/models.py:2702 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2589 +#: archaeological_operations/models.py:2706 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2832 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2842 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2728 +#: archaeological_operations/models.py:2845 #: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2732 +#: archaeological_operations/models.py:2849 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2861 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2865 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2752 +#: archaeological_operations/models.py:2869 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2755 +#: archaeological_operations/models.py:2872 msgctxt "key for text search" msgid "signature" msgstr "" -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:2876 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2888 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2892 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2778 +#: archaeological_operations/models.py:2895 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2782 +#: archaeological_operations/models.py:2899 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2903 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2907 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2911 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2915 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2918 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:2921 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2808 +#: archaeological_operations/models.py:2925 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2812 +#: archaeological_operations/models.py:2929 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2816 +#: archaeological_operations/models.py:2933 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2937 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2824 +#: archaeological_operations/models.py:2941 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2858 +#: archaeological_operations/models.py:2975 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2920 +#: archaeological_operations/models.py:3037 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2926 +#: archaeological_operations/models.py:3043 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:3191 +#: archaeological_operations/models.py:3308 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3193 ishtar_common/models.py:2644 +#: archaeological_operations/models.py:3310 ishtar_common/models.py:2644 #: ishtar_common/models.py:2949 ishtar_common/models.py:3956 #: ishtar_common/models_common.py:3421 ishtar_common/models_common.py:3456 #: ishtar_common/models_common.py:4394 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3485 ishtar_common/models.py:3821 +#: archaeological_operations/models.py:3602 ishtar_common/models.py:3821 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3500 +#: archaeological_operations/models.py:3617 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3501 +#: archaeological_operations/models.py:3618 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3523 ishtar_common/models.py:5338 +#: archaeological_operations/models.py:3640 ishtar_common/models.py:5338 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3526 +#: archaeological_operations/models.py:3643 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3527 +#: archaeological_operations/models.py:3644 msgid "Operation types old" msgstr "" @@ -7979,23 +8187,23 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:693 ishtar_common/models.py:1015 +#: archaeological_operations/views.py:691 ishtar_common/models.py:1015 msgid "Site deletion" msgstr "" -#: archaeological_operations/views.py:773 +#: archaeological_operations/views.py:771 msgid "Operation: new administrative act" msgstr "" -#: archaeological_operations/views.py:790 +#: archaeological_operations/views.py:788 msgid "Operation: administrative act modification" msgstr "" -#: archaeological_operations/views.py:825 +#: archaeological_operations/views.py:823 msgid "Operation: administrative act deletion" msgstr "" -#: archaeological_operations/views.py:945 +#: archaeological_operations/views.py:943 msgid "" "Syntax error on the source template \"{}\" - contact your administrator and " "ask him to check the syntax of this document." @@ -8774,12 +8982,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:665 ishtar_common/views_item.py:1635 +#: ishtar_common/views_item.py:673 ishtar_common/views_item.py:1643 msgid "True" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1637 +#: ishtar_common/views_item.py:1645 msgid "False" msgstr "" @@ -11567,10 +11775,6 @@ msgstr "" msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 -msgid "Types" -msgstr "" - #: ishtar_common/models.py:2944 msgid "Is attached to" msgstr "" @@ -13862,8 +14066,8 @@ msgstr "" msgid ", " msgstr "" -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2808 -#: ishtar_common/utils.py:2816 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2801 +#: ishtar_common/utils.py:2809 msgid "." msgstr "" @@ -14596,37 +14800,45 @@ msgid "Operations associees en tant que rapporteur CIRA" msgstr "" #: ishtar_common/templates/ishtar/sheet_person.html:103 -msgid "Associated archaeological sites as collaborator" +msgid "Associated archaeological sites as discoverer" msgstr "" #: ishtar_common/templates/ishtar/sheet_person.html:108 +msgid "Associated archaeological sites as collaborator" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:113 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:118 +#: ishtar_common/templates/ishtar/sheet_person.html:123 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:140 +#: ishtar_common/templates/ishtar/sheet_person.html:128 +msgid "Associated context records as excavator" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "In charge of treatments" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:145 +#: ishtar_common/templates/ishtar/sheet_person.html:155 msgid "In charge of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:150 +#: ishtar_common/templates/ishtar/sheet_person.html:160 msgid "Applicant of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:155 +#: ishtar_common/templates/ishtar/sheet_person.html:165 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "" @@ -15190,47 +15402,47 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:219 ishtar_common/views.py:126 +#: ishtar_common/utils.py:218 ishtar_common/views.py:126 msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:1019 +#: ishtar_common/utils.py:1018 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:1099 +#: ishtar_common/utils.py:1098 msgid "Information" msgstr "" -#: ishtar_common/utils.py:1100 +#: ishtar_common/utils.py:1099 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1999 +#: ishtar_common/utils.py:1992 msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/utils.py:2785 +#: ishtar_common/utils.py:2778 msgid "uppercase letter" msgstr "" -#: ishtar_common/utils.py:2786 +#: ishtar_common/utils.py:2779 msgid "lowercase letter" msgstr "" -#: ishtar_common/utils.py:2787 +#: ishtar_common/utils.py:2780 msgid "number" msgstr "" -#: ishtar_common/utils.py:2788 +#: ishtar_common/utils.py:2781 msgid "punctuation sign" msgstr "" -#: ishtar_common/utils.py:2807 +#: ishtar_common/utils.py:2800 msgid "This password must contain one of this character: " msgstr "" -#: ishtar_common/utils.py:2813 +#: ishtar_common/utils.py:2806 msgid "Your password must contain each of these characters: " msgstr "" @@ -15274,8 +15486,8 @@ msgstr "" msgid "New biographical note" msgstr "" -#: ishtar_common/views.py:1166 ishtar_common/views_item.py:230 -#: ishtar_common/views_item.py:273 ishtar_common/views_item.py:290 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:238 +#: ishtar_common/views_item.py:281 ishtar_common/views_item.py:298 msgid "Operation not permitted." msgstr "" @@ -15407,17 +15619,17 @@ msgstr "" msgid "Delete geographic item" msgstr "" -#: ishtar_common/views_item.py:239 +#: ishtar_common/views_item.py:247 #, python-format msgid "New %s" msgstr "" -#: ishtar_common/views_item.py:302 +#: ishtar_common/views_item.py:310 #, python-format msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:1044 +#: ishtar_common/views_item.py:1052 msgctxt "key for text search" msgid "today" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 2e853c461..9015e8dd8 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-09-17 11:29+0200\n" +"POT-Creation-Date: 2024-09-20 15:25+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-" @@ -19,25 +19,25 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 4.5.3\n" -#: archaeological_context_records/forms.py:77 -#: archaeological_context_records/forms.py:83 -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/models.py:835 +#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:84 +#: archaeological_context_records/models.py:576 +#: archaeological_context_records/models.py:842 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2739 +#: archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2759 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:386 -#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1227 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2572 -#: archaeological_operations/models.py:2688 -#: archaeological_operations/models.py:2883 -#: archaeological_operations/models.py:3173 +#: archaeological_operations/models.py:1707 +#: archaeological_operations/models.py:2671 +#: archaeological_operations/models.py:2689 +#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:3000 +#: archaeological_operations/models.py:3290 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 @@ -48,97 +48,97 @@ msgstr "" msgid "Operation" msgstr "Opération" -#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:79 msgid "Context record - 010 - Operation choice" msgstr "Unité d'enregistrement - 010 - Choix de l'opération" -#: archaeological_context_records/forms.py:93 +#: archaeological_context_records/forms.py:94 msgid "Dating - period" msgstr "Datation - période" -#: archaeological_context_records/forms.py:94 +#: archaeological_context_records/forms.py:95 msgid "Dating - precise" msgstr "Datation - datation précise" -#: archaeological_context_records/forms.py:95 +#: archaeological_context_records/forms.py:96 msgid "Dating - start date" msgstr "Datation - date de début" -#: archaeological_context_records/forms.py:96 +#: archaeological_context_records/forms.py:97 msgid "Dating - end date" msgstr "Datation - date de fin" -#: archaeological_context_records/forms.py:98 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "Datation - type de datation" -#: archaeological_context_records/forms.py:100 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "Datation - qualité de datation" -#: archaeological_context_records/forms.py:129 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "Unité d'enregistrement - 001 - Recherche" -#: archaeological_context_records/forms.py:133 archaeological_files/forms.py:88 -#: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 -#: archaeological_finds/forms.py:1693 archaeological_finds/forms.py:2409 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:88 +#: archaeological_files/forms.py:1079 archaeological_files/forms.py:1115 +#: archaeological_finds/forms.py:1703 archaeological_finds/forms.py:2421 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:557 #: archaeological_finds/forms_treatments.py:632 #: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:458 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1453 #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" msgstr "Recherche en texte intégral" -#: archaeological_context_records/forms.py:136 -#: archaeological_context_records/forms.py:316 -#: archaeological_context_records/forms.py:624 -#: archaeological_context_records/forms.py:678 -#: archaeological_context_records/models.py:847 -#: archaeological_context_records/models.py:1514 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/forms.py:639 +#: archaeological_context_records/forms.py:693 +#: archaeological_context_records/models.py:854 +#: archaeological_context_records/models.py:1525 msgid "ID" msgstr "Identifiant" -#: archaeological_context_records/forms.py:140 -#: archaeological_operations/forms.py:1716 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1760 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: archaeological_context_records/forms.py:142 +#: archaeological_context_records/forms.py:143 msgid "Operation - name" msgstr "Opération - nom" -#: archaeological_context_records/forms.py:143 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2526 msgid "Operation - year" msgstr "Opération - année" -#: archaeological_context_records/forms.py:145 +#: 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:148 -#: archaeological_context_records/forms.py:794 -#: archaeological_context_records/models.py:841 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:817 +#: archaeological_context_records/models.py:848 #: archaeological_operations/forms.py:521 -#: archaeological_operations/models.py:574 ishtar_common/models.py:5563 +#: archaeological_operations/models.py:691 ishtar_common/models.py:5563 msgid "Archaeological site" msgstr "Entité archéologique" -#: archaeological_context_records/forms.py:156 -#: archaeological_finds/forms.py:1782 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1792 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: archaeological_context_records/forms.py:158 -#: archaeological_files/templates/ishtar/sheet_file.html:188 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_context_records/forms.py:159 +#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:717 #: archaeological_finds/models_treatments.py:140 @@ -196,22 +196,29 @@ msgstr "Rechercher parmi les opérations liées" msgid "Type" msgstr "Type" -#: archaeological_context_records/forms.py:159 -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/forms.py:791 -#: archaeological_context_records/models.py:578 -#: archaeological_context_records/models.py:931 ishtar_common/admin.py:797 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:858 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +msgid "Excavator" +msgstr "Fouilleur" + +#: archaeological_context_records/forms.py:166 +#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:810 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:942 ishtar_common/admin.py:797 #: ishtar_common/models.py:3389 msgid "Activity" msgstr "Activité" -#: archaeological_context_records/forms.py:160 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/forms.py:792 -#: archaeological_context_records/models.py:577 -#: archaeological_context_records/models.py:923 -#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:741 -#: archaeological_finds/forms.py:975 +#: archaeological_context_records/forms.py:167 +#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:811 +#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:934 +#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:751 +#: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:145 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:98 #: cd17_app/templates/ishtar/sheet_find.html:155 @@ -226,38 +233,42 @@ msgstr "Activité" msgid "Identification" msgstr "Identification" -#: archaeological_context_records/forms.py:162 -#: archaeological_context_records/models.py:888 -#: archaeological_finds/forms.py:489 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2049 -#: archaeological_operations/forms.py:1206 -#: archaeological_operations/models.py:508 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/models.py:899 +#: archaeological_finds/forms.py:494 archaeological_finds/forms.py:1146 +#: archaeological_finds/forms.py:1867 archaeological_finds/models_finds.py:2069 +#: archaeological_operations/forms.py:1210 +#: archaeological_operations/models.py:606 msgid "Cultural attribution" msgstr "Attribution culturelle" -#: archaeological_context_records/forms.py:163 -#: archaeological_context_records/forms.py:330 -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:170 +#: archaeological_context_records/forms.py:345 +#: archaeological_context_records/forms.py:808 #: ishtar_common/forms_common.py:1992 ishtar_common/templates/welcome.html:12 msgid "Documentation" msgstr "Documentation" -#: archaeological_context_records/forms.py:164 -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/forms.py:345 -#: archaeological_context_records/models.py:848 -#: archaeological_context_records/models.py:1517 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 -#: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 -#: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:976 -#: archaeological_finds/forms.py:1076 archaeological_finds/forms.py:1796 +#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:337 +#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/models.py:855 +#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: archaeological_finds/forms.py:428 archaeological_finds/forms.py:433 +#: archaeological_finds/forms.py:593 archaeological_finds/forms.py:758 +#: archaeological_finds/forms.py:760 archaeological_finds/forms.py:986 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1806 #: archaeological_finds/forms_treatments.py:192 -#: archaeological_finds/models_finds.py:554 -#: archaeological_finds/models_finds.py:1991 +#: archaeological_finds/models_finds.py:566 +#: archaeological_finds/models_finds.py:2011 #: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 +#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/models.py:628 +#: archaeological_operations/templates/ishtar/sheet_site.html:54 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2164 ishtar_common/forms_common.py:2440 #: ishtar_common/models.py:1056 ishtar_common/models.py:4652 @@ -271,113 +282,115 @@ msgstr "Documentation" msgid "Description" msgstr "Description" -#: archaeological_context_records/forms.py:165 -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:849 -#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1853 -#: archaeological_finds/models_finds.py:2136 +#: archaeological_context_records/forms.py:172 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:856 +#: archaeological_finds/forms.py:492 archaeological_finds/forms.py:1864 +#: archaeological_finds/models_finds.py:2156 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "Commentaire général" -#: archaeological_context_records/forms.py:166 -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:885 +#: archaeological_context_records/forms.py:173 +#: archaeological_context_records/forms.py:352 +#: archaeological_context_records/models.py:896 msgid "Filling" msgstr "Remplissage" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:516 -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/forms.py:174 +#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/models.py:897 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:195 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:196 msgid "Interpretation" msgstr "Interprétation" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:307 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/forms.py:679 -#: archaeological_context_records/models.py:564 +#: archaeological_context_records/forms.py:175 +#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:641 +#: archaeological_context_records/forms.py:694 #: archaeological_context_records/models.py:565 -#: archaeological_context_records/models.py:819 -#: archaeological_context_records/models.py:1516 +#: archaeological_context_records/models.py:566 +#: archaeological_context_records/models.py:826 +#: archaeological_context_records/models.py:1527 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 -#: archaeological_finds/models_finds.py:1156 +#: archaeological_files/forms.py:95 archaeological_files/forms.py:1128 +#: archaeological_finds/models_finds.py:1172 #: archaeological_operations/forms.py:473 #: archaeological_operations/forms.py:1046 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:3197 -#: archaeological_operations/models.py:3491 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3608 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" -#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:176 #: archaeological_operations/forms.py:546 msgid "Has finds" msgstr "A du mobilier rattaché" -#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:178 #: archaeological_operations/forms.py:511 msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: archaeological_context_records/forms.py:173 -#: archaeological_context_records/forms.py:324 -#: archaeological_context_records/models.py:579 -#: archaeological_context_records/models.py:936 +#: archaeological_context_records/forms.py:180 +#: archaeological_context_records/forms.py:339 +#: archaeological_context_records/models.py:580 +#: archaeological_context_records/models.py:947 msgid "Excavation techniques" msgstr "Méthodes de fouille" -#: archaeological_context_records/forms.py:174 -#: archaeological_context_records/forms.py:348 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/forms.py:181 +#: archaeological_context_records/forms.py:363 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:147 msgid "Structure" msgstr "Structure" -#: archaeological_context_records/forms.py:175 -#: archaeological_context_records/forms.py:354 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/forms.py:182 +#: archaeological_context_records/forms.py:369 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:148 msgid "Texture" msgstr "Texture" -#: archaeological_context_records/forms.py:176 -#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/forms.py:183 +#: archaeological_context_records/forms.py:375 +#: archaeological_context_records/forms.py:815 msgid "Inclusions" msgstr "Inclusions" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:366 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/forms.py:184 +#: archaeological_context_records/forms.py:381 +#: archaeological_context_records/forms.py:814 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 msgid "Colors" msgstr "Couleurs" -#: archaeological_context_records/forms.py:178 -#: archaeological_context_records/forms.py:371 -#: archaeological_context_records/models.py:874 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/forms.py:185 +#: archaeological_context_records/forms.py:386 +#: archaeological_context_records/models.py:885 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 msgid "Details on color" msgstr "Précisions sur les couleurs" -#: archaeological_context_records/forms.py:217 -#: archaeological_context_records/forms.py:238 +#: archaeological_context_records/forms.py:224 +#: archaeological_context_records/forms.py:245 #: archaeological_context_records/views.py:115 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" -#: archaeological_context_records/forms.py:287 -#: archaeological_files/forms.py:205 +#: archaeological_context_records/forms.py:294 +#: archaeological_files/forms.py:209 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:651 #: archaeological_operations/forms.py:677 -#: archaeological_operations/forms.py:1306 -#: archaeological_operations/forms.py:1466 +#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1510 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -392,21 +405,21 @@ msgstr "Rechercher une Unité d'Enregistrement" msgid "General" msgstr "Général" -#: archaeological_context_records/forms.py:288 +#: archaeological_context_records/forms.py:295 msgid "Context record - 020 - General" msgstr "Unité d'enregistrement - 020 - Général" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:616 -#: archaeological_context_records/forms.py:680 -#: archaeological_context_records/forms.py:783 -#: archaeological_context_records/models.py:561 +#: archaeological_context_records/forms.py:316 +#: archaeological_context_records/forms.py:631 +#: archaeological_context_records/forms.py:695 +#: archaeological_context_records/forms.py:802 #: archaeological_context_records/models.py:562 -#: archaeological_context_records/models.py:827 -#: archaeological_finds/models_finds.py:1153 +#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:834 +#: archaeological_finds/models_finds.py:1169 #: archaeological_operations/forms.py:72 archaeological_operations/forms.py:210 #: archaeological_operations/forms.py:1018 -#: archaeological_operations/models.py:3178 +#: archaeological_operations/models.py:3295 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 @@ -416,37 +429,37 @@ msgstr "Unité d'enregistrement - 020 - Général" msgid "Town" msgstr "Commune" -#: archaeological_context_records/forms.py:313 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:321 +#: archaeological_context_records/forms.py:636 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:318 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:682 -#: archaeological_context_records/models.py:566 -#: archaeological_context_records/models.py:574 -#: archaeological_context_records/models.py:879 -#: archaeological_context_records/models.py:1515 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/forms.py:642 +#: archaeological_context_records/forms.py:697 +#: archaeological_context_records/models.py:567 +#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:890 +#: archaeological_context_records/models.py:1526 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:850 +#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/models.py:861 msgid "Opening date" msgstr "Date d'ouverture" -#: archaeological_context_records/forms.py:336 -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:248 -#: archaeological_files/models.py:629 +#: archaeological_context_records/forms.py:351 +#: archaeological_context_records/models.py:862 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_files/models.py:663 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:660 #: archaeological_finds/forms_treatments.py:753 #: archaeological_finds/models_treatments.py:276 #: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:1350 +#: archaeological_operations/models.py:1467 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1043 ishtar_common/forms.py:1044 #: na_app/templates/ishtar/sheet_operation.html:204 @@ -454,8 +467,8 @@ msgstr "Date d'ouverture" msgid "Closing date" msgstr "Date de clôture" -#: archaeological_context_records/forms.py:339 -#: archaeological_context_records/models.py:864 +#: archaeological_context_records/forms.py:354 +#: archaeological_context_records/models.py:875 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:237 #: archaeological_finds/models_treatments.py:851 @@ -465,10 +478,10 @@ msgstr "Date de clôture" msgid "Location" msgstr "Localisation" -#: archaeological_context_records/forms.py:372 +#: archaeological_context_records/forms.py:387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:155 -#: archaeological_finds/forms.py:496 archaeological_finds/forms.py:797 -#: archaeological_finds/forms.py:1604 +#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:807 +#: archaeological_finds/forms.py:1614 #: archaeological_finds/templates/ishtar/sheet_find.html:196 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:175 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -479,65 +492,66 @@ msgstr "Localisation" msgid "Dimensions" msgstr "Dimensions" -#: archaeological_context_records/forms.py:376 +#: archaeological_context_records/forms.py:391 +#: archaeological_files/forms.py:313 archaeological_files/models.py:700 msgid "Total surface (m²)" msgstr "Surface totale (m²)" -#: archaeological_context_records/forms.py:382 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/forms.py:397 +#: archaeological_context_records/models.py:863 msgid "Length (m)" msgstr "Longueur (m)" -#: archaeological_context_records/forms.py:383 -#: archaeological_context_records/models.py:853 +#: archaeological_context_records/forms.py:398 +#: archaeological_context_records/models.py:864 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 msgid "Excavated length (m)" msgstr "Longueur fouillée (m)" -#: archaeological_context_records/forms.py:384 -#: archaeological_context_records/models.py:854 +#: archaeological_context_records/forms.py:399 +#: archaeological_context_records/models.py:865 msgid "Width (m)" msgstr "Largeur (m)" -#: archaeological_context_records/forms.py:385 -#: archaeological_context_records/models.py:855 +#: archaeological_context_records/forms.py:400 +#: archaeological_context_records/models.py:866 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:168 msgid "Excavated width (m)" msgstr "Largeur fouillée (m)" -#: archaeological_context_records/forms.py:386 -#: archaeological_context_records/models.py:856 +#: archaeological_context_records/forms.py:401 +#: archaeological_context_records/models.py:867 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: archaeological_context_records/forms.py:387 -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/forms.py:402 +#: archaeological_context_records/models.py:868 msgid "Diameter (m)" msgstr "Diamètre (m)" -#: archaeological_context_records/forms.py:388 -#: archaeological_context_records/models.py:858 +#: archaeological_context_records/forms.py:403 +#: archaeological_context_records/models.py:869 msgid "Depth (m)" msgstr "Profondeur (m)" -#: archaeological_context_records/forms.py:390 -#: archaeological_context_records/models.py:860 +#: archaeological_context_records/forms.py:405 +#: archaeological_context_records/models.py:871 msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition (m)" -#: archaeological_context_records/forms.py:477 +#: archaeological_context_records/forms.py:492 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: archaeological_context_records/forms.py:482 +#: archaeological_context_records/forms.py:497 msgid "You have to choose a town or a parcel." msgstr "Vous devez choisir une commune ou une parcelle." -#: archaeological_context_records/forms.py:487 -#: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:156 -#: archaeological_finds/forms.py:1541 archaeological_finds/forms.py:1562 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/models.py:157 +#: archaeological_finds/forms.py:1551 archaeological_finds/forms.py:1572 +#: archaeological_finds/models_finds.py:2066 #: archaeological_finds/templates/ishtar/sheet_find.html:247 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:195 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -548,11 +562,11 @@ msgstr "Vous devez choisir une commune ou une parcelle." msgid "Dating" msgstr "Datation" -#: archaeological_context_records/forms.py:494 -#: archaeological_context_records/models.py:108 -#: archaeological_context_records/models.py:576 -#: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1548 -#: archaeological_finds/models_finds.py:1206 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:109 +#: archaeological_context_records/models.py:577 +#: archaeological_finds/forms.py:1143 archaeological_finds/forms.py:1558 +#: archaeological_finds/models_finds.py:1222 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 #: archaeological_operations/forms.py:803 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 @@ -570,15 +584,15 @@ msgstr "Datation" msgid "Chronological period" msgstr "Période chronologique" -#: archaeological_context_records/forms.py:495 -#: archaeological_context_records/models.py:110 -#: archaeological_files/forms.py:775 archaeological_files/models.py:76 -#: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms.py:1550 +#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/models.py:111 +#: archaeological_files/forms.py:750 archaeological_files/models.py:78 +#: archaeological_files/models.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:193 +#: archaeological_finds/forms.py:1560 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:751 -#: archaeological_finds/models_finds.py:3700 +#: archaeological_finds/models_finds.py:3720 #: archaeological_finds/models_treatments.py:275 #: archaeological_finds/models_treatments.py:849 #: archaeological_finds/templates/ishtar/sheet_find.html:438 @@ -589,9 +603,9 @@ msgstr "Période chronologique" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 #: archaeological_operations/forms.py:508 #: archaeological_operations/forms.py:752 -#: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3495 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:3612 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -616,11 +630,11 @@ msgstr "Période chronologique" msgid "Start date" msgstr "Date de début" -#: archaeological_context_records/forms.py:496 -#: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:664 archaeological_files/forms.py:780 -#: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3701 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:112 +#: archaeological_files/forms.py:639 archaeological_files/forms.py:755 +#: archaeological_files/models.py:79 archaeological_files/models.py:778 +#: archaeological_finds/forms.py:1561 archaeological_finds/models_finds.py:3721 #: archaeological_finds/models_treatments.py:850 #: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_finds/templates/ishtar/sheet_find.html:477 @@ -630,8 +644,8 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3496 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:3613 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -662,9 +676,9 @@ msgstr "Date de début" msgid "End date" msgstr "Date de fin" -#: archaeological_context_records/forms.py:497 -#: archaeological_context_records/models.py:121 -#: archaeological_finds/forms.py:1552 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:122 +#: archaeological_finds/forms.py:1562 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: cd17_app/templates/ishtar/sheet_find.html:233 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 @@ -675,10 +689,10 @@ msgstr "Date de fin" msgid "Quality" msgstr "Qualité" -#: archaeological_context_records/forms.py:498 -#: archaeological_context_records/models.py:83 -#: archaeological_context_records/models.py:114 -#: archaeological_finds/forms.py:1549 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:115 +#: archaeological_finds/forms.py:1559 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: cd17_app/templates/ishtar/sheet_find.html:232 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 @@ -689,150 +703,159 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: archaeological_context_records/forms.py:499 -#: archaeological_context_records/models.py:126 -#: archaeological_finds/forms.py:1553 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:127 +#: archaeological_finds/forms.py:1563 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "Précision sur cette datation" -#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/forms.py:525 msgid "Context record - 030 - Dating" msgstr "Unité d'enregistrement - 030 - Datation" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:532 msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:211 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:212 msgid "Dating complements" msgstr "Compléments sur la datation" -#: archaeological_context_records/forms.py:536 -#: archaeological_context_records/models.py:891 +#: archaeological_context_records/forms.py:551 +#: archaeological_context_records/models.py:902 msgid "TAQ" msgstr "TAQ" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:900 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/models.py:911 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:906 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/models.py:917 msgid "TPQ" msgstr "TPQ" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:915 +#: archaeological_context_records/forms.py:554 +#: archaeological_context_records/models.py:926 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: archaeological_context_records/forms.py:541 +#: archaeological_context_records/forms.py:556 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/forms.py:1327 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1368 +#: archaeological_operations/forms.py:1864 msgid "Cultural attributions" msgstr "Attributions culturelles" -#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:561 msgid "Comments on dating" msgstr "Précisions sur la datation" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:574 #: archaeological_operations/forms.py:586 #: archaeological_operations/forms.py:599 #: archaeological_operations/views.py:197 msgid "Operation search" msgstr "Rechercher une opération" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:579 #: archaeological_operations/forms.py:379 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: archaeological_context_records/forms.py:570 +#: archaeological_context_records/forms.py:585 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: archaeological_context_records/forms.py:580 +#: archaeological_context_records/forms.py:595 msgid "You should select a context record and a relation type." -msgstr "Vous devez sélectionner une unité d'enregistrement et un type de relation." +msgstr "" +"Vous devez sélectionner une unité d'enregistrement et un type de relation." -#: archaeological_context_records/forms.py:581 +#: archaeological_context_records/forms.py:596 msgid "A context record cannot be related to himself." msgstr "Une unité d'enregistrement ne peut être associée à elle-même." -#: archaeological_context_records/forms.py:584 +#: archaeological_context_records/forms.py:599 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1645 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1656 #: archaeological_context_records/views.py:253 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 -#: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 -#: archaeological_finds/forms.py:1774 archaeological_finds/models_finds.py:1149 -#: archaeological_finds/models_finds.py:2731 +#: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:1784 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2751 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1842 #: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5564 ishtar_common/views.py:504 msgid "Context record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/forms.py:610 +#: archaeological_context_records/forms.py:625 msgid "Context records - Relations" msgstr "Unités d'Enregistrement - Relations" -#: archaeological_context_records/forms.py:611 +#: archaeological_context_records/forms.py:626 msgid "Context record - Relations" msgstr "Unité d'Enregistrement - Relations" -#: archaeological_context_records/forms.py:714 -#: archaeological_finds/forms.py:1355 archaeological_finds/forms.py:1380 -#: archaeological_operations/forms.py:1786 ishtar_common/forms_common.py:2701 +#: archaeological_context_records/forms.py:729 +#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1390 +#: archaeological_operations/forms.py:1830 ishtar_common/forms_common.py:2701 #: ishtar_common/models.py:3545 ishtar_common/models.py:3919 msgid " - duplicate" msgstr " - copie" -#: archaeological_context_records/forms.py:744 +#: archaeological_context_records/forms.py:759 msgid "Context record - Quick action - Modify" msgstr "Unité d'enregistrement - Action rapide - Modification" -#: archaeological_context_records/forms.py:769 -#: archaeological_context_records/models.py:1406 -#: archaeological_context_records/models.py:1445 -#: archaeological_context_records/models.py:1513 +#: archaeological_context_records/forms.py:788 +#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1524 #: archaeological_operations/forms.py:383 msgid "Relation type" msgstr "Type de relation" -#: archaeological_context_records/forms.py:773 +#: archaeological_context_records/forms.py:792 #: 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:781 +#: archaeological_context_records/forms.py:800 msgid "Unit type" msgstr "Type d'unité" -#: archaeological_context_records/forms.py:790 +#: archaeological_context_records/forms.py:809 msgid "Excavation technic" msgstr "Méthode de fouille" -#: archaeological_context_records/forms.py:802 +#: archaeological_context_records/forms.py:812 +msgid "Structures" +msgstr "Structures" + +#: archaeological_context_records/forms.py:813 +msgid "Textures" +msgstr "Textures" + +#: archaeological_context_records/forms.py:825 msgid "Associated parcel" msgstr "Parcelle associée" -#: archaeological_context_records/forms.py:831 +#: archaeological_context_records/forms.py:858 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:850 +#: archaeological_context_records/forms.py:877 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -916,61 +939,61 @@ msgstr "Modification" msgid "Deletion" msgstr "Suppression" -#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:85 msgid "Dating types" msgstr "Types de datation" -#: archaeological_context_records/models.py:94 +#: archaeological_context_records/models.py:95 msgid "Dating quality type" msgstr "Type de qualité de datation" -#: archaeological_context_records/models.py:95 +#: archaeological_context_records/models.py:96 msgid "Dating quality types" msgstr "Types de qualité de datation" -#: archaeological_context_records/models.py:130 +#: archaeological_context_records/models.py:131 #: archaeological_context_records/tests.py:935 #: archaeological_finds/tests.py:1520 archaeological_finds/tests.py:1749 msgctxt "key for text search" msgid "datings-period" msgstr "datation-periode" -#: archaeological_context_records/models.py:134 +#: archaeological_context_records/models.py:135 msgctxt "key for text search" msgid "datings-precise" msgstr "datation-precise" -#: archaeological_context_records/models.py:138 +#: archaeological_context_records/models.py:139 msgctxt "key for text search" msgid "datings-start" msgstr "datation-debut" -#: archaeological_context_records/models.py:142 +#: archaeological_context_records/models.py:143 msgctxt "key for text search" msgid "datings-end" msgstr "datation-fin" -#: archaeological_context_records/models.py:146 +#: archaeological_context_records/models.py:147 msgctxt "key for text search" msgid "datings-type" msgstr "datation-type" -#: archaeological_context_records/models.py:150 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "datation-qualite" -#: archaeological_context_records/models.py:157 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "Datations" -#: archaeological_context_records/models.py:273 -#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 +#: archaeological_context_records/models.py:274 +#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:613 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2308 -#: archaeological_finds/models_finds.py:3605 -#: archaeological_finds/models_finds.py:3645 -#: archaeological_finds/models_finds.py:3688 +#: archaeological_finds/models_finds.py:2328 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/models_finds.py:3665 +#: archaeological_finds/models_finds.py:3708 #: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 @@ -983,24 +1006,24 @@ msgstr "Datations" msgid "Find" msgstr "Mobilier" -#: archaeological_context_records/models.py:298 -#: archaeological_context_records/models.py:321 -#: 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:105 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 +#: archaeological_files/models.py:77 archaeological_files/models.py:107 +#: archaeological_files/models.py:161 archaeological_files/models.py:177 +#: archaeological_files/models.py:237 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:259 #: archaeological_finds/models_finds.py:335 #: archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1982 +#: archaeological_finds/models_finds.py:2002 #: archaeological_finds/models_treatments.py:67 #: archaeological_finds/models_treatments.py:843 -#: archaeological_operations/models.py:100 -#: archaeological_operations/models.py:125 -#: archaeological_operations/models.py:143 -#: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3522 +#: archaeological_operations/models.py:102 +#: archaeological_operations/models.py:127 +#: archaeological_operations/models.py:184 +#: archaeological_operations/models.py:197 +#: archaeological_operations/models.py:3639 #: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:681 #: ishtar_common/models.py:737 ishtar_common/models.py:788 @@ -1012,215 +1035,215 @@ msgstr "Mobilier" msgid "Order" msgstr "Ordre" -#: archaeological_context_records/models.py:301 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "Type d'UE parent" -#: archaeological_context_records/models.py:308 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "Type d'Unité d'Enregistrement" -#: archaeological_context_records/models.py:309 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "Types d'Unité d'Enregistrement" -#: archaeological_context_records/models.py:324 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "Type d'activité" -#: archaeological_context_records/models.py:325 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "Types d'activité" -#: archaeological_context_records/models.py:338 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "Type d'identification" -#: archaeological_context_records/models.py:339 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "Types d'identification" -#: archaeological_context_records/models.py:352 +#: archaeological_context_records/models.py:353 msgid "Structure Type" msgstr "Type de structure" -#: archaeological_context_records/models.py:353 +#: archaeological_context_records/models.py:354 msgid "Structure Types" msgstr "Types de structure" -#: archaeological_context_records/models.py:366 +#: archaeological_context_records/models.py:367 msgid "Texture Type" msgstr "Type de texture" -#: archaeological_context_records/models.py:367 +#: archaeological_context_records/models.py:368 msgid "Texture Types" msgstr "Types de textures" -#: archaeological_context_records/models.py:380 +#: archaeological_context_records/models.py:381 msgid "Color Type" msgstr "Type de couleur" -#: archaeological_context_records/models.py:381 +#: archaeological_context_records/models.py:382 msgid "Color Types" msgstr "Types de couleur" -#: archaeological_context_records/models.py:394 +#: archaeological_context_records/models.py:395 msgid "Inclusion Type" msgstr "Type d'inclusion" -#: archaeological_context_records/models.py:395 +#: archaeological_context_records/models.py:396 msgid "Inclusion Types" msgstr "Types d'inclusion" -#: archaeological_context_records/models.py:408 +#: archaeological_context_records/models.py:409 msgid "Excavation technique type" msgstr "Type de méthode de fouille" -#: archaeological_context_records/models.py:409 +#: archaeological_context_records/models.py:410 msgid "Excavation technique types" msgstr "Types de méthode de fouille" -#: archaeological_context_records/models.py:419 +#: archaeological_context_records/models.py:420 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "Type de documentation" -#: archaeological_context_records/models.py:420 +#: archaeological_context_records/models.py:421 msgid "Documentation types" msgstr "Types de documentation" -#: archaeological_context_records/models.py:553 #: archaeological_context_records/models.py:554 -#: archaeological_context_records/models.py:1518 -#: archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1169 +#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:1529 +#: archaeological_finds/models_finds.py:1184 +#: archaeological_finds/models_finds.py:1185 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1106 -#: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/models.py:305 -#: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1001 -#: archaeological_operations/models.py:1091 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/forms.py:1207 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:601 +#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1208 +#: archaeological_operations/models.py:1529 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "Périodes" -#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:556 msgid "Datings (period)" msgstr "Datations (période)" -#: archaeological_context_records/models.py:556 #: archaeological_context_records/models.py:557 +#: archaeological_context_records/models.py:558 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: archaeological_context_records/models.py:558 +#: archaeological_context_records/models.py:559 msgid "Operation (Patriarche code)" msgstr "Opération (code Patriarche)" -#: archaeological_context_records/models.py:559 -#: archaeological_finds/models_finds.py:1154 +#: archaeological_context_records/models.py:560 +#: archaeological_finds/models_finds.py:1170 msgid "Operation (name)" msgstr "Opération (nom)" -#: archaeological_context_records/models.py:560 +#: archaeological_context_records/models.py:561 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant)" -#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:564 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: archaeological_context_records/models.py:580 -#: archaeological_finds/models_finds.py:1218 -#: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:1005 +#: archaeological_context_records/models.py:581 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1122 msgid "Associated document type" msgstr "Type de document associé" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1219 -#: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:1006 +#: archaeological_context_records/models.py:582 +#: archaeological_finds/models_finds.py:1235 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1123 msgid "Modification (year)" msgstr "Modification (année)" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:631 msgctxt "key for text search" msgid "id" msgstr "id" -#: archaeological_context_records/models.py:632 +#: archaeological_context_records/models.py:634 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:495 archaeological_finds/models_finds.py:1325 -#: archaeological_operations/models.py:386 -#: archaeological_operations/models.py:1155 +#: archaeological_files/models.py:521 archaeological_finds/models_finds.py:1341 +#: archaeological_operations/models.py:471 +#: archaeological_operations/models.py:1272 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4422 msgctxt "key for text search" msgid "town" msgstr "commune" -#: archaeological_context_records/models.py:635 ishtar_common/models.py:4382 +#: archaeological_context_records/models.py:637 ishtar_common/models.py:4382 msgctxt "key for text search" msgid "operation-year" msgstr "operation-annee" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:640 +#: archaeological_finds/models_finds.py:1670 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "operation-nom" -#: archaeological_context_records/models.py:642 -#: archaeological_operations/models.py:1151 -#: archaeological_operations/models.py:2718 +#: archaeological_context_records/models.py:644 +#: archaeological_operations/models.py:1268 +#: archaeological_operations/models.py:2835 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "patriarche" -#: archaeological_context_records/models.py:646 -#: archaeological_finds/models_finds.py:1333 +#: archaeological_context_records/models.py:648 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "operation-code" msgstr "operation-code" -#: archaeological_context_records/models.py:650 -#: archaeological_context_records/models.py:761 -#: archaeological_finds/models_finds.py:1443 -#: archaeological_finds/models_finds.py:1886 -#: archaeological_operations/models.py:421 -#: archaeological_operations/models.py:448 ishtar_common/models.py:4373 +#: archaeological_context_records/models.py:652 +#: archaeological_context_records/models.py:768 +#: archaeological_finds/models_finds.py:1459 +#: archaeological_finds/models_finds.py:1906 +#: archaeological_operations/models.py:518 +#: archaeological_operations/models.py:545 ishtar_common/models.py:4373 #: ishtar_common/models.py:4484 msgctxt "key for text search" msgid "operation" msgstr "operation" -#: archaeological_context_records/models.py:654 -#: archaeological_context_records/models.py:764 -#: archaeological_finds/models_finds.py:1349 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:1312 +#: archaeological_context_records/models.py:656 +#: archaeological_context_records/models.py:771 +#: archaeological_finds/models_finds.py:1365 +#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1429 #: archaeological_warehouse/models.py:989 ishtar_common/models.py:4414 #: ishtar_common/models.py:4493 msgctxt "key for text search" msgid "site" msgstr "site" -#: archaeological_context_records/models.py:659 +#: archaeological_context_records/models.py:661 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1380 +#: archaeological_finds/models_finds.py:1396 msgctxt "key for text search" msgid "operation-relation-type" msgstr "operation-type-relation" -#: archaeological_context_records/models.py:663 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1201 +#: archaeological_context_records/models.py:665 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1318 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1229,184 +1252,188 @@ msgctxt "key for text search" msgid "period" msgstr "periode" -#: archaeological_context_records/models.py:667 +#: archaeological_context_records/models.py:669 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "type-unite" -#: archaeological_context_records/models.py:670 +#: archaeological_context_records/models.py:672 msgctxt "key for text search" msgid "activity" msgstr "activite" -#: archaeological_context_records/models.py:673 -#: archaeological_files/models.py:498 archaeological_operations/models.py:1161 -#: archaeological_operations/models.py:2736 +#: archaeological_context_records/models.py:675 +#: archaeological_files/models.py:524 archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:2853 msgctxt "key for text search" msgid "parcel" msgstr "parcelle" -#: archaeological_context_records/models.py:677 -#: archaeological_operations/models.py:1267 +#: archaeological_context_records/models.py:679 +#: archaeological_operations/models.py:1384 msgctxt "key for text search" msgid "has-finds" msgstr "mobilier-rattache" -#: archaeological_context_records/models.py:680 +#: archaeological_context_records/models.py:682 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "ue-type-relation" -#: archaeological_context_records/models.py:684 +#: archaeological_context_records/models.py:686 msgctxt "key for text search" msgid "excavation-technique" msgstr "methode-de-fouille" -#: archaeological_context_records/models.py:688 -#: archaeological_finds/models_finds.py:1618 -#: archaeological_operations/models.py:437 +#: archaeological_context_records/models.py:690 +#: archaeological_finds/models_finds.py:1638 +#: archaeological_operations/models.py:534 msgctxt "key for text search" msgid "cultural-attribution" msgstr "attribution-culturelle" -#: archaeological_context_records/models.py:692 +#: archaeological_context_records/models.py:694 msgctxt "key for text search" msgid "identification" msgstr "identification" -#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:698 msgctxt "key for text search" msgid "documentation" msgstr "documentation" -#: archaeological_context_records/models.py:700 -#: archaeological_finds/models_finds.py:1413 archaeological_finds/tests.py:1586 -#: ishtar_common/models.py:4300 +#: archaeological_context_records/models.py:702 +#: archaeological_finds/models_finds.py:1429 archaeological_finds/tests.py:1586 +#: archaeological_operations/models.py:477 ishtar_common/models.py:4300 msgctxt "key for text search" msgid "description" msgstr "description" -#: archaeological_context_records/models.py:704 +#: archaeological_context_records/models.py:706 msgctxt "key for text search" msgid "filling" msgstr "remplissage" -#: archaeological_context_records/models.py:708 +#: archaeological_context_records/models.py:710 msgctxt "key for text search" msgid "interpretation" msgstr "interprétation" -#: archaeological_context_records/models.py:712 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:1531 -#: archaeological_operations/models.py:392 -#: archaeological_operations/models.py:1214 -#: archaeological_operations/models.py:2828 +#: archaeological_context_records/models.py:714 +#: archaeological_files/models.py:564 archaeological_finds/models_finds.py:1547 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:1331 +#: archaeological_operations/models.py:2945 #: archaeological_warehouse/models.py:972 ishtar_common/models.py:4363 msgctxt "key for text search" msgid "comment" msgstr "commentaire" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:718 msgctxt "key for text search" msgid "structure" msgstr "structure" -#: archaeological_context_records/models.py:720 +#: archaeological_context_records/models.py:722 msgctxt "key for text search" msgid "texture" msgstr "texture" -#: archaeological_context_records/models.py:724 +#: archaeological_context_records/models.py:726 msgctxt "key for text search" msgid "inclusion" msgstr "inclusion" -#: archaeological_context_records/models.py:728 +#: archaeological_context_records/models.py:730 msgctxt "key for text search" msgid "color" msgstr "couleur" -#: archaeological_context_records/models.py:732 +#: archaeological_context_records/models.py:734 msgctxt "key for text search" msgid "color-details" msgstr "precision-couleur" -#: archaeological_context_records/models.py:779 -#: archaeological_finds/models_finds.py:1845 -#: archaeological_operations/models.py:467 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:738 +msgctxt "key for text search" +msgid "excavator" +msgstr "fouilleur" + +#: archaeological_context_records/models.py:786 +#: archaeological_finds/models_finds.py:1865 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1412 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" -#: archaeological_context_records/models.py:786 -#: archaeological_finds/models_finds.py:1838 -#: archaeological_operations/models.py:474 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:793 +#: archaeological_finds/models_finds.py:1858 +#: archaeological_operations/models.py:571 +#: archaeological_operations/models.py:1405 #: archaeological_warehouse/models.py:377 #: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2619 #: ishtar_common/models.py:2900 ishtar_common/models.py:4510 msgid "Bulk update" msgstr "Modification par lot" -#: archaeological_context_records/models.py:796 -#: archaeological_context_records/models.py:1178 +#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:1189 #: archaeological_context_records/views.py:277 #: archaeological_context_records/views.py:292 -#: archaeological_finds/models_finds.py:926 -#: archaeological_finds/models_finds.py:1855 -#: archaeological_finds/models_finds.py:2633 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:942 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/models_finds.py:2653 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 -#: archaeological_operations/models.py:672 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2036 -#: archaeological_operations/views.py:1027 -#: archaeological_operations/views.py:1042 -#: archaeological_operations/views.py:1049 -#: archaeological_operations/views.py:1066 ishtar_common/admin.py:1722 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:589 +#: archaeological_operations/models.py:789 +#: archaeological_operations/models.py:1422 +#: archaeological_operations/models.py:2153 +#: archaeological_operations/views.py:1025 +#: archaeological_operations/views.py:1040 +#: archaeological_operations/views.py:1047 +#: archaeological_operations/views.py:1064 ishtar_common/admin.py:1722 #: ishtar_common/admin.py:1865 ishtar_common/models.py:4519 #: ishtar_common/models.py:4898 ishtar_common/views.py:3154 #: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "Dupliquer" -#: archaeological_context_records/models.py:813 -#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:549 -#: archaeological_finds/models_finds.py:1976 +#: archaeological_context_records/models.py:820 +#: archaeological_files/models.py:601 archaeological_finds/models_finds.py:561 +#: archaeological_finds/models_finds.py:1996 #: archaeological_finds/models_treatments.py:270 -#: archaeological_operations/models.py:3186 +#: archaeological_operations/models.py:3303 #: archaeological_warehouse/models.py:439 #: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4545 msgid "External ID" msgstr "Identifiant" -#: archaeological_context_records/models.py:815 -#: archaeological_files/models.py:570 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:1978 -#: archaeological_operations/models.py:3189 +#: archaeological_context_records/models.py:822 +#: archaeological_files/models.py:604 archaeological_finds/models_finds.py:563 +#: archaeological_finds/models_finds.py:1998 +#: archaeological_operations/models.py:3306 #: archaeological_warehouse/models.py:441 #: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" -#: archaeological_context_records/models.py:862 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3395 -msgid "Surface (m2)" -msgstr "Surface (m2)" +#: archaeological_context_records/models.py:873 +msgid "Surface (m²)" +msgstr "Surface (m²)" -#: archaeological_context_records/models.py:867 +#: archaeological_context_records/models.py:878 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:876 +#: archaeological_context_records/models.py:887 msgid "Comment on datings" msgstr "Précisions sur les datations" -#: archaeological_context_records/models.py:895 +#: archaeological_context_records/models.py:906 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -1414,11 +1441,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date" -#: archaeological_context_records/models.py:903 +#: archaeological_context_records/models.py:914 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: archaeological_context_records/models.py:910 +#: archaeological_context_records/models.py:921 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -1426,23 +1453,23 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date" -#: archaeological_context_records/models.py:918 +#: archaeological_context_records/models.py:929 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: archaeological_context_records/models.py:945 +#: archaeological_context_records/models.py:956 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2261 +#: archaeological_files/models.py:798 archaeological_finds/models_finds.py:2281 #: archaeological_finds/models_treatments.py:290 #: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2932 +#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:1595 +#: archaeological_operations/models.py:3049 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:95 +#: archaeological_operations/templates/ishtar/sheet_site.html:104 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 @@ -1456,7 +1483,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: ishtar_common/models.py:4696 ishtar_common/models_common.py:3424 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:161 +#: ishtar_common/templates/ishtar/sheet_person.html:171 #: ishtar_common/templates/ishtar/sheet_town.html:119 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1469,139 +1496,139 @@ msgstr "Estimation d'un « Terminus Post Quem »" msgid "Documents" msgstr "Documents" -#: archaeological_context_records/models.py:952 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2267 +#: archaeological_context_records/models.py:963 +#: archaeological_files/models.py:804 archaeological_finds/models_finds.py:2287 #: archaeological_finds/models_treatments.py:296 #: archaeological_finds/models_treatments.py:1255 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2939 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1601 +#: archaeological_operations/models.py:3056 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2402 #: ishtar_common/models_common.py:3430 msgid "Main image" msgstr "Image principale" -#: archaeological_context_records/models.py:957 -#: archaeological_finds/models_finds.py:2280 -#: archaeological_operations/models.py:559 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:968 +#: archaeological_finds/models_finds.py:2300 +#: archaeological_operations/models.py:676 +#: archaeological_operations/models.py:1692 msgid "Cached periods label" msgstr "Nom en cache des périodes" -#: archaeological_context_records/models.py:960 -#: archaeological_context_records/models.py:966 -#: archaeological_finds/models_finds.py:2283 -#: archaeological_finds/models_finds.py:2289 -#: archaeological_finds/models_finds.py:2295 -#: archaeological_operations/models.py:556 -#: archaeological_operations/models.py:562 -#: archaeological_operations/models.py:568 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 +#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:977 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_finds/models_finds.py:2315 +#: archaeological_operations/models.py:673 +#: archaeological_operations/models.py:679 +#: archaeological_operations/models.py:685 +#: archaeological_operations/models.py:1683 +#: archaeological_operations/models.py:1689 +#: archaeological_operations/models.py:1695 +#: archaeological_operations/models.py:1701 #: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4398 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:974 msgid "Cached related context records" msgstr "Nom en cache des unités d'enregistrements liées" -#: archaeological_context_records/models.py:970 -#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:981 +#: archaeological_context_records/models.py:982 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:562 +#: archaeological_finds/models_finds.py:574 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: archaeological_context_records/models.py:992 +#: archaeological_context_records/models.py:1003 msgctxt "short" msgid "Context record" msgstr "UE" -#: archaeological_context_records/models.py:1027 -#: archaeological_finds/models_finds.py:2505 +#: archaeological_context_records/models.py:1038 +#: archaeological_finds/models_finds.py:2525 msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" -#: archaeological_context_records/models.py:1155 +#: archaeological_context_records/models.py:1166 msgid "Add find" msgstr "Ajout mobilier" -#: archaeological_context_records/models.py:1157 +#: archaeological_context_records/models.py:1168 msgid "find" msgstr "mobilier" -#: archaeological_context_records/models.py:1166 -#: archaeological_operations/models.py:2024 +#: archaeological_context_records/models.py:1177 +#: archaeological_operations/models.py:2141 msgid "Modify relations" msgstr "Modifier les relations" -#: archaeological_context_records/models.py:1168 -#: archaeological_operations/models.py:2026 +#: archaeological_context_records/models.py:1179 +#: archaeological_operations/models.py:2143 msgid "relations" msgstr "relations" -#: archaeological_context_records/models.py:1352 -#: archaeological_finds/models_finds.py:621 +#: archaeological_context_records/models.py:1363 +#: archaeological_finds/models_finds.py:637 msgid "Base finds" msgstr "Mobilier d'origine" -#: archaeological_context_records/models.py:1407 +#: archaeological_context_records/models.py:1418 msgid "Relation types" msgstr "Types de relation" -#: archaeological_context_records/models.py:1440 +#: archaeological_context_records/models.py:1451 msgid "ID (left)" msgstr "Identifiant (gauche)" -#: archaeological_context_records/models.py:1441 +#: archaeological_context_records/models.py:1452 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: archaeological_context_records/models.py:1442 +#: archaeological_context_records/models.py:1453 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: archaeological_context_records/models.py:1443 +#: archaeological_context_records/models.py:1454 msgid "Description (left)" msgstr "Description (gauche)" -#: archaeological_context_records/models.py:1444 +#: archaeological_context_records/models.py:1455 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: archaeological_context_records/models.py:1446 +#: archaeological_context_records/models.py:1457 msgid "ID (right)" msgstr "Identifiant (droit)" -#: archaeological_context_records/models.py:1447 +#: archaeological_context_records/models.py:1458 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: archaeological_context_records/models.py:1448 +#: archaeological_context_records/models.py:1459 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: archaeological_context_records/models.py:1449 +#: archaeological_context_records/models.py:1460 msgid "Description (right)" msgstr "Description (droite)" -#: archaeological_context_records/models.py:1450 +#: archaeological_context_records/models.py:1461 msgid "Periods (right)" msgstr "Périodes (droite)" -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:1470 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:1471 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1651 +#: archaeological_context_records/models.py:1662 msgid "Context record parent" msgstr "Unité d'Enregistrement parente" @@ -1650,7 +1677,7 @@ msgid "Identification / Description" msgstr "Identification / Description" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:208 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:209 msgid "Datations" msgstr "Datations" @@ -1659,8 +1686,8 @@ msgid "Operation / Archaeological site" msgstr "Opération / Site" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 -#: archaeological_finds/forms.py:2206 archaeological_finds/models_finds.py:97 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:280 +#: archaeological_finds/forms.py:2218 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 #: archaeological_finds/models_finds.py:239 @@ -1676,18 +1703,19 @@ msgstr "Opération / Site" #: archaeological_finds/models_finds.py:383 #: archaeological_finds/models_finds.py:398 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:631 -#: archaeological_finds/models_finds.py:870 -#: archaeological_finds/models_finds.py:939 -#: archaeological_finds/models_finds.py:2309 -#: archaeological_finds/models_finds.py:2320 -#: archaeological_finds/models_finds.py:3709 +#: archaeological_finds/models_finds.py:427 +#: archaeological_finds/models_finds.py:647 +#: archaeological_finds/models_finds.py:886 +#: archaeological_finds/models_finds.py:955 +#: archaeological_finds/models_finds.py:2329 +#: archaeological_finds/models_finds.py:2340 +#: archaeological_finds/models_finds.py:3729 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_operations/templates/ishtar/sheet_site.html:100 #: archaeological_warehouse/templates/ishtar/sheet_container.html:195 #: archaeological_warehouse/templates/ishtar/sheet_container.html:242 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 @@ -1720,7 +1748,7 @@ msgstr "Relations" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:103 +#: archaeological_operations/templates/ishtar/sheet_site.html:112 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1775,13 +1803,13 @@ msgstr "Champs personnalisés" msgid "Complete identifier" msgstr "Identifiant complet" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 msgid "Inclusion" msgstr "Inclusion" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_files/templates/ishtar/sheet_file.html:272 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1791,11 +1819,11 @@ msgid "Surface" msgstr "Surface" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 -#: archaeological_files/forms.py:283 +#: archaeological_files/forms.py:289 #: archaeological_files/templates/ishtar/sheet_file.html:88 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:59 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_operations/templates/ishtar/sheet_site.html:74 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:110 #: man_app/templates/ishtar/sheet_basefind.html:56 @@ -1805,25 +1833,25 @@ msgstr "Surface" msgid "Geographic localisation" msgstr "Localisation géographique" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:239 -#: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 -#: archaeological_finds/forms.py:977 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:242 +#: archaeological_finds/forms.py:545 archaeological_finds/forms.py:829 +#: archaeological_finds/forms.py:987 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:71 #: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 -#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_operations/templates/ishtar/sheet_site.html:117 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 -#: ishtar_common/templates/ishtar/sheet_person.html:166 +#: ishtar_common/templates/ishtar/sheet_person.html:176 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1834,22 +1862,22 @@ msgstr "Localisation géographique" msgid "Sheet" msgstr "Fiche" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 msgid "Operation summary" msgstr "Résumé de l'opération" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:231 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:236 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 msgid "Numerical reference" msgstr "Référence numérique" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:242 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:141 #: archaeological_finds/models_treatments.py:230 @@ -1884,7 +1912,7 @@ msgstr "Référence numérique" msgid "State" msgstr "État" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 @@ -1892,14 +1920,14 @@ msgstr "État" msgid "Active file" msgstr "Dossier actif" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "Opération close" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:250 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:251 #: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 @@ -1907,41 +1935,41 @@ msgstr "Opération close" msgid "by" msgstr "par" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:262 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 msgid "No operation linked to this context record!" msgstr "Pas d'opération liée à cette Unité d'Enregistrement !" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:284 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:285 msgid "No associated finds." msgstr "Pas de mobilier associé." -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:301 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:307 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:308 msgid "Diagram of stratigraphic relations - above" msgstr "Diagramme de relations stratigraphiques - au dessus de" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:315 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:316 msgid "Diagram of stratigraphic relations - below" msgstr "Diagramme de relations stratigraphiques - au dessous de" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:323 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:324 msgid "Diagram of stratigraphic relations - full" msgstr "Diagramme de relations stratigraphiques - complet" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:339 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:340 msgid "Document from this context record" msgstr "Document associé à cette Unité d'Enregistrement" @@ -1958,31 +1986,31 @@ msgid "Context record deletion" msgstr "Supprimer une Unité d'Enregistrement" #: archaeological_context_records/views.py:259 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:2119 msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" -#: archaeological_files/admin.py:139 +#: archaeological_files/admin.py:141 msgid "Copy from" msgstr "Copier depuis" -#: archaeological_files/admin.py:143 +#: archaeological_files/admin.py:145 msgid "To" msgstr "Vers" -#: archaeological_files/admin.py:160 archaeological_files/tests.py:301 +#: archaeological_files/admin.py:162 archaeological_files/tests.py:301 msgid "Source and destination must be different." msgstr "Source et destination doivent être différents." -#: archaeological_files/admin.py:180 +#: archaeological_files/admin.py:182 msgid "Cannot change price agreement." msgstr "Impossible de changer le contrat tarifaire." -#: archaeological_files/admin.py:212 +#: archaeological_files/admin.py:214 msgid "{} item(s) created." msgstr "{} élément(s) créés." -#: archaeological_files/admin.py:216 +#: archaeological_files/admin.py:218 msgid "{} item(s) already in database." msgstr "{} élément(s) existe(nt) déjà en base de données." @@ -1990,12 +2018,12 @@ msgstr "{} élément(s) existe(nt) déjà en base de données." msgid "File - 001 - Search" msgstr "Dossier - 001 - Recherche" -#: archaeological_files/forms.py:91 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:234 archaeological_files/forms.py:656 -#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:212 -#: archaeological_finds/forms.py:1708 +#: archaeological_files/forms.py:91 archaeological_files/forms.py:215 +#: archaeological_files/forms.py:631 archaeological_files/forms.py:1086 +#: archaeological_files/forms.py:1122 archaeological_files/models.py:429 +#: archaeological_files/models.py:593 +#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_finds/forms.py:1718 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:407 @@ -2003,57 +2031,57 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_finds/forms_treatments.py:637 #: archaeological_finds/forms_treatments.py:708 #: archaeological_finds/forms_treatments.py:819 -#: archaeological_finds/models_finds.py:1200 +#: archaeological_finds/models_finds.py:1216 #: archaeological_finds/models_treatments.py:215 #: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:74 archaeological_operations/forms.py:460 #: archaeological_operations/forms.py:697 -#: archaeological_operations/forms.py:1413 -#: archaeological_operations/forms.py:1718 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2686 -#: archaeological_operations/models.py:2911 -#: archaeological_operations/models.py:3176 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1762 +#: archaeological_operations/models.py:1114 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:3028 +#: archaeological_operations/models.py:3293 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 msgid "Year" msgstr "Année" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:237 -#: archaeological_files/forms.py:662 archaeological_files/models.py:561 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:637 +#: archaeological_files/models.py:595 msgid "Numeric reference" msgstr "Identifiant numérique" -#: archaeological_files/forms.py:93 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1149 archaeological_operations/forms.py:1103 +#: archaeological_files/forms.py:93 archaeological_files/forms.py:1088 +#: archaeological_files/forms.py:1124 archaeological_operations/forms.py:1103 #: archaeological_operations/forms.py:1201 -#: archaeological_operations/forms.py:1318 -#: archaeological_operations/forms.py:1415 -#: archaeological_operations/forms.py:1480 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:2914 +#: archaeological_operations/forms.py:1343 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1524 +#: archaeological_operations/models.py:598 +#: archaeological_operations/models.py:3031 msgid "Other reference" msgstr "Autre référence" -#: archaeological_files/forms.py:98 archaeological_files/forms.py:1119 -#: archaeological_files/forms.py:1156 archaeological_files/models.py:1396 +#: archaeological_files/forms.py:98 archaeological_files/forms.py:1094 +#: archaeological_files/forms.py:1131 archaeological_files/models.py:1438 #: archaeological_operations/forms.py:476 -#: archaeological_operations/forms.py:1426 -#: archaeological_operations/models.py:2558 ishtar_common/models_common.py:2070 +#: archaeological_operations/forms.py:1470 +#: archaeological_operations/models.py:2675 ishtar_common/models_common.py:2070 #: ishtar_common/models_common.py:3404 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: archaeological_files/forms.py:100 archaeological_files/forms.py:1161 +#: archaeological_files/forms.py:100 archaeological_files/forms.py:1136 msgid "File name" msgstr "Nom du dossier" -#: archaeological_files/forms.py:101 archaeological_files/forms.py:209 -#: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:573 +#: archaeological_files/forms.py:101 archaeological_files/forms.py:213 +#: archaeological_files/models.py:430 archaeological_files/models.py:435 +#: archaeological_files/models.py:607 msgid "File type" msgstr "Type de dossier" @@ -2061,41 +2089,52 @@ msgstr "Type de dossier" msgid "Is active?" msgstr "Est actif ?" -#: archaeological_files/forms.py:103 archaeological_files/forms.py:263 -#: archaeological_files/forms.py:540 +#: archaeological_files/forms.py:103 archaeological_files/forms.py:291 +#: archaeological_files/models.py:372 archaeological_files/models.py:757 +#: archaeological_files/templates/ishtar/sheet_file.html:120 +msgid "Development type" +msgstr "Nature de l'aménagement" + +#: archaeological_files/forms.py:104 archaeological_files/forms.py:269 msgid "Saisine type" msgstr "Type de saisine" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:262 -#: archaeological_files/forms.py:524 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:622 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:447 +#: archaeological_files/models.py:761 +#: archaeological_files/templates/ishtar/sheet_file.html:121 +msgid "Monitoring justification" +msgstr "Motivation de la prescription" + +#: archaeological_files/forms.py:106 archaeological_files/forms.py:268 +#: archaeological_files/models.py:323 archaeological_files/models.py:434 +#: archaeological_files/models.py:656 msgid "Permit type" msgstr "Type de permis" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:464 -#: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:130 +#: archaeological_files/forms.py:107 archaeological_files/forms.py:449 +#: archaeological_files/models.py:661 +#: archaeological_files/templates/ishtar/sheet_file.html:133 #: 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:106 archaeological_files/forms.py:653 -#: archaeological_files/models.py:675 archaeological_finds/forms.py:791 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 -#: archaeological_finds/forms.py:2460 +#: archaeological_files/forms.py:108 archaeological_files/forms.py:628 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:801 +#: archaeological_finds/forms.py:1134 archaeological_finds/forms.py:1419 +#: archaeological_finds/forms.py:2472 #: archaeological_finds/forms_treatments.py:194 #: archaeological_finds/forms_treatments.py:745 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:512 #: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1479 -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2928 +#: archaeological_operations/forms.py:1219 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1523 +#: archaeological_operations/models.py:627 +#: archaeological_operations/models.py:1590 +#: archaeological_operations/models.py:3045 #: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 #: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 #: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 @@ -2109,55 +2148,54 @@ msgstr "Référence du permis / de l'arrêté" msgid "Comment" msgstr "Commentaire" -#: archaeological_files/forms.py:108 archaeological_files/forms.py:375 -#: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/forms.py:110 archaeological_files/forms.py:378 +#: archaeological_files/forms.py:436 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "Responsable" -#: archaeological_files/forms.py:118 archaeological_files/forms.py:345 -#: archaeological_files/forms.py:355 archaeological_files/forms.py:496 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:585 +#: archaeological_files/forms.py:120 archaeological_files/forms.py:356 +#: archaeological_files/forms.py:366 archaeological_files/forms.py:1138 +#: archaeological_files/models.py:619 msgid "General contractor" msgstr "Aménageur" -#: archaeological_files/forms.py:128 archaeological_files/forms.py:1173 +#: archaeological_files/forms.py:130 archaeological_files/forms.py:1148 msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" -#: archaeological_files/forms.py:139 archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:1179 #: archaeological_operations/forms.py:528 ishtar_common/forms.py:956 msgid "Created by" msgstr "Créée par" -#: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 +#: archaeological_files/forms.py:149 archaeological_files/forms.py:1187 #: archaeological_finds/forms_treatments.py:578 #: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:534 msgid "Modified by" msgstr "Modifiée par" -#: archaeological_files/forms.py:170 archaeological_files/forms.py:187 +#: archaeological_files/forms.py:174 archaeological_files/forms.py:191 msgid "Archaeological file search" msgstr "Rechercher un dossier archéologique" -#: archaeological_files/forms.py:206 +#: archaeological_files/forms.py:210 msgid "Archaeological file - 010 - General" msgstr "Dossier archéologique - 010 - Général" -#: archaeological_files/forms.py:218 archaeological_files/models.py:642 +#: archaeological_files/forms.py:222 archaeological_files/models.py:676 #: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2160 +#: archaeological_operations/models.py:1466 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4646 ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "Date de création" -#: archaeological_files/forms.py:219 archaeological_files/forms.py:541 -#: archaeological_files/models.py:644 +#: archaeological_files/forms.py:223 archaeological_files/models.py:678 #: archaeological_finds/forms_treatments.py:748 #: archaeological_finds/models_treatments.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:514 @@ -2170,43 +2208,39 @@ msgstr "Date de création" msgid "Reception date" msgstr "Date de réception" -#: archaeological_files/forms.py:228 +#: archaeological_files/forms.py:232 msgid "Reception date cannot be after today." msgstr "La date de réception ne peut pas être dans le futur." -#: archaeological_files/forms.py:250 -msgid "Another file with this numeric id exists." -msgstr "Un autre dossier avec cet identifiant numérique existe." - -#: archaeological_files/forms.py:256 +#: archaeological_files/forms.py:262 msgid "Archaeological file - 013 - Preventive - Saisine" msgstr "Dossier archéologique - 013 - Préventif - Saisine" -#: archaeological_files/forms.py:277 +#: archaeological_files/forms.py:283 msgid "Planning" msgstr "Aménagement" -#: archaeological_files/forms.py:278 +#: archaeological_files/forms.py:284 msgid "Archaeological file - 017 - Preventive - Planning" msgstr "Dossier archéologique - 017 - Préventif - Aménagement" -#: archaeological_files/forms.py:284 +#: archaeological_files/forms.py:290 msgid "Planning name" msgstr "Nom de l'aménagement" -#: archaeological_files/forms.py:286 archaeological_files/forms.py:330 -#: archaeological_files/models.py:475 archaeological_files/models.py:639 +#: archaeological_files/forms.py:294 archaeological_files/forms.py:341 +#: archaeological_files/models.py:501 archaeological_files/models.py:673 #: archaeological_operations/forms.py:691 #: archaeological_operations/forms.py:1016 #: archaeological_operations/forms.py:1032 #: archaeological_operations/forms.py:1037 -#: archaeological_operations/forms.py:1368 -#: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:511 -#: archaeological_operations/models.py:1088 -#: archaeological_operations/models.py:1090 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2923 +#: archaeological_operations/forms.py:1375 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:609 +#: archaeological_operations/models.py:1205 +#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1526 +#: archaeological_operations/models.py:3040 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1794 ishtar_common/forms_common.py:1808 #: ishtar_common/forms_common.py:1809 ishtar_common/models.py:2383 @@ -2218,50 +2252,44 @@ msgstr "Nom de l'aménagement" msgid "Towns" msgstr "Communes" -#: archaeological_files/forms.py:290 archaeological_files/forms.py:333 -#: archaeological_files/models.py:678 archaeological_operations/models.py:2917 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:344 +#: archaeological_files/models.py:712 archaeological_operations/models.py:3034 #: ishtar_common/models_common.py:2071 msgid "Departments" msgstr "Départements" -#: archaeological_files/forms.py:292 +#: archaeological_files/forms.py:300 msgid "Only relevant when no town is provided." msgstr "Seulement pertinent quand aucune commune n'est renseignée." -#: archaeological_files/forms.py:294 archaeological_files/forms.py:335 -#: archaeological_files/models.py:670 +#: archaeological_files/forms.py:302 archaeological_files/forms.py:346 +#: archaeological_files/models.py:704 msgid "Locality" msgstr "Lieu-dit" -#: archaeological_files/forms.py:296 archaeological_files/forms.py:337 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:348 msgid "Address (number/street)" msgstr "Adresse (n° / voie)" -#: archaeological_files/forms.py:297 archaeological_files/forms.py:338 +#: archaeological_files/forms.py:305 archaeological_files/forms.py:349 msgid "Number/street" msgstr "N° / voie" -#: archaeological_files/forms.py:300 archaeological_files/forms.py:341 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:352 #: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3690 msgid "Postal code" msgstr "Code postal" -#: archaeological_files/forms.py:301 archaeological_files/forms.py:736 +#: archaeological_files/forms.py:309 archaeological_files/forms.py:711 msgid "Surfaces" msgstr "Surfaces" -#: archaeological_files/forms.py:305 archaeological_files/forms.py:811 -#: archaeological_files/models.py:666 archaeological_operations/forms.py:706 -msgid "Total surface (m2)" -msgstr "Surface totale (m2)" - -#: archaeological_files/forms.py:313 archaeological_files/forms.py:532 -#: archaeological_files/forms.py:801 archaeological_files/models.py:668 -msgid "Total developed surface (m2)" -msgstr "Surface totale aménagée (m2)" +#: archaeological_files/forms.py:321 archaeological_files/models.py:702 +msgid "Total developed surface (m²)" +msgstr "Surface totale aménagée (m²)" -#: archaeological_files/forms.py:323 +#: archaeological_files/forms.py:334 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 @@ -2270,224 +2298,224 @@ msgstr "Surface totale aménagée (m2)" msgid "Address" msgstr "Adresse" -#: archaeological_files/forms.py:324 +#: archaeological_files/forms.py:335 msgid "Archaeological file - 015 - Research - Address" msgstr "Dossier archéologique - 015 - Recherche - Adresse" -#: archaeological_files/forms.py:328 +#: archaeological_files/forms.py:339 msgid "Project name" msgstr "Nom du projet" -#: archaeological_files/forms.py:346 +#: archaeological_files/forms.py:357 msgid "Archaeological file - 030 - General contractor" msgstr "Dossier archéologique - 030 - Aménageur" -#: archaeological_files/forms.py:401 archaeological_files/forms.py:475 +#: archaeological_files/forms.py:399 archaeological_files/forms.py:464 msgid "Non existing person." msgstr "Personne inexistante." -#: archaeological_files/forms.py:408 +#: archaeological_files/forms.py:406 msgid "" "The organization of the person in charge differs from the general contractor." msgstr "" "L'organisation de la personne responsable diffère de celle de l'aménageur." -#: archaeological_files/forms.py:416 archaeological_files/forms.py:425 +#: archaeological_files/forms.py:414 archaeological_files/forms.py:424 msgid "Planning service" msgstr "Service instructeur" -#: archaeological_files/forms.py:417 +#: archaeological_files/forms.py:415 msgid "Archaeological file - 040 - Planning service" msgstr "Dossier archéologique - 040 - Service aménageur" -#: archaeological_files/forms.py:466 archaeological_files/models.py:646 +#: archaeological_files/forms.py:451 archaeological_files/models.py:680 msgid "Date of planning service file" msgstr "Date du dossier du service instructeur" -#: archaeological_files/forms.py:479 +#: archaeological_files/forms.py:468 msgid "" "The organization of the person in charge differs from the planning service." msgstr "" "L'organisation de la personne responsable diffère de celle du service " "instructeur." -#: archaeological_files/forms.py:488 -msgid "Preventive informations" -msgstr "Information archéologie préventive" - -#: archaeological_files/forms.py:510 archaeological_files/models.py:606 -msgid "Responsible for planning service" -msgstr "Responsable pour le service instructeur" - -#: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:143 +#: archaeological_files/forms.py:544 +#: archaeological_files/templates/ishtar/sheet_file.html:146 msgid "Research archaeology" msgstr "Archéologie programmée" -#: archaeological_files/forms.py:559 +#: archaeological_files/forms.py:545 msgid "Archaeological file - 045 - Research - General" msgstr "Dossier archéologique - 045 - Recherche - Général" -#: archaeological_files/forms.py:585 archaeological_files/models.py:702 +#: archaeological_files/forms.py:561 archaeological_files/models.py:736 #: archaeological_operations/forms.py:495 msgid "Scientist in charge" msgstr "Responsable d'opération" -#: archaeological_files/forms.py:588 archaeological_files/models.py:686 +#: archaeological_files/forms.py:565 archaeological_files/models.py:720 msgid "Requested operation type" msgstr "Type d'opération demandée" -#: archaeological_files/forms.py:591 +#: archaeological_files/forms.py:569 msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:169 +#: archaeological_files/forms.py:583 archaeological_files/models.py:739 +#: archaeological_files/templates/ishtar/sheet_file.html:172 msgid "Research archaeology comment" msgstr "Précisions sur l'archéologie programmée" -#: archaeological_files/forms.py:614 archaeological_files/models.py:708 +#: archaeological_files/forms.py:592 archaeological_files/models.py:742 msgid "Classified area" msgstr "Au sein d'un site classé" -#: archaeological_files/forms.py:615 archaeological_files/models.py:710 +#: archaeological_files/forms.py:593 archaeological_files/models.py:744 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" -#: archaeological_files/forms.py:628 +#: archaeological_files/forms.py:606 msgid "Instruction" msgstr "Instruction" -#: archaeological_files/forms.py:629 +#: archaeological_files/forms.py:607 msgid "Archaeological file - 050 - Instruction" msgstr "Dossier archéologique - 050 - Instruction" -#: archaeological_files/forms.py:633 +#: archaeological_files/forms.py:611 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "Dossier géré par" -#: archaeological_files/forms.py:646 archaeological_files/models.py:650 +#: archaeological_files/forms.py:621 archaeological_files/models.py:684 msgid "Related file" msgstr "Dossier associé" -#: archaeological_files/forms.py:654 archaeological_files/models.py:664 +#: archaeological_files/forms.py:629 archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "Date limite d'instruction" -#: archaeological_files/forms.py:719 +#: archaeological_files/forms.py:694 msgid "Would you like to close this archaeological file?" msgstr "Voulez-vous clore ce dossier archéologique ?" -#: archaeological_files/forms.py:724 +#: archaeological_files/forms.py:699 msgid "Would you like to delete this archaeological file ?" msgstr "Voulez-vous supprimer ce dossier archéologique ?" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:703 msgid "Preventive file" msgstr "Dossier préventif" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:704 msgid "Preventive file - 020 - Edition form" msgstr "Dossier préventif - 020 - Formulaire d'édition" -#: archaeological_files/forms.py:735 ishtar_common/forms_common.py:2225 +#: archaeological_files/forms.py:710 ishtar_common/forms_common.py:2225 #: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "Dates" -#: archaeological_files/forms.py:737 +#: archaeological_files/forms.py:712 msgid "Archaeological royalties" msgstr "Redevances archéologiques" -#: archaeological_files/forms.py:760 archaeological_files/models.py:727 +#: archaeological_files/forms.py:735 archaeological_files/models.py:769 msgid "Intervention period" msgstr "Période d'intervention" -#: archaeological_files/forms.py:765 archaeological_files/models.py:730 +#: archaeological_files/forms.py:740 archaeological_files/models.py:772 msgid "Study period" msgstr "Période d'étude" -#: archaeological_files/forms.py:770 archaeological_files/models.py:733 +#: archaeological_files/forms.py:745 archaeological_files/models.py:775 msgid "Report due period" msgstr "Période de remise du rapport" -#: archaeological_files/forms.py:785 archaeological_files/models.py:737 +#: archaeological_files/forms.py:760 archaeological_files/models.py:779 msgid "Ground start date" msgstr "Date de début de la fouille" -#: archaeological_files/forms.py:790 archaeological_files/models.py:738 +#: archaeological_files/forms.py:765 archaeological_files/models.py:780 msgid "Ground end date" msgstr "Date de fin de la fouille" -#: archaeological_files/forms.py:795 archaeological_files/models.py:740 +#: archaeological_files/forms.py:770 archaeological_files/models.py:782 msgid "Execution report date" msgstr "Date du rapport d'exécution" -#: archaeological_files/forms.py:818 +#: archaeological_files/forms.py:776 +msgid "Total developed surface (m2)" +msgstr "Surface totale aménagée (m2)" + +#: archaeological_files/forms.py:786 archaeological_operations/forms.py:706 +msgid "Total surface (m2)" +msgstr "Surface totale (m2)" + +#: archaeological_files/forms.py:793 msgid "Linear meter (m)" msgstr "Mètre linéaire (m)" -#: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/forms.py:853 archaeological_files/forms.py:855 #: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:295 #: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 msgid "Man by day" msgstr "Personnes par jour" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/forms.py:854 archaeological_files/forms.py:856 #: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:296 #: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:348 msgid "Days" msgstr "Jours" -#: archaeological_files/forms.py:882 archaeological_files/models.py:116 -#: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/forms.py:857 archaeological_files/models.py:118 +#: archaeological_files/models.py:1480 archaeological_files/models.py:1499 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Job" msgstr "Emploi" -#: archaeological_files/forms.py:903 archaeological_files/models.py:80 -#: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:723 +#: archaeological_files/forms.py:878 archaeological_files/models.py:82 +#: archaeological_files/models.py:83 archaeological_files/models.py:95 +#: archaeological_files/models.py:208 archaeological_files/models.py:765 msgid "Price agreement" msgstr "Contrat tarifaire" -#: archaeological_files/forms.py:961 +#: archaeological_files/forms.py:936 msgid "Post-excavation" msgstr "Post-fouille" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:937 msgid "Preventive file - 030 - Post-excavation" msgstr "Dossier préventif - 030 - Post-fouille" -#: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/forms.py:961 +#: archaeological_files/templates/ishtar/sheet_file.html:282 msgid "Ground jobs" msgstr "Emplois de terrain" -#: archaeological_files/forms.py:988 +#: archaeological_files/forms.py:963 msgid "Preventive file - 040 - Ground jobs" msgstr "Dossier préventif - 040 - Emplois de terrain" -#: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/forms.py:969 archaeological_files/forms.py:971 #: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 msgid "Quantity" msgstr "Quantité" -#: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/forms.py:973 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Equipment / service" msgstr "Équipement / service" -#: archaeological_files/forms.py:1112 archaeological_files/forms.py:1148 -#: archaeological_files/forms.py:1278 +#: archaeological_files/forms.py:1087 archaeological_files/forms.py:1123 +#: archaeological_files/forms.py:1253 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 #: archaeological_finds/forms_treatments.py:562 @@ -2500,9 +2528,9 @@ msgstr "Équipement / service" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 -#: archaeological_operations/forms.py:1414 -#: archaeological_operations/forms.py:1535 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2970 #: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 #: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:619 @@ -2514,84 +2542,84 @@ msgstr "Équipement / service" msgid "Index" msgstr "Index" -#: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 -#: archaeological_files/forms.py:1267 +#: archaeological_files/forms.py:1089 archaeological_files/forms.py:1125 +#: archaeological_files/forms.py:1242 #: archaeological_finds/forms_treatments.py:563 #: archaeological_finds/forms_treatments.py:610 #: archaeological_finds/forms_treatments.py:821 #: archaeological_finds/forms_treatments.py:873 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1469 -#: archaeological_operations/models.py:2588 -#: archaeological_operations/models.py:2843 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/forms.py:1513 +#: archaeological_operations/models.py:2705 +#: archaeological_operations/models.py:2960 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "Type d'acte" -#: archaeological_files/forms.py:1115 +#: archaeological_files/forms.py:1090 msgid "Object (full text search)" msgstr "Objet (recherche en texte intégral)" -#: archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1126 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:822 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/forms.py:1605 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1649 msgid "Indexed?" msgstr "Indexé ?" -#: archaeological_files/forms.py:1158 +#: archaeological_files/forms.py:1133 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:823 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/forms.py:1476 -#: archaeological_operations/models.py:2912 +#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/models.py:3029 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: archaeological_files/forms.py:1160 +#: archaeological_files/forms.py:1135 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:826 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1478 -#: archaeological_operations/models.py:2910 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/forms.py:1522 +#: archaeological_operations/models.py:3027 msgid "Signature date" msgstr "Date de signature" -#: archaeological_files/forms.py:1184 +#: archaeological_files/forms.py:1159 msgid "File numeric reference" msgstr "Dossier : réf. numérique" -#: archaeological_files/forms.py:1186 +#: archaeological_files/forms.py:1161 msgid "File year" msgstr "Dossier : année" -#: archaeological_files/forms.py:1188 +#: archaeological_files/forms.py:1163 msgid "File other reference" msgstr "Dossier : autre référence" -#: archaeological_files/forms.py:1191 +#: archaeological_files/forms.py:1166 msgid "File in charge" msgstr "Dossier : responsable" -#: archaeological_files/forms.py:1201 +#: archaeological_files/forms.py:1176 msgid "File permit reference" msgstr "Dossier : réf. du permis / de l'arrêté" -#: archaeological_files/forms.py:1265 +#: archaeological_files/forms.py:1240 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:786 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:828 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:643 #: archaeological_operations/forms.py:915 -#: archaeological_operations/models.py:2045 -#: archaeological_operations/models.py:2571 -#: archaeological_operations/models.py:2687 -#: archaeological_operations/models.py:2891 +#: archaeological_operations/models.py:2162 +#: archaeological_operations/models.py:2688 +#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:3008 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2604,19 +2632,20 @@ 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:3691 +#: archaeological_finds/models_finds.py:3711 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2948 +#: archaeological_operations/models.py:1837 +#: archaeological_operations/models.py:3065 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" 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:1444 -#: archaeological_files/models.py:1463 archaeological_files/models.py:1490 +#: archaeological_files/models.py:90 archaeological_files/models.py:125 +#: archaeological_files/models.py:170 archaeological_files/models.py:186 +#: archaeological_files/models.py:256 archaeological_files/models.py:351 +#: archaeological_files/models.py:363 archaeological_files/models.py:375 +#: archaeological_files/models.py:395 archaeological_files/models.py:1486 +#: archaeological_files/models.py:1505 archaeological_files/models.py:1532 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5395 @@ -2624,96 +2653,96 @@ msgstr "Acte administratif" msgid "Preventive" msgstr "Préventif" -#: archaeological_files/models.py:96 +#: archaeological_files/models.py:98 msgid "Ground daily cost" msgstr "Coût journalier terrain" -#: archaeological_files/models.py:97 +#: archaeological_files/models.py:99 msgid "Daily cost" msgstr "Coût journalier" -#: archaeological_files/models.py:99 archaeological_files/models.py:148 +#: archaeological_files/models.py:101 archaeological_files/models.py:150 msgid "Permanent contract" msgstr "Contrat à durée indéterminée" -#: archaeological_files/models.py:102 +#: archaeological_files/models.py:104 msgid "Def. daily number on ground" msgstr "Nb. journalier terrain par défaut" -#: archaeological_files/models.py:104 +#: archaeological_files/models.py:106 msgid "Def. daily number on study" msgstr "Nb. journalier post-fouille par défaut" -#: archaeological_files/models.py:110 +#: archaeological_files/models.py:112 msgid "Child" msgstr "Enfant" -#: archaeological_files/models.py:111 +#: archaeological_files/models.py:113 msgid "Auto-add this job when a parent is added" msgstr "Ajout automatique de cet emploi lorsqu'un parent est ajouté" -#: archaeological_files/models.py:117 +#: archaeological_files/models.py:119 msgid "Jobs" msgstr "Emplois" -#: archaeological_files/models.py:128 +#: archaeological_files/models.py:130 msgid "fixed-term contract" msgstr "contrat à durée déterminée" -#: archaeological_files/models.py:152 +#: archaeological_files/models.py:154 msgid "Fixed-term contract" msgstr "Contrat à durée déterminée" -#: archaeological_files/models.py:162 +#: archaeological_files/models.py:164 msgid "Generic equipment type" msgstr "Type d'équipement générique" -#: archaeological_files/models.py:163 +#: archaeological_files/models.py:165 msgid "Generic equipment types" msgstr "Types d'équipement générique" -#: archaeological_files/models.py:173 +#: archaeological_files/models.py:175 msgid "Generic type" msgstr "Type générique" -#: archaeological_files/models.py:178 +#: archaeological_files/models.py:180 msgid "Equipment/service type" msgstr "Type d'équipement/de service" -#: archaeological_files/models.py:179 +#: archaeological_files/models.py:181 msgid "Equipment/service types" msgstr "Types d'équipement/de service" -#: archaeological_files/models.py:188 +#: archaeological_files/models.py:190 #: archaeological_operations/templates/ishtar/sheet_operation.html:233 #: na_app/templates/ishtar/sheet_operation.html:229 #: sra_idf_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "jours" -#: archaeological_files/models.py:189 +#: archaeological_files/models.py:191 msgid "weeks" msgstr "semaines" -#: archaeological_files/models.py:190 +#: archaeological_files/models.py:192 msgid "months" msgstr "mois" -#: archaeological_files/models.py:191 +#: archaeological_files/models.py:193 msgid "linear m." msgstr "m. linéaire" -#: archaeological_files/models.py:210 +#: archaeological_files/models.py:212 msgid "Equipment/Service" msgstr "Équipement/Service" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 +#: archaeological_files/models.py:215 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3255 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "Identifiant textuel" -#: archaeological_files/models.py:217 ishtar_common/models.py:3258 +#: archaeological_files/models.py:219 ishtar_common/models.py:3258 #: ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " @@ -2723,114 +2752,126 @@ msgstr "" "lettres en minuscule, des nombres et des tirets (-). Chaque \"slug\" doit " "être unique dans la typologie." -#: archaeological_files/models.py:223 +#: archaeological_files/models.py:225 msgid "Service provider" msgstr "Fournisseur de service" -#: archaeological_files/models.py:225 archaeological_files/models.py:281 +#: archaeological_files/models.py:227 archaeological_files/models.py:283 msgid "Flat rate" msgstr "Tarif forfaitaire" -#: archaeological_files/models.py:226 +#: archaeological_files/models.py:228 msgid "Unitary cost" msgstr "Coût unitaire" -#: archaeological_files/models.py:228 ishtar_common/models_imports.py:1077 +#: archaeological_files/models.py:230 ishtar_common/models_imports.py:1077 msgid "Unit" msgstr "Unité" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:233 msgid "Specificity" msgstr "Spécificité" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:236 msgid "Default quantity by day" msgstr "Quantité par défaut par jour" -#: archaeological_files/models.py:236 ishtar_common/models.py:1665 +#: archaeological_files/models.py:238 ishtar_common/models.py:1665 #: ishtar_common/models.py:2083 ishtar_common/models.py:3823 #: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:206 #: ishtar_common/models_imports.py:441 ishtar_common/models_imports.py:952 msgid "Available" msgstr "Disponible" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 +#: archaeological_files/models.py:244 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1267 ishtar_common/models.py:2390 #: ishtar_common/models_common.py:748 msgid "Parent" msgstr "Parent" -#: archaeological_files/models.py:243 +#: archaeological_files/models.py:245 msgid "Auto-add this cost when a parent is added" msgstr "Ajout automatique de ce coût lorsqu'un parent est ajouté" -#: archaeological_files/models.py:248 +#: archaeological_files/models.py:250 msgid "Equipment/service cost" msgstr "Coût équipement/service" -#: archaeological_files/models.py:249 +#: archaeological_files/models.py:251 msgid "Equipment/service costs" msgstr "Coûts équipement/service" -#: archaeological_files/models.py:301 +#: archaeological_files/models.py:303 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: archaeological_files/models.py:302 +#: archaeological_files/models.py:304 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: archaeological_files/models.py:322 +#: archaeological_files/models.py:324 msgid "Permit types" msgstr "Types de permis" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:335 msgid "Delay (in days)" msgstr "Délai (en jours)" -#: archaeological_files/models.py:346 +#: archaeological_files/models.py:348 msgid "Agreement type - France" msgstr "Type de convention - France" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:349 msgid "Agreement types - France" msgstr "Types de convention - France" -#: archaeological_files/models.py:358 +#: archaeological_files/models.py:360 +msgid "Monitoring justification type" +msgstr "Type de motivation de la prescription" + +#: archaeological_files/models.py:361 +msgid "Monitoring justification types" +msgstr "Types de motivation de la prescription" + +#: archaeological_files/models.py:373 +msgid "Development types" +msgstr "Types d'aménagement" + +#: archaeological_files/models.py:384 msgid "Increase coefficient" msgstr "Coefficient majoration" -#: archaeological_files/models.py:360 +#: archaeological_files/models.py:386 msgid "Increased final value" msgstr "Valeur finale majorée" -#: archaeological_files/models.py:362 +#: archaeological_files/models.py:388 msgid "Category" msgstr "Catégorie" -#: archaeological_files/models.py:366 +#: archaeological_files/models.py:392 msgid "Operation type for royalties - France" msgstr "Type d'opération pour les redevances - France" -#: archaeological_files/models.py:367 +#: archaeological_files/models.py:393 msgid "Operation types for royalties - France" msgstr "Types d'opération pour les redevances - France" -#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1201 -#: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:998 ishtar_common/admin.py:1451 +#: archaeological_files/models.py:431 archaeological_finds/models_finds.py:1217 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1115 ishtar_common/admin.py:1451 #: ishtar_common/forms_common.py:2561 ishtar_common/models.py:2408 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "Zone" -#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1204 -#: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:999 +#: archaeological_files/models.py:432 archaeological_finds/models_finds.py:1220 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1116 msgid "Extended area" msgstr "Zone étendue" -#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1225 +#: archaeological_files/models.py:441 archaeological_finds/models_finds.py:1241 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2855,49 +2896,49 @@ msgstr "Zone étendue" msgid "Number" msgstr "Nombre" -#: archaeological_files/models.py:416 -msgid "Total surface (km2)" -msgstr "Surface totale (km2)" +#: archaeological_files/models.py:442 +msgid "Total surface (km²)" +msgstr "Surface totale (km²)" -#: archaeological_files/models.py:417 -msgid "Total developed surface (km2)" +#: archaeological_files/models.py:443 +msgid "Total developed surface (km²)" msgstr "Surface totale aménagée (km²)" -#: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1329 +#: archaeological_files/models.py:512 archaeological_finds/models_finds.py:1345 #: archaeological_finds/models_treatments.py:167 #: archaeological_finds/models_treatments.py:1156 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1142 -#: archaeological_operations/models.py:2711 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1259 +#: archaeological_operations/models.py:2828 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "annee" -#: archaeological_files/models.py:488 +#: archaeological_files/models.py:514 #: archaeological_finds/models_treatments.py:1153 -#: archaeological_operations/models.py:370 +#: archaeological_operations/models.py:436 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4292 msgctxt "key for text search" msgid "reference" msgstr "reference" -#: archaeological_files/models.py:491 +#: archaeological_files/models.py:517 #: archaeological_finds/models_treatments.py:164 -#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:442 msgctxt "key for text search" msgid "other-reference" msgstr "autre-reference" -#: archaeological_files/models.py:503 archaeological_operations/models.py:1166 +#: archaeological_files/models.py:529 archaeological_operations/models.py:1283 msgctxt "key for text search" msgid "department" msgstr "departement" -#: archaeological_files/models.py:507 +#: archaeological_files/models.py:533 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_operations/models.py:373 -#: archaeological_operations/models.py:1170 +#: archaeological_operations/models.py:439 +#: archaeological_operations/models.py:1287 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2601 #: ishtar_common/models.py:2863 ishtar_common/models.py:3669 @@ -2905,11 +2946,12 @@ msgctxt "key for text search" msgid "name" msgstr "nom" -#: archaeological_files/models.py:510 +#: archaeological_files/models.py:536 #: archaeological_finds/models_treatments.py:170 #: archaeological_finds/models_treatments.py:1159 -#: archaeological_operations/models.py:1176 -#: archaeological_operations/models.py:2722 +#: archaeological_operations/models.py:446 +#: archaeological_operations/models.py:1293 +#: archaeological_operations/models.py:2839 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 #: archaeological_warehouse/models.py:955 ishtar_common/models.py:2604 @@ -2919,51 +2961,61 @@ msgctxt "key for text search" msgid "type" msgstr "type" -#: archaeological_files/models.py:513 +#: archaeological_files/models.py:539 msgctxt "key for text search" msgid "active" msgstr "actif" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:542 msgctxt "key for text search" msgid "saisine-type" msgstr "type-saisine" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:547 +msgctxt "key for text search" +msgid "development-type" +msgstr "nature-amenagement" + +#: archaeological_files/models.py:551 +msgctxt "key for text search" +msgid "monitoring-justification" +msgstr "motivation-prescription" + +#: archaeological_files/models.py:555 msgctxt "key for text search" msgid "permit-type" msgstr "type-permis" -#: archaeological_files/models.py:526 +#: archaeological_files/models.py:560 msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:1658 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2763 +#: archaeological_files/models.py:571 archaeological_operations/models.py:2880 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:542 archaeological_operations/models.py:2767 +#: archaeological_files/models.py:576 archaeological_operations/models.py:2884 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" -#: archaeological_files/models.py:564 +#: archaeological_files/models.py:598 #: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:606 #: archaeological_finds/forms_treatments.py:635 #: archaeological_finds/forms_treatments.py:706 #: archaeological_finds/models_treatments.py:1200 @@ -2972,9 +3024,9 @@ msgstr "Référence interne" #: archaeological_operations/forms.py:477 #: archaeological_operations/forms.py:1102 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1774 -#: archaeological_operations/models.py:502 +#: archaeological_operations/forms.py:1342 +#: archaeological_operations/forms.py:1818 +#: archaeological_operations/models.py:599 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 @@ -3017,7 +3069,7 @@ msgstr "Référence interne" msgid "Name" msgstr "Nom" -#: archaeological_files/models.py:577 +#: archaeological_files/models.py:611 #: archaeological_finds/models_treatments.py:1209 #: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 @@ -3030,35 +3082,39 @@ msgstr "Nom" msgid "Person in charge" msgstr "Personne responsable" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:625 msgid "General contractor (raw)" msgstr "Aménageur (brut)" -#: archaeological_files/models.py:596 +#: archaeological_files/models.py:630 msgid "General contractor organization" msgstr "Organisation de l'aménageur" -#: archaeological_files/models.py:610 +#: archaeological_files/models.py:640 +msgid "Responsible for planning service" +msgstr "Responsable pour le service instructeur" + +#: archaeological_files/models.py:644 msgid "Planning service (raw)" msgstr "Service instructeur (brut)" -#: archaeological_files/models.py:617 +#: archaeological_files/models.py:651 msgid "Planning service organization" msgstr "Service instructeur" -#: archaeological_files/models.py:632 +#: archaeological_files/models.py:666 msgid "Main town" msgstr "Commune principale" -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:705 msgid "Main address" msgstr "Adresse des terrains" -#: archaeological_files/models.py:673 +#: archaeological_files/models.py:707 msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:726 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:418 #: archaeological_finds/models_treatments.py:263 @@ -3074,128 +3130,128 @@ msgstr "Adresse des terrains - code postal" msgid "Organization" msgstr "Organisation" -#: archaeological_files/models.py:742 +#: archaeological_files/models.py:784 msgid "Linear meter" msgstr "Mètre linéaire" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:788 msgid "Type of agreement" msgstr "Type de convention" -#: archaeological_files/models.py:751 +#: archaeological_files/models.py:793 msgid "Operation type for royalties" msgstr "Type d'opération pour la redevance" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:809 msgid "Imported line" msgstr "Ligne importée" -#: archaeological_files/models.py:787 +#: archaeological_files/models.py:829 #: ishtar_common/templates/ishtar/sheet_town.html:124 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: archaeological_files/models.py:814 +#: archaeological_files/models.py:856 msgid "FILE" msgstr "DOSSIER" -#: archaeological_files/models.py:1067 +#: archaeological_files/models.py:1109 msgid "Multi-town" msgstr "Intercommunal" -#: archaeological_files/models.py:1073 +#: archaeological_files/models.py:1115 msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1282 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1324 archaeological_operations/models.py:2097 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1284 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1326 archaeological_operations/models.py:2099 msgid "parcels" msgstr "parcelles" -#: archaeological_files/models.py:1294 +#: archaeological_files/models.py:1336 msgid "Edit intervention plan" msgstr "Modifier le plan d'intervention" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1338 msgid "plan" msgstr "plan d'intervention" -#: archaeological_files/models.py:1305 +#: archaeological_files/models.py:1347 #: archaeological_finds/models_treatments.py:420 #: archaeological_finds/models_treatments.py:1316 -#: archaeological_operations/models.py:2013 +#: archaeological_operations/models.py:2130 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" -#: archaeological_files/models.py:1307 +#: archaeological_files/models.py:1349 #: archaeological_finds/models_treatments.py:422 #: archaeological_finds/models_treatments.py:1318 -#: archaeological_operations/models.py:2015 +#: archaeological_operations/models.py:2132 msgid "admin. act" msgstr "acte admin." -#: archaeological_files/models.py:1316 +#: archaeological_files/models.py:1358 msgid "Add operation" msgstr "Ajouter une opération" -#: archaeological_files/models.py:1318 +#: archaeological_files/models.py:1360 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1393 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3163 +#: archaeological_files/models.py:1435 archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:3280 msgid "File" msgstr "Dossier" -#: archaeological_files/models.py:1412 +#: archaeological_files/models.py:1454 msgid "Man by day - planned" msgstr "Personnes par jour - planifiés" -#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 +#: archaeological_files/models.py:1456 archaeological_files/models.py:1522 msgid "Days - planned" msgstr "Jours - planifiés" -#: archaeological_files/models.py:1416 +#: archaeological_files/models.py:1458 msgid "Man by day - worked" msgstr "Personnes par jour - travaillés" -#: archaeological_files/models.py:1418 archaeological_files/models.py:1484 +#: archaeological_files/models.py:1460 archaeological_files/models.py:1526 msgid "Days - worked" msgstr "Jours - travaillés" -#: archaeological_files/models.py:1442 +#: archaeological_files/models.py:1484 msgid "Human requirement on field" msgstr "Besoin humain terrains" -#: archaeological_files/models.py:1443 +#: archaeological_files/models.py:1485 msgid "Human requirements on field" msgstr "Besoins humains terrains" -#: archaeological_files/models.py:1461 +#: archaeological_files/models.py:1503 msgid "Human requirement for post-excavation" msgstr "Besoin humain post-fouille" -#: archaeological_files/models.py:1462 +#: archaeological_files/models.py:1504 msgid "Human requirements for post-excavation" msgstr "Besoins humains post-fouille" -#: archaeological_files/models.py:1478 +#: archaeological_files/models.py:1520 msgid "Quantity by day - planned" msgstr "Quantité par jour - planifié" -#: archaeological_files/models.py:1482 +#: archaeological_files/models.py:1524 msgid "Quantity by day - worked" msgstr "Quantité par jour - travaillé" -#: archaeological_files/models.py:1488 +#: archaeological_files/models.py:1530 msgid "Equipment requirement" msgstr "Besoin en équipement" -#: archaeological_files/models.py:1489 +#: archaeological_files/models.py:1531 msgid "Equipment requirements" msgstr "Besoins en équipements" @@ -3221,9 +3277,9 @@ msgid "Change price agreement" msgstr "Changer le contrat tarifaire" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:391 msgid "Planned" msgstr "Planifié" @@ -3264,18 +3320,18 @@ msgstr "Dossier d'archéologie préventive" msgid "Developed surface" msgstr "Surface aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:176 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "Parcelles associées" -#: archaeological_files/templates/ishtar/sheet_file.html:179 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: 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:2949 +#: archaeological_operations/models.py:3066 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3286,15 +3342,15 @@ msgstr "Parcelles associées" msgid "Administrative acts" msgstr "Actes administratifs" -#: archaeological_files/templates/ishtar/sheet_file.html:182 +#: archaeological_files/templates/ishtar/sheet_file.html:185 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "Opérations associées" -#: archaeological_files/templates/ishtar/sheet_file.html:186 -#: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_operations/models.py:2685 -#: archaeological_operations/models.py:2984 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:3101 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 @@ -3303,22 +3359,22 @@ msgstr "Opérations associées" msgid "Ref." msgstr "Réf." -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/models.py:1470 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: archaeological_files/templates/ishtar/sheet_file.html:205 +#: archaeological_files/templates/ishtar/sheet_file.html:208 msgid "No operation associated to this archaeological file" msgstr "Pas d'opération associée à ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:209 +#: archaeological_files/templates/ishtar/sheet_file.html:212 msgid "Admninistrative acts linked to associated operations" msgstr "Actes administratifs associés à ces opérations" -#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:797 #: ishtar_common/models.py:704 ishtar_common/models.py:3386 @@ -3326,43 +3382,43 @@ msgstr "Actes administratifs associés à ces opérations" msgid "Date" msgstr "Date" -#: archaeological_files/templates/ishtar/sheet_file.html:225 +#: archaeological_files/templates/ishtar/sheet_file.html:228 msgid "No administrative act linked to operations" msgstr "Pas d'acte administratif associé à ces opérations" -#: archaeological_files/templates/ishtar/sheet_file.html:231 +#: archaeological_files/templates/ishtar/sheet_file.html:234 msgid "Document for this archaeological file" msgstr "Document pour ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:264 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Human and technical requirements" msgstr "Besoins humains et techniques" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:392 msgid "Effective" msgstr "Effectif" -#: archaeological_files/templates/ishtar/sheet_file.html:291 #: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:297 #: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:349 #: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "Coût" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:312 +#: archaeological_files/templates/ishtar/sheet_file.html:364 +#: archaeological_files/templates/ishtar/sheet_file.html:420 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3373,13 +3429,13 @@ msgstr "Coût" msgid "Total" msgstr "Total" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:323 +#: archaeological_files/templates/ishtar/sheet_file.html:375 +#: archaeological_files/templates/ishtar/sheet_file.html:427 msgid "Difference" msgstr "Différence" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:334 msgid "Post-excavation jobs" msgstr "Emplois post-fouille" @@ -3473,326 +3529,336 @@ msgstr "Mobilier - 010 - Choix de l'unité d'enregistrement" msgid "Simple find - 020 - General" msgstr "Mobilier simple - 020 - Général" -#: archaeological_finds/forms.py:354 +#: archaeological_finds/forms.py:356 msgid "Museum identification" msgstr "Identification musée" -#: archaeological_finds/forms.py:356 archaeological_finds/forms.py:744 -#: archaeological_finds/forms.py:1002 archaeological_finds/forms.py:1341 -#: archaeological_finds/forms.py:1696 archaeological_finds/forms.py:2346 -#: archaeological_finds/models_finds.py:548 -#: archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:754 +#: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1706 archaeological_finds/forms.py:2358 +#: archaeological_finds/models_finds.py:560 +#: archaeological_finds/models_finds.py:2003 msgid "Free ID" msgstr "Identifiant libre" -#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1011 -#: archaeological_finds/models_finds.py:1986 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1021 +#: archaeological_finds/models_finds.py:2006 msgid "Museum ID prefix" msgstr "Préfixe num. inventaire" -#: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1012 -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:1987 +#: archaeological_finds/forms.py:361 archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:1708 archaeological_finds/models_finds.py:2007 msgid "Museum inventory number" msgstr "Numéro d'inventaire musée" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1013 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:1023 +#: archaeological_finds/models_finds.py:2008 msgid "Museum ID suffix" msgstr "Suffixe num. inventaire" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:363 archaeological_finds/models_finds.py:2009 msgid "Comment on museum ID" msgstr "Précisions sur le numéro d’inventaire" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:746 -#: archaeological_finds/forms.py:1006 archaeological_finds/forms.py:1343 -#: archaeological_finds/forms.py:1697 archaeological_finds/forms.py:2413 -#: archaeological_finds/models_finds.py:1984 ishtar_common/forms_common.py:1409 +#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:756 +#: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1353 +#: archaeological_finds/forms.py:1707 archaeological_finds/forms.py:2425 +#: archaeological_finds/models_finds.py:2004 ishtar_common/forms_common.py:1409 #: ishtar_common/models.py:3253 msgid "Denomination" msgstr "Dénomination" -#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1700 archaeological_finds/models_finds.py:2138 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1017 +#: archaeological_finds/forms.py:1710 archaeological_finds/models_finds.py:2158 msgid "Previous ID" msgstr "Identifiant précédent" -#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1014 -#: archaeological_finds/forms.py:1703 archaeological_finds/models_finds.py:1990 +#: archaeological_finds/forms.py:367 archaeological_finds/forms.py:1024 +#: archaeological_finds/forms.py:1713 archaeological_finds/models_finds.py:2010 msgid "Laboratory ID" msgstr "Numéro de laboratoire" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1015 -#: archaeological_finds/forms.py:1702 archaeological_finds/models_finds.py:1981 +#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:2001 msgid "Seal number" msgstr "Numéro de scellé" -#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:1070 +#: archaeological_finds/models_finds.py:2208 msgid "Presence of inventory marking" msgstr "Présence d’un marquage inventaire" -#: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2192 +#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1073 +#: archaeological_finds/models_finds.py:2212 msgid "Type of marking" msgstr "Type de marquage" -#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1943 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:1026 +#: archaeological_finds/forms.py:1954 archaeological_finds/models_finds.py:2155 msgid "Marking details" msgstr "Précisions sur le marquage" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:980 -#: archaeological_finds/forms.py:1634 archaeological_finds/models_finds.py:428 -#: archaeological_finds/models_finds.py:443 -#: archaeological_finds/models_finds.py:458 -#: archaeological_finds/models_finds.py:473 -#: archaeological_finds/models_finds.py:488 -#: archaeological_finds/models_finds.py:503 +#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:990 +#: archaeological_finds/forms.py:1644 archaeological_finds/models_finds.py:442 +#: archaeological_finds/models_finds.py:457 +#: archaeological_finds/models_finds.py:472 +#: archaeological_finds/models_finds.py:487 +#: archaeological_finds/models_finds.py:502 +#: archaeological_finds/models_finds.py:517 msgid "Museum" msgstr "Musée" -#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:384 archaeological_finds/forms.py:1036 +#: archaeological_finds/models_finds.py:2179 msgid "Owner institution" msgstr "Institution propriétaire" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/forms.py:387 archaeological_finds/forms.py:1042 +#: archaeological_finds/models_finds.py:2184 msgid "Assigned institution" msgstr "Institution affectataire" -#: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:1048 +#: archaeological_finds/models_finds.py:2189 msgid "Custodian institution" msgstr "Institution dépositaire" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2171 +#: archaeological_finds/forms.py:392 archaeological_finds/models_finds.py:2191 msgid "Depositor inventory number" msgstr "Numéro d’inventaire du déposant" -#: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1053 +#: archaeological_finds/models_finds.py:2194 msgid "Collections entry mode" msgstr "Mode d’entrée dans les collections" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1055 +#: archaeological_finds/models_finds.py:2196 msgid "Comment on museum entry mode" msgstr "Précisions sur le mode d'entrée" -#: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:397 archaeological_finds/forms.py:1058 +#: archaeological_finds/models_finds.py:2197 msgid "Museum entry date (exact or start)" msgstr "Date d’entrée au musée (exacte ou début)" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:398 archaeological_finds/forms.py:1060 +#: archaeological_finds/models_finds.py:2198 msgid "Museum entry date (end)" msgstr "Date d’entrée au musée (fin)" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2179 +#: archaeological_finds/forms.py:399 archaeological_finds/models_finds.py:2199 msgid "Comment on museum entry date" msgstr "Précisions sur la date d’entrée au musée" -#: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2183 +#: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1062 +#: archaeological_finds/models_finds.py:2203 msgid "Donor, testator or vendor" msgstr "Donateur, testateur ou vendeur" -#: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2152 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:409 archaeological_finds/forms.py:1075 +#: archaeological_finds/models_finds.py:2172 +#: archaeological_finds/models_finds.py:2219 msgid "Collection" msgstr "Collection" -#: archaeological_finds/forms.py:410 archaeological_finds/forms.py:1067 +#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1077 msgid "Former collections" msgstr "Anciennes collections" -#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/forms.py:414 archaeological_finds/forms.py:1082 +#: archaeological_finds/models_finds.py:2227 msgid "Inventory entry year" msgstr "Année d’inscription à l’inventaire" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:417 archaeological_finds/models_finds.py:2231 msgid "Conformity with inventory" msgstr "Conformité avec l’inventaire" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2213 +#: archaeological_finds/forms.py:420 archaeological_finds/models_finds.py:2233 msgid "Comment on conformity" msgstr "Précisions sur la conformité" -#: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/forms.py:423 archaeological_finds/forms.py:1083 +#: archaeological_finds/models_finds.py:2237 msgid "Original/reproduction" msgstr "Original/reproduction" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:425 archaeological_finds/models_finds.py:2239 msgid "Date of museum allocation" msgstr "Date d’affectation au musée" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2220 +#: archaeological_finds/forms.py:426 archaeological_finds/models_finds.py:2240 msgid "Purchase price" msgstr "Prix d’achat" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2214 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2234 msgid "Inventory transcript" msgstr "Transcription de l’inventaire" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2258 +#: archaeological_finds/forms.py:436 archaeological_finds/models_finds.py:2278 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/models.py:629 +#: archaeological_operations/templates/ishtar/sheet_site.html:55 msgid "Public description" msgstr "Description publique" -#: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1801 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:439 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:1807 archaeological_finds/models_finds.py:585 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:23 +msgid "Discovery method" +msgstr "Méthode de découverte" + +#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:763 +#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:2095 msgid "Is complete?" msgstr "Est complet ?" -#: archaeological_finds/forms.py:438 archaeological_finds/forms.py:756 -#: archaeological_finds/forms.py:1085 archaeological_finds/models_finds.py:95 -#: archaeological_finds/models_finds.py:1170 -#: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1998 +#: archaeological_finds/forms.py:443 archaeological_finds/forms.py:766 +#: archaeological_finds/forms.py:1095 archaeological_finds/models_finds.py:95 +#: archaeological_finds/models_finds.py:1186 +#: archaeological_finds/models_finds.py:1187 +#: archaeological_finds/models_finds.py:2018 msgid "Material types" msgstr "Types de matériau" -#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:759 -#: archaeological_finds/forms.py:1810 archaeological_finds/models_finds.py:2002 +#: archaeological_finds/forms.py:446 archaeological_finds/forms.py:769 +#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:2022 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "Qualité du type de matériaux" -#: archaeological_finds/forms.py:444 archaeological_finds/forms.py:1088 -#: archaeological_finds/forms.py:1813 archaeological_finds/models_finds.py:2010 +#: archaeological_finds/forms.py:449 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2030 msgid "Technical processes" msgstr "Procédé(s) technique(s)" -#: archaeological_finds/forms.py:448 archaeological_finds/forms.py:1819 -#: archaeological_finds/models_finds.py:2015 +#: archaeological_finds/forms.py:453 archaeological_finds/forms.py:1830 +#: archaeological_finds/models_finds.py:2035 msgid "Comment on the material" msgstr "Précisions sur le matériau" -#: archaeological_finds/forms.py:451 archaeological_finds/forms.py:762 -#: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1173 -#: archaeological_finds/models_finds.py:2077 +#: archaeological_finds/forms.py:456 archaeological_finds/forms.py:772 +#: archaeological_finds/forms.py:1102 archaeological_finds/models_finds.py:275 +#: archaeological_finds/models_finds.py:1188 +#: archaeological_finds/models_finds.py:1189 +#: archaeological_finds/models_finds.py:2097 msgid "Object types" msgstr "Types d'objet" -#: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:460 archaeological_finds/forms.py:776 +#: archaeological_finds/forms.py:1837 archaeological_finds/models_finds.py:2101 msgid "Object type quality" msgstr "Qualité du type d'objet" -#: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1828 archaeological_finds/models_finds.py:2089 +#: archaeological_finds/forms.py:463 archaeological_finds/forms.py:1106 +#: archaeological_finds/forms.py:1839 archaeological_finds/models_finds.py:2109 msgid "Functional areas" msgstr "Domaines fonctionnels" -#: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1835 archaeological_finds/models_finds.py:2095 +#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:1110 +#: archaeological_finds/forms.py:1846 archaeological_finds/models_finds.py:2115 msgid "Technical areas" msgstr "Domaines techniques" -#: archaeological_finds/forms.py:465 archaeological_finds/forms.py:768 -#: archaeological_finds/forms.py:1078 archaeological_finds/forms.py:1841 -#: archaeological_finds/forms.py:2352 archaeological_finds/models_finds.py:2022 +#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:778 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1852 +#: archaeological_finds/forms.py:2364 archaeological_finds/models_finds.py:2042 msgid "Number of remains" msgstr "Nombre de restes (NR)" -#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:770 -#: archaeological_finds/forms.py:1080 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2024 +#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:780 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1854 +#: archaeological_finds/models_finds.py:2044 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 -#: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1845 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/forms.py:474 archaeological_finds/forms.py:782 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1856 +#: archaeological_finds/models_finds.py:2241 msgid "Inventory quantity" msgstr "Quantité à l’inventaire" -#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 -#: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1846 -#: archaeological_finds/models_finds.py:2222 +#: archaeological_finds/forms.py:475 archaeological_finds/forms.py:783 +#: archaeological_finds/forms.py:1093 archaeological_finds/forms.py:1857 +#: archaeological_finds/models_finds.py:2242 msgid "Observed quantity" msgstr "Quantité vue" -#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:775 -#: archaeological_finds/models_finds.py:2027 +#: archaeological_finds/forms.py:477 archaeological_finds/forms.py:785 +#: archaeological_finds/models_finds.py:2047 msgid "Comment on quantity" msgstr "Précisions sur la quantité" -#: archaeological_finds/forms.py:476 archaeological_finds/forms.py:779 -#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:1992 +#: archaeological_finds/forms.py:481 archaeological_finds/forms.py:789 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2012 msgid "Decoration" msgstr "Décor" -#: archaeological_finds/forms.py:479 archaeological_finds/forms.py:782 -#: archaeological_finds/forms.py:1850 archaeological_finds/models_finds.py:1993 +#: archaeological_finds/forms.py:484 archaeological_finds/forms.py:792 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2013 msgid "Inscription" msgstr "Inscription" -#: archaeological_finds/forms.py:482 archaeological_finds/forms.py:785 -#: archaeological_finds/forms.py:1104 archaeological_finds/forms.py:1848 -#: archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:795 +#: archaeological_finds/forms.py:1114 archaeological_finds/forms.py:1859 +#: archaeological_finds/models_finds.py:2015 msgid "Manufacturing place" msgstr "Lieu de fabrication" -#: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 -#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1852 -#: archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/forms.py:490 archaeological_finds/forms.py:798 +#: archaeological_finds/forms.py:1117 archaeological_finds/forms.py:1863 +#: archaeological_finds/models_finds.py:1229 +#: archaeological_finds/models_finds.py:2133 msgid "Communicability" msgstr "Communicabilité" -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 -#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1858 -#: archaeological_finds/models_finds.py:2137 +#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:804 +#: archaeological_finds/forms.py:1150 archaeological_finds/forms.py:1869 +#: archaeological_finds/models_finds.py:2157 msgid "Comment on dating" msgstr "Précisions sur les datations" -#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2117 +#: archaeological_finds/forms.py:503 archaeological_finds/forms.py:808 +#: archaeological_finds/forms.py:1871 archaeological_finds/models_finds.py:2137 msgid "Length (cm)" msgstr "Longueur (cm)" -#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2118 +#: archaeological_finds/forms.py:506 archaeological_finds/forms.py:809 +#: archaeological_finds/forms.py:1872 archaeological_finds/models_finds.py:2138 msgid "Width (cm)" msgstr "Largeur (cm)" -#: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:810 +#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2139 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2122 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:813 +#: archaeological_finds/forms.py:1874 archaeological_finds/models_finds.py:2142 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1864 archaeological_finds/models_finds.py:2120 +#: archaeological_finds/forms.py:515 archaeological_finds/forms.py:811 +#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2140 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1865 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:518 archaeological_finds/forms.py:812 +#: archaeological_finds/forms.py:1876 archaeological_finds/models_finds.py:2141 msgid "Circumference (cm)" msgstr "Circonférence (cm)" -#: archaeological_finds/forms.py:517 archaeological_finds/forms.py:804 -#: archaeological_finds/forms.py:1866 archaeological_finds/forms.py:2350 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:814 +#: archaeological_finds/forms.py:1877 archaeological_finds/forms.py:2362 +#: archaeological_finds/models_finds.py:2037 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "Volume (l)" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:2351 +#: archaeological_finds/forms.py:524 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:2363 #: archaeological_finds/templates/ishtar/sheet_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3803,115 +3869,115 @@ msgstr "Volume (l)" msgid "Weight (g)" msgstr "Poids (g)" -#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:807 -#: archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:817 +#: archaeological_finds/forms.py:1880 msgid "Clutter long side (cm)" msgstr "Encombrement grand côté (cm)" -#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:810 -#: archaeological_finds/forms.py:1873 +#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1884 msgid "Clutter short side (cm)" msgstr "Encombrement petit côté (cm)" -#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:1877 +#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:823 +#: archaeological_finds/forms.py:1888 msgid "Clutter height (cm)" msgstr "Encombrement hauteur (cm)" -#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1880 archaeological_finds/models_finds.py:2133 +#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2153 msgid "Dimensions comment" msgstr "Précisions sur les dimensions" -#: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1885 -#: archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2142 +#: archaeological_finds/forms.py:546 archaeological_finds/forms.py:830 +#: archaeological_finds/forms.py:1137 archaeological_finds/forms.py:1896 +#: archaeological_finds/models_finds.py:1230 +#: archaeological_finds/models_finds.py:2162 msgid "Check" msgstr "Vérification" -#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1886 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:547 archaeological_finds/forms.py:831 +#: archaeological_finds/forms.py:1138 archaeological_finds/forms.py:1897 +#: archaeological_finds/models_finds.py:2167 msgid "Check date" msgstr "Date de vérification" -#: archaeological_finds/forms.py:600 +#: archaeological_finds/forms.py:606 msgid "Clutter: short side cannot be bigger than the long side." msgstr "" "Encombrement : le petit côté court ne peut pas être plus grand que le grand " "côté." -#: archaeological_finds/forms.py:608 +#: archaeological_finds/forms.py:614 msgid "Find - 020 - General" msgstr "Mobilier - 020 - Général" -#: archaeological_finds/forms.py:694 archaeological_finds/models_finds.py:555 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:50 +#: archaeological_finds/forms.py:701 archaeological_finds/models_finds.py:567 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "Précisions sur les circonstances de découverte" -#: archaeological_finds/forms.py:697 archaeological_finds/forms.py:1009 -#: archaeological_finds/forms.py:1701 archaeological_finds/models_finds.py:553 +#: archaeological_finds/forms.py:704 archaeological_finds/forms.py:1019 +#: archaeological_finds/forms.py:1711 archaeological_finds/models_finds.py:565 msgid "Excavation ID" msgstr "Identifiant fouille" -#: archaeological_finds/forms.py:701 archaeological_finds/forms.py:1798 -#: archaeological_finds/models_finds.py:566 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:32 +#: archaeological_finds/forms.py:711 archaeological_finds/forms.py:1809 +#: archaeological_finds/models_finds.py:578 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:33 #: 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:704 archaeological_finds/forms.py:1799 -#: archaeological_finds/models_finds.py:569 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:34 +#: archaeological_finds/forms.py:714 archaeological_finds/forms.py:1810 +#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:35 #: 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:707 archaeological_finds/forms.py:1800 -#: archaeological_finds/models_finds.py:573 +#: archaeological_finds/forms.py:717 archaeological_finds/forms.py:1811 +#: archaeological_finds/models_finds.py:589 msgid "Batch/object" msgstr "Lot/objet" -#: archaeological_finds/forms.py:710 +#: archaeological_finds/forms.py:720 msgid "Topography" msgstr "Topographie" -#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1883 -#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/forms.py:722 archaeological_finds/forms.py:1894 +#: archaeological_finds/models_finds.py:597 msgid "Point of topographic reference" msgstr "Point topographique" -#: archaeological_finds/forms.py:728 archaeological_finds/forms.py:2343 +#: archaeological_finds/forms.py:738 archaeological_finds/forms.py:2355 msgid "Resulting find" msgstr "Mobilier résultant" -#: archaeological_finds/forms.py:729 +#: archaeological_finds/forms.py:739 msgid "Treatment n-1 - 030 - Resulting find" msgstr "Traitement n-1 - 030 - Mobilier résultant" -#: archaeological_finds/forms.py:836 archaeological_finds/forms.py:2358 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2370 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: archaeological_finds/forms.py:837 +#: archaeological_finds/forms.py:847 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "Traitement 1-n - 030 - Mobiliers résultants" -#: archaeological_finds/forms.py:842 +#: archaeological_finds/forms.py:852 msgid "Number of resulting finds" msgstr "Nombre de mobiliers résultants" -#: archaeological_finds/forms.py:845 +#: archaeological_finds/forms.py:855 msgid "Prefix label for resulting finds" msgstr "Préfixe du libellé des mobiliers résultants" -#: archaeological_finds/forms.py:848 +#: archaeological_finds/forms.py:858 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" @@ -3919,29 +3985,29 @@ msgstr "" "Par exemple : avec un préfixe « élément- », chaque élément résultant sera " "nommé « élément-1 », « élément-2 », « élément-3 »..." -#: archaeological_finds/forms.py:853 +#: archaeological_finds/forms.py:863 msgid "Numbering starting from" msgstr "Numérotation commençant depuis" -#: archaeological_finds/forms.py:856 +#: archaeological_finds/forms.py:866 msgid "Name of the new basket containing the resulting items" msgstr "Nom du nouveau panier contenant les éléments résultants" -#: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1321 -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1331 +#: archaeological_finds/forms.py:1398 msgid "A basket with this label already exists." msgstr "Un panier avec ce libellé existe déjà." -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1397 +#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1407 msgid "Find - Quick action - Modify" msgstr "Mobilier - Action rapide - Modification" -#: archaeological_finds/forms.py:978 +#: archaeological_finds/forms.py:988 msgid "Datation" msgstr "Datation" -#: archaeological_finds/forms.py:979 archaeological_finds/forms.py:1450 -#: archaeological_finds/forms.py:1621 +#: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1631 #: archaeological_finds/templates/ishtar/sheet_find.html:283 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:309 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3952,250 +4018,250 @@ msgstr "Datation" msgid "Preservation" msgstr "Conservation" -#: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 -#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2240 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1499 +#: archaeological_finds/forms.py:1902 archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:2260 #: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "Altération" -#: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 -#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:1216 -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 +#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:1232 +#: archaeological_finds/models_finds.py:2264 #: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "Cause d'altération" -#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 -#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2227 +#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1493 +#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2247 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" msgstr "États de conservation" -#: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:1217 -#: archaeological_finds/models_finds.py:2250 +#: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1517 +#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1233 +#: archaeological_finds/models_finds.py:2270 #: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "Urgence du traitement" -#: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 -#: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2101 +#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1481 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:1227 +#: archaeological_finds/models_finds.py:2121 #: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "Intégrité" -#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 -#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1131 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 +#: archaeological_finds/models_finds.py:2127 #: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "Remarquabilité" -#: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:2256 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1911 archaeological_finds/models_finds.py:2276 msgid "Appraisal date" msgstr "Date d'évaluation" -#: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 -#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 -#: archaeological_finds/models_finds.py:2255 +#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1520 +#: archaeological_finds/forms.py:1910 archaeological_finds/models_finds.py:1244 +#: archaeological_finds/models_finds.py:2275 msgid "Insurance value" msgstr "Valeur d'assurance" -#: archaeological_finds/forms.py:1144 +#: archaeological_finds/forms.py:1154 msgid "Comment on conservatory" msgstr "Précisions sur la conservation" -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1274 msgid "Find - Quick action - Modify single" msgstr "Mobilier - Action rapide - Modification simple" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 msgid "Create" msgstr "Créer" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "Mettre à jour" -#: archaeological_finds/forms.py:1284 archaeological_finds/forms.py:1789 -#: archaeological_finds/forms.py:2562 archaeological_finds/forms.py:2567 -#: archaeological_finds/forms.py:2584 archaeological_finds/forms.py:2589 +#: archaeological_finds/forms.py:1294 archaeological_finds/forms.py:1799 +#: archaeological_finds/forms.py:2574 archaeological_finds/forms.py:2579 +#: archaeological_finds/forms.py:2596 archaeological_finds/forms.py:2601 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:933 -#: archaeological_finds/models_finds.py:1862 +#: archaeological_finds/models_finds.py:949 +#: archaeological_finds/models_finds.py:1882 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:420 msgid "Basket" msgstr "Panier" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1317 msgid "On update, you have to select a basket." msgstr "Pour la mise à jour, sélectionnez un panier." -#: archaeological_finds/forms.py:1314 +#: archaeological_finds/forms.py:1324 msgid "You cannot update the selected basket." msgstr "Vous ne pouvez pas mettre à jour le panier sélectionné." -#: archaeological_finds/forms.py:1318 archaeological_finds/forms.py:1385 +#: archaeological_finds/forms.py:1328 archaeological_finds/forms.py:1395 msgid "A label is required." msgstr "Un libellé est obligatoire." -#: archaeological_finds/forms.py:1407 archaeological_finds/forms.py:2458 +#: archaeological_finds/forms.py:1417 archaeological_finds/forms.py:2470 #: ishtar_common/models.py:1051 ishtar_common/models.py:2054 #: ishtar_common/models.py:3813 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:1408 archaeological_finds/forms.py:2459 +#: archaeological_finds/forms.py:1418 archaeological_finds/forms.py:2471 msgid "Is public" msgstr "Est public" -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2464 -#: archaeological_finds/forms.py:2506 ishtar_common/models.py:3826 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2518 ishtar_common/models.py:3826 msgid "Shared (read) with" msgstr "Partagé (lecture) avec" -#: archaeological_finds/forms.py:1420 archaeological_finds/forms.py:2471 -#: archaeological_finds/forms.py:2513 ishtar_common/models.py:3832 +#: archaeological_finds/forms.py:1430 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:2525 ishtar_common/models.py:3832 msgid "Shared (read/edit) with" msgstr "Partagé (lecture/édition) avec" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1461 msgid "Find - 030 - Preservation" msgstr "Mobilier - 030 - Conservation" -#: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1894 -#: archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/forms.py:1511 archaeological_finds/forms.py:1905 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2255 msgid "Recommended treatments" msgstr "Traitements recommandés" -#: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1898 -#: archaeological_finds/models_finds.py:1227 -#: archaeological_finds/models_finds.py:2148 +#: archaeological_finds/forms.py:1519 archaeological_finds/forms.py:1909 +#: archaeological_finds/models_finds.py:1243 +#: archaeological_finds/models_finds.py:2168 msgid "Estimated value" msgstr "Valeur estimée" -#: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2231 +#: archaeological_finds/forms.py:1523 archaeological_finds/forms.py:1901 +#: archaeological_finds/models_finds.py:2251 msgid "Conservatory comment" msgstr "Précisions sur la conservation" -#: archaeological_finds/forms.py:1563 +#: archaeological_finds/forms.py:1573 msgid "Find - 040 - Dating" msgstr "Mobilier - 040 - Datation" -#: archaeological_finds/forms.py:1569 +#: archaeological_finds/forms.py:1579 msgid "Find - 001 - Search" msgstr "Mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:1573 +#: archaeological_finds/forms.py:1583 msgid "Find origin" msgstr "Origine du mobilier" -#: archaeological_finds/forms.py:1596 +#: archaeological_finds/forms.py:1606 msgid "Discovery" msgstr "Découverte" -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:1709 archaeological_finds/models_finds.py:2318 msgid "Complete museum ID" msgstr "Numéro d’inventaire complet" -#: archaeological_finds/forms.py:1705 archaeological_finds/models_finds.py:1150 +#: archaeological_finds/forms.py:1715 archaeological_finds/models_finds.py:1166 msgid "Base find - Short ID" msgstr "Mobilier d'origine - ID court" -#: archaeological_finds/forms.py:1706 archaeological_finds/models_finds.py:1151 +#: archaeological_finds/forms.py:1716 archaeological_finds/models_finds.py:1167 msgid "Base find - Complete ID" msgstr "Mobilier d'origine - ID complet" -#: archaeological_finds/forms.py:1710 +#: archaeological_finds/forms.py:1720 msgid "Operation - number (index by year)" msgstr "Opération - Numéro (index par année)" -#: archaeological_finds/forms.py:1713 +#: archaeological_finds/forms.py:1723 msgid "Operation - Code (PATRIARCHE)" msgstr "Opération - Code (PATRIARCHE)" -#: archaeological_finds/forms.py:1716 +#: archaeological_finds/forms.py:1726 msgid "Operation - Type" msgstr "Opération - Type" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1729 msgid "Operation - Address / Locality" msgstr "Opération - Adresse / Lieu-dit" -#: archaeological_finds/forms.py:1722 +#: archaeological_finds/forms.py:1732 msgid "Operation - In charge" msgstr "Opération - Responsable" -#: archaeological_finds/forms.py:1733 +#: archaeological_finds/forms.py:1743 msgid "Operation - Scientist in charge" msgstr "Opération - Responsable d'opération" -#: archaeological_finds/forms.py:1736 +#: archaeological_finds/forms.py:1746 msgid "Operation - Operator" msgstr "Opération - Opérateur" -#: archaeological_finds/forms.py:1740 +#: archaeological_finds/forms.py:1750 msgid "Operation - Name" msgstr "Opération - Nom" -#: archaeological_finds/forms.py:1743 +#: archaeological_finds/forms.py:1753 msgid "Operation - Remains" msgstr "Opération - Vestiges" -#: archaeological_finds/forms.py:1746 archaeological_operations/forms.py:472 -#: archaeological_operations/forms.py:1208 ishtar_common/forms_common.py:1570 +#: archaeological_finds/forms.py:1756 archaeological_operations/forms.py:472 +#: archaeological_operations/forms.py:1216 ishtar_common/forms_common.py:1570 #: ishtar_common/models.py:2409 ishtar_common/models.py:3482 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:91 msgid "Areas" msgstr "Zones" -#: archaeological_finds/forms.py:1749 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "Site archéologique (rattaché à l'opération)" -#: archaeological_finds/forms.py:1757 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "Site archéologique nom (rattaché à l'opération)" -#: archaeological_finds/forms.py:1760 archaeological_warehouse/forms.py:552 +#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "Site archéologique (rattaché à l'UE)" -#: archaeological_finds/forms.py:1768 archaeological_warehouse/forms.py:560 +#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "Site archéologique nom (rattaché à l'UE)" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1781 msgid "Archaeological site - Remains" msgstr "Site archéologique - Vestiges" -#: archaeological_finds/forms.py:1780 +#: archaeological_finds/forms.py:1790 msgid "Context record - Type" msgstr "Unité d'Enregistrement - Type" -#: archaeological_finds/forms.py:1785 +#: archaeological_finds/forms.py:1795 msgid "Search within related context records" msgstr "Recherche parmi les Unités d'Enregistrement associées" -#: archaeological_finds/forms.py:1797 +#: archaeological_finds/forms.py:1808 msgid "Base find - Comment on the circumstances of discovery" msgstr "Précisions sur les circonstances de découvertes" -#: archaeological_finds/forms.py:1803 archaeological_finds/forms.py:2349 +#: archaeological_finds/forms.py:1814 archaeological_finds/forms.py:2361 #: archaeological_finds/models_finds.py:94 -#: archaeological_finds/models_finds.py:1207 +#: archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 #: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -4203,8 +4269,8 @@ msgstr "Précisions sur les circonstances de découvertes" msgid "Material type" msgstr "Type de matériau" -#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:274 -#: archaeological_finds/models_finds.py:1208 +#: archaeological_finds/forms.py:1832 archaeological_finds/models_finds.py:274 +#: archaeological_finds/models_finds.py:1224 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 @@ -4212,112 +4278,112 @@ msgstr "Type de matériau" msgid "Object type" msgstr "Type d'objet" -#: archaeological_finds/forms.py:1867 +#: archaeological_finds/forms.py:1878 msgid "Weight - lower than (g)" msgstr "Poids - plus petit que (g)" -#: archaeological_finds/forms.py:1902 +#: archaeological_finds/forms.py:1913 msgid "Loan?" msgstr "Prêt ?" -#: archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:1914 msgid "Treatment file end date" msgstr "Dossier de traitement - date de clotûre" -#: archaeological_finds/forms.py:1904 +#: archaeological_finds/forms.py:1915 msgid "Treatment end date" msgstr "Traitement - date de clôture" -#: archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1917 msgid "Museum - Comment on museum ID" msgstr "Musée - Précisions sur le numéro d’inventaire" -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1919 msgid "Museum - Owner institution" msgstr "Musée - Institution propriétaire" -#: archaeological_finds/forms.py:1914 +#: archaeological_finds/forms.py:1925 msgid "Museum - Assigned institution" msgstr "Musée - Institution affectataire" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1931 msgid "Museum - Custodian institution" msgstr "Musée - Institution dépositaire" -#: archaeological_finds/forms.py:1925 +#: archaeological_finds/forms.py:1936 msgid "Museum - Depositor inventory number" msgstr "Musée - Numéro d’inventaire du déposant" -#: archaeological_finds/forms.py:1926 +#: archaeological_finds/forms.py:1937 msgid "Museum - Collections entry mode" msgstr "Musée - Mode d’entrée dans les collections" -#: archaeological_finds/forms.py:1927 +#: archaeological_finds/forms.py:1938 msgid "Museum - Comment on museum entry mode" msgstr "Musée - Précisions sur le mode d'entrée" -#: archaeological_finds/forms.py:1928 +#: archaeological_finds/forms.py:1939 msgid "Museum - Entry date (exact or start)" msgstr "Musée - Date d’entrée (exacte ou début)" -#: archaeological_finds/forms.py:1929 +#: archaeological_finds/forms.py:1940 msgid "Museum - Entry date end" msgstr "Musée - Date d’entrée (fin)" -#: archaeological_finds/forms.py:1930 +#: archaeological_finds/forms.py:1941 msgid "Museum - Comment on entry date" msgstr "Musée - Précisions sur la date d’entrée" -#: archaeological_finds/forms.py:1932 +#: archaeological_finds/forms.py:1943 msgid "Museum - Donor, testator or vendor" msgstr "Musée - Donateur, testateur ou vendeur" -#: archaeological_finds/forms.py:1938 +#: archaeological_finds/forms.py:1949 msgid "Museum - Presence of inventory marking" msgstr "Musée - Présence d’un marquage inventaire" -#: archaeological_finds/forms.py:1941 +#: archaeological_finds/forms.py:1952 msgid "Museum - Type of marking" msgstr "Musée - Type de marquage" -#: archaeological_finds/forms.py:1945 +#: archaeological_finds/forms.py:1956 msgid "Museum - Collection" msgstr "Musée - Collection" -#: archaeological_finds/forms.py:1948 +#: archaeological_finds/forms.py:1959 msgid "Museum - Former collection" msgstr "Musée - Ancienne collection" -#: archaeological_finds/forms.py:1953 +#: archaeological_finds/forms.py:1964 msgid "Museum - Inventory entry year" msgstr "Musée - Année d’inscription à l’inventaire" -#: archaeological_finds/forms.py:1955 +#: archaeological_finds/forms.py:1966 msgid "Museum - Conformity with inventory" msgstr "Musée - Conformité avec l’inventaire" -#: archaeological_finds/forms.py:1957 +#: archaeological_finds/forms.py:1968 msgid "Museum - Comment on conformity" msgstr "Musée - Précisions sur la conformité" -#: archaeological_finds/forms.py:1958 +#: archaeological_finds/forms.py:1969 msgid "Museum - Inventory transcript" msgstr "Musée - Transcription de l’inventaire" -#: archaeological_finds/forms.py:1960 +#: archaeological_finds/forms.py:1971 msgid "Museum - Original/reproduction" msgstr "Musée - Original/reproduction" -#: archaeological_finds/forms.py:1962 +#: archaeological_finds/forms.py:1973 msgid "Museum - Date of allocation" msgstr "Musée - Date d’affectation au musée" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1974 msgid "Museum - Purchase price" msgstr "Musée - Prix d’achat" -#: archaeological_finds/forms.py:2035 archaeological_finds/models_finds.py:1167 -#: archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:2047 archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:2085 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4329,11 +4395,11 @@ msgstr "Musée - Prix d’achat" msgid "Reference container" msgstr "Contenant de référence" -#: archaeological_finds/forms.py:2042 +#: archaeological_finds/forms.py:2054 msgid "Reference container - Warehouse (location)" msgstr "Lieu de conservation du contenant de référence" -#: archaeological_finds/forms.py:2061 archaeological_finds/models_finds.py:1166 +#: archaeological_finds/forms.py:2073 archaeological_finds/models_finds.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:329 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:355 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4345,47 +4411,47 @@ msgstr "Lieu de conservation du contenant de référence" msgid "Current container" msgstr "Contenant actuel" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:2080 msgid "Current container - Warehouse (location)" msgstr "Lieu de conservation du contenant actuel" -#: archaeological_finds/forms.py:2088 archaeological_finds/forms.py:2109 -#: archaeological_finds/forms.py:2165 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2100 archaeological_finds/forms.py:2121 +#: archaeological_finds/forms.py:2177 archaeological_finds/views.py:382 msgid "Find search" msgstr "Rechercher un mobilier" -#: archaeological_finds/forms.py:2204 archaeological_finds/forms.py:2367 +#: archaeological_finds/forms.py:2216 archaeological_finds/forms.py:2379 #: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "Mobilier amont" -#: archaeological_finds/forms.py:2227 +#: archaeological_finds/forms.py:2239 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: archaeological_finds/forms.py:2348 +#: archaeological_finds/forms.py:2360 msgid "Precise description" msgstr "Description précise" -#: archaeological_finds/forms.py:2363 +#: archaeological_finds/forms.py:2375 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: archaeological_finds/forms.py:2406 +#: archaeological_finds/forms.py:2418 msgid "Find basket - 001 - Search" msgstr "Panier mobilier - 001 - Recherche" -#: archaeological_finds/forms.py:2418 archaeological_finds/forms.py:2436 +#: archaeological_finds/forms.py:2430 archaeological_finds/forms.py:2448 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "Recherche de panier" -#: archaeological_finds/forms.py:2453 +#: archaeological_finds/forms.py:2465 msgid "Find basket" msgstr "Panier de mobilier" -#: archaeological_finds/forms.py:2456 +#: archaeological_finds/forms.py:2468 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:211 @@ -4418,11 +4484,11 @@ msgstr "Panier de mobilier" msgid "Label" msgstr "Dénomination" -#: archaeological_finds/forms.py:2498 archaeological_finds/forms.py:2553 +#: archaeological_finds/forms.py:2510 archaeological_finds/forms.py:2565 msgid "A basket with this slug already exists." msgstr "Un panier avec cet identifiant textuel existe déjà." -#: archaeological_finds/forms.py:2545 +#: archaeological_finds/forms.py:2557 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." @@ -4469,8 +4535,8 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2574 -#: archaeological_operations/models.py:2907 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:3024 ishtar_common/views.py:511 msgid "Treatment" msgstr "Traitement" @@ -4573,8 +4639,8 @@ msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/models_treatments.py:1269 #: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2573 -#: archaeological_operations/models.py:2899 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2690 +#: archaeological_operations/models.py:3016 ishtar_common/views.py:510 msgid "Treatment request" msgstr "Demande de traitement" @@ -4608,8 +4674,8 @@ msgid "Treatment type is required." msgstr "Type de traitement est requis." #: archaeological_finds/forms_treatments.py:498 -#: archaeological_finds/models_finds.py:2053 -#: archaeological_finds/models_finds.py:3612 +#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:3632 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:852 #: archaeological_finds/templates/ishtar/sheet_find.html:390 @@ -4806,7 +4872,7 @@ msgid "Treatment one to many - creation" msgstr "Traitement de un à plusieurs - création" #: archaeological_finds/models_finds.py:90 -#: archaeological_operations/models.py:2578 +#: archaeological_operations/models.py:2695 #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 #: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4027 msgid "Code" @@ -4905,7 +4971,7 @@ msgid "Treatment types" msgstr "Types de traitement" #: archaeological_finds/models_finds.py:187 -#: archaeological_finds/models_finds.py:2273 +#: archaeological_finds/models_finds.py:2293 #: archaeological_finds/models_treatments.py:76 #: archaeological_finds/models_treatments.py:304 #: archaeological_finds/models_treatments.py:316 @@ -5020,107 +5086,115 @@ msgid "Checked types" msgstr "Types de vérification" #: archaeological_finds/models_finds.py:421 +msgid "Discovery method type" +msgstr "Type de méthode de découverte" + +#: archaeological_finds/models_finds.py:422 +msgid "Discovery method types" +msgstr "Types de méthode de découverte" + +#: archaeological_finds/models_finds.py:435 msgid "Collection entry mode type" msgstr "Type de mode d’entrée dans les collections" -#: archaeological_finds/models_finds.py:422 +#: archaeological_finds/models_finds.py:436 msgid "Collection entry mode types" msgstr "Types de mode d’entrée dans les collections" -#: archaeological_finds/models_finds.py:437 +#: archaeological_finds/models_finds.py:451 msgid "Presence of inventory marking type" msgstr "Type de présence d’un marquage inventaire" -#: archaeological_finds/models_finds.py:438 +#: archaeological_finds/models_finds.py:452 msgid "Presence of inventory marking types" msgstr "Types de présence d’un marquage inventaire" -#: archaeological_finds/models_finds.py:452 +#: archaeological_finds/models_finds.py:466 msgid "Marking type" msgstr "Type de marquage" -#: archaeological_finds/models_finds.py:453 +#: archaeological_finds/models_finds.py:467 msgid "Marking types" msgstr "Types de marquage" -#: archaeological_finds/models_finds.py:467 +#: archaeological_finds/models_finds.py:481 msgid "Museum collection type" msgstr "Type de collection muséale" -#: archaeological_finds/models_finds.py:468 +#: archaeological_finds/models_finds.py:482 msgid "Museum collection types" msgstr "Types de collection muséale" -#: archaeological_finds/models_finds.py:482 +#: archaeological_finds/models_finds.py:496 msgid "Inventory conformity type" msgstr "Type de conformité avec l’inventaire" -#: archaeological_finds/models_finds.py:483 +#: archaeological_finds/models_finds.py:497 msgid "Inventory conformity types" msgstr "Types de conformité avec l’inventaire" -#: archaeological_finds/models_finds.py:497 +#: archaeological_finds/models_finds.py:511 msgid "Original/reproduction type" msgstr "Type original/reproduction" -#: archaeological_finds/models_finds.py:498 +#: archaeological_finds/models_finds.py:512 msgid "Original/reproduction types" msgstr "Types original/reproduction" -#: archaeological_finds/models_finds.py:557 +#: archaeological_finds/models_finds.py:569 msgid "Special interest" msgstr "Intérêt spécifique" -#: archaeological_finds/models_finds.py:579 +#: archaeological_finds/models_finds.py:595 msgid "Material index" msgstr "Index matériel" -#: archaeological_finds/models_finds.py:584 +#: archaeological_finds/models_finds.py:600 #: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "Ligne" -#: archaeological_finds/models_finds.py:586 +#: archaeological_finds/models_finds.py:602 msgid "Short ID" msgstr "Identifiant court" -#: archaeological_finds/models_finds.py:590 -#: archaeological_finds/models_finds.py:597 -#: archaeological_finds/models_finds.py:2302 ishtar_common/models.py:4672 +#: archaeological_finds/models_finds.py:606 +#: archaeological_finds/models_finds.py:613 +#: archaeological_finds/models_finds.py:2322 ishtar_common/models.py:4672 #: ishtar_common/models.py:4679 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: archaeological_finds/models_finds.py:593 +#: archaeological_finds/models_finds.py:609 msgid "Complete ID" msgstr "Identifiant complet" -#: archaeological_finds/models_finds.py:614 +#: archaeological_finds/models_finds.py:630 msgid "Concatenation of associated material types codes" msgstr "Concaténation des types de matériaux associés" -#: archaeological_finds/models_finds.py:620 -#: archaeological_finds/models_finds.py:1974 +#: archaeological_finds/models_finds.py:636 +#: archaeological_finds/models_finds.py:1994 msgid "Base find" msgstr "Mobilier d'origine" -#: archaeological_finds/models_finds.py:904 +#: archaeological_finds/models_finds.py:920 msgid "g" msgstr "g" -#: archaeological_finds/models_finds.py:905 +#: archaeological_finds/models_finds.py:921 msgid "kg" msgstr "kg" -#: archaeological_finds/models_finds.py:912 +#: archaeological_finds/models_finds.py:928 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 msgid "Associated finds" msgstr "Mobilier associé" -#: archaeological_finds/models_finds.py:917 +#: archaeological_finds/models_finds.py:933 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -5133,620 +5207,625 @@ msgstr "Mobilier associé" msgid "Modify" msgstr "Modifier" -#: archaeological_finds/models_finds.py:974 archaeological_finds/views.py:539 +#: archaeological_finds/models_finds.py:990 archaeological_finds/views.py:539 msgid "Manage basket" msgstr "Gérer un panier" -#: archaeological_finds/models_finds.py:986 +#: archaeological_finds/models_finds.py:1002 #: archaeological_warehouse/models.py:1946 msgid "Add treatment" msgstr "Ajouter un traitement" -#: archaeological_finds/models_finds.py:997 +#: archaeological_finds/models_finds.py:1013 msgid "Add treatment file" msgstr "Ajouter une demande de traitement" -#: archaeological_finds/models_finds.py:1152 +#: archaeological_finds/models_finds.py:1168 msgid "Operation (code)" msgstr "Opération (code)" -#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1173 msgid "Batch" msgstr "Lot" -#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1174 msgid "Base find - Comment" msgstr "Mobilier d'origine - Commentaires" -#: archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1175 msgid "Base find - Description" msgstr "Mobilier d'origine - Description" -#: archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1177 msgid "Base find - Topographic localisation" msgstr "Mobilier d'origine - Localisation topographique" -#: archaeological_finds/models_finds.py:1163 +#: archaeological_finds/models_finds.py:1179 msgid "Base find - Special interest" msgstr "Mobilier d'origine - Intérêt spécifique" -#: archaeological_finds/models_finds.py:1164 +#: archaeological_finds/models_finds.py:1180 msgid "Base find - Discovery date (exact or beginning)" msgstr "Mobilier d'origine - Date de découverte (exacte ou début)" -#: archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:1181 msgid "Base find - Discovery date (end)" msgstr "Mobilier d'origine - Date de découverte (fin)" -#: archaeological_finds/models_finds.py:1194 +#: archaeological_finds/models_finds.py:1210 #: archaeological_operations/forms.py:479 #: archaeological_operations/forms.py:684 -#: archaeological_operations/forms.py:1655 -#: archaeological_operations/forms.py:1723 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1089 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5342 +#: archaeological_operations/forms.py:1699 +#: archaeological_operations/forms.py:1767 +#: archaeological_operations/models.py:1113 +#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1518 ishtar_common/models.py:5342 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "Type d'opération" -#: archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:1242 msgid "Weight (kg)" msgstr "Poids (kg)" -#: archaeological_finds/models_finds.py:1311 +#: archaeological_finds/models_finds.py:1327 msgctxt "key for text search" msgid "short-id" msgstr "id-court" -#: archaeological_finds/models_finds.py:1315 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "complete-id" msgstr "id-complet" -#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_finds.py:1335 msgctxt "key for text search" msgid "free-id" msgstr "id-libre" -#: archaeological_finds/models_finds.py:1322 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "denomination" msgstr "denomination" -#: archaeological_finds/models_finds.py:1337 archaeological_finds/tests.py:1537 +#: archaeological_finds/models_finds.py:1353 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:1341 ishtar_common/models.py:4378 +#: archaeological_finds/models_finds.py:1357 ishtar_common/models.py:4378 msgctxt "key for text search" msgid "operation-type" msgstr "type-operation" -#: archaeological_finds/models_finds.py:1345 -#: archaeological_operations/models.py:389 -#: archaeological_operations/models.py:1158 ishtar_common/models.py:4427 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_operations/models.py:474 +#: archaeological_operations/models.py:1275 ishtar_common/models.py:4427 msgctxt "key for text search" msgid "area" msgstr "zone" -#: archaeological_finds/models_finds.py:1354 +#: archaeological_finds/models_finds.py:1370 #: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "site-nom" -#: archaeological_finds/models_finds.py:1359 -#: archaeological_finds/models_finds.py:1895 +#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1915 #: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "ue-site" -#: archaeological_finds/models_finds.py:1364 +#: archaeological_finds/models_finds.py:1380 #: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "ue-site-nom" -#: archaeological_finds/models_finds.py:1368 -#: archaeological_finds/models_finds.py:1890 +#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1910 #: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4386 #: ishtar_common/models.py:4488 msgctxt "key for text search" msgid "context-record" msgstr "ue" -#: archaeological_finds/models_finds.py:1372 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "context-record-type" msgstr "ue-type" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "discovery-comment" msgstr "decouverte-precisions" -#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "ue-type-relation" -#: archaeological_finds/models_finds.py:1388 archaeological_finds/tests.py:1444 +#: archaeological_finds/models_finds.py:1404 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:1393 +#: archaeological_finds/models_finds.py:1409 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "type-objet" -#: archaeological_finds/models_finds.py:1397 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "recommended-treatments" msgstr "traitements-recommandes" -#: archaeological_finds/models_finds.py:1401 archaeological_finds/tests.py:1691 +#: archaeological_finds/models_finds.py:1417 archaeological_finds/tests.py:1691 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "conservation" -#: archaeological_finds/models_finds.py:1405 +#: archaeological_finds/models_finds.py:1421 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "integrite" -#: archaeological_finds/models_finds.py:1409 +#: archaeological_finds/models_finds.py:1425 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "remarquabilite" -#: archaeological_finds/models_finds.py:1416 +#: archaeological_finds/models_finds.py:1432 msgctxt "key for text search" msgid "batch" msgstr "lot" -#: archaeological_finds/models_finds.py:1420 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "checked" msgstr "verifie" -#: archaeological_finds/models_finds.py:1424 ishtar_common/models.py:4409 +#: archaeological_finds/models_finds.py:1440 ishtar_common/models.py:4409 msgctxt "key for text search" msgid "container" msgstr "contenant" -#: archaeological_finds/models_finds.py:1428 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1913 #: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "localisation" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1448 msgctxt "key for text search" msgid "current-location" msgstr "localisation-actuelle" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1452 msgctxt "key for text search" msgid "current-container" msgstr "contenant-actuel" -#: archaeological_finds/models_finds.py:1440 +#: archaeological_finds/models_finds.py:1456 #: archaeological_finds/wizards.py:462 msgctxt "key for text search" msgid "basket" msgstr "panier" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "last-modified-by" msgstr "modifie-en-dernier-par" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1467 #: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" -#: archaeological_finds/models_finds.py:1454 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1470 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "pret" -#: archaeological_finds/models_finds.py:1456 +#: archaeological_finds/models_finds.py:1472 msgctxt "key for text search" msgid "treatment-file-end-date" msgstr "demande-fin-de-traitement" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "treatment-end-date" msgstr "fin-de-traitement" -#: archaeological_finds/models_finds.py:1464 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" msgid "previous-id" msgstr "id-precedent" -#: archaeological_finds/models_finds.py:1471 +#: archaeological_finds/models_finds.py:1487 msgctxt "key for text search" msgid "seal-number" msgstr "numero-scelle" -#: archaeological_finds/models_finds.py:1474 +#: archaeological_finds/models_finds.py:1490 msgctxt "key for text search" msgid "excavation-id" msgstr "id-fouille" -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1494 msgctxt "key for text search" msgid "museum-id" msgstr "id-musee" -#: archaeological_finds/models_finds.py:1481 +#: archaeological_finds/models_finds.py:1497 msgctxt "key for text search" msgid "complete-museum-id" msgstr "id-musee-complet" -#: archaeological_finds/models_finds.py:1484 +#: archaeological_finds/models_finds.py:1500 msgctxt "key for text search" msgid "laboratory-id" msgstr "numero-laboratoire" -#: archaeological_finds/models_finds.py:1488 +#: archaeological_finds/models_finds.py:1504 msgctxt "key for text search" msgid "mark" msgstr "marquage" -#: archaeological_finds/models_finds.py:1491 +#: archaeological_finds/models_finds.py:1507 msgctxt "key for text search" msgid "discovery-date" msgstr "date-decouverte" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1511 msgctxt "key for text search" msgid "discovery-date-taq" msgstr "date-decouverte-taq" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1515 msgctxt "key for text search" msgid "is-complete" msgstr "est-complet" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1518 msgctxt "key for text search" msgid "material-type-quality" msgstr "type-materiaux-qualite" -#: archaeological_finds/models_finds.py:1506 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "object-type-quality" msgstr "type-objet-qualite" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1526 msgctxt "key for text search" msgid "find-number" msgstr "nombre-mobilier" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "nmi" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1533 msgctxt "key for text search" msgid "decoration" msgstr "decor" -#: archaeological_finds/models_finds.py:1520 +#: archaeological_finds/models_finds.py:1536 msgctxt "key for text search" msgid "inscription" msgstr "inscription" -#: archaeological_finds/models_finds.py:1523 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "manufacturing-place" msgstr "lieu-fabrication" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "communicabilities" msgstr "communicabilite" -#: archaeological_finds/models_finds.py:1534 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "material-comment" msgstr "materiau-commentaire" -#: archaeological_finds/models_finds.py:1538 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "dating-comment" msgstr "commentaire-datation" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "conservatory-comment" msgstr "commentaire-conservation" -#: archaeological_finds/models_finds.py:1546 +#: archaeological_finds/models_finds.py:1562 msgctxt "key for text search" msgid "length" msgstr "longueur" -#: archaeological_finds/models_finds.py:1549 +#: archaeological_finds/models_finds.py:1565 msgctxt "key for text search" msgid "width" msgstr "largeur" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "height" msgstr "hauteur" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1571 msgctxt "key for text search" msgid "thickness" msgstr "epaisseur" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1574 msgctxt "key for text search" msgid "diameter" msgstr "diametre" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "circumference" msgstr "circonference" -#: archaeological_finds/models_finds.py:1565 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "volume" msgstr "volume" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" msgid "weight" msgstr "poids" -#: archaeological_finds/models_finds.py:1571 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" msgid "clutter-long-side" msgstr "encombrement-cote-long" -#: archaeological_finds/models_finds.py:1575 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" msgid "clutter-short-side" msgstr "encombrement-cote-court" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1595 msgctxt "key for text search" msgid "clutter-height" msgstr "encombrement-hauteur" -#: archaeological_finds/models_finds.py:1583 +#: archaeological_finds/models_finds.py:1599 msgctxt "key for text search" msgid "dimensions-comment" msgstr "commentaire-dimensions" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1603 +msgctxt "key for text search" +msgid "discovery-method" +msgstr "methode-decouverte" + +#: archaeological_finds/models_finds.py:1607 msgctxt "key for text search" msgid "topographic-localisation" msgstr "localisation-topographique" -#: archaeological_finds/models_finds.py:1591 +#: archaeological_finds/models_finds.py:1611 msgctxt "key for text search" msgid "check-date" msgstr "date-verification" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1614 #: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "alterations" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1618 #: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "causes-alterations" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1622 #: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "urgence-traitement" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1626 msgctxt "key for text search" msgid "estimated-value" msgstr "valeur-estimee" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1630 msgctxt "key for text search" msgid "insurance-value" msgstr "valeur-assurance" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1634 msgctxt "key for text search" msgid "appraisal-date" msgstr "date-evaluation" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1642 msgctxt "key for text search" msgid "functional-area" msgstr "domaine-fonctionnel" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1646 msgctxt "key for text search" msgid "technical-area" msgstr "domaine-technique" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1650 msgctxt "key for text search" msgid "technical-process" msgstr "procede-technique" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1654 archaeological_finds/tests.py:1631 msgctxt "key for text search" msgid "operation-address" msgstr "operation-adresse" -#: archaeological_finds/models_finds.py:1642 -#: archaeological_operations/models.py:1188 +#: archaeological_finds/models_finds.py:1662 +#: archaeological_operations/models.py:1305 msgctxt "key for text search" msgid "scientist" msgstr "scientifique" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1193 +#: archaeological_finds/models_finds.py:1666 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1310 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "operateur" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1674 msgctxt "key for text search" msgid "operation-remain" msgstr "operation-vestige" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1678 msgctxt "key for text search" msgid "site-remain" msgstr "site-vestige" -#: archaeological_finds/models_finds.py:1662 +#: archaeological_finds/models_finds.py:1682 msgctxt "key for text search" msgid "museum-id-comment" msgstr "musee-id-commentaire" -#: archaeological_finds/models_finds.py:1666 +#: archaeological_finds/models_finds.py:1686 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "musee-proprietaire" -#: archaeological_finds/models_finds.py:1671 +#: archaeological_finds/models_finds.py:1691 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "musee-affectataire" -#: archaeological_finds/models_finds.py:1676 +#: archaeological_finds/models_finds.py:1696 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "musee-depositaire" -#: archaeological_finds/models_finds.py:1681 +#: archaeological_finds/models_finds.py:1701 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "musee-inventaire-deposant" -#: archaeological_finds/models_finds.py:1685 +#: archaeological_finds/models_finds.py:1705 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "musee-mode-entree-collection" -#: archaeological_finds/models_finds.py:1689 +#: archaeological_finds/models_finds.py:1709 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "musee-mode-entree-commentaire" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1713 msgctxt "key for text search" msgid "museum-entry-date" msgstr "musee-date-entree" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1717 msgctxt "key for text search" msgid "museum-entry-date-end" msgstr "musee-date-entree-fin" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1721 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "musee-date-entree-commentaire" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1725 msgctxt "key for text search" msgid "museum-donor" msgstr "musee-donneur" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1730 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "musee-type-presence-marquage" -#: archaeological_finds/models_finds.py:1714 +#: archaeological_finds/models_finds.py:1734 msgctxt "key for text search" msgid "museum-marking-type" msgstr "musee-type-marquage" -#: archaeological_finds/models_finds.py:1718 +#: archaeological_finds/models_finds.py:1738 msgctxt "key for text search" msgid "museum-collection" msgstr "musee-collection" -#: archaeological_finds/models_finds.py:1723 +#: archaeological_finds/models_finds.py:1743 msgctxt "key for text search" msgid "museum-former-collection" msgstr "musee-ancienne-collection" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1748 msgctxt "key for text search" msgid "museum-inventory-entry-year" msgstr "musee-entree-inventaire-annee" -#: archaeological_finds/models_finds.py:1732 +#: archaeological_finds/models_finds.py:1752 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "musee-conformite-inventaire" -#: archaeological_finds/models_finds.py:1737 +#: archaeological_finds/models_finds.py:1757 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "musee-commentaire-conformite" -#: archaeological_finds/models_finds.py:1741 +#: archaeological_finds/models_finds.py:1761 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "musee-transcription-inventaire" -#: archaeological_finds/models_finds.py:1745 +#: archaeological_finds/models_finds.py:1765 msgctxt "key for text search" msgid "museum-original-repro" msgstr "musee-original-repro" -#: archaeological_finds/models_finds.py:1750 +#: archaeological_finds/models_finds.py:1770 msgctxt "key for text search" msgid "museum-allocation-date" msgstr "musee-date-affectation" -#: archaeological_finds/models_finds.py:1754 +#: archaeological_finds/models_finds.py:1774 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "musee-prix-achat" -#: archaeological_finds/models_finds.py:1758 +#: archaeological_finds/models_finds.py:1778 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "musee-quantite-inventaire" -#: archaeological_finds/models_finds.py:1762 +#: archaeological_finds/models_finds.py:1782 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "musee-quantite-vue" -#: archaeological_finds/models_finds.py:1869 -#: archaeological_finds/models_finds.py:2668 +#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:2688 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 #: archaeological_warehouse/views.py:304 ishtar_common/models.py:4526 @@ -5756,19 +5835,19 @@ msgstr "musee-quantite-vue" msgid "Packaging" msgstr "Conditionnement" -#: archaeological_finds/models_finds.py:1877 +#: archaeological_finds/models_finds.py:1897 msgid "Treatment many to one" msgstr "Traitement de plusieurs à un" -#: archaeological_finds/models_finds.py:2018 +#: archaeological_finds/models_finds.py:2038 msgid "Weight" msgstr "Poids" -#: archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2040 msgid "Weight unit" msgstr "Unité de poids" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2055 #: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5779,7 +5858,7 @@ msgstr "Unité de poids" msgid "Upstream treatment" msgstr "Traitement amont" -#: archaeological_finds/models_finds.py:2042 +#: archaeological_finds/models_finds.py:2062 #: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5790,111 +5869,111 @@ msgstr "Traitement amont" msgid "Downstream treatment" msgstr "Traitement aval" -#: archaeological_finds/models_finds.py:2060 +#: archaeological_finds/models_finds.py:2080 msgid "Container - first full location" msgstr "Contenant - Localisation complète" -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:2081 +#: archaeological_finds/models_finds.py:2093 msgid "Updated as long as no packaging is attached" msgstr "Mis à jour tant qu'aucun conditionnement n'ai attaché" -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/models_finds.py:2092 msgid "Reference container - first full location" msgstr "Contenant de référence - Localisation complète" -#: archaeological_finds/models_finds.py:2124 +#: archaeological_finds/models_finds.py:2144 msgid "Clutter - long side (cm)" msgstr "Encombrement - grand côté (cm)" -#: archaeological_finds/models_finds.py:2127 +#: archaeological_finds/models_finds.py:2147 msgid "Clutter - short side (cm)" msgstr "Encombrement - petit côté (cm)" -#: archaeological_finds/models_finds.py:2130 +#: archaeological_finds/models_finds.py:2150 msgid "Clutter - height (cm)" msgstr "Encombrement - hauteur (cm)" -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2173 msgid "Do not use - need evolutions" msgstr "Ne pas utiliser - Nécessite des évolutions" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2224 msgid "Former collection" msgstr "Ancienne collection" -#: archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_finds.py:2296 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:2286 +#: archaeological_finds/models_finds.py:2306 msgid "Cached object types label" msgstr "Nom en cache des types d'objet" -#: archaeological_finds/models_finds.py:2292 +#: archaeological_finds/models_finds.py:2312 msgid "Cached material types label" msgstr "Nom en cache des types de matériaux" -#: archaeological_finds/models_finds.py:2332 +#: archaeological_finds/models_finds.py:2352 msgid "FIND" msgstr "MOBILIER" -#: archaeological_finds/models_finds.py:2506 +#: archaeological_finds/models_finds.py:2526 msgid "Material types string" msgstr "Chaîne de caractère des types de matériau" -#: archaeological_finds/models_finds.py:2507 +#: archaeological_finds/models_finds.py:2527 msgid "Material types code string" msgstr "Code des types de matériau" -#: archaeological_finds/models_finds.py:2508 +#: archaeological_finds/models_finds.py:2528 msgid "Recommendations string from material" msgstr "Chaîne de caractères - recommandations pour le matériau" -#: archaeological_finds/models_finds.py:2509 +#: archaeological_finds/models_finds.py:2529 msgid "Complete ID of associated base finds" msgstr "Identifiant complet du mobilier d'origine associé" -#: archaeological_finds/models_finds.py:2510 +#: archaeological_finds/models_finds.py:2530 msgid "Label of associated context records" msgstr "Dénomination des unités d'enregistrement associées" -#: archaeological_finds/models_finds.py:2641 +#: archaeological_finds/models_finds.py:2661 msgid "Add to basket" msgstr "Ajouter au panier" -#: archaeological_finds/models_finds.py:2649 +#: archaeological_finds/models_finds.py:2669 msgid "Simple treatment" msgstr "Traitement simple" -#: archaeological_finds/models_finds.py:2657 +#: archaeological_finds/models_finds.py:2677 msgid "Divide treatment" msgstr "Traitement de division" -#: archaeological_finds/models_finds.py:3135 +#: archaeological_finds/models_finds.py:3155 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:3141 +#: archaeological_finds/models_finds.py:3161 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:3631 +#: archaeological_finds/models_finds.py:3651 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Current" msgstr "Actuel" -#: archaeological_finds/models_finds.py:3632 +#: archaeological_finds/models_finds.py:3652 #: archaeological_finds/models_treatments.py:1198 #: archaeological_finds/templates/ishtar/sheet_find.html:420 #: archaeological_operations/forms.py:1101 #: archaeological_operations/forms.py:1198 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:500 +#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:597 #: archaeological_warehouse/forms.py:343 #: archaeological_warehouse/models.py:2103 ishtar_common/forms_common.py:2150 #: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 @@ -5903,28 +5982,28 @@ msgstr "Actuel" msgid "Reference" msgstr "Référence" -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:3653 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Reference/current" msgstr "Référence/actuel" -#: archaeological_finds/models_finds.py:3653 +#: archaeological_finds/models_finds.py:3673 msgid "Full location" msgstr "Localisation complète" -#: archaeological_finds/models_finds.py:3654 +#: archaeological_finds/models_finds.py:3674 msgid "Location type" msgstr "Type de localisation" -#: archaeological_finds/models_finds.py:3658 +#: archaeological_finds/models_finds.py:3678 msgid "Find - Treatment" msgstr "Mobilier - Traitement" -#: archaeological_finds/models_finds.py:3659 +#: archaeological_finds/models_finds.py:3679 msgid "Find - Treatments" msgstr "Mobilier - Traitements" -#: archaeological_finds/models_finds.py:3696 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3716 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2954 #: ishtar_common/models.py:3273 ishtar_common/models.py:3371 @@ -5934,11 +6013,11 @@ msgstr "Mobilier - Traitements" msgid "Person" msgstr "Personne" -#: archaeological_finds/models_finds.py:3704 +#: archaeological_finds/models_finds.py:3724 msgid "Property" msgstr "Propriété" -#: archaeological_finds/models_finds.py:3705 +#: archaeological_finds/models_finds.py:3725 msgid "Properties" msgstr "Propriétés" @@ -5973,7 +6052,7 @@ msgstr "libelle" #: archaeological_finds/models_treatments.py:168 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2830 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" @@ -6152,13 +6231,13 @@ msgstr "" msgid "Internal ID" msgstr "ID interne" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:26 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:27 #: man_app/templates/ishtar/sheet_basefind.html:23 #: sra_idf_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery date" msgstr "Date de découverte" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:29 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:30 #: man_app/templates/ishtar/sheet_basefind.html:26 #: sra_idf_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery year" @@ -6496,8 +6575,8 @@ msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." #: ishtar_common/forms.py:1211 ishtar_common/forms.py:1290 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:664 ishtar_common/views_item.py:936 -#: ishtar_common/views_item.py:973 ishtar_common/wizards.py:502 +#: ishtar_common/views_item.py:672 ishtar_common/views_item.py:944 +#: ishtar_common/views_item.py:981 ishtar_common/wizards.py:502 msgid "Yes" msgstr "Oui" @@ -6605,7 +6684,7 @@ msgstr "" #: archaeological_operations/forms.py:1043 #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:3198 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6614,20 +6693,20 @@ msgid "Parcels" msgstr "Parcelles" #: archaeological_operations/forms.py:77 -#: archaeological_operations/models.py:3180 +#: archaeological_operations/models.py:3297 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:80 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/models.py:3299 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:82 -#: archaeological_operations/models.py:3184 -#: archaeological_operations/models.py:3212 -#: archaeological_operations/models.py:3280 +#: archaeological_operations/models.py:3301 +#: archaeological_operations/models.py:3329 +#: archaeological_operations/models.py:3397 msgid "Public domain" msgstr "Domaine public" @@ -6681,26 +6760,26 @@ msgstr "Opération - 001 - Recherche" #: archaeological_operations/forms.py:461 #: archaeological_operations/forms.py:911 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:1506 +#: archaeological_operations/models.py:2178 msgid "Yearly index" msgstr "Index annuel" #: archaeological_operations/forms.py:468 #: archaeological_operations/forms.py:702 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1549 msgid "Old code" msgstr "Ancien code" #: archaeological_operations/forms.py:470 #: archaeological_operations/forms.py:683 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/models.py:1648 msgid "DRASSM code" msgstr "Code DRASSM" #: archaeological_operations/forms.py:478 #: archaeological_operations/forms.py:688 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/models.py:1589 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" @@ -6711,35 +6790,35 @@ msgstr "Est ouvert ?" #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:739 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2850 +#: archaeological_operations/models.py:1495 +#: archaeological_operations/models.py:2967 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:728 -#: archaeological_operations/forms.py:1659 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:1703 +#: archaeological_operations/models.py:1488 msgid "Operator" msgstr "Opérateur" #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:736 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/models.py:1586 msgid "Operator reference" msgstr "Référence de l'opérateur" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:1109 -#: archaeological_operations/forms.py:1204 -#: archaeological_operations/forms.py:1324 -#: archaeological_operations/forms.py:1825 -#: archaeological_operations/models.py:306 -#: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1000 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/forms.py:1208 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1869 +#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:603 +#: archaeological_operations/models.py:1117 +#: archaeological_operations/models.py:1209 +#: archaeological_operations/models.py:1523 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "Vestiges" @@ -6750,26 +6829,26 @@ msgstr "Résumé (recherche en texte intégral)" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/models.py:1592 msgid "Comment about scientific documentation" msgstr "Précisions sur la documentation scientifique" #: archaeological_operations/forms.py:516 #: archaeological_operations/forms.py:797 -#: archaeological_operations/models.py:1002 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:1119 +#: archaeological_operations/models.py:1627 msgid "Record quality" msgstr "Qualité d'enregistrement" #: archaeological_operations/forms.py:517 #: archaeological_operations/forms.py:757 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/models.py:1544 msgid "Report processing" msgstr "Traitement du rapport" #: archaeological_operations/forms.py:519 #: archaeological_operations/forms.py:710 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/models.py:1618 msgid "Virtual operation" msgstr "Opération virtuelle" @@ -6779,16 +6858,16 @@ msgstr "A un dossier rattaché ?" #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1667 -#: archaeological_operations/models.py:1003 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:1711 +#: archaeological_operations/models.py:1120 +#: archaeological_operations/models.py:1638 msgid "Documentation provided" msgstr "Documentation versée" #: archaeological_operations/forms.py:543 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1671 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:1715 +#: archaeological_operations/models.py:1633 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "Date de versement de la documentation" @@ -6799,16 +6878,16 @@ msgstr "Date limite de versement de la documentation" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1674 -#: archaeological_operations/models.py:1004 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:1718 +#: archaeological_operations/models.py:1121 +#: archaeological_operations/models.py:1644 msgid "Finds provided" msgstr "Mobilier versé" #: archaeological_operations/forms.py:550 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1678 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:1722 +#: archaeological_operations/models.py:1640 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "Date de versement du mobilier" @@ -6826,8 +6905,8 @@ msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" #: archaeological_operations/forms.py:686 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:1765 +#: archaeological_operations/models.py:1588 msgid "Generic name" msgstr "Nom générique" @@ -6836,17 +6915,17 @@ msgid "Actors" msgstr "Acteurs" #: archaeological_operations/forms.py:715 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2868 +#: archaeological_operations/models.py:1479 +#: archaeological_operations/models.py:2985 msgid "Head scientist" msgstr "Responsable d'opération" #: archaeological_operations/forms.py:750 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1681 -#: archaeological_operations/forms.py:1814 -#: archaeological_operations/models.py:523 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:1346 +#: archaeological_operations/forms.py:1725 +#: archaeological_operations/forms.py:1858 +#: archaeological_operations/models.py:640 +#: archaeological_operations/models.py:1502 msgid "Collaborators" msgstr "Collaborateurs" @@ -6855,31 +6934,32 @@ msgid "Dates / Administrative" msgstr "Dates / Administratif" #: archaeological_operations/forms.py:755 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/models.py:1473 msgid "Report delivery date" msgstr "Date de livraison du rapport" #: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/models.py:1635 msgid "Deadline for submission of the documentation" msgstr "Date limite de versement de la documentation" #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/models.py:1642 msgid "Deadline for submission of the finds" msgstr "Date limite de versement du mobilier" #: archaeological_operations/forms.py:793 +#: archaeological_operations/forms.py:1353 msgid "Scientific" msgstr "Scientifique" #: archaeological_operations/forms.py:800 -#: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 +#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "Type de vestige" #: archaeological_operations/forms.py:806 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/models.py:1632 msgid "Abstract" msgstr "Résumé" @@ -6919,12 +6999,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "Opération - 015 - Saisie judiciaire" #: archaeological_operations/forms.py:956 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/models.py:1651 msgid "Seizure name" msgstr "Nom de la saisie" #: archaeological_operations/forms.py:959 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1653 msgid "Official report number" msgstr "Numéro de procès-verbal ou de saisine" @@ -6933,12 +7013,12 @@ msgid "Protagonist" msgstr "Protagoniste" #: archaeological_operations/forms.py:971 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1665 msgid "Applicant authority" msgstr "Autorité requérante" #: archaeological_operations/forms.py:977 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/models.py:1673 msgid "Writer of the minutes" msgstr "Rédacteur du procès verbal" @@ -6951,22 +7031,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "Opération - 033 - Préventif - Fouille" #: archaeological_operations/forms.py:986 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:1528 msgid "Cost (euros)" msgstr "Coût (euros)" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1532 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" #: archaeological_operations/forms.py:989 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/models.py:1536 msgid "Optional man-days" msgstr "Jours-hommes optionnels" #: archaeological_operations/forms.py:991 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1540 msgid "Effective man-days" msgstr "Jours-hommes effectifs" @@ -6979,17 +7059,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "Opération - 037 - Préventif - Diagnostic" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/models.py:1560 msgid "Prescription on zoning" msgstr "Prescription sur zonage" #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/models.py:1564 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" #: archaeological_operations/forms.py:1012 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/models.py:1567 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" @@ -7010,8 +7090,8 @@ msgid "Operation - 050 - Parcels (2)" msgstr "Opération - 050 - Parcelles (2)" #: archaeological_operations/forms.py:1134 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1837 msgid "This reference already exists." msgstr "Cette référence existe déjà." @@ -7027,102 +7107,152 @@ msgstr "Voulez-vous supprimer cette opération ?" msgid "Archaeological site - 001 - Search" msgstr "Site archéologique - 001 - Recherche" +#: archaeological_operations/forms.py:1203 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/models.py:600 +#: archaeological_operations/templates/ishtar/sheet_site.html:44 +#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 +msgid "Types" +msgstr "Types" + +#: archaeological_operations/forms.py:1206 +#: archaeological_operations/forms.py:1372 +#: archaeological_operations/models.py:619 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 +msgid "Discoverer" +msgstr "Inventeur" + +#: archaeological_operations/forms.py:1211 +#: archaeological_operations/forms.py:1359 +#: archaeological_operations/models.py:616 +#: archaeological_operations/templates/ishtar/sheet_site.html:45 +msgid "Discovery status" +msgstr "État à la découverte" + #: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1360 +#: archaeological_operations/models.py:612 +#: archaeological_operations/templates/ishtar/sheet_site.html:46 +msgid "Current status" +msgstr "État actuel" + +#: archaeological_operations/forms.py:1213 +#: archaeological_operations/forms.py:1357 +#: archaeological_operations/models.py:621 +#: archaeological_operations/templates/ishtar/sheet_site.html:47 +msgid "Nature of site" +msgstr "Nature du site" + +#: archaeological_operations/forms.py:1214 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/models.py:624 +#: archaeological_operations/templates/ishtar/sheet_site.html:48 +msgid "Interpretation level" +msgstr "Niveau d'interprétation" + +#: archaeological_operations/forms.py:1221 msgid "Top operation" msgstr "Opération chapeau" -#: archaeological_operations/forms.py:1224 -#: archaeological_operations/forms.py:1335 -#: archaeological_operations/models.py:515 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1378 +#: archaeological_operations/models.py:630 +#: archaeological_operations/templates/ishtar/sheet_site.html:86 +msgid "Precise locality" +msgstr "Localisation précise" + +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/models.py:632 msgid "National Geographic Institute locality" msgstr "Lieu-dit IGN" -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/models.py:518 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1386 +#: archaeological_operations/models.py:635 msgid "Cadastral locality" msgstr "Lieu-dit cadastre" -#: archaeological_operations/forms.py:1231 -#: archaeological_operations/forms.py:1383 -#: archaeological_operations/models.py:535 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1427 +#: archaeological_operations/models.py:652 msgid "AffMar number" msgstr "Numéro AffMar" -#: archaeological_operations/forms.py:1233 -#: archaeological_operations/forms.py:1385 -#: archaeological_operations/models.py:538 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1429 +#: archaeological_operations/models.py:655 msgid "DRASSM number" msgstr "Numéro DRASSM" -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1387 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1431 +#: archaeological_operations/models.py:644 msgid "Shipwreck name" msgstr "Nom de l'épave" -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1395 -#: archaeological_operations/models.py:529 +#: archaeological_operations/forms.py:1249 +#: archaeological_operations/forms.py:1439 +#: archaeological_operations/models.py:646 msgid "Oceanographic service localisation" msgstr "Localisation SHOM" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1389 -#: archaeological_operations/models.py:531 +#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/models.py:648 msgid "Shipwreck code" msgstr "Code épave" -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1391 -#: archaeological_operations/models.py:532 +#: archaeological_operations/forms.py:1254 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/models.py:649 msgid "Sinking date" msgstr "Date de naufrage" -#: archaeological_operations/forms.py:1245 -#: archaeological_operations/forms.py:1393 -#: archaeological_operations/models.py:533 +#: archaeological_operations/forms.py:1256 +#: archaeological_operations/forms.py:1437 +#: archaeological_operations/models.py:650 msgid "Discovery area" msgstr "Zone de découverte" -#: archaeological_operations/forms.py:1307 +#: archaeological_operations/forms.py:1323 msgid "Archaeological site - 010 - General" msgstr "Site archéologique - 010 - Général" -#: archaeological_operations/forms.py:1369 -msgid "Archaeological site - 020 - Towns" -msgstr "Site archéologique - 020 - Villes" +#: archaeological_operations/forms.py:1373 +msgid "Localization" +msgstr "Localisation" -#: archaeological_operations/forms.py:1378 -#: archaeological_operations/templates/ishtar/sheet_site.html:52 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/templates/ishtar/sheet_site.html:60 msgid "Underwater" msgstr "Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1379 +#: archaeological_operations/forms.py:1423 msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/views.py:760 +#: archaeological_operations/forms.py:1490 +#: archaeological_operations/views.py:758 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1607 +#: archaeological_operations/forms.py:1674 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1471 -#: archaeological_operations/models.py:2875 +#: archaeological_operations/forms.py:1515 +#: archaeological_operations/models.py:2992 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1489 +#: archaeological_operations/forms.py:1533 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1523 +#: archaeological_operations/forms.py:1567 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -7131,48 +7261,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:1527 +#: archaeological_operations/forms.py:1571 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1540 +#: archaeological_operations/forms.py:1584 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1545 ishtar_common/forms.py:1334 +#: archaeological_operations/forms.py:1589 ishtar_common/forms.py:1334 #: ishtar_common/models.py:2057 msgid "Template" msgstr "Patron" -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1617 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:1591 +#: archaeological_operations/forms.py:1635 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1593 +#: archaeological_operations/forms.py:1637 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1614 +#: archaeological_operations/forms.py:1658 #: archaeological_operations/ishtar_menu.py:112 -#: archaeological_operations/views.py:871 +#: archaeological_operations/views.py:869 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1635 +#: archaeological_operations/forms.py:1679 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1748 +#: archaeological_operations/forms.py:1792 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:1804 +#: archaeological_operations/forms.py:1848 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -7180,631 +7310,710 @@ msgstr "Dossiers - Action rapide - Modification" msgid "Administrative Act" msgstr "Acte administratif" -#: archaeological_operations/models.py:91 +#: archaeological_operations/models.py:93 msgid "Remain types" msgstr "Types de vestige" -#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:107 msgid "Parent period" msgstr "Période parente" -#: archaeological_operations/models.py:112 +#: archaeological_operations/models.py:114 msgid "Type Period" msgstr "Type de période" -#: archaeological_operations/models.py:113 +#: archaeological_operations/models.py:115 msgid "Types Period" msgstr "Types de période" -#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:130 msgid "Type of report state" msgstr "Type d'état de rapport" -#: archaeological_operations/models.py:129 +#: archaeological_operations/models.py:131 msgid "Types of report state" msgstr "Types d'état de rapport" -#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:141 +msgid "Current status type" +msgstr "Type d'état actuel" + +#: archaeological_operations/models.py:142 +msgid "Current status types" +msgstr "Types d'état actuel" + +#: archaeological_operations/models.py:152 +msgid "Discovery status type" +msgstr "Type d'état de découverte" + +#: archaeological_operations/models.py:153 +msgid "Discovery status types" +msgstr "Types d'état de découverte" + +#: archaeological_operations/models.py:163 +msgid "Nature of site type" +msgstr "Type de nature de site" + +#: archaeological_operations/models.py:164 +msgid "Nature of site types" +msgstr "Types de nature de site" + +#: archaeological_operations/models.py:174 +msgid "Interpretation level type" +msgstr "Type de niveau d'interprétation" + +#: archaeological_operations/models.py:175 +msgid "Interpretation level types" +msgstr "Types de niveau d'interprétation" + +#: archaeological_operations/models.py:187 msgid "Type of record quality" msgstr "Type de qualité d'enregistrement" -#: archaeological_operations/models.py:147 +#: archaeological_operations/models.py:188 msgid "Types of record quality" msgstr "Types de qualité d'enregistrement" -#: archaeological_operations/models.py:155 ishtar_common/models_imports.py:1070 +#: archaeological_operations/models.py:200 ishtar_common/models_imports.py:1070 msgid "Cultural attribution type" msgstr "Type d'attribution culturelle" -#: archaeological_operations/models.py:156 +#: archaeological_operations/models.py:201 msgid "Cultural attribution types" msgstr "Types d'attribution culturelle" -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:211 +msgid "Site type" +msgstr "Type de site" + +#: archaeological_operations/models.py:212 +msgid "Site types" +msgstr "Types de site" + +#: archaeological_operations/models.py:449 +msgctxt "key for text search" +msgid "discovery-status" +msgstr "etat-decouverte" + +#: archaeological_operations/models.py:453 +msgctxt "key for text search" +msgid "current-status" +msgstr "etat-actuel" + +#: archaeological_operations/models.py:457 +msgctxt "key for text search" +msgid "nature" +msgstr "nature" + +#: archaeological_operations/models.py:461 +msgctxt "key for text search" +msgid "interpretation-level" +msgstr "niveau-interpretation" + +#: archaeological_operations/models.py:468 +#: archaeological_operations/models.py:1315 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "vestige" -#: archaeological_operations/models.py:395 +#: archaeological_operations/models.py:480 +msgctxt "key for text search" +msgid "discoverer" +msgstr "inventeur" + +#: archaeological_operations/models.py:483 +msgctxt "key for text search" +msgid "public-description" +msgstr "description-publique" + +#: archaeological_operations/models.py:489 +msgctxt "key for text search" +msgid "locality" +msgstr "localisation" + +#: archaeological_operations/models.py:492 msgctxt "key for text search" msgid "locality-ngi" msgstr "lieu-dit-ign" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:495 msgctxt "key for text search" msgid "locality-cadastral" msgstr "lieu-dit-cadastre" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:499 msgctxt "key for text search" msgid "shipwreck-name" msgstr "nom-epave" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:503 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "localisation-shom" -#: archaeological_operations/models.py:410 +#: archaeological_operations/models.py:507 msgctxt "key for text search" msgid "shipwreck-code" msgstr "code-epave" -#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:511 msgctxt "key for text search" msgid "sinking-date" msgstr "date-naufrage" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:514 msgctxt "key for text search" msgid "discovery-area" msgstr "zone-decouverte" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:522 msgctxt "key for text search" msgid "top-operation" msgstr "operation-chapeau" -#: archaeological_operations/models.py:429 +#: archaeological_operations/models.py:526 msgctxt "key for text search" msgid "numero-drassm" msgstr "numero-drassm" -#: archaeological_operations/models.py:433 +#: archaeological_operations/models.py:530 msgctxt "key for text search" msgid "numero-affmar" msgstr "numero-affmar" -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:581 msgid "Create associated operation" msgstr "Créer une opération associée" -#: archaeological_operations/models.py:553 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:670 +#: archaeological_operations/models.py:1686 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "Nom en cache des communes" -#: archaeological_operations/models.py:565 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:682 +#: archaeological_operations/models.py:1698 msgid "Cached remains label" msgstr "Nom en cache des vestiges" -#: archaeological_operations/models.py:575 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:692 +#: archaeological_operations/models.py:1607 #: 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:595 +#: archaeological_operations/models.py:712 msgid "SITE" msgstr "SITE" -#: archaeological_operations/models.py:647 +#: archaeological_operations/models.py:764 msgid "Create an operation associated to this site" msgstr "Créer une opération associée à ce site" -#: archaeological_operations/models.py:649 +#: archaeological_operations/models.py:766 msgid "ope." msgstr "ope." -#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:776 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:661 +#: archaeological_operations/models.py:778 msgid "top ope." msgstr "ope. sup." -#: archaeological_operations/models.py:814 ishtar_common/forms.py:1210 +#: archaeological_operations/models.py:931 ishtar_common/forms.py:1210 #: ishtar_common/models.py:5470 ishtar_common/models.py:5631 -#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1817 +#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1825 msgid "Unknown" msgstr "Inconnu" -#: archaeological_operations/models.py:816 +#: archaeological_operations/models.py:933 msgid "Virtual operation of site: {}" msgstr "Opération virtuelle du site : {}" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1188 msgid "Associated file (label)" msgstr "Dossier associé (nom)" -#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1189 msgid "Operator name" msgstr "Nom de l'opérateur" -#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1190 msgid "Associated file (external ID)" msgstr "Dossier associé (identifiant)" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1191 msgid "Scientist (title)" msgstr "Responsable d'opération (titre)" -#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1192 msgid "Scientist (surname)" msgstr "Responsable d'opération (nom)" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1193 msgid "Scientist (name)" msgstr "Scientifique (nom)" -#: archaeological_operations/models.py:1077 +#: archaeological_operations/models.py:1194 msgid "Scientist (full name)" msgstr "Responsable d'opération (nom complet)" -#: archaeological_operations/models.py:1078 +#: archaeological_operations/models.py:1195 msgid "Scientist - Organization (name)" msgstr "Scientifique - Organisation (nom)" -#: archaeological_operations/models.py:1079 +#: archaeological_operations/models.py:1196 msgid "Scientific monitor (title)" msgstr "Responsable de suivi scientifique (titre)" -#: archaeological_operations/models.py:1080 +#: archaeological_operations/models.py:1197 msgid "Scientific monitor (surname)" msgstr "Responsable de suivi scientifique (prénom)" -#: archaeological_operations/models.py:1081 +#: archaeological_operations/models.py:1198 msgid "Scientific monitor (name)" msgstr "Responsable de suivi scientifique (nom)" -#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:1199 msgid "Scientific monitor - Organization (name)" msgstr "Responsable de suivi scientifique - Organisation (nom)" -#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:1204 msgid "Archaeological sites (reference)" msgstr "Entités archéologiques (référence)" -#: archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:1261 msgctxt "key for text search" msgid "yearly-index" msgstr "index-annuel" -#: archaeological_operations/models.py:1147 +#: archaeological_operations/models.py:1264 msgctxt "key for text search" msgid "operation-old-code" msgstr "operation-ancien-code" -#: archaeological_operations/models.py:1173 +#: archaeological_operations/models.py:1290 msgctxt "key for text search" msgid "address" msgstr "adresse" -#: archaeological_operations/models.py:1180 +#: archaeological_operations/models.py:1297 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "est-ouvert" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1300 msgctxt "key for text search" msgid "scientific-monitor" msgstr "responsable-suivi-scientifique" -#: archaeological_operations/models.py:1204 +#: archaeological_operations/models.py:1321 msgctxt "key for text search" msgid "start" msgstr "commence" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1324 msgctxt "key for text search" msgid "end" msgstr "fin" -#: archaeological_operations/models.py:1211 +#: archaeological_operations/models.py:1328 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "type-relation" -#: archaeological_operations/models.py:1217 +#: archaeological_operations/models.py:1334 msgctxt "key for text search" msgid "operator-reference" msgstr "operateur-ref" -#: archaeological_operations/models.py:1220 +#: archaeological_operations/models.py:1337 msgctxt "key for text search" msgid "has-archeo-file" msgstr "a-un-dossier" -#: archaeological_operations/models.py:1224 +#: archaeological_operations/models.py:1341 msgctxt "key for text search" msgid "abstract" msgstr "resume" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1344 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "commentaire-documentation-scientifique" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1348 msgctxt "key for text search" msgid "record-quality" msgstr "qualite-enregistrement" -#: archaeological_operations/models.py:1235 +#: archaeological_operations/models.py:1352 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "traitement-rapport" -#: archaeological_operations/models.py:1239 +#: archaeological_operations/models.py:1356 msgctxt "key for text search" msgid "virtual-operation" msgstr "operation-virtuelle" -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1365 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "documentation-date-versement" -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1369 msgctxt "key for text search" msgid "documentation-provided" msgstr "documentation-versee" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1373 msgctxt "key for text search" msgid "documentation-deadline" msgstr "documentation-date-limite" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1377 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "mobilier-date-versement" -#: archaeological_operations/models.py:1264 +#: archaeological_operations/models.py:1381 msgctxt "key for text search" msgid "finds-provided" msgstr "mobilier-verse" -#: archaeological_operations/models.py:1271 +#: archaeological_operations/models.py:1388 msgctxt "key for text search" msgid "finds-deadline" msgstr "mobilier-date-limite" -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1392 msgctxt "key for text search" msgid "code-drassm" msgstr "code-drassm" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4405 +#: archaeological_operations/models.py:1430 ishtar_common/models.py:4405 #: ishtar_common/models.py:4491 msgctxt "key for text search" msgid "file" msgstr "dossier" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1521 ishtar_common/models_common.py:3395 +msgid "Surface (m2)" +msgstr "Surface (m2)" + +#: archaeological_operations/models.py:1613 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:1621 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:1657 msgid "Name of the protagonist" msgstr "Nom du protagoniste" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1680 msgid "Cached label" msgstr "Libellé en cache" -#: archaeological_operations/models.py:1591 -#: archaeological_operations/templates/ishtar/sheet_site.html:85 +#: archaeological_operations/models.py:1708 +#: archaeological_operations/templates/ishtar/sheet_site.html:94 #: ishtar_common/models.py:1006 #: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:129 msgid "Operations" msgstr "Opérations" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1748 msgid "List of associated context records" msgstr "Liste des unités d'enregistrement associées" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1749 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:1750 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:1751 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:1868 msgid "OPE" msgstr "OPE" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1963 msgid "No associated town" msgstr "Pas de commune associée" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1978 msgid "Intercommunal" msgstr "Intercommunal" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:2121 msgid "context record" msgstr "UE" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2163 msgid "Code patriarche" msgstr "Code patriarche" -#: archaeological_operations/models.py:2094 -#: archaeological_operations/models.py:3100 +#: archaeological_operations/models.py:2211 +#: archaeological_operations/models.py:3217 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:2155 +#: archaeological_operations/models.py:2272 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: archaeological_operations/models.py:2165 +#: archaeological_operations/models.py:2282 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: archaeological_operations/models.py:2173 +#: archaeological_operations/models.py:2290 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2298 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: archaeological_operations/models.py:2235 +#: archaeological_operations/models.py:2352 #: 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:2296 -#: archaeological_operations/models.py:2375 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2492 msgid "No type" msgstr "Pas de type" -#: archaeological_operations/models.py:2340 +#: archaeological_operations/models.py:2457 msgid "Number of sources" msgstr "Nombre de documents" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2502 msgid "Mean" msgstr "Moyenne" -#: archaeological_operations/models.py:2484 +#: archaeological_operations/models.py:2601 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: archaeological_operations/models.py:2485 +#: archaeological_operations/models.py:2602 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2627 msgid "Operation record relation" msgstr "Relation entre opérations" -#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2628 msgid "Operation record relations" msgstr "Relations entre opérations" -#: archaeological_operations/models.py:2577 +#: archaeological_operations/models.py:2694 msgid "Intended to" msgstr "Destiné à" -#: archaeological_operations/models.py:2582 +#: archaeological_operations/models.py:2699 msgid "Associated template" msgstr "Patron associé" -#: archaeological_operations/models.py:2585 +#: archaeological_operations/models.py:2702 msgid "Indexed" msgstr "Indexé" -#: archaeological_operations/models.py:2589 +#: archaeological_operations/models.py:2706 msgid "Act types" msgstr "Types d'acte" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2832 msgctxt "key for text search" msgid "other-ref" msgstr "autre-ref" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2842 msgctxt "key for text search" msgid "indexed" msgstr "indexe" -#: archaeological_operations/models.py:2728 +#: archaeological_operations/models.py:2845 #: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "operation-commune" -#: archaeological_operations/models.py:2732 +#: archaeological_operations/models.py:2849 msgctxt "key for text search" msgid "file-town" msgstr "dossier-commune" -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2861 msgctxt "key for text search" msgid "operation-department" msgstr "operation-departement" -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2865 msgctxt "key for text search" msgid "file-department" msgstr "dossier-departement" -#: archaeological_operations/models.py:2752 +#: archaeological_operations/models.py:2869 msgctxt "key for text search" msgid "object" msgstr "objet" -#: archaeological_operations/models.py:2755 +#: archaeological_operations/models.py:2872 msgctxt "key for text search" msgid "signature" msgstr "signature" -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:2876 msgctxt "key for text search" msgid "file-name" msgstr "dossier-nom" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2888 msgctxt "key for text search" msgid "file-reference" msgstr "dossier-reference" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2892 msgctxt "key for text search" msgid "file-year" msgstr "dossier-annee" -#: archaeological_operations/models.py:2778 +#: archaeological_operations/models.py:2895 msgctxt "key for text search" msgid "file-other-reference" msgstr "dossier-autre-reference" -#: archaeological_operations/models.py:2782 +#: archaeological_operations/models.py:2899 msgctxt "key for text search" msgid "file-in-charge" msgstr "dossier-responsable" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2903 msgctxt "key for text search" msgid "file-permit-reference" msgstr "dossier-ref-permis" -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2907 msgctxt "key for text search" msgid "treatment-name" msgstr "traitement-nom" -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2911 msgctxt "key for text search" msgid "treatment-reference" msgstr "traitement-reference" -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2915 msgctxt "key for text search" msgid "treatment-year" msgstr "traitement-annee" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2918 msgctxt "key for text search" msgid "treatment-index" msgstr "traitement-index" -#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:2921 msgctxt "key for text search" msgid "treatment-type" msgstr "traitement-type" -#: archaeological_operations/models.py:2808 +#: archaeological_operations/models.py:2925 msgctxt "key for text search" msgid "treatment-file-name" msgstr "dossier-traitement-nom" -#: archaeological_operations/models.py:2812 +#: archaeological_operations/models.py:2929 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "dossier-traitement-reference" -#: archaeological_operations/models.py:2816 +#: archaeological_operations/models.py:2933 msgctxt "key for text search" msgid "treatment-file-year" msgstr "dossier-traitement-annee" -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2937 msgctxt "key for text search" msgid "treatment-file-index" msgstr "dossier-traitement-index" -#: archaeological_operations/models.py:2824 +#: archaeological_operations/models.py:2941 msgctxt "key for text search" msgid "treatment-file-type" msgstr "dossier-traitement-type" -#: archaeological_operations/models.py:2858 +#: archaeological_operations/models.py:2975 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2920 +#: archaeological_operations/models.py:3037 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2926 +#: archaeological_operations/models.py:3043 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:3191 +#: archaeological_operations/models.py:3308 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3193 ishtar_common/models.py:2644 +#: archaeological_operations/models.py:3310 ishtar_common/models.py:2644 #: ishtar_common/models.py:2949 ishtar_common/models.py:3956 #: ishtar_common/models_common.py:3421 ishtar_common/models_common.py:3456 #: ishtar_common/models_common.py:4394 msgid "Cached name" msgstr "Nom en cache" -#: archaeological_operations/models.py:3485 ishtar_common/models.py:3821 +#: archaeological_operations/models.py:3602 ishtar_common/models.py:3821 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3500 +#: archaeological_operations/models.py:3617 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3501 +#: archaeological_operations/models.py:3618 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3523 ishtar_common/models.py:5338 +#: archaeological_operations/models.py:3640 ishtar_common/models.py:5338 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3526 +#: archaeological_operations/models.py:3643 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3527 +#: archaeological_operations/models.py:3644 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -8062,23 +8271,23 @@ msgstr "Clôturer une opération" msgid "Operation deletion" msgstr "Supprimer une opération" -#: archaeological_operations/views.py:693 ishtar_common/models.py:1015 +#: archaeological_operations/views.py:691 ishtar_common/models.py:1015 msgid "Site deletion" msgstr "Supprimer un site" -#: archaeological_operations/views.py:773 +#: archaeological_operations/views.py:771 msgid "Operation: new administrative act" msgstr "Opération : ajouter un acte administratif" -#: archaeological_operations/views.py:790 +#: archaeological_operations/views.py:788 msgid "Operation: administrative act modification" msgstr "Opération : modification d'un acte administratif" -#: archaeological_operations/views.py:825 +#: archaeological_operations/views.py:823 msgid "Operation: administrative act deletion" msgstr "Opération : supprimer un acte administratif" -#: archaeological_operations/views.py:945 +#: archaeological_operations/views.py:943 msgid "" "Syntax error on the source template \"{}\" - contact your administrator and " "ask him to check the syntax of this document." @@ -8891,12 +9100,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:665 ishtar_common/views_item.py:1635 +#: ishtar_common/views_item.py:673 ishtar_common/views_item.py:1643 msgid "True" msgstr "Oui" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1637 +#: ishtar_common/views_item.py:1645 msgid "False" msgstr "Non" @@ -11843,10 +12052,6 @@ msgstr "" msgid "Contact type" msgstr "Type de contact" -#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 -msgid "Types" -msgstr "Types" - #: ishtar_common/models.py:2944 msgid "Is attached to" msgstr "Est rattaché à" @@ -14212,8 +14417,8 @@ msgstr "et" msgid ", " msgstr ", " -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2808 -#: ishtar_common/utils.py:2816 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2801 +#: ishtar_common/utils.py:2809 msgid "." msgstr "." @@ -14977,37 +15182,45 @@ msgid "Operations associees en tant que rapporteur CIRA" msgstr "Opérations associées en tant que rapporteur CIRA" #: ishtar_common/templates/ishtar/sheet_person.html:103 +msgid "Associated archaeological sites as discoverer" +msgstr "Entités archéologiques associées en tant qu'inventeur" + +#: ishtar_common/templates/ishtar/sheet_person.html:108 msgid "Associated archaeological sites as collaborator" msgstr "Entités archéologiques associées en tant que collaborateur" -#: ishtar_common/templates/ishtar/sheet_person.html:108 +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "Responsable des dossiers" -#: ishtar_common/templates/ishtar/sheet_person.html:113 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "Aménageur des dossiers" -#: ishtar_common/templates/ishtar/sheet_person.html:118 +#: ishtar_common/templates/ishtar/sheet_person.html:123 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "Responsable pour le service instructeur des dossiers" -#: ishtar_common/templates/ishtar/sheet_person.html:140 +#: ishtar_common/templates/ishtar/sheet_person.html:128 +msgid "Associated context records as excavator" +msgstr "Unités d'enregistrement associées en tant que fouilleur" + +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "In charge of treatments" msgstr "Responsable des traitements" -#: ishtar_common/templates/ishtar/sheet_person.html:145 +#: ishtar_common/templates/ishtar/sheet_person.html:155 msgid "In charge of treatment files" msgstr "Responsable des dossiers de traitement" -#: ishtar_common/templates/ishtar/sheet_person.html:150 +#: ishtar_common/templates/ishtar/sheet_person.html:160 msgid "Applicant of treatment files" msgstr "Demandeur des dossiers de traitement" -#: ishtar_common/templates/ishtar/sheet_person.html:155 +#: ishtar_common/templates/ishtar/sheet_person.html:165 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "Responsable des lieux de conservation" @@ -15623,48 +15836,48 @@ msgstr "Pas de résultats" msgid "Loading..." msgstr "Chargement..." -#: ishtar_common/utils.py:219 ishtar_common/views.py:126 +#: ishtar_common/utils.py:218 ishtar_common/views.py:126 msgid "You don't have sufficient permissions to do this action." msgstr "" "Vous n'avez pas les permissions suffisantes pour effectuer cette action." -#: ishtar_common/utils.py:1019 +#: ishtar_common/utils.py:1018 msgid " (...)" msgstr " (...)" -#: ishtar_common/utils.py:1099 +#: ishtar_common/utils.py:1098 msgid "Information" msgstr "Information" -#: ishtar_common/utils.py:1100 +#: ishtar_common/utils.py:1099 msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: ishtar_common/utils.py:1999 +#: ishtar_common/utils.py:1992 msgid "The maximum supported file size is {} Mo." msgstr "La taille maximale supportée pour le fichier est de {} Mo." -#: ishtar_common/utils.py:2785 +#: ishtar_common/utils.py:2778 msgid "uppercase letter" msgstr "majuscule" -#: ishtar_common/utils.py:2786 +#: ishtar_common/utils.py:2779 msgid "lowercase letter" msgstr "minuscule" -#: ishtar_common/utils.py:2787 +#: ishtar_common/utils.py:2780 msgid "number" msgstr "nombre" -#: ishtar_common/utils.py:2788 +#: ishtar_common/utils.py:2781 msgid "punctuation sign" msgstr "signe de ponctuation" -#: ishtar_common/utils.py:2807 +#: ishtar_common/utils.py:2800 msgid "This password must contain one of this character: " msgstr "Ce mot de passe doit contenir un de ces caractères : " -#: ishtar_common/utils.py:2813 +#: ishtar_common/utils.py:2806 msgid "Your password must contain each of these characters: " msgstr "Votre mot de passe doit contenir chacun de ces caractères : " @@ -15713,8 +15926,8 @@ msgstr "Supprimer un compte" msgid "New biographical note" msgstr "Nouvelle notice biographique" -#: ishtar_common/views.py:1166 ishtar_common/views_item.py:230 -#: ishtar_common/views_item.py:273 ishtar_common/views_item.py:290 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:238 +#: ishtar_common/views_item.py:281 ishtar_common/views_item.py:298 msgid "Operation not permitted." msgstr "Opération non permise." @@ -15846,17 +16059,17 @@ msgstr "Élément géographique modification" msgid "Delete geographic item" msgstr "Supprimer des données géographiques" -#: ishtar_common/views_item.py:239 +#: ishtar_common/views_item.py:247 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: ishtar_common/views_item.py:302 +#: ishtar_common/views_item.py:310 #, python-format msgid "Modify a %s" msgstr "Modifier un %s" -#: ishtar_common/views_item.py:1044 +#: ishtar_common/views_item.py:1052 msgctxt "key for text search" msgid "today" msgstr "aujourdhui" @@ -15927,6 +16140,21 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "Archaeological site - 020 - Towns" +#~ msgstr "Site archéologique - 020 - Villes" + +#~ msgid "Total surface (km2)" +#~ msgstr "Surface totale (km2)" + +#~ msgid "Total developed surface (km2)" +#~ msgstr "Surface totale aménagée (km²)" + +#~ msgid "Another file with this numeric id exists." +#~ msgstr "Un autre dossier avec cet identifiant numérique existe." + +#~ msgid "Preventive informations" +#~ msgstr "Information archéologie préventive" + #~ msgid "Context record - 050 - Relations" #~ msgstr "Unité d'enregistrement - 050 - Relations" @@ -16865,10 +17093,6 @@ msgstr "Surcharges de traductions" #~ msgstr "contenant-ref" #~ msgctxt "key for text search" -#~ msgid "current-warehouse" -#~ msgstr "depot-actuel" - -#~ msgctxt "key for text search" #~ msgid "current-container-index" #~ msgstr "contenant-actuel-index" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 56b081229..e73ca0a6b 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-09-17 11:29+0200\n" +"POT-Creation-Date: 2024-09-20 15:25+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" @@ -18,25 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: archaeological_context_records/forms.py:77 -#: archaeological_context_records/forms.py:83 -#: archaeological_context_records/models.py:575 -#: archaeological_context_records/models.py:835 +#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:84 +#: archaeological_context_records/models.py:576 +#: archaeological_context_records/models.py:842 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 -#: archaeological_finds/models_finds.py:1198 -#: archaeological_finds/models_finds.py:2739 +#: archaeological_finds/models_finds.py:1214 +#: archaeological_finds/models_finds.py:2759 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:96 archaeological_finds/wizards.py:579 #: archaeological_operations/forms.py:386 -#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1227 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1590 -#: archaeological_operations/models.py:2554 -#: archaeological_operations/models.py:2572 -#: archaeological_operations/models.py:2688 -#: archaeological_operations/models.py:2883 -#: archaeological_operations/models.py:3173 +#: archaeological_operations/models.py:1707 +#: archaeological_operations/models.py:2671 +#: archaeological_operations/models.py:2689 +#: archaeological_operations/models.py:2805 +#: archaeological_operations/models.py:3000 +#: archaeological_operations/models.py:3290 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:251 #: archaeological_operations/wizards.py:263 @@ -47,97 +47,97 @@ msgstr "" msgid "Operation" msgstr "" -#: archaeological_context_records/forms.py:78 +#: archaeological_context_records/forms.py:79 msgid "Context record - 010 - Operation choice" msgstr "" -#: archaeological_context_records/forms.py:93 +#: archaeological_context_records/forms.py:94 msgid "Dating - period" msgstr "" -#: archaeological_context_records/forms.py:94 +#: archaeological_context_records/forms.py:95 msgid "Dating - precise" msgstr "" -#: archaeological_context_records/forms.py:95 +#: archaeological_context_records/forms.py:96 msgid "Dating - start date" msgstr "" -#: archaeological_context_records/forms.py:96 +#: archaeological_context_records/forms.py:97 msgid "Dating - end date" msgstr "" -#: archaeological_context_records/forms.py:98 +#: archaeological_context_records/forms.py:99 msgid "Dating - dating type" msgstr "" -#: archaeological_context_records/forms.py:100 +#: archaeological_context_records/forms.py:101 msgid "Dating - dating quality" msgstr "" -#: archaeological_context_records/forms.py:129 +#: archaeological_context_records/forms.py:130 msgid "Context record - 001 - Search" msgstr "" -#: archaeological_context_records/forms.py:133 archaeological_files/forms.py:88 -#: archaeological_files/forms.py:1104 archaeological_files/forms.py:1140 -#: archaeological_finds/forms.py:1693 archaeological_finds/forms.py:2409 +#: archaeological_context_records/forms.py:134 archaeological_files/forms.py:88 +#: archaeological_files/forms.py:1079 archaeological_files/forms.py:1115 +#: archaeological_finds/forms.py:1703 archaeological_finds/forms.py:2421 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:557 #: archaeological_finds/forms_treatments.py:632 #: archaeological_finds/forms_treatments.py:815 #: archaeological_operations/forms.py:458 #: archaeological_operations/forms.py:1196 -#: archaeological_operations/forms.py:1409 +#: archaeological_operations/forms.py:1453 #: archaeological_warehouse/forms.py:145 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:820 ishtar_common/forms_common.py:1011 #: ishtar_common/forms_common.py:1236 ishtar_common/forms_common.py:2423 msgid "Full text search" msgstr "" -#: archaeological_context_records/forms.py:136 -#: archaeological_context_records/forms.py:316 -#: archaeological_context_records/forms.py:624 -#: archaeological_context_records/forms.py:678 -#: archaeological_context_records/models.py:847 -#: archaeological_context_records/models.py:1514 +#: archaeological_context_records/forms.py:137 +#: archaeological_context_records/forms.py:324 +#: archaeological_context_records/forms.py:639 +#: archaeological_context_records/forms.py:693 +#: archaeological_context_records/models.py:854 +#: archaeological_context_records/models.py:1525 msgid "ID" msgstr "" -#: archaeological_context_records/forms.py:140 -#: archaeological_operations/forms.py:1716 +#: archaeological_context_records/forms.py:141 +#: archaeological_operations/forms.py:1760 msgid "Code PATRIARCHE" msgstr "" -#: archaeological_context_records/forms.py:142 +#: archaeological_context_records/forms.py:143 msgid "Operation - name" msgstr "" -#: archaeological_context_records/forms.py:143 +#: archaeological_context_records/forms.py:144 #: ishtar_common/forms_common.py:2526 msgid "Operation - year" msgstr "" -#: archaeological_context_records/forms.py:145 +#: archaeological_context_records/forms.py:146 msgid "Operation's number (index by year)" msgstr "" -#: archaeological_context_records/forms.py:148 -#: archaeological_context_records/forms.py:794 -#: archaeological_context_records/models.py:841 +#: archaeological_context_records/forms.py:149 +#: archaeological_context_records/forms.py:817 +#: archaeological_context_records/models.py:848 #: archaeological_operations/forms.py:521 -#: archaeological_operations/models.py:574 ishtar_common/models.py:5563 +#: archaeological_operations/models.py:691 ishtar_common/models.py:5563 msgid "Archaeological site" msgstr "" -#: archaeological_context_records/forms.py:156 -#: archaeological_finds/forms.py:1782 +#: archaeological_context_records/forms.py:157 +#: archaeological_finds/forms.py:1792 msgid "Search within related operations" msgstr "" -#: archaeological_context_records/forms.py:158 -#: archaeological_files/templates/ishtar/sheet_file.html:188 -#: archaeological_files/templates/ishtar/sheet_file.html:214 +#: archaeological_context_records/forms.py:159 +#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_finds/forms_treatments.py:639 #: archaeological_finds/forms_treatments.py:717 #: archaeological_finds/models_treatments.py:140 @@ -195,22 +195,29 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_context_records/forms.py:159 -#: archaeological_context_records/forms.py:529 -#: archaeological_context_records/forms.py:791 -#: archaeological_context_records/models.py:578 -#: archaeological_context_records/models.py:931 ishtar_common/admin.py:797 +#: archaeological_context_records/forms.py:161 +#: archaeological_context_records/forms.py:331 +#: archaeological_context_records/models.py:858 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +msgid "Excavator" +msgstr "" + +#: archaeological_context_records/forms.py:166 +#: archaeological_context_records/forms.py:544 +#: archaeological_context_records/forms.py:810 +#: archaeological_context_records/models.py:579 +#: archaeological_context_records/models.py:942 ishtar_common/admin.py:797 #: ishtar_common/models.py:3389 msgid "Activity" msgstr "" -#: archaeological_context_records/forms.py:160 -#: archaeological_context_records/forms.py:531 -#: archaeological_context_records/forms.py:792 -#: archaeological_context_records/models.py:577 -#: archaeological_context_records/models.py:923 -#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:741 -#: archaeological_finds/forms.py:975 +#: archaeological_context_records/forms.py:167 +#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:811 +#: archaeological_context_records/models.py:578 +#: archaeological_context_records/models.py:934 +#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:751 +#: archaeological_finds/forms.py:985 #: archaeological_finds/templates/ishtar/sheet_find.html:145 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:98 #: cd17_app/templates/ishtar/sheet_find.html:155 @@ -225,38 +232,42 @@ msgstr "" msgid "Identification" msgstr "" -#: archaeological_context_records/forms.py:162 -#: archaeological_context_records/models.py:888 -#: archaeological_finds/forms.py:489 archaeological_finds/forms.py:1136 -#: archaeological_finds/forms.py:1856 archaeological_finds/models_finds.py:2049 -#: archaeological_operations/forms.py:1206 -#: archaeological_operations/models.py:508 +#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/models.py:899 +#: archaeological_finds/forms.py:494 archaeological_finds/forms.py:1146 +#: archaeological_finds/forms.py:1867 archaeological_finds/models_finds.py:2069 +#: archaeological_operations/forms.py:1210 +#: archaeological_operations/models.py:606 msgid "Cultural attribution" msgstr "" -#: archaeological_context_records/forms.py:163 -#: archaeological_context_records/forms.py:330 -#: archaeological_context_records/forms.py:789 +#: archaeological_context_records/forms.py:170 +#: archaeological_context_records/forms.py:345 +#: archaeological_context_records/forms.py:808 #: ishtar_common/forms_common.py:1992 ishtar_common/templates/welcome.html:12 msgid "Documentation" msgstr "" -#: archaeological_context_records/forms.py:164 -#: archaeological_context_records/forms.py:322 -#: archaeological_context_records/forms.py:345 -#: archaeological_context_records/models.py:848 -#: archaeological_context_records/models.py:1517 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 -#: archaeological_finds/forms.py:426 archaeological_finds/forms.py:431 -#: archaeological_finds/forms.py:587 archaeological_finds/forms.py:748 -#: archaeological_finds/forms.py:750 archaeological_finds/forms.py:976 -#: archaeological_finds/forms.py:1076 archaeological_finds/forms.py:1796 +#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:337 +#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/models.py:855 +#: archaeological_context_records/models.py:1528 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: archaeological_finds/forms.py:428 archaeological_finds/forms.py:433 +#: archaeological_finds/forms.py:593 archaeological_finds/forms.py:758 +#: archaeological_finds/forms.py:760 archaeological_finds/forms.py:986 +#: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1806 #: archaeological_finds/forms_treatments.py:192 -#: archaeological_finds/models_finds.py:554 -#: archaeological_finds/models_finds.py:1991 +#: archaeological_finds/models_finds.py:566 +#: archaeological_finds/models_finds.py:2011 #: archaeological_finds/models_treatments.py:273 #: archaeological_finds/templates/ishtar/sheet_find.html:167 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 +#: archaeological_operations/forms.py:1217 +#: archaeological_operations/forms.py:1347 +#: archaeological_operations/models.py:628 +#: archaeological_operations/templates/ishtar/sheet_site.html:54 #: cd17_app/templates/ishtar/sheet_find.html:177 #: ishtar_common/forms_common.py:2164 ishtar_common/forms_common.py:2440 #: ishtar_common/models.py:1056 ishtar_common/models.py:4652 @@ -270,113 +281,115 @@ msgstr "" msgid "Description" msgstr "" -#: archaeological_context_records/forms.py:165 -#: archaeological_context_records/forms.py:320 -#: archaeological_context_records/models.py:849 -#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:1853 -#: archaeological_finds/models_finds.py:2136 +#: archaeological_context_records/forms.py:172 +#: archaeological_context_records/forms.py:328 +#: archaeological_context_records/models.py:856 +#: archaeological_finds/forms.py:492 archaeological_finds/forms.py:1864 +#: archaeological_finds/models_finds.py:2156 #: archaeological_finds/templates/ishtar/sheet_find.html:192 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:141 #: man_app/templates/ishtar/sheet_museum_find.html:143 msgid "General comment" msgstr "" -#: archaeological_context_records/forms.py:166 -#: archaeological_context_records/forms.py:337 -#: archaeological_context_records/models.py:885 +#: archaeological_context_records/forms.py:173 +#: archaeological_context_records/forms.py:352 +#: archaeological_context_records/models.py:896 msgid "Filling" msgstr "" -#: archaeological_context_records/forms.py:167 -#: archaeological_context_records/forms.py:516 -#: archaeological_context_records/forms.py:527 -#: archaeological_context_records/models.py:886 +#: archaeological_context_records/forms.py:174 +#: archaeological_context_records/forms.py:531 +#: archaeological_context_records/forms.py:542 +#: archaeological_context_records/models.py:897 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:195 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:196 msgid "Interpretation" msgstr "" -#: archaeological_context_records/forms.py:168 -#: archaeological_context_records/forms.py:307 -#: archaeological_context_records/forms.py:626 -#: archaeological_context_records/forms.py:679 -#: archaeological_context_records/models.py:564 +#: archaeological_context_records/forms.py:175 +#: archaeological_context_records/forms.py:315 +#: archaeological_context_records/forms.py:641 +#: archaeological_context_records/forms.py:694 #: archaeological_context_records/models.py:565 -#: archaeological_context_records/models.py:819 -#: archaeological_context_records/models.py:1516 +#: archaeological_context_records/models.py:566 +#: archaeological_context_records/models.py:826 +#: archaeological_context_records/models.py:1527 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:95 archaeological_files/forms.py:1153 -#: archaeological_finds/models_finds.py:1156 +#: archaeological_files/forms.py:95 archaeological_files/forms.py:1128 +#: archaeological_finds/models_finds.py:1172 #: archaeological_operations/forms.py:473 #: archaeological_operations/forms.py:1046 -#: archaeological_operations/forms.py:1423 -#: archaeological_operations/models.py:3197 -#: archaeological_operations/models.py:3491 +#: archaeological_operations/forms.py:1467 +#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3608 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" -#: archaeological_context_records/forms.py:169 +#: archaeological_context_records/forms.py:176 #: archaeological_operations/forms.py:546 msgid "Has finds" msgstr "" -#: archaeological_context_records/forms.py:171 +#: archaeological_context_records/forms.py:178 #: archaeological_operations/forms.py:511 msgid "Search within relations" msgstr "" -#: archaeological_context_records/forms.py:173 -#: archaeological_context_records/forms.py:324 -#: archaeological_context_records/models.py:579 -#: archaeological_context_records/models.py:936 +#: archaeological_context_records/forms.py:180 +#: archaeological_context_records/forms.py:339 +#: archaeological_context_records/models.py:580 +#: archaeological_context_records/models.py:947 msgid "Excavation techniques" msgstr "" -#: archaeological_context_records/forms.py:174 -#: archaeological_context_records/forms.py:348 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/forms.py:181 +#: archaeological_context_records/forms.py:363 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:147 msgid "Structure" msgstr "" -#: archaeological_context_records/forms.py:175 -#: archaeological_context_records/forms.py:354 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/forms.py:182 +#: archaeological_context_records/forms.py:369 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:148 msgid "Texture" msgstr "" -#: archaeological_context_records/forms.py:176 -#: archaeological_context_records/forms.py:360 +#: archaeological_context_records/forms.py:183 +#: archaeological_context_records/forms.py:375 +#: archaeological_context_records/forms.py:815 msgid "Inclusions" msgstr "" -#: archaeological_context_records/forms.py:177 -#: archaeological_context_records/forms.py:366 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/forms.py:184 +#: archaeological_context_records/forms.py:381 +#: archaeological_context_records/forms.py:814 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 msgid "Colors" msgstr "" -#: archaeological_context_records/forms.py:178 -#: archaeological_context_records/forms.py:371 -#: archaeological_context_records/models.py:874 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/forms.py:185 +#: archaeological_context_records/forms.py:386 +#: archaeological_context_records/models.py:885 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 msgid "Details on color" msgstr "" -#: archaeological_context_records/forms.py:217 -#: archaeological_context_records/forms.py:238 +#: archaeological_context_records/forms.py:224 +#: archaeological_context_records/forms.py:245 #: archaeological_context_records/views.py:115 msgid "Context record search" msgstr "" -#: archaeological_context_records/forms.py:287 -#: archaeological_files/forms.py:205 +#: archaeological_context_records/forms.py:294 +#: archaeological_files/forms.py:209 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 #: archaeological_operations/forms.py:651 #: archaeological_operations/forms.py:677 -#: archaeological_operations/forms.py:1306 -#: archaeological_operations/forms.py:1466 +#: archaeological_operations/forms.py:1322 +#: archaeological_operations/forms.py:1510 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:45 #: archaeological_operations/templates/ishtar/sheet_site.html:40 @@ -391,21 +404,21 @@ msgstr "" msgid "General" msgstr "" -#: archaeological_context_records/forms.py:288 +#: archaeological_context_records/forms.py:295 msgid "Context record - 020 - General" msgstr "" -#: archaeological_context_records/forms.py:308 -#: archaeological_context_records/forms.py:616 -#: archaeological_context_records/forms.py:680 -#: archaeological_context_records/forms.py:783 -#: archaeological_context_records/models.py:561 +#: archaeological_context_records/forms.py:316 +#: archaeological_context_records/forms.py:631 +#: archaeological_context_records/forms.py:695 +#: archaeological_context_records/forms.py:802 #: archaeological_context_records/models.py:562 -#: archaeological_context_records/models.py:827 -#: archaeological_finds/models_finds.py:1153 +#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:834 +#: archaeological_finds/models_finds.py:1169 #: archaeological_operations/forms.py:72 archaeological_operations/forms.py:210 #: archaeological_operations/forms.py:1018 -#: archaeological_operations/models.py:3178 +#: archaeological_operations/models.py:3295 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:150 archaeological_warehouse/models.py:337 #: ishtar_common/forms_common.py:93 ishtar_common/forms_common.py:115 @@ -415,37 +428,37 @@ msgstr "" msgid "Town" msgstr "" -#: archaeological_context_records/forms.py:313 -#: archaeological_context_records/forms.py:621 +#: archaeological_context_records/forms.py:321 +#: archaeological_context_records/forms.py:636 msgid "Only the items associated to the operation can be selected." msgstr "" -#: archaeological_context_records/forms.py:318 -#: archaeological_context_records/forms.py:627 -#: archaeological_context_records/forms.py:682 -#: archaeological_context_records/models.py:566 -#: archaeological_context_records/models.py:574 -#: archaeological_context_records/models.py:879 -#: archaeological_context_records/models.py:1515 +#: archaeological_context_records/forms.py:326 +#: archaeological_context_records/forms.py:642 +#: archaeological_context_records/forms.py:697 +#: archaeological_context_records/models.py:567 +#: archaeological_context_records/models.py:575 +#: archaeological_context_records/models.py:890 +#: archaeological_context_records/models.py:1526 msgid "Context record type" msgstr "" -#: archaeological_context_records/forms.py:335 -#: archaeological_context_records/models.py:850 +#: archaeological_context_records/forms.py:350 +#: archaeological_context_records/models.py:861 msgid "Opening date" msgstr "" -#: archaeological_context_records/forms.py:336 -#: archaeological_context_records/models.py:851 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:248 -#: archaeological_files/models.py:629 +#: archaeological_context_records/forms.py:351 +#: archaeological_context_records/models.py:862 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_files/models.py:663 #: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:660 #: archaeological_finds/forms_treatments.py:753 #: archaeological_finds/models_treatments.py:276 #: archaeological_finds/models_treatments.py:1230 -#: archaeological_operations/models.py:1350 +#: archaeological_operations/models.py:1467 #: archaeological_operations/templates/ishtar/sheet_operation.html:208 #: ishtar_common/forms.py:1043 ishtar_common/forms.py:1044 #: na_app/templates/ishtar/sheet_operation.html:204 @@ -453,8 +466,8 @@ msgstr "" msgid "Closing date" msgstr "" -#: archaeological_context_records/forms.py:339 -#: archaeological_context_records/models.py:864 +#: archaeological_context_records/forms.py:354 +#: archaeological_context_records/models.py:875 #: archaeological_finds/forms_treatments.py:151 #: archaeological_finds/models_treatments.py:237 #: archaeological_finds/models_treatments.py:851 @@ -464,10 +477,10 @@ msgstr "" msgid "Location" msgstr "" -#: archaeological_context_records/forms.py:372 +#: archaeological_context_records/forms.py:387 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:155 -#: archaeological_finds/forms.py:496 archaeological_finds/forms.py:797 -#: archaeological_finds/forms.py:1604 +#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:807 +#: archaeological_finds/forms.py:1614 #: archaeological_finds/templates/ishtar/sheet_find.html:196 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:175 #: cd17_app/templates/ishtar/sheet_find.html:201 @@ -478,65 +491,66 @@ msgstr "" msgid "Dimensions" msgstr "" -#: archaeological_context_records/forms.py:376 +#: archaeological_context_records/forms.py:391 +#: archaeological_files/forms.py:313 archaeological_files/models.py:700 msgid "Total surface (m²)" msgstr "" -#: archaeological_context_records/forms.py:382 -#: archaeological_context_records/models.py:852 +#: archaeological_context_records/forms.py:397 +#: archaeological_context_records/models.py:863 msgid "Length (m)" msgstr "" -#: archaeological_context_records/forms.py:383 -#: archaeological_context_records/models.py:853 +#: archaeological_context_records/forms.py:398 +#: archaeological_context_records/models.py:864 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 msgid "Excavated length (m)" msgstr "" -#: archaeological_context_records/forms.py:384 -#: archaeological_context_records/models.py:854 +#: archaeological_context_records/forms.py:399 +#: archaeological_context_records/models.py:865 msgid "Width (m)" msgstr "" -#: archaeological_context_records/forms.py:385 -#: archaeological_context_records/models.py:855 +#: archaeological_context_records/forms.py:400 +#: archaeological_context_records/models.py:866 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:168 msgid "Excavated width (m)" msgstr "" -#: archaeological_context_records/forms.py:386 -#: archaeological_context_records/models.py:856 +#: archaeological_context_records/forms.py:401 +#: archaeological_context_records/models.py:867 msgid "Thickness (m)" msgstr "" -#: archaeological_context_records/forms.py:387 -#: archaeological_context_records/models.py:857 +#: archaeological_context_records/forms.py:402 +#: archaeological_context_records/models.py:868 msgid "Diameter (m)" msgstr "" -#: archaeological_context_records/forms.py:388 -#: archaeological_context_records/models.py:858 +#: archaeological_context_records/forms.py:403 +#: archaeological_context_records/models.py:869 msgid "Depth (m)" msgstr "" -#: archaeological_context_records/forms.py:390 -#: archaeological_context_records/models.py:860 +#: archaeological_context_records/forms.py:405 +#: archaeological_context_records/models.py:871 msgid "Depth of appearance (m)" msgstr "" -#: archaeological_context_records/forms.py:477 +#: archaeological_context_records/forms.py:492 msgid "This ID already exists for this operation." msgstr "" -#: archaeological_context_records/forms.py:482 +#: archaeological_context_records/forms.py:497 msgid "You have to choose a town or a parcel." msgstr "" -#: archaeological_context_records/forms.py:487 -#: archaeological_context_records/forms.py:509 -#: archaeological_context_records/models.py:156 -#: archaeological_finds/forms.py:1541 archaeological_finds/forms.py:1562 -#: archaeological_finds/models_finds.py:2046 +#: archaeological_context_records/forms.py:502 +#: archaeological_context_records/forms.py:524 +#: archaeological_context_records/models.py:157 +#: archaeological_finds/forms.py:1551 archaeological_finds/forms.py:1572 +#: archaeological_finds/models_finds.py:2066 #: archaeological_finds/templates/ishtar/sheet_find.html:247 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:195 #: cd17_app/templates/ishtar/sheet_find.html:221 @@ -547,11 +561,11 @@ msgstr "" msgid "Dating" msgstr "" -#: archaeological_context_records/forms.py:494 -#: archaeological_context_records/models.py:108 -#: archaeological_context_records/models.py:576 -#: archaeological_finds/forms.py:1133 archaeological_finds/forms.py:1548 -#: archaeological_finds/models_finds.py:1206 +#: archaeological_context_records/forms.py:509 +#: archaeological_context_records/models.py:109 +#: archaeological_context_records/models.py:577 +#: archaeological_finds/forms.py:1143 archaeological_finds/forms.py:1558 +#: archaeological_finds/models_finds.py:1222 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 #: archaeological_operations/forms.py:803 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 @@ -569,15 +583,15 @@ msgstr "" msgid "Chronological period" msgstr "" -#: archaeological_context_records/forms.py:495 -#: archaeological_context_records/models.py:110 -#: archaeological_files/forms.py:775 archaeological_files/models.py:76 -#: archaeological_files/models.py:735 -#: archaeological_files/templates/ishtar/sheet_file.html:190 -#: archaeological_finds/forms.py:1550 +#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/models.py:111 +#: archaeological_files/forms.py:750 archaeological_files/models.py:78 +#: archaeological_files/models.py:777 +#: archaeological_files/templates/ishtar/sheet_file.html:193 +#: archaeological_finds/forms.py:1560 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:751 -#: archaeological_finds/models_finds.py:3700 +#: archaeological_finds/models_finds.py:3720 #: archaeological_finds/models_treatments.py:275 #: archaeological_finds/models_treatments.py:849 #: archaeological_finds/templates/ishtar/sheet_find.html:438 @@ -588,9 +602,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 #: archaeological_operations/forms.py:508 #: archaeological_operations/forms.py:752 -#: archaeological_operations/models.py:101 -#: archaeological_operations/models.py:1351 -#: archaeological_operations/models.py:3495 +#: archaeological_operations/models.py:103 +#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:3612 #: cd17_app/templates/ishtar/sheet_find.html:230 #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 @@ -615,11 +629,11 @@ msgstr "" msgid "Start date" msgstr "" -#: archaeological_context_records/forms.py:496 -#: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:664 archaeological_files/forms.py:780 -#: archaeological_files/models.py:77 archaeological_files/models.py:736 -#: archaeological_finds/forms.py:1551 archaeological_finds/models_finds.py:3701 +#: archaeological_context_records/forms.py:511 +#: archaeological_context_records/models.py:112 +#: archaeological_files/forms.py:639 archaeological_files/forms.py:755 +#: archaeological_files/models.py:79 archaeological_files/models.py:778 +#: archaeological_finds/forms.py:1561 archaeological_finds/models_finds.py:3721 #: archaeological_finds/models_treatments.py:850 #: archaeological_finds/templates/ishtar/sheet_find.html:439 #: archaeological_finds/templates/ishtar/sheet_find.html:477 @@ -629,8 +643,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 -#: archaeological_operations/models.py:102 -#: archaeological_operations/models.py:3496 +#: archaeological_operations/models.py:104 +#: archaeological_operations/models.py:3613 #: cd17_app/templates/ishtar/sheet_find.html:231 #: cd17_app/templates/ishtar/sheet_find.html:398 #: cd17_app/templates/ishtar/sheet_find.html:436 @@ -661,9 +675,9 @@ msgstr "" msgid "End date" msgstr "" -#: archaeological_context_records/forms.py:497 -#: archaeological_context_records/models.py:121 -#: archaeological_finds/forms.py:1552 +#: archaeological_context_records/forms.py:512 +#: archaeological_context_records/models.py:122 +#: archaeological_finds/forms.py:1562 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: cd17_app/templates/ishtar/sheet_find.html:233 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 @@ -674,10 +688,10 @@ msgstr "" msgid "Quality" msgstr "" -#: archaeological_context_records/forms.py:498 -#: archaeological_context_records/models.py:83 -#: archaeological_context_records/models.py:114 -#: archaeological_finds/forms.py:1549 +#: archaeological_context_records/forms.py:513 +#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:115 +#: archaeological_finds/forms.py:1559 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: cd17_app/templates/ishtar/sheet_find.html:232 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 @@ -688,148 +702,156 @@ msgstr "" msgid "Dating type" msgstr "" -#: archaeological_context_records/forms.py:499 -#: archaeological_context_records/models.py:126 -#: archaeological_finds/forms.py:1553 +#: archaeological_context_records/forms.py:514 +#: archaeological_context_records/models.py:127 +#: archaeological_finds/forms.py:1563 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "" -#: archaeological_context_records/forms.py:510 +#: archaeological_context_records/forms.py:525 msgid "Context record - 030 - Dating" msgstr "" -#: archaeological_context_records/forms.py:517 +#: archaeological_context_records/forms.py:532 msgid "Context record - 040 - Interpretation" msgstr "" -#: archaeological_context_records/forms.py:535 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:211 +#: archaeological_context_records/forms.py:550 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:212 msgid "Dating complements" msgstr "" -#: archaeological_context_records/forms.py:536 -#: archaeological_context_records/models.py:891 +#: archaeological_context_records/forms.py:551 +#: archaeological_context_records/models.py:902 msgid "TAQ" msgstr "" -#: archaeological_context_records/forms.py:537 -#: archaeological_context_records/models.py:900 +#: archaeological_context_records/forms.py:552 +#: archaeological_context_records/models.py:911 msgid "Estimated TAQ" msgstr "" -#: archaeological_context_records/forms.py:538 -#: archaeological_context_records/models.py:906 +#: archaeological_context_records/forms.py:553 +#: archaeological_context_records/models.py:917 msgid "TPQ" msgstr "" -#: archaeological_context_records/forms.py:539 -#: archaeological_context_records/models.py:915 +#: archaeological_context_records/forms.py:554 +#: archaeological_context_records/models.py:926 msgid "Estimated TPQ" msgstr "" -#: archaeological_context_records/forms.py:541 +#: archaeological_context_records/forms.py:556 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/forms.py:1327 -#: archaeological_operations/forms.py:1820 +#: archaeological_operations/forms.py:1368 +#: archaeological_operations/forms.py:1864 msgid "Cultural attributions" msgstr "" -#: archaeological_context_records/forms.py:546 +#: archaeological_context_records/forms.py:561 msgid "Comments on dating" msgstr "" -#: archaeological_context_records/forms.py:559 +#: archaeological_context_records/forms.py:574 #: archaeological_operations/forms.py:586 #: archaeological_operations/forms.py:599 #: archaeological_operations/views.py:197 msgid "Operation search" msgstr "" -#: archaeological_context_records/forms.py:564 +#: archaeological_context_records/forms.py:579 #: archaeological_operations/forms.py:379 msgid "You should select an operation." msgstr "" -#: archaeological_context_records/forms.py:570 +#: archaeological_context_records/forms.py:585 msgid "Would you like to delete this context record?" msgstr "" -#: archaeological_context_records/forms.py:580 +#: archaeological_context_records/forms.py:595 msgid "You should select a context record and a relation type." msgstr "" -#: archaeological_context_records/forms.py:581 +#: archaeological_context_records/forms.py:596 msgid "A context record cannot be related to himself." msgstr "" -#: archaeological_context_records/forms.py:584 +#: archaeological_context_records/forms.py:599 #: archaeological_context_records/ishtar_menu.py:33 -#: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1645 +#: archaeological_context_records/models.py:268 +#: archaeological_context_records/models.py:1656 #: archaeological_context_records/views.py:253 #: archaeological_finds/forms.py:174 archaeological_finds/forms.py:180 -#: archaeological_finds/forms.py:974 archaeological_finds/forms.py:993 -#: archaeological_finds/forms.py:1774 archaeological_finds/models_finds.py:1149 -#: archaeological_finds/models_finds.py:2731 +#: archaeological_finds/forms.py:984 archaeological_finds/forms.py:1003 +#: archaeological_finds/forms.py:1784 archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:2751 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 -#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1725 +#: archaeological_finds/wizards.py:97 archaeological_operations/models.py:1842 #: archaeological_warehouse/forms.py:573 ishtar_common/forms_common.py:2528 #: ishtar_common/models.py:5564 ishtar_common/views.py:504 msgid "Context record" msgstr "" -#: archaeological_context_records/forms.py:610 +#: archaeological_context_records/forms.py:625 msgid "Context records - Relations" msgstr "" -#: archaeological_context_records/forms.py:611 +#: archaeological_context_records/forms.py:626 msgid "Context record - Relations" msgstr "" -#: archaeological_context_records/forms.py:714 -#: archaeological_finds/forms.py:1355 archaeological_finds/forms.py:1380 -#: archaeological_operations/forms.py:1786 ishtar_common/forms_common.py:2701 +#: archaeological_context_records/forms.py:729 +#: archaeological_finds/forms.py:1365 archaeological_finds/forms.py:1390 +#: archaeological_operations/forms.py:1830 ishtar_common/forms_common.py:2701 #: ishtar_common/models.py:3545 ishtar_common/models.py:3919 msgid " - duplicate" msgstr "" -#: archaeological_context_records/forms.py:744 +#: archaeological_context_records/forms.py:759 msgid "Context record - Quick action - Modify" msgstr "" -#: archaeological_context_records/forms.py:769 -#: archaeological_context_records/models.py:1406 -#: archaeological_context_records/models.py:1445 -#: archaeological_context_records/models.py:1513 +#: archaeological_context_records/forms.py:788 +#: archaeological_context_records/models.py:1417 +#: archaeological_context_records/models.py:1456 +#: archaeological_context_records/models.py:1524 #: archaeological_operations/forms.py:383 msgid "Relation type" msgstr "" -#: archaeological_context_records/forms.py:773 +#: archaeological_context_records/forms.py:792 #: 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:781 +#: archaeological_context_records/forms.py:800 msgid "Unit type" msgstr "" -#: archaeological_context_records/forms.py:790 +#: archaeological_context_records/forms.py:809 msgid "Excavation technic" msgstr "" -#: archaeological_context_records/forms.py:802 +#: archaeological_context_records/forms.py:812 +msgid "Structures" +msgstr "" + +#: archaeological_context_records/forms.py:813 +msgid "Textures" +msgstr "" + +#: archaeological_context_records/forms.py:825 msgid "Associated parcel" msgstr "" -#: archaeological_context_records/forms.py:831 +#: archaeological_context_records/forms.py:858 msgid "Parcel can be modified only if operations are the same" msgstr "" -#: archaeological_context_records/forms.py:850 +#: archaeological_context_records/forms.py:877 msgid "" "To add relations, you must fill \"relation type\" and \"related to\" fields." msgstr "" @@ -911,61 +933,61 @@ msgstr "" msgid "Deletion" msgstr "" -#: archaeological_context_records/models.py:84 +#: archaeological_context_records/models.py:85 msgid "Dating types" msgstr "" -#: archaeological_context_records/models.py:94 +#: archaeological_context_records/models.py:95 msgid "Dating quality type" msgstr "" -#: archaeological_context_records/models.py:95 +#: archaeological_context_records/models.py:96 msgid "Dating quality types" msgstr "" -#: archaeological_context_records/models.py:130 +#: archaeological_context_records/models.py:131 #: archaeological_context_records/tests.py:935 #: archaeological_finds/tests.py:1520 archaeological_finds/tests.py:1749 msgctxt "key for text search" msgid "datings-period" msgstr "" -#: archaeological_context_records/models.py:134 +#: archaeological_context_records/models.py:135 msgctxt "key for text search" msgid "datings-precise" msgstr "" -#: archaeological_context_records/models.py:138 +#: archaeological_context_records/models.py:139 msgctxt "key for text search" msgid "datings-start" msgstr "" -#: archaeological_context_records/models.py:142 +#: archaeological_context_records/models.py:143 msgctxt "key for text search" msgid "datings-end" msgstr "" -#: archaeological_context_records/models.py:146 +#: archaeological_context_records/models.py:147 msgctxt "key for text search" msgid "datings-type" msgstr "" -#: archaeological_context_records/models.py:150 +#: archaeological_context_records/models.py:151 msgctxt "key for text search" msgid "datings-quality" msgstr "" -#: archaeological_context_records/models.py:157 +#: archaeological_context_records/models.py:158 msgid "Datings" msgstr "" -#: archaeological_context_records/models.py:273 -#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:607 +#: archaeological_context_records/models.py:274 +#: archaeological_finds/forms.py:211 archaeological_finds/forms.py:613 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2308 -#: archaeological_finds/models_finds.py:3605 -#: archaeological_finds/models_finds.py:3645 -#: archaeological_finds/models_finds.py:3688 +#: archaeological_finds/models_finds.py:2328 +#: archaeological_finds/models_finds.py:3625 +#: archaeological_finds/models_finds.py:3665 +#: archaeological_finds/models_finds.py:3708 #: archaeological_finds/models_treatments.py:831 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 @@ -978,24 +1000,24 @@ msgstr "" msgid "Find" msgstr "" -#: archaeological_context_records/models.py:298 -#: archaeological_context_records/models.py:321 -#: 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:105 +#: archaeological_context_records/models.py:299 +#: archaeological_context_records/models.py:322 +#: archaeological_files/models.py:77 archaeological_files/models.py:107 +#: archaeological_files/models.py:161 archaeological_files/models.py:177 +#: archaeological_files/models.py:237 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:259 #: archaeological_finds/models_finds.py:335 #: archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1982 +#: archaeological_finds/models_finds.py:2002 #: archaeological_finds/models_treatments.py:67 #: archaeological_finds/models_treatments.py:843 -#: archaeological_operations/models.py:100 -#: archaeological_operations/models.py:125 -#: archaeological_operations/models.py:143 -#: archaeological_operations/models.py:152 -#: archaeological_operations/models.py:3522 +#: archaeological_operations/models.py:102 +#: archaeological_operations/models.py:127 +#: archaeological_operations/models.py:184 +#: archaeological_operations/models.py:197 +#: archaeological_operations/models.py:3639 #: archaeological_warehouse/forms.py:113 archaeological_warehouse/models.py:738 #: archaeological_warehouse/models.py:770 ishtar_common/models.py:681 #: ishtar_common/models.py:737 ishtar_common/models.py:788 @@ -1007,215 +1029,215 @@ msgstr "" msgid "Order" msgstr "" -#: archaeological_context_records/models.py:301 +#: archaeological_context_records/models.py:302 msgid "Parent context record type" msgstr "" -#: archaeological_context_records/models.py:308 +#: archaeological_context_records/models.py:309 msgid "Context record Type" msgstr "" -#: archaeological_context_records/models.py:309 +#: archaeological_context_records/models.py:310 msgid "Context record Types" msgstr "" -#: archaeological_context_records/models.py:324 +#: archaeological_context_records/models.py:325 msgid "Activity Type" msgstr "" -#: archaeological_context_records/models.py:325 +#: archaeological_context_records/models.py:326 msgid "Activity Types" msgstr "" -#: archaeological_context_records/models.py:338 +#: archaeological_context_records/models.py:339 msgid "Identification Type" msgstr "" -#: archaeological_context_records/models.py:339 +#: archaeological_context_records/models.py:340 msgid "Identification Types" msgstr "" -#: archaeological_context_records/models.py:352 +#: archaeological_context_records/models.py:353 msgid "Structure Type" msgstr "" -#: archaeological_context_records/models.py:353 +#: archaeological_context_records/models.py:354 msgid "Structure Types" msgstr "" -#: archaeological_context_records/models.py:366 +#: archaeological_context_records/models.py:367 msgid "Texture Type" msgstr "" -#: archaeological_context_records/models.py:367 +#: archaeological_context_records/models.py:368 msgid "Texture Types" msgstr "" -#: archaeological_context_records/models.py:380 +#: archaeological_context_records/models.py:381 msgid "Color Type" msgstr "" -#: archaeological_context_records/models.py:381 +#: archaeological_context_records/models.py:382 msgid "Color Types" msgstr "" -#: archaeological_context_records/models.py:394 +#: archaeological_context_records/models.py:395 msgid "Inclusion Type" msgstr "" -#: archaeological_context_records/models.py:395 +#: archaeological_context_records/models.py:396 msgid "Inclusion Types" msgstr "" -#: archaeological_context_records/models.py:408 +#: archaeological_context_records/models.py:409 msgid "Excavation technique type" msgstr "" -#: archaeological_context_records/models.py:409 +#: archaeological_context_records/models.py:410 msgid "Excavation technique types" msgstr "" -#: archaeological_context_records/models.py:419 +#: archaeological_context_records/models.py:420 #: ishtar_common/models_imports.py:1081 msgid "Documentation type" msgstr "" -#: archaeological_context_records/models.py:420 +#: archaeological_context_records/models.py:421 msgid "Documentation types" msgstr "" -#: archaeological_context_records/models.py:553 #: archaeological_context_records/models.py:554 -#: archaeological_context_records/models.py:1518 -#: archaeological_finds/models_finds.py:1168 -#: archaeological_finds/models_finds.py:1169 +#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:1529 +#: archaeological_finds/models_finds.py:1184 +#: archaeological_finds/models_finds.py:1185 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1106 -#: archaeological_operations/forms.py:1203 -#: archaeological_operations/forms.py:1321 -#: archaeological_operations/models.py:305 -#: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:503 -#: archaeological_operations/models.py:1001 -#: archaeological_operations/models.py:1091 -#: archaeological_operations/models.py:1412 +#: archaeological_operations/forms.py:1207 +#: archaeological_operations/forms.py:1362 +#: archaeological_operations/models.py:366 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:601 +#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1208 +#: archaeological_operations/models.py:1529 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" -#: archaeological_context_records/models.py:555 +#: archaeological_context_records/models.py:556 msgid "Datings (period)" msgstr "" -#: archaeological_context_records/models.py:556 #: archaeological_context_records/models.py:557 +#: archaeological_context_records/models.py:558 msgid "Related context records" msgstr "" -#: archaeological_context_records/models.py:558 +#: archaeological_context_records/models.py:559 msgid "Operation (Patriarche code)" msgstr "" -#: archaeological_context_records/models.py:559 -#: archaeological_finds/models_finds.py:1154 +#: archaeological_context_records/models.py:560 +#: archaeological_finds/models_finds.py:1170 msgid "Operation (name)" msgstr "" -#: archaeological_context_records/models.py:560 +#: archaeological_context_records/models.py:561 msgid "Parcel (external ID)" msgstr "" -#: archaeological_context_records/models.py:563 +#: archaeological_context_records/models.py:564 msgid "Parcel (year)" msgstr "" -#: archaeological_context_records/models.py:580 -#: archaeological_finds/models_finds.py:1218 -#: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:1005 +#: archaeological_context_records/models.py:581 +#: archaeological_finds/models_finds.py:1234 +#: archaeological_operations/models.py:377 +#: archaeological_operations/models.py:1122 msgid "Associated document type" msgstr "" -#: archaeological_context_records/models.py:581 -#: archaeological_finds/models_finds.py:1219 -#: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:1006 +#: archaeological_context_records/models.py:582 +#: archaeological_finds/models_finds.py:1235 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1123 msgid "Modification (year)" msgstr "" -#: archaeological_context_records/models.py:629 +#: archaeological_context_records/models.py:631 msgctxt "key for text search" msgid "id" msgstr "" -#: archaeological_context_records/models.py:632 +#: archaeological_context_records/models.py:634 #: archaeological_context_records/tests.py:761 -#: archaeological_files/models.py:495 archaeological_finds/models_finds.py:1325 -#: archaeological_operations/models.py:386 -#: archaeological_operations/models.py:1155 +#: archaeological_files/models.py:521 archaeological_finds/models_finds.py:1341 +#: archaeological_operations/models.py:471 +#: archaeological_operations/models.py:1272 #: archaeological_operations/tests.py:3107 #: archaeological_warehouse/models.py:367 ishtar_common/models.py:4422 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:635 ishtar_common/models.py:4382 +#: archaeological_context_records/models.py:637 ishtar_common/models.py:4382 msgctxt "key for text search" msgid "operation-year" msgstr "" -#: archaeological_context_records/models.py:638 -#: archaeological_finds/models_finds.py:1650 archaeological_finds/tests.py:1569 +#: archaeological_context_records/models.py:640 +#: archaeological_finds/models_finds.py:1670 archaeological_finds/tests.py:1569 msgctxt "key for text search" msgid "operation-name" msgstr "" -#: archaeological_context_records/models.py:642 -#: archaeological_operations/models.py:1151 -#: archaeological_operations/models.py:2718 +#: archaeological_context_records/models.py:644 +#: archaeological_operations/models.py:1268 +#: archaeological_operations/models.py:2835 #: archaeological_operations/tests.py:4614 msgctxt "key for text search" msgid "patriarche" msgstr "" -#: archaeological_context_records/models.py:646 -#: archaeological_finds/models_finds.py:1333 +#: archaeological_context_records/models.py:648 +#: archaeological_finds/models_finds.py:1349 msgctxt "key for text search" msgid "operation-code" msgstr "" -#: archaeological_context_records/models.py:650 -#: archaeological_context_records/models.py:761 -#: archaeological_finds/models_finds.py:1443 -#: archaeological_finds/models_finds.py:1886 -#: archaeological_operations/models.py:421 -#: archaeological_operations/models.py:448 ishtar_common/models.py:4373 +#: archaeological_context_records/models.py:652 +#: archaeological_context_records/models.py:768 +#: archaeological_finds/models_finds.py:1459 +#: archaeological_finds/models_finds.py:1906 +#: archaeological_operations/models.py:518 +#: archaeological_operations/models.py:545 ishtar_common/models.py:4373 #: ishtar_common/models.py:4484 msgctxt "key for text search" msgid "operation" msgstr "" -#: archaeological_context_records/models.py:654 -#: archaeological_context_records/models.py:764 -#: archaeological_finds/models_finds.py:1349 -#: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:1312 +#: archaeological_context_records/models.py:656 +#: archaeological_context_records/models.py:771 +#: archaeological_finds/models_finds.py:1365 +#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1429 #: archaeological_warehouse/models.py:989 ishtar_common/models.py:4414 #: ishtar_common/models.py:4493 msgctxt "key for text search" msgid "site" msgstr "" -#: archaeological_context_records/models.py:659 +#: archaeological_context_records/models.py:661 #: archaeological_context_records/tests.py:828 -#: archaeological_finds/models_finds.py:1380 +#: archaeological_finds/models_finds.py:1396 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" -#: archaeological_context_records/models.py:663 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1201 +#: archaeological_context_records/models.py:665 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1318 #: archaeological_operations/tests.py:3085 #: archaeological_operations/tests.py:3123 #: archaeological_operations/tests.py:3262 @@ -1224,216 +1246,220 @@ msgctxt "key for text search" msgid "period" msgstr "" -#: archaeological_context_records/models.py:667 +#: archaeological_context_records/models.py:669 #: archaeological_context_records/tests.py:887 msgctxt "key for text search" msgid "unit-type" msgstr "" -#: archaeological_context_records/models.py:670 +#: archaeological_context_records/models.py:672 msgctxt "key for text search" msgid "activity" msgstr "" -#: archaeological_context_records/models.py:673 -#: archaeological_files/models.py:498 archaeological_operations/models.py:1161 -#: archaeological_operations/models.py:2736 +#: archaeological_context_records/models.py:675 +#: archaeological_files/models.py:524 archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:2853 msgctxt "key for text search" msgid "parcel" msgstr "" -#: archaeological_context_records/models.py:677 -#: archaeological_operations/models.py:1267 +#: archaeological_context_records/models.py:679 +#: archaeological_operations/models.py:1384 msgctxt "key for text search" msgid "has-finds" msgstr "" -#: archaeological_context_records/models.py:680 +#: archaeological_context_records/models.py:682 #: archaeological_context_records/tests.py:793 msgctxt "key for text search" msgid "record-relation-type" msgstr "" -#: archaeological_context_records/models.py:684 +#: archaeological_context_records/models.py:686 msgctxt "key for text search" msgid "excavation-technique" msgstr "" -#: archaeological_context_records/models.py:688 -#: archaeological_finds/models_finds.py:1618 -#: archaeological_operations/models.py:437 +#: archaeological_context_records/models.py:690 +#: archaeological_finds/models_finds.py:1638 +#: archaeological_operations/models.py:534 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" -#: archaeological_context_records/models.py:692 +#: archaeological_context_records/models.py:694 msgctxt "key for text search" msgid "identification" msgstr "" -#: archaeological_context_records/models.py:696 +#: archaeological_context_records/models.py:698 msgctxt "key for text search" msgid "documentation" msgstr "" -#: archaeological_context_records/models.py:700 -#: archaeological_finds/models_finds.py:1413 archaeological_finds/tests.py:1586 -#: ishtar_common/models.py:4300 +#: archaeological_context_records/models.py:702 +#: archaeological_finds/models_finds.py:1429 archaeological_finds/tests.py:1586 +#: archaeological_operations/models.py:477 ishtar_common/models.py:4300 msgctxt "key for text search" msgid "description" msgstr "" -#: archaeological_context_records/models.py:704 +#: archaeological_context_records/models.py:706 msgctxt "key for text search" msgid "filling" msgstr "" -#: archaeological_context_records/models.py:708 +#: archaeological_context_records/models.py:710 msgctxt "key for text search" msgid "interpretation" msgstr "" -#: archaeological_context_records/models.py:712 -#: archaeological_files/models.py:530 archaeological_finds/models_finds.py:1531 -#: archaeological_operations/models.py:392 -#: archaeological_operations/models.py:1214 -#: archaeological_operations/models.py:2828 +#: archaeological_context_records/models.py:714 +#: archaeological_files/models.py:564 archaeological_finds/models_finds.py:1547 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:1331 +#: archaeological_operations/models.py:2945 #: archaeological_warehouse/models.py:972 ishtar_common/models.py:4363 msgctxt "key for text search" msgid "comment" msgstr "" -#: archaeological_context_records/models.py:716 +#: archaeological_context_records/models.py:718 msgctxt "key for text search" msgid "structure" msgstr "" -#: archaeological_context_records/models.py:720 +#: archaeological_context_records/models.py:722 msgctxt "key for text search" msgid "texture" msgstr "" -#: archaeological_context_records/models.py:724 +#: archaeological_context_records/models.py:726 msgctxt "key for text search" msgid "inclusion" msgstr "" -#: archaeological_context_records/models.py:728 +#: archaeological_context_records/models.py:730 msgctxt "key for text search" msgid "color" msgstr "" -#: archaeological_context_records/models.py:732 +#: archaeological_context_records/models.py:734 msgctxt "key for text search" msgid "color-details" msgstr "" -#: archaeological_context_records/models.py:779 -#: archaeological_finds/models_finds.py:1845 -#: archaeological_operations/models.py:467 -#: archaeological_operations/models.py:1295 +#: archaeological_context_records/models.py:738 +msgctxt "key for text search" +msgid "excavator" +msgstr "" + +#: archaeological_context_records/models.py:786 +#: archaeological_finds/models_finds.py:1865 +#: archaeological_operations/models.py:564 +#: archaeological_operations/models.py:1412 #: archaeological_warehouse/models.py:385 #: archaeological_warehouse/models.py:1119 msgid "Lock/Unlock" msgstr "" -#: archaeological_context_records/models.py:786 -#: archaeological_finds/models_finds.py:1838 -#: archaeological_operations/models.py:474 -#: archaeological_operations/models.py:1288 +#: archaeological_context_records/models.py:793 +#: archaeological_finds/models_finds.py:1858 +#: archaeological_operations/models.py:571 +#: archaeological_operations/models.py:1405 #: archaeological_warehouse/models.py:377 #: archaeological_warehouse/models.py:1105 ishtar_common/models.py:2619 #: ishtar_common/models.py:2900 ishtar_common/models.py:4510 msgid "Bulk update" msgstr "" -#: archaeological_context_records/models.py:796 -#: archaeological_context_records/models.py:1178 +#: archaeological_context_records/models.py:803 +#: archaeological_context_records/models.py:1189 #: archaeological_context_records/views.py:277 #: archaeological_context_records/views.py:292 -#: archaeological_finds/models_finds.py:926 -#: archaeological_finds/models_finds.py:1855 -#: archaeological_finds/models_finds.py:2633 archaeological_finds/views.py:1249 +#: archaeological_finds/models_finds.py:942 +#: archaeological_finds/models_finds.py:1875 +#: archaeological_finds/models_finds.py:2653 archaeological_finds/views.py:1249 #: archaeological_finds/views.py:1264 archaeological_finds/views.py:1302 -#: archaeological_finds/views.py:1318 archaeological_operations/models.py:492 -#: archaeological_operations/models.py:672 -#: archaeological_operations/models.py:1305 -#: archaeological_operations/models.py:2036 -#: archaeological_operations/views.py:1027 -#: archaeological_operations/views.py:1042 -#: archaeological_operations/views.py:1049 -#: archaeological_operations/views.py:1066 ishtar_common/admin.py:1722 +#: archaeological_finds/views.py:1318 archaeological_operations/models.py:589 +#: archaeological_operations/models.py:789 +#: archaeological_operations/models.py:1422 +#: archaeological_operations/models.py:2153 +#: archaeological_operations/views.py:1025 +#: archaeological_operations/views.py:1040 +#: archaeological_operations/views.py:1047 +#: archaeological_operations/views.py:1064 ishtar_common/admin.py:1722 #: ishtar_common/admin.py:1865 ishtar_common/models.py:4519 #: ishtar_common/models.py:4898 ishtar_common/views.py:3154 #: ishtar_common/views.py:3172 msgid "Duplicate" msgstr "" -#: archaeological_context_records/models.py:813 -#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:549 -#: archaeological_finds/models_finds.py:1976 +#: archaeological_context_records/models.py:820 +#: archaeological_files/models.py:601 archaeological_finds/models_finds.py:561 +#: archaeological_finds/models_finds.py:1996 #: archaeological_finds/models_treatments.py:270 -#: archaeological_operations/models.py:3186 +#: archaeological_operations/models.py:3303 #: archaeological_warehouse/models.py:439 #: archaeological_warehouse/models.py:1194 ishtar_common/models.py:4545 msgid "External ID" msgstr "" -#: archaeological_context_records/models.py:815 -#: archaeological_files/models.py:570 archaeological_finds/models_finds.py:551 -#: archaeological_finds/models_finds.py:1978 -#: archaeological_operations/models.py:3189 +#: archaeological_context_records/models.py:822 +#: archaeological_files/models.py:604 archaeological_finds/models_finds.py:563 +#: archaeological_finds/models_finds.py:1998 +#: archaeological_operations/models.py:3306 #: archaeological_warehouse/models.py:441 #: archaeological_warehouse/models.py:1196 msgid "External ID is set automatically" msgstr "" -#: archaeological_context_records/models.py:862 -#: archaeological_operations/models.py:1404 ishtar_common/models_common.py:3395 -msgid "Surface (m2)" +#: archaeological_context_records/models.py:873 +msgid "Surface (m²)" msgstr "" -#: archaeological_context_records/models.py:867 +#: archaeological_context_records/models.py:878 msgid "A short description of the location of the context record" msgstr "" -#: archaeological_context_records/models.py:876 +#: archaeological_context_records/models.py:887 msgid "Comment on datings" msgstr "" -#: archaeological_context_records/models.py:895 +#: archaeological_context_records/models.py:906 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: archaeological_context_records/models.py:903 +#: archaeological_context_records/models.py:914 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: archaeological_context_records/models.py:910 +#: archaeological_context_records/models.py:921 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: archaeological_context_records/models.py:918 +#: archaeological_context_records/models.py:929 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: archaeological_context_records/models.py:945 +#: archaeological_context_records/models.py:956 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:756 archaeological_finds/models_finds.py:2261 +#: archaeological_files/models.py:798 archaeological_finds/models_finds.py:2281 #: archaeological_finds/models_treatments.py:290 #: archaeological_finds/models_treatments.py:1248 #: archaeological_finds/templates/ishtar/sheet_find.html:63 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1478 -#: archaeological_operations/models.py:2932 +#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:1595 +#: archaeological_operations/models.py:3049 #: archaeological_operations/templates/ishtar/sheet_operation.html:62 -#: archaeological_operations/templates/ishtar/sheet_site.html:95 +#: archaeological_operations/templates/ishtar/sheet_site.html:104 #: archaeological_warehouse/models.py:428 #: archaeological_warehouse/models.py:1201 #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 @@ -1447,7 +1473,7 @@ msgstr "" #: ishtar_common/models.py:4696 ishtar_common/models_common.py:3424 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_area.html:97 -#: ishtar_common/templates/ishtar/sheet_person.html:161 +#: ishtar_common/templates/ishtar/sheet_person.html:171 #: ishtar_common/templates/ishtar/sheet_town.html:119 #: man_app/templates/ishtar/sheet_museum_find.html:65 #: na_app/templates/ishtar/sheet_container.html:50 @@ -1460,139 +1486,139 @@ msgstr "" msgid "Documents" msgstr "" -#: archaeological_context_records/models.py:952 -#: archaeological_files/models.py:762 archaeological_finds/models_finds.py:2267 +#: archaeological_context_records/models.py:963 +#: archaeological_files/models.py:804 archaeological_finds/models_finds.py:2287 #: archaeological_finds/models_treatments.py:296 #: archaeological_finds/models_treatments.py:1255 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1484 -#: archaeological_operations/models.py:2939 +#: archaeological_operations/models.py:665 +#: archaeological_operations/models.py:1601 +#: archaeological_operations/models.py:3056 #: archaeological_warehouse/models.py:435 #: archaeological_warehouse/models.py:1208 ishtar_common/models.py:2402 #: ishtar_common/models_common.py:3430 msgid "Main image" msgstr "" -#: archaeological_context_records/models.py:957 -#: archaeological_finds/models_finds.py:2280 -#: archaeological_operations/models.py:559 -#: archaeological_operations/models.py:1575 +#: archaeological_context_records/models.py:968 +#: archaeological_finds/models_finds.py:2300 +#: archaeological_operations/models.py:676 +#: archaeological_operations/models.py:1692 msgid "Cached periods label" msgstr "" -#: archaeological_context_records/models.py:960 -#: archaeological_context_records/models.py:966 -#: archaeological_finds/models_finds.py:2283 -#: archaeological_finds/models_finds.py:2289 -#: archaeological_finds/models_finds.py:2295 -#: archaeological_operations/models.py:556 -#: archaeological_operations/models.py:562 -#: archaeological_operations/models.py:568 -#: archaeological_operations/models.py:1566 -#: archaeological_operations/models.py:1572 -#: archaeological_operations/models.py:1578 -#: archaeological_operations/models.py:1584 +#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:977 +#: archaeological_finds/models_finds.py:2303 +#: archaeological_finds/models_finds.py:2309 +#: archaeological_finds/models_finds.py:2315 +#: archaeological_operations/models.py:673 +#: archaeological_operations/models.py:679 +#: archaeological_operations/models.py:685 +#: archaeological_operations/models.py:1683 +#: archaeological_operations/models.py:1689 +#: archaeological_operations/models.py:1695 +#: archaeological_operations/models.py:1701 #: archaeological_warehouse/models.py:452 ishtar_common/models_common.py:4398 msgid "Generated automatically - do not edit" msgstr "" -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:974 msgid "Cached related context records" msgstr "" -#: archaeological_context_records/models.py:970 -#: archaeological_context_records/models.py:971 +#: archaeological_context_records/models.py:981 +#: archaeological_context_records/models.py:982 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 -#: archaeological_finds/models_finds.py:562 +#: archaeological_finds/models_finds.py:574 msgid "Context Record" msgstr "" -#: archaeological_context_records/models.py:992 +#: archaeological_context_records/models.py:1003 msgctxt "short" msgid "Context record" msgstr "" -#: archaeological_context_records/models.py:1027 -#: archaeological_finds/models_finds.py:2505 +#: archaeological_context_records/models.py:1038 +#: archaeological_finds/models_finds.py:2525 msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1155 +#: archaeological_context_records/models.py:1166 msgid "Add find" msgstr "" -#: archaeological_context_records/models.py:1157 +#: archaeological_context_records/models.py:1168 msgid "find" msgstr "" -#: archaeological_context_records/models.py:1166 -#: archaeological_operations/models.py:2024 +#: archaeological_context_records/models.py:1177 +#: archaeological_operations/models.py:2141 msgid "Modify relations" msgstr "" -#: archaeological_context_records/models.py:1168 -#: archaeological_operations/models.py:2026 +#: archaeological_context_records/models.py:1179 +#: archaeological_operations/models.py:2143 msgid "relations" msgstr "" -#: archaeological_context_records/models.py:1352 -#: archaeological_finds/models_finds.py:621 +#: archaeological_context_records/models.py:1363 +#: archaeological_finds/models_finds.py:637 msgid "Base finds" msgstr "" -#: archaeological_context_records/models.py:1407 +#: archaeological_context_records/models.py:1418 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1440 +#: archaeological_context_records/models.py:1451 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1441 +#: archaeological_context_records/models.py:1452 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1442 +#: archaeological_context_records/models.py:1453 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1443 +#: archaeological_context_records/models.py:1454 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1444 +#: archaeological_context_records/models.py:1455 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1446 +#: archaeological_context_records/models.py:1457 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1447 +#: archaeological_context_records/models.py:1458 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1448 +#: archaeological_context_records/models.py:1459 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1449 +#: archaeological_context_records/models.py:1460 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1450 +#: archaeological_context_records/models.py:1461 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1459 +#: archaeological_context_records/models.py:1470 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1460 +#: archaeological_context_records/models.py:1471 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1651 +#: archaeological_context_records/models.py:1662 msgid "Context record parent" msgstr "" @@ -1638,7 +1664,7 @@ msgid "Identification / Description" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:208 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:209 msgid "Datations" msgstr "" @@ -1647,8 +1673,8 @@ msgid "Operation / Archaeological site" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 -#: archaeological_finds/forms.py:2206 archaeological_finds/models_finds.py:97 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:280 +#: archaeological_finds/forms.py:2218 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 #: archaeological_finds/models_finds.py:239 @@ -1664,18 +1690,19 @@ msgstr "" #: archaeological_finds/models_finds.py:383 #: archaeological_finds/models_finds.py:398 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:631 -#: archaeological_finds/models_finds.py:870 -#: archaeological_finds/models_finds.py:939 -#: archaeological_finds/models_finds.py:2309 -#: archaeological_finds/models_finds.py:2320 -#: archaeological_finds/models_finds.py:3709 +#: archaeological_finds/models_finds.py:427 +#: archaeological_finds/models_finds.py:647 +#: archaeological_finds/models_finds.py:886 +#: archaeological_finds/models_finds.py:955 +#: archaeological_finds/models_finds.py:2329 +#: archaeological_finds/models_finds.py:2340 +#: archaeological_finds/models_finds.py:3729 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:473 #: archaeological_operations/templates/ishtar/sheet_operation.html:565 -#: archaeological_operations/templates/ishtar/sheet_site.html:91 +#: archaeological_operations/templates/ishtar/sheet_site.html:100 #: archaeological_warehouse/templates/ishtar/sheet_container.html:195 #: archaeological_warehouse/templates/ishtar/sheet_container.html:242 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:200 @@ -1708,7 +1735,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_museum_find.html:72 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:572 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 -#: archaeological_operations/templates/ishtar/sheet_site.html:103 +#: archaeological_operations/templates/ishtar/sheet_site.html:112 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 #: cd17_app/templates/ishtar/sheet_find.html:74 @@ -1763,13 +1790,13 @@ msgstr "" msgid "Complete identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 msgid "Inclusion" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 #: archaeological_files/templates/ishtar/sheet_file.html:98 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_files/templates/ishtar/sheet_file.html:272 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1779,11 +1806,11 @@ msgid "Surface" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 -#: archaeological_files/forms.py:283 +#: archaeological_files/forms.py:289 #: archaeological_files/templates/ishtar/sheet_file.html:88 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:59 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 -#: archaeological_operations/templates/ishtar/sheet_site.html:66 +#: archaeological_operations/templates/ishtar/sheet_site.html:74 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 #: ishtar_common/templates/ishtar/sheet_town.html:110 #: man_app/templates/ishtar/sheet_basefind.html:56 @@ -1793,25 +1820,25 @@ msgstr "" msgid "Geographic localisation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:187 -#: archaeological_files/templates/ishtar/sheet_file.html:239 -#: archaeological_finds/forms.py:540 archaeological_finds/forms.py:819 -#: archaeological_finds/forms.py:977 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:70 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:242 +#: archaeological_finds/forms.py:545 archaeological_finds/forms.py:829 +#: archaeological_finds/forms.py:987 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:71 #: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:241 #: archaeological_finds/templates/ishtar/sheet_treatment.html:102 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:92 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:89 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 -#: archaeological_operations/templates/ishtar/sheet_site.html:108 +#: archaeological_operations/templates/ishtar/sheet_site.html:117 #: archaeological_warehouse/templates/ishtar/sheet_container.html:176 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:130 #: cd17_app/templates/ishtar/sheet_find.html:265 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:146 #: ishtar_common/templates/ishtar/sheet_organization.html:83 -#: ishtar_common/templates/ishtar/sheet_person.html:166 +#: ishtar_common/templates/ishtar/sheet_person.html:176 #: man_app/templates/ishtar/sheet_basefind.html:67 #: man_app/templates/ishtar/sheet_museum_find.html:252 #: na_app/templates/ishtar/sheet_find.html:269 @@ -1822,22 +1849,22 @@ msgstr "" msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:231 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:236 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 msgid "Numerical reference" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:242 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:141 #: archaeological_finds/models_treatments.py:230 @@ -1872,7 +1899,7 @@ msgstr "" msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 @@ -1880,14 +1907,14 @@ msgstr "" msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:243 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:244 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:250 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:251 #: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 @@ -1895,41 +1922,41 @@ msgstr "" msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:262 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:263 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:284 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:285 msgid "No associated finds." msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:301 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:307 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:308 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:315 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:316 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:323 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:324 msgid "Diagram of stratigraphic relations - full" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:339 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:340 msgid "Document from this context record" msgstr "" @@ -1946,31 +1973,31 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:259 -#: archaeological_operations/models.py:2002 +#: archaeological_operations/models.py:2119 msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:139 +#: archaeological_files/admin.py:141 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:143 +#: archaeological_files/admin.py:145 msgid "To" msgstr "" -#: archaeological_files/admin.py:160 archaeological_files/tests.py:301 +#: archaeological_files/admin.py:162 archaeological_files/tests.py:301 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:180 +#: archaeological_files/admin.py:182 msgid "Cannot change price agreement." msgstr "" -#: archaeological_files/admin.py:212 +#: archaeological_files/admin.py:214 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:216 +#: archaeological_files/admin.py:218 msgid "{} item(s) already in database." msgstr "" @@ -1978,12 +2005,12 @@ msgstr "" msgid "File - 001 - Search" msgstr "" -#: archaeological_files/forms.py:91 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:234 archaeological_files/forms.py:656 -#: archaeological_files/forms.py:1111 archaeological_files/forms.py:1147 -#: archaeological_files/models.py:403 archaeological_files/models.py:559 -#: archaeological_files/templates/ishtar/sheet_file.html:212 -#: archaeological_finds/forms.py:1708 +#: archaeological_files/forms.py:91 archaeological_files/forms.py:215 +#: archaeological_files/forms.py:631 archaeological_files/forms.py:1086 +#: archaeological_files/forms.py:1122 archaeological_files/models.py:429 +#: archaeological_files/models.py:593 +#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_finds/forms.py:1718 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 #: archaeological_finds/forms_treatments.py:407 @@ -1991,57 +2018,57 @@ msgstr "" #: archaeological_finds/forms_treatments.py:637 #: archaeological_finds/forms_treatments.py:708 #: archaeological_finds/forms_treatments.py:819 -#: archaeological_finds/models_finds.py:1200 +#: archaeological_finds/models_finds.py:1216 #: archaeological_finds/models_treatments.py:215 #: archaeological_finds/models_treatments.py:1192 #: archaeological_operations/forms.py:74 archaeological_operations/forms.py:460 #: archaeological_operations/forms.py:697 -#: archaeological_operations/forms.py:1413 -#: archaeological_operations/forms.py:1718 -#: archaeological_operations/models.py:997 -#: archaeological_operations/models.py:1388 -#: archaeological_operations/models.py:2686 -#: archaeological_operations/models.py:2911 -#: archaeological_operations/models.py:3176 +#: archaeological_operations/forms.py:1457 +#: archaeological_operations/forms.py:1762 +#: archaeological_operations/models.py:1114 +#: archaeological_operations/models.py:1505 +#: archaeological_operations/models.py:2803 +#: archaeological_operations/models.py:3028 +#: archaeological_operations/models.py:3293 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:149 #: ishtar_common/models_imports.py:1124 msgid "Year" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:237 -#: archaeological_files/forms.py:662 archaeological_files/models.py:561 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:637 +#: archaeological_files/models.py:595 msgid "Numeric reference" msgstr "" -#: archaeological_files/forms.py:93 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1149 archaeological_operations/forms.py:1103 +#: archaeological_files/forms.py:93 archaeological_files/forms.py:1088 +#: archaeological_files/forms.py:1124 archaeological_operations/forms.py:1103 #: archaeological_operations/forms.py:1201 -#: archaeological_operations/forms.py:1318 -#: archaeological_operations/forms.py:1415 -#: archaeological_operations/forms.py:1480 -#: archaeological_operations/models.py:501 -#: archaeological_operations/models.py:2914 +#: archaeological_operations/forms.py:1343 +#: archaeological_operations/forms.py:1459 +#: archaeological_operations/forms.py:1524 +#: archaeological_operations/models.py:598 +#: archaeological_operations/models.py:3031 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:98 archaeological_files/forms.py:1119 -#: archaeological_files/forms.py:1156 archaeological_files/models.py:1396 +#: archaeological_files/forms.py:98 archaeological_files/forms.py:1094 +#: archaeological_files/forms.py:1131 archaeological_files/models.py:1438 #: archaeological_operations/forms.py:476 -#: archaeological_operations/forms.py:1426 -#: archaeological_operations/models.py:2558 ishtar_common/models_common.py:2070 +#: archaeological_operations/forms.py:1470 +#: archaeological_operations/models.py:2675 ishtar_common/models_common.py:2070 #: ishtar_common/models_common.py:3404 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:100 archaeological_files/forms.py:1161 +#: archaeological_files/forms.py:100 archaeological_files/forms.py:1136 msgid "File name" msgstr "" -#: archaeological_files/forms.py:101 archaeological_files/forms.py:209 -#: archaeological_files/models.py:404 archaeological_files/models.py:409 -#: archaeological_files/models.py:573 +#: archaeological_files/forms.py:101 archaeological_files/forms.py:213 +#: archaeological_files/models.py:430 archaeological_files/models.py:435 +#: archaeological_files/models.py:607 msgid "File type" msgstr "" @@ -2049,41 +2076,52 @@ msgstr "" msgid "Is active?" msgstr "" -#: archaeological_files/forms.py:103 archaeological_files/forms.py:263 -#: archaeological_files/forms.py:540 +#: archaeological_files/forms.py:103 archaeological_files/forms.py:291 +#: archaeological_files/models.py:372 archaeological_files/models.py:757 +#: archaeological_files/templates/ishtar/sheet_file.html:120 +msgid "Development type" +msgstr "" + +#: archaeological_files/forms.py:104 archaeological_files/forms.py:269 msgid "Saisine type" msgstr "" -#: archaeological_files/forms.py:104 archaeological_files/forms.py:262 -#: archaeological_files/forms.py:524 archaeological_files/models.py:321 -#: archaeological_files/models.py:408 archaeological_files/models.py:622 +#: archaeological_files/forms.py:105 archaeological_files/forms.py:447 +#: archaeological_files/models.py:761 +#: archaeological_files/templates/ishtar/sheet_file.html:121 +msgid "Monitoring justification" +msgstr "" + +#: archaeological_files/forms.py:106 archaeological_files/forms.py:268 +#: archaeological_files/models.py:323 archaeological_files/models.py:434 +#: archaeological_files/models.py:656 msgid "Permit type" msgstr "" -#: archaeological_files/forms.py:105 archaeological_files/forms.py:464 -#: archaeological_files/forms.py:526 archaeological_files/models.py:627 -#: archaeological_files/templates/ishtar/sheet_file.html:130 +#: archaeological_files/forms.py:107 archaeological_files/forms.py:449 +#: archaeological_files/models.py:661 +#: archaeological_files/templates/ishtar/sheet_file.html:133 #: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" -#: archaeological_files/forms.py:106 archaeological_files/forms.py:653 -#: archaeological_files/models.py:675 archaeological_finds/forms.py:791 -#: archaeological_finds/forms.py:1124 archaeological_finds/forms.py:1409 -#: archaeological_finds/forms.py:2460 +#: archaeological_files/forms.py:108 archaeological_files/forms.py:628 +#: archaeological_files/models.py:709 archaeological_finds/forms.py:801 +#: archaeological_finds/forms.py:1134 archaeological_finds/forms.py:1419 +#: archaeological_finds/forms.py:2472 #: archaeological_finds/forms_treatments.py:194 #: archaeological_finds/forms_treatments.py:745 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1244 #: archaeological_operations/forms.py:512 #: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1209 -#: archaeological_operations/forms.py:1332 -#: archaeological_operations/forms.py:1429 -#: archaeological_operations/forms.py:1479 -#: archaeological_operations/models.py:513 -#: archaeological_operations/models.py:1473 -#: archaeological_operations/models.py:2928 +#: archaeological_operations/forms.py:1219 +#: archaeological_operations/forms.py:1351 +#: archaeological_operations/forms.py:1473 +#: archaeological_operations/forms.py:1523 +#: archaeological_operations/models.py:627 +#: archaeological_operations/models.py:1590 +#: archaeological_operations/models.py:3045 #: archaeological_warehouse/forms.py:236 archaeological_warehouse/forms.py:386 #: archaeological_warehouse/forms.py:524 archaeological_warehouse/models.py:418 #: archaeological_warehouse/models.py:1167 ishtar_common/forms_common.py:2162 @@ -2097,55 +2135,54 @@ msgstr "" msgid "Comment" msgstr "" -#: archaeological_files/forms.py:108 archaeological_files/forms.py:375 -#: archaeological_files/forms.py:444 -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/forms.py:110 archaeological_files/forms.py:378 +#: archaeological_files/forms.py:436 +#: archaeological_files/templates/ishtar/sheet_file.html:192 #: archaeological_finds/forms_treatments.py:642 msgid "In charge" msgstr "" -#: archaeological_files/forms.py:118 archaeological_files/forms.py:345 -#: archaeological_files/forms.py:355 archaeological_files/forms.py:496 -#: archaeological_files/forms.py:1163 archaeological_files/models.py:585 +#: archaeological_files/forms.py:120 archaeological_files/forms.py:356 +#: archaeological_files/forms.py:366 archaeological_files/forms.py:1138 +#: archaeological_files/models.py:619 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:128 archaeological_files/forms.py:1173 +#: archaeological_files/forms.py:130 archaeological_files/forms.py:1148 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:139 archaeological_files/forms.py:1204 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:1179 #: archaeological_operations/forms.py:528 ishtar_common/forms.py:956 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:147 archaeological_files/forms.py:1212 +#: archaeological_files/forms.py:149 archaeological_files/forms.py:1187 #: archaeological_finds/forms_treatments.py:578 #: archaeological_finds/forms_treatments.py:840 #: archaeological_operations/forms.py:534 msgid "Modified by" msgstr "" -#: archaeological_files/forms.py:170 archaeological_files/forms.py:187 +#: archaeological_files/forms.py:174 archaeological_files/forms.py:191 msgid "Archaeological file search" msgstr "" -#: archaeological_files/forms.py:206 +#: archaeological_files/forms.py:210 msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:642 +#: archaeological_files/forms.py:222 archaeological_files/models.py:676 #: archaeological_files/templates/ishtar/sheet_file.html:63 #: archaeological_finds/models_treatments.py:1232 -#: archaeological_operations/models.py:1349 ishtar_common/forms_common.py:2160 +#: archaeological_operations/models.py:1466 ishtar_common/forms_common.py:2160 #: ishtar_common/forms_common.py:2563 ishtar_common/forms_common.py:2646 #: ishtar_common/models.py:4646 ishtar_common/models_imports.py:1436 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" -#: archaeological_files/forms.py:219 archaeological_files/forms.py:541 -#: archaeological_files/models.py:644 +#: archaeological_files/forms.py:223 archaeological_files/models.py:678 #: archaeological_finds/forms_treatments.py:748 #: archaeological_finds/models_treatments.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:514 @@ -2158,43 +2195,39 @@ msgstr "" msgid "Reception date" msgstr "" -#: archaeological_files/forms.py:228 +#: archaeological_files/forms.py:232 msgid "Reception date cannot be after today." msgstr "" -#: archaeological_files/forms.py:250 -msgid "Another file with this numeric id exists." -msgstr "" - -#: archaeological_files/forms.py:256 +#: archaeological_files/forms.py:262 msgid "Archaeological file - 013 - Preventive - Saisine" msgstr "" -#: archaeological_files/forms.py:277 +#: archaeological_files/forms.py:283 msgid "Planning" msgstr "" -#: archaeological_files/forms.py:278 +#: archaeological_files/forms.py:284 msgid "Archaeological file - 017 - Preventive - Planning" msgstr "" -#: archaeological_files/forms.py:284 +#: archaeological_files/forms.py:290 msgid "Planning name" msgstr "" -#: archaeological_files/forms.py:286 archaeological_files/forms.py:330 -#: archaeological_files/models.py:475 archaeological_files/models.py:639 +#: archaeological_files/forms.py:294 archaeological_files/forms.py:341 +#: archaeological_files/models.py:501 archaeological_files/models.py:673 #: archaeological_operations/forms.py:691 #: archaeological_operations/forms.py:1016 #: archaeological_operations/forms.py:1032 #: archaeological_operations/forms.py:1037 -#: archaeological_operations/forms.py:1368 -#: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:511 -#: archaeological_operations/models.py:1088 -#: archaeological_operations/models.py:1090 -#: archaeological_operations/models.py:1409 -#: archaeological_operations/models.py:2923 +#: archaeological_operations/forms.py:1375 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:609 +#: archaeological_operations/models.py:1205 +#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1526 +#: archaeological_operations/models.py:3040 #: archaeological_operations/templates/ishtar/sheet_operation.html:150 #: ishtar_common/forms_common.py:1794 ishtar_common/forms_common.py:1808 #: ishtar_common/forms_common.py:1809 ishtar_common/models.py:2383 @@ -2206,50 +2239,44 @@ msgstr "" msgid "Towns" msgstr "" -#: archaeological_files/forms.py:290 archaeological_files/forms.py:333 -#: archaeological_files/models.py:678 archaeological_operations/models.py:2917 +#: archaeological_files/forms.py:298 archaeological_files/forms.py:344 +#: archaeological_files/models.py:712 archaeological_operations/models.py:3034 #: ishtar_common/models_common.py:2071 msgid "Departments" msgstr "" -#: archaeological_files/forms.py:292 +#: archaeological_files/forms.py:300 msgid "Only relevant when no town is provided." msgstr "" -#: archaeological_files/forms.py:294 archaeological_files/forms.py:335 -#: archaeological_files/models.py:670 +#: archaeological_files/forms.py:302 archaeological_files/forms.py:346 +#: archaeological_files/models.py:704 msgid "Locality" msgstr "" -#: archaeological_files/forms.py:296 archaeological_files/forms.py:337 +#: archaeological_files/forms.py:304 archaeological_files/forms.py:348 msgid "Address (number/street)" msgstr "" -#: archaeological_files/forms.py:297 archaeological_files/forms.py:338 +#: archaeological_files/forms.py:305 archaeological_files/forms.py:349 msgid "Number/street" msgstr "" -#: archaeological_files/forms.py:300 archaeological_files/forms.py:341 +#: archaeological_files/forms.py:308 archaeological_files/forms.py:352 #: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:769 #: ishtar_common/forms_common.py:1177 ishtar_common/models_common.py:3690 msgid "Postal code" msgstr "" -#: archaeological_files/forms.py:301 archaeological_files/forms.py:736 +#: archaeological_files/forms.py:309 archaeological_files/forms.py:711 msgid "Surfaces" msgstr "" -#: archaeological_files/forms.py:305 archaeological_files/forms.py:811 -#: archaeological_files/models.py:666 archaeological_operations/forms.py:706 -msgid "Total surface (m2)" -msgstr "" - -#: archaeological_files/forms.py:313 archaeological_files/forms.py:532 -#: archaeological_files/forms.py:801 archaeological_files/models.py:668 -msgid "Total developed surface (m2)" +#: archaeological_files/forms.py:321 archaeological_files/models.py:702 +msgid "Total developed surface (m²)" msgstr "" -#: archaeological_files/forms.py:323 +#: archaeological_files/forms.py:334 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:247 #: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:1173 @@ -2258,221 +2285,221 @@ msgstr "" msgid "Address" msgstr "" -#: archaeological_files/forms.py:324 +#: archaeological_files/forms.py:335 msgid "Archaeological file - 015 - Research - Address" msgstr "" -#: archaeological_files/forms.py:328 +#: archaeological_files/forms.py:339 msgid "Project name" msgstr "" -#: archaeological_files/forms.py:346 +#: archaeological_files/forms.py:357 msgid "Archaeological file - 030 - General contractor" msgstr "" -#: archaeological_files/forms.py:401 archaeological_files/forms.py:475 +#: archaeological_files/forms.py:399 archaeological_files/forms.py:464 msgid "Non existing person." msgstr "" -#: archaeological_files/forms.py:408 +#: archaeological_files/forms.py:406 msgid "" "The organization of the person in charge differs from the general contractor." msgstr "" -#: archaeological_files/forms.py:416 archaeological_files/forms.py:425 +#: archaeological_files/forms.py:414 archaeological_files/forms.py:424 msgid "Planning service" msgstr "" -#: archaeological_files/forms.py:417 +#: archaeological_files/forms.py:415 msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:466 archaeological_files/models.py:646 +#: archaeological_files/forms.py:451 archaeological_files/models.py:680 msgid "Date of planning service file" msgstr "" -#: archaeological_files/forms.py:479 +#: archaeological_files/forms.py:468 msgid "" "The organization of the person in charge differs from the planning service." msgstr "" -#: archaeological_files/forms.py:488 -msgid "Preventive informations" -msgstr "" - -#: archaeological_files/forms.py:510 archaeological_files/models.py:606 -msgid "Responsible for planning service" -msgstr "" - -#: archaeological_files/forms.py:558 -#: archaeological_files/templates/ishtar/sheet_file.html:143 +#: archaeological_files/forms.py:544 +#: archaeological_files/templates/ishtar/sheet_file.html:146 msgid "Research archaeology" msgstr "" -#: archaeological_files/forms.py:559 +#: archaeological_files/forms.py:545 msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:585 archaeological_files/models.py:702 +#: archaeological_files/forms.py:561 archaeological_files/models.py:736 #: archaeological_operations/forms.py:495 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:588 archaeological_files/models.py:686 +#: archaeological_files/forms.py:565 archaeological_files/models.py:720 msgid "Requested operation type" msgstr "" -#: archaeological_files/forms.py:591 +#: archaeological_files/forms.py:569 msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:605 archaeological_files/models.py:705 -#: archaeological_files/templates/ishtar/sheet_file.html:169 +#: archaeological_files/forms.py:583 archaeological_files/models.py:739 +#: archaeological_files/templates/ishtar/sheet_file.html:172 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:614 archaeological_files/models.py:708 +#: archaeological_files/forms.py:592 archaeological_files/models.py:742 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:615 archaeological_files/models.py:710 +#: archaeological_files/forms.py:593 archaeological_files/models.py:744 msgid "Protected area" msgstr "" -#: archaeological_files/forms.py:628 +#: archaeological_files/forms.py:606 msgid "Instruction" msgstr "" -#: archaeological_files/forms.py:629 +#: archaeological_files/forms.py:607 msgid "Archaeological file - 050 - Instruction" msgstr "" -#: archaeological_files/forms.py:633 +#: archaeological_files/forms.py:611 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:646 archaeological_files/models.py:650 +#: archaeological_files/forms.py:621 archaeological_files/models.py:684 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:654 archaeological_files/models.py:664 +#: archaeological_files/forms.py:629 archaeological_files/models.py:698 #: archaeological_files/templates/ishtar/sheet_file.html:65 msgid "Instruction deadline" msgstr "" -#: archaeological_files/forms.py:719 +#: archaeological_files/forms.py:694 msgid "Would you like to close this archaeological file?" msgstr "" -#: archaeological_files/forms.py:724 +#: archaeological_files/forms.py:699 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: archaeological_files/forms.py:728 +#: archaeological_files/forms.py:703 msgid "Preventive file" msgstr "" -#: archaeological_files/forms.py:729 +#: archaeological_files/forms.py:704 msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:735 ishtar_common/forms_common.py:2225 +#: archaeological_files/forms.py:710 ishtar_common/forms_common.py:2225 #: ishtar_common/templates/ishtar/sheet_document.html:77 msgid "Dates" msgstr "" -#: archaeological_files/forms.py:737 +#: archaeological_files/forms.py:712 msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:760 archaeological_files/models.py:727 +#: archaeological_files/forms.py:735 archaeological_files/models.py:769 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:765 archaeological_files/models.py:730 +#: archaeological_files/forms.py:740 archaeological_files/models.py:772 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:770 archaeological_files/models.py:733 +#: archaeological_files/forms.py:745 archaeological_files/models.py:775 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:785 archaeological_files/models.py:737 +#: archaeological_files/forms.py:760 archaeological_files/models.py:779 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:790 archaeological_files/models.py:738 +#: archaeological_files/forms.py:765 archaeological_files/models.py:780 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:795 archaeological_files/models.py:740 +#: archaeological_files/forms.py:770 archaeological_files/models.py:782 msgid "Execution report date" msgstr "" -#: archaeological_files/forms.py:818 +#: archaeological_files/forms.py:776 +msgid "Total developed surface (m2)" +msgstr "" + +#: archaeological_files/forms.py:786 archaeological_operations/forms.py:706 +msgid "Total surface (m2)" +msgstr "" + +#: archaeological_files/forms.py:793 msgid "Linear meter (m)" msgstr "" -#: archaeological_files/forms.py:878 archaeological_files/forms.py:880 -#: archaeological_files/templates/ishtar/sheet_file.html:289 +#: archaeological_files/forms.py:853 archaeological_files/forms.py:855 #: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 +#: archaeological_files/templates/ishtar/sheet_file.html:295 #: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:347 msgid "Man by day" msgstr "" -#: archaeological_files/forms.py:879 archaeological_files/forms.py:881 -#: archaeological_files/templates/ishtar/sheet_file.html:290 +#: archaeological_files/forms.py:854 archaeological_files/forms.py:856 #: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 +#: archaeological_files/templates/ishtar/sheet_file.html:296 #: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:348 msgid "Days" msgstr "" -#: archaeological_files/forms.py:882 archaeological_files/models.py:116 -#: archaeological_files/models.py:1438 archaeological_files/models.py:1457 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/forms.py:857 archaeological_files/models.py:118 +#: archaeological_files/models.py:1480 archaeological_files/models.py:1499 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Job" msgstr "" -#: archaeological_files/forms.py:903 archaeological_files/models.py:80 -#: archaeological_files/models.py:81 archaeological_files/models.py:93 -#: archaeological_files/models.py:206 archaeological_files/models.py:723 +#: archaeological_files/forms.py:878 archaeological_files/models.py:82 +#: archaeological_files/models.py:83 archaeological_files/models.py:95 +#: archaeological_files/models.py:208 archaeological_files/models.py:765 msgid "Price agreement" msgstr "" -#: archaeological_files/forms.py:961 +#: archaeological_files/forms.py:936 msgid "Post-excavation" msgstr "" -#: archaeological_files/forms.py:962 +#: archaeological_files/forms.py:937 msgid "Preventive file - 030 - Post-excavation" msgstr "" -#: archaeological_files/forms.py:986 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/forms.py:961 +#: archaeological_files/templates/ishtar/sheet_file.html:282 msgid "Ground jobs" msgstr "" -#: archaeological_files/forms.py:988 +#: archaeological_files/forms.py:963 msgid "Preventive file - 040 - Ground jobs" msgstr "" -#: archaeological_files/forms.py:994 archaeological_files/forms.py:996 -#: archaeological_files/templates/ishtar/sheet_file.html:393 +#: archaeological_files/forms.py:969 archaeological_files/forms.py:971 #: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:399 msgid "Quantity" msgstr "" -#: archaeological_files/forms.py:998 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/forms.py:973 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:1112 archaeological_files/forms.py:1148 -#: archaeological_files/forms.py:1278 +#: archaeological_files/forms.py:1087 archaeological_files/forms.py:1123 +#: archaeological_files/forms.py:1253 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:347 #: archaeological_finds/forms_treatments.py:562 @@ -2485,9 +2512,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_find.html:362 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:388 -#: archaeological_operations/forms.py:1414 -#: archaeological_operations/forms.py:1535 -#: archaeological_operations/models.py:2853 +#: archaeological_operations/forms.py:1458 +#: archaeological_operations/forms.py:1579 +#: archaeological_operations/models.py:2970 #: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:523 #: archaeological_warehouse/models.py:1182 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:619 @@ -2499,84 +2526,84 @@ msgstr "" msgid "Index" msgstr "" -#: archaeological_files/forms.py:1114 archaeological_files/forms.py:1150 -#: archaeological_files/forms.py:1267 +#: archaeological_files/forms.py:1089 archaeological_files/forms.py:1125 +#: archaeological_files/forms.py:1242 #: archaeological_finds/forms_treatments.py:563 #: archaeological_finds/forms_treatments.py:610 #: archaeological_finds/forms_treatments.py:821 #: archaeological_finds/forms_treatments.py:873 -#: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1469 -#: archaeological_operations/models.py:2588 -#: archaeological_operations/models.py:2843 +#: archaeological_operations/forms.py:1464 +#: archaeological_operations/forms.py:1513 +#: archaeological_operations/models.py:2705 +#: archaeological_operations/models.py:2960 #: ishtar_common/models_imports.py:1076 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:1115 +#: archaeological_files/forms.py:1090 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:1151 +#: archaeological_files/forms.py:1126 #: archaeological_finds/forms_treatments.py:564 #: archaeological_finds/forms_treatments.py:822 -#: archaeological_operations/forms.py:1421 -#: archaeological_operations/forms.py:1605 +#: archaeological_operations/forms.py:1465 +#: archaeological_operations/forms.py:1649 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:1158 +#: archaeological_files/forms.py:1133 #: archaeological_finds/forms_treatments.py:565 #: archaeological_finds/forms_treatments.py:823 -#: archaeological_operations/forms.py:1427 -#: archaeological_operations/forms.py:1476 -#: archaeological_operations/models.py:2912 +#: archaeological_operations/forms.py:1471 +#: archaeological_operations/forms.py:1520 +#: archaeological_operations/models.py:3029 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:1160 +#: archaeological_files/forms.py:1135 #: archaeological_finds/forms_treatments.py:568 #: archaeological_finds/forms_treatments.py:826 -#: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1478 -#: archaeological_operations/models.py:2910 +#: archaeological_operations/forms.py:1474 +#: archaeological_operations/forms.py:1522 +#: archaeological_operations/models.py:3027 msgid "Signature date" msgstr "" -#: archaeological_files/forms.py:1184 +#: archaeological_files/forms.py:1159 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:1186 +#: archaeological_files/forms.py:1161 msgid "File year" msgstr "" -#: archaeological_files/forms.py:1188 +#: archaeological_files/forms.py:1163 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:1191 +#: archaeological_files/forms.py:1166 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:1201 +#: archaeological_files/forms.py:1176 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1265 +#: archaeological_files/forms.py:1240 msgid "Archaeological file - Administrative act - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:786 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:828 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:643 #: archaeological_operations/forms.py:915 -#: archaeological_operations/models.py:2045 -#: archaeological_operations/models.py:2571 -#: archaeological_operations/models.py:2687 -#: archaeological_operations/models.py:2891 +#: archaeological_operations/models.py:2162 +#: archaeological_operations/models.py:2688 +#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:3008 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:499 msgid "Archaeological file" msgstr "" @@ -2589,19 +2616,20 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3691 +#: archaeological_finds/models_finds.py:3711 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:1720 -#: archaeological_operations/models.py:2948 +#: archaeological_operations/models.py:1837 +#: archaeological_operations/models.py:3065 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" 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:1444 -#: archaeological_files/models.py:1463 archaeological_files/models.py:1490 +#: archaeological_files/models.py:90 archaeological_files/models.py:125 +#: archaeological_files/models.py:170 archaeological_files/models.py:186 +#: archaeological_files/models.py:256 archaeological_files/models.py:351 +#: archaeological_files/models.py:363 archaeological_files/models.py:375 +#: archaeological_files/models.py:395 archaeological_files/models.py:1486 +#: archaeological_files/models.py:1505 archaeological_files/models.py:1532 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:308 #: ishtar_common/models.py:5395 @@ -2609,210 +2637,222 @@ msgstr "" msgid "Preventive" msgstr "" -#: archaeological_files/models.py:96 +#: archaeological_files/models.py:98 msgid "Ground daily cost" msgstr "" -#: archaeological_files/models.py:97 +#: archaeological_files/models.py:99 msgid "Daily cost" msgstr "" -#: archaeological_files/models.py:99 archaeological_files/models.py:148 +#: archaeological_files/models.py:101 archaeological_files/models.py:150 msgid "Permanent contract" msgstr "" -#: archaeological_files/models.py:102 +#: archaeological_files/models.py:104 msgid "Def. daily number on ground" msgstr "" -#: archaeological_files/models.py:104 +#: archaeological_files/models.py:106 msgid "Def. daily number on study" msgstr "" -#: archaeological_files/models.py:110 +#: archaeological_files/models.py:112 msgid "Child" msgstr "" -#: archaeological_files/models.py:111 +#: archaeological_files/models.py:113 msgid "Auto-add this job when a parent is added" msgstr "" -#: archaeological_files/models.py:117 +#: archaeological_files/models.py:119 msgid "Jobs" msgstr "" -#: archaeological_files/models.py:128 +#: archaeological_files/models.py:130 msgid "fixed-term contract" msgstr "" -#: archaeological_files/models.py:152 +#: archaeological_files/models.py:154 msgid "Fixed-term contract" msgstr "" -#: archaeological_files/models.py:162 +#: archaeological_files/models.py:164 msgid "Generic equipment type" msgstr "" -#: archaeological_files/models.py:163 +#: archaeological_files/models.py:165 msgid "Generic equipment types" msgstr "" -#: archaeological_files/models.py:173 +#: archaeological_files/models.py:175 msgid "Generic type" msgstr "" -#: archaeological_files/models.py:178 +#: archaeological_files/models.py:180 msgid "Equipment/service type" msgstr "" -#: archaeological_files/models.py:179 +#: archaeological_files/models.py:181 msgid "Equipment/service types" msgstr "" -#: archaeological_files/models.py:188 +#: archaeological_files/models.py:190 #: archaeological_operations/templates/ishtar/sheet_operation.html:233 #: na_app/templates/ishtar/sheet_operation.html:229 #: sra_idf_app/templates/ishtar/sheet_operation.html:229 msgid "days" msgstr "" -#: archaeological_files/models.py:189 +#: archaeological_files/models.py:191 msgid "weeks" msgstr "" -#: archaeological_files/models.py:190 +#: archaeological_files/models.py:192 msgid "months" msgstr "" -#: archaeological_files/models.py:191 +#: archaeological_files/models.py:193 msgid "linear m." msgstr "" -#: archaeological_files/models.py:210 +#: archaeological_files/models.py:212 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:213 archaeological_warehouse/forms.py:211 +#: archaeological_files/models.py:215 archaeological_warehouse/forms.py:211 #: archaeological_warehouse/models.py:398 ishtar_common/models.py:3255 #: ishtar_common/models_common.py:176 ishtar_common/models_common.py:207 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:217 ishtar_common/models.py:3258 +#: archaeological_files/models.py:219 ishtar_common/models.py:3258 #: ishtar_common/models_common.py:180 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." msgstr "" -#: archaeological_files/models.py:223 +#: archaeological_files/models.py:225 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:225 archaeological_files/models.py:281 +#: archaeological_files/models.py:227 archaeological_files/models.py:283 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:226 +#: archaeological_files/models.py:228 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:228 ishtar_common/models_imports.py:1077 +#: archaeological_files/models.py:230 ishtar_common/models_imports.py:1077 msgid "Unit" msgstr "" -#: archaeological_files/models.py:231 +#: archaeological_files/models.py:233 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:236 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:236 ishtar_common/models.py:1665 +#: archaeological_files/models.py:238 ishtar_common/models.py:1665 #: ishtar_common/models.py:2083 ishtar_common/models.py:3823 #: ishtar_common/models_common.py:186 ishtar_common/models_imports.py:206 #: ishtar_common/models_imports.py:441 ishtar_common/models_imports.py:952 msgid "Available" msgstr "" -#: archaeological_files/models.py:242 archaeological_warehouse/forms.py:777 +#: archaeological_files/models.py:244 archaeological_warehouse/forms.py:777 #: ishtar_common/admin.py:1267 ishtar_common/models.py:2390 #: ishtar_common/models_common.py:748 msgid "Parent" msgstr "" -#: archaeological_files/models.py:243 +#: archaeological_files/models.py:245 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:248 +#: archaeological_files/models.py:250 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:249 +#: archaeological_files/models.py:251 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:301 +#: archaeological_files/models.py:303 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:302 +#: archaeological_files/models.py:304 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:322 +#: archaeological_files/models.py:324 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:335 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:346 +#: archaeological_files/models.py:348 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:347 +#: archaeological_files/models.py:349 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:358 +#: archaeological_files/models.py:360 +msgid "Monitoring justification type" +msgstr "" + +#: archaeological_files/models.py:361 +msgid "Monitoring justification types" +msgstr "" + +#: archaeological_files/models.py:373 +msgid "Development types" +msgstr "" + +#: archaeological_files/models.py:384 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:360 +#: archaeological_files/models.py:386 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:362 +#: archaeological_files/models.py:388 msgid "Category" msgstr "" -#: archaeological_files/models.py:366 +#: archaeological_files/models.py:392 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:367 +#: archaeological_files/models.py:393 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:405 archaeological_finds/models_finds.py:1201 -#: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:998 ishtar_common/admin.py:1451 +#: archaeological_files/models.py:431 archaeological_finds/models_finds.py:1217 +#: archaeological_operations/models.py:373 +#: archaeological_operations/models.py:1115 ishtar_common/admin.py:1451 #: ishtar_common/forms_common.py:2561 ishtar_common/models.py:2408 #: ishtar_common/templates/ishtar/sheet_area.html:4 msgid "Area" msgstr "" -#: archaeological_files/models.py:406 archaeological_finds/models_finds.py:1204 -#: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:999 +#: archaeological_files/models.py:432 archaeological_finds/models_finds.py:1220 +#: archaeological_operations/models.py:374 +#: archaeological_operations/models.py:1116 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:415 archaeological_finds/models_finds.py:1225 +#: archaeological_files/models.py:441 archaeological_finds/models_finds.py:1241 #: archaeological_operations/templates/ishtar/sheet_operation.html:546 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 @@ -2837,49 +2877,49 @@ msgstr "" msgid "Number" msgstr "" -#: archaeological_files/models.py:416 -msgid "Total surface (km2)" +#: archaeological_files/models.py:442 +msgid "Total surface (km²)" msgstr "" -#: archaeological_files/models.py:417 -msgid "Total developed surface (km2)" +#: archaeological_files/models.py:443 +msgid "Total developed surface (km²)" msgstr "" -#: archaeological_files/models.py:486 archaeological_finds/models_finds.py:1329 +#: archaeological_files/models.py:512 archaeological_finds/models_finds.py:1345 #: archaeological_finds/models_treatments.py:167 #: archaeological_finds/models_treatments.py:1156 -#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1142 -#: archaeological_operations/models.py:2711 +#: archaeological_finds/tests.py:1608 archaeological_operations/models.py:1259 +#: archaeological_operations/models.py:2828 #: archaeological_operations/tests.py:3091 #: archaeological_operations/tests.py:3183 msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:488 +#: archaeological_files/models.py:514 #: archaeological_finds/models_treatments.py:1153 -#: archaeological_operations/models.py:370 +#: archaeological_operations/models.py:436 #: archaeological_warehouse/models.py:959 ishtar_common/models.py:4292 msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:491 +#: archaeological_files/models.py:517 #: archaeological_finds/models_treatments.py:164 -#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:442 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:1166 +#: archaeological_files/models.py:529 archaeological_operations/models.py:1283 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:507 +#: archaeological_files/models.py:533 #: archaeological_finds/models_treatments.py:1150 -#: archaeological_operations/models.py:373 -#: archaeological_operations/models.py:1170 +#: archaeological_operations/models.py:439 +#: archaeological_operations/models.py:1287 #: archaeological_operations/tests.py:3227 #: archaeological_warehouse/models.py:360 ishtar_common/models.py:2601 #: ishtar_common/models.py:2863 ishtar_common/models.py:3669 @@ -2887,11 +2927,12 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:510 +#: archaeological_files/models.py:536 #: archaeological_finds/models_treatments.py:170 #: archaeological_finds/models_treatments.py:1159 -#: archaeological_operations/models.py:1176 -#: archaeological_operations/models.py:2722 +#: archaeological_operations/models.py:446 +#: archaeological_operations/models.py:1293 +#: archaeological_operations/models.py:2839 #: archaeological_operations/tests.py:3240 #: archaeological_warehouse/models.py:363 #: archaeological_warehouse/models.py:955 ishtar_common/models.py:2604 @@ -2901,51 +2942,61 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:513 +#: archaeological_files/models.py:539 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:516 +#: archaeological_files/models.py:542 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:521 +#: archaeological_files/models.py:547 +msgctxt "key for text search" +msgid "development-type" +msgstr "" + +#: archaeological_files/models.py:551 +msgctxt "key for text search" +msgid "monitoring-justification" +msgstr "" + +#: archaeological_files/models.py:555 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:526 +#: archaeological_files/models.py:560 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:533 archaeological_finds/models_finds.py:1638 +#: archaeological_files/models.py:567 archaeological_finds/models_finds.py:1658 #: archaeological_finds/models_treatments.py:1162 #: archaeological_finds/tests.py:1643 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:537 archaeological_operations/models.py:2763 +#: archaeological_files/models.py:571 archaeological_operations/models.py:2880 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:542 archaeological_operations/models.py:2767 +#: archaeological_files/models.py:576 archaeological_operations/models.py:2884 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:564 +#: archaeological_files/models.py:598 #: archaeological_finds/models_treatments.py:1195 #: ishtar_common/forms_common.py:2155 ishtar_common/forms_common.py:2439 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" -#: archaeological_files/models.py:572 +#: archaeological_files/models.py:606 #: archaeological_finds/forms_treatments.py:635 #: archaeological_finds/forms_treatments.py:706 #: archaeological_finds/models_treatments.py:1200 @@ -2954,9 +3005,9 @@ msgstr "" #: archaeological_operations/forms.py:477 #: archaeological_operations/forms.py:1102 #: archaeological_operations/forms.py:1200 -#: archaeological_operations/forms.py:1317 -#: archaeological_operations/forms.py:1774 -#: archaeological_operations/models.py:502 +#: archaeological_operations/forms.py:1342 +#: archaeological_operations/forms.py:1818 +#: archaeological_operations/models.py:599 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:157 #: archaeological_warehouse/forms.py:148 archaeological_warehouse/forms.py:210 @@ -2999,7 +3050,7 @@ msgstr "" msgid "Name" msgstr "" -#: archaeological_files/models.py:577 +#: archaeological_files/models.py:611 #: archaeological_finds/models_treatments.py:1209 #: archaeological_finds/templates/ishtar/sheet_find.html:511 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:529 @@ -3012,35 +3063,39 @@ msgstr "" msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:591 +#: archaeological_files/models.py:625 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:596 +#: archaeological_files/models.py:630 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:610 +#: archaeological_files/models.py:640 +msgid "Responsible for planning service" +msgstr "" + +#: archaeological_files/models.py:644 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:617 +#: archaeological_files/models.py:651 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:632 +#: archaeological_files/models.py:666 msgid "Main town" msgstr "" -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:705 msgid "Main address" msgstr "" -#: archaeological_files/models.py:673 +#: archaeological_files/models.py:707 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:726 #: archaeological_finds/forms_treatments.py:169 #: archaeological_finds/forms_treatments.py:418 #: archaeological_finds/models_treatments.py:263 @@ -3056,128 +3111,128 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:742 +#: archaeological_files/models.py:784 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:746 +#: archaeological_files/models.py:788 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:751 +#: archaeological_files/models.py:793 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:767 +#: archaeological_files/models.py:809 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:787 +#: archaeological_files/models.py:829 #: ishtar_common/templates/ishtar/sheet_town.html:124 msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:814 +#: archaeological_files/models.py:856 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1067 +#: archaeological_files/models.py:1109 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1073 +#: archaeological_files/models.py:1115 msgid "No town" msgstr "" -#: archaeological_files/models.py:1282 archaeological_operations/models.py:1980 +#: archaeological_files/models.py:1324 archaeological_operations/models.py:2097 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1284 archaeological_operations/models.py:1982 +#: archaeological_files/models.py:1326 archaeological_operations/models.py:2099 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1294 +#: archaeological_files/models.py:1336 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1296 +#: archaeological_files/models.py:1338 msgid "plan" msgstr "" -#: archaeological_files/models.py:1305 +#: archaeological_files/models.py:1347 #: archaeological_finds/models_treatments.py:420 #: archaeological_finds/models_treatments.py:1316 -#: archaeological_operations/models.py:2013 +#: archaeological_operations/models.py:2130 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1307 +#: archaeological_files/models.py:1349 #: archaeological_finds/models_treatments.py:422 #: archaeological_finds/models_treatments.py:1318 -#: archaeological_operations/models.py:2015 +#: archaeological_operations/models.py:2132 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1316 +#: archaeological_files/models.py:1358 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1318 +#: archaeological_files/models.py:1360 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 msgid "operation" msgstr "" -#: archaeological_files/models.py:1393 archaeological_operations/models.py:1393 -#: archaeological_operations/models.py:3163 +#: archaeological_files/models.py:1435 archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:3280 msgid "File" msgstr "" -#: archaeological_files/models.py:1412 +#: archaeological_files/models.py:1454 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1414 archaeological_files/models.py:1480 +#: archaeological_files/models.py:1456 archaeological_files/models.py:1522 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1416 +#: archaeological_files/models.py:1458 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1418 archaeological_files/models.py:1484 +#: archaeological_files/models.py:1460 archaeological_files/models.py:1526 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1442 +#: archaeological_files/models.py:1484 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1443 +#: archaeological_files/models.py:1485 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1461 +#: archaeological_files/models.py:1503 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1462 +#: archaeological_files/models.py:1504 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1478 +#: archaeological_files/models.py:1520 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1482 +#: archaeological_files/models.py:1524 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1488 +#: archaeological_files/models.py:1530 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1489 +#: archaeological_files/models.py:1531 msgid "Equipment requirements" msgstr "" @@ -3203,9 +3258,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:339 +#: archaeological_files/templates/ishtar/sheet_file.html:391 msgid "Planned" msgstr "" @@ -3246,18 +3301,18 @@ msgstr "" msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:176 +#: archaeological_files/templates/ishtar/sheet_file.html:179 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:179 +#: archaeological_files/templates/ishtar/sheet_file.html:182 #: 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:2949 +#: archaeological_operations/models.py:3066 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 #: ishtar_common/templates/ishtar/sheet_document.html:123 @@ -3268,15 +3323,15 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:182 +#: archaeological_files/templates/ishtar/sheet_file.html:185 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 -#: archaeological_files/templates/ishtar/sheet_file.html:213 -#: archaeological_operations/models.py:2685 -#: archaeological_operations/models.py:2984 +#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_operations/models.py:2802 +#: archaeological_operations/models.py:3101 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:520 archaeological_warehouse/models.py:737 @@ -3285,22 +3340,22 @@ msgstr "" msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:191 +#: archaeological_files/templates/ishtar/sheet_file.html:194 #: archaeological_operations/forms.py:509 #: archaeological_operations/forms.py:753 -#: archaeological_operations/models.py:1353 +#: archaeological_operations/models.py:1470 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:205 +#: archaeological_files/templates/ishtar/sheet_file.html:208 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:209 +#: archaeological_files/templates/ishtar/sheet_file.html:212 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:215 +#: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:710 ishtar_common/admin.py:797 #: ishtar_common/models.py:704 ishtar_common/models.py:3386 @@ -3308,43 +3363,43 @@ msgstr "" msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:225 +#: archaeological_files/templates/ishtar/sheet_file.html:228 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:231 +#: archaeological_files/templates/ishtar/sheet_file.html:234 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:264 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:279 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:392 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:291 #: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 +#: archaeological_files/templates/ishtar/sheet_file.html:297 #: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 +#: archaeological_files/templates/ishtar/sheet_file.html:349 #: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:312 +#: archaeological_files/templates/ishtar/sheet_file.html:364 +#: archaeological_files/templates/ishtar/sheet_file.html:420 #: archaeological_warehouse/templates/ishtar/sheet_container.html:252 #: archaeological_warehouse/templates/ishtar/sheet_container.html:276 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:209 @@ -3355,13 +3410,13 @@ msgstr "" msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:323 +#: archaeological_files/templates/ishtar/sheet_file.html:375 +#: archaeological_files/templates/ishtar/sheet_file.html:427 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:334 msgid "Post-excavation jobs" msgstr "" @@ -3455,326 +3510,336 @@ msgstr "" msgid "Simple find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:354 +#: archaeological_finds/forms.py:356 msgid "Museum identification" msgstr "" -#: archaeological_finds/forms.py:356 archaeological_finds/forms.py:744 -#: archaeological_finds/forms.py:1002 archaeological_finds/forms.py:1341 -#: archaeological_finds/forms.py:1696 archaeological_finds/forms.py:2346 -#: archaeological_finds/models_finds.py:548 -#: archaeological_finds/models_finds.py:1983 +#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:754 +#: archaeological_finds/forms.py:1012 archaeological_finds/forms.py:1351 +#: archaeological_finds/forms.py:1706 archaeological_finds/forms.py:2358 +#: archaeological_finds/models_finds.py:560 +#: archaeological_finds/models_finds.py:2003 msgid "Free ID" msgstr "" -#: archaeological_finds/forms.py:358 archaeological_finds/forms.py:1011 -#: archaeological_finds/models_finds.py:1986 +#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1021 +#: archaeological_finds/models_finds.py:2006 msgid "Museum ID prefix" msgstr "" -#: archaeological_finds/forms.py:359 archaeological_finds/forms.py:1012 -#: archaeological_finds/forms.py:1698 archaeological_finds/models_finds.py:1987 +#: archaeological_finds/forms.py:361 archaeological_finds/forms.py:1022 +#: archaeological_finds/forms.py:1708 archaeological_finds/models_finds.py:2007 msgid "Museum inventory number" msgstr "" -#: archaeological_finds/forms.py:360 archaeological_finds/forms.py:1013 -#: archaeological_finds/models_finds.py:1988 +#: archaeological_finds/forms.py:362 archaeological_finds/forms.py:1023 +#: archaeological_finds/models_finds.py:2008 msgid "Museum ID suffix" msgstr "" -#: archaeological_finds/forms.py:361 archaeological_finds/models_finds.py:1989 +#: archaeological_finds/forms.py:363 archaeological_finds/models_finds.py:2009 msgid "Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:363 archaeological_finds/forms.py:746 -#: archaeological_finds/forms.py:1006 archaeological_finds/forms.py:1343 -#: archaeological_finds/forms.py:1697 archaeological_finds/forms.py:2413 -#: archaeological_finds/models_finds.py:1984 ishtar_common/forms_common.py:1409 +#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:756 +#: archaeological_finds/forms.py:1016 archaeological_finds/forms.py:1353 +#: archaeological_finds/forms.py:1707 archaeological_finds/forms.py:2425 +#: archaeological_finds/models_finds.py:2004 ishtar_common/forms_common.py:1409 #: ishtar_common/models.py:3253 msgid "Denomination" msgstr "" -#: archaeological_finds/forms.py:364 archaeological_finds/forms.py:1007 -#: archaeological_finds/forms.py:1700 archaeological_finds/models_finds.py:2138 +#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1017 +#: archaeological_finds/forms.py:1710 archaeological_finds/models_finds.py:2158 msgid "Previous ID" msgstr "" -#: archaeological_finds/forms.py:365 archaeological_finds/forms.py:1014 -#: archaeological_finds/forms.py:1703 archaeological_finds/models_finds.py:1990 +#: archaeological_finds/forms.py:367 archaeological_finds/forms.py:1024 +#: archaeological_finds/forms.py:1713 archaeological_finds/models_finds.py:2010 msgid "Laboratory ID" msgstr "" -#: archaeological_finds/forms.py:366 archaeological_finds/forms.py:1015 -#: archaeological_finds/forms.py:1702 archaeological_finds/models_finds.py:1981 +#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1025 +#: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:2001 msgid "Seal number" msgstr "" -#: archaeological_finds/forms.py:368 archaeological_finds/forms.py:1060 -#: archaeological_finds/models_finds.py:2188 +#: archaeological_finds/forms.py:370 archaeological_finds/forms.py:1070 +#: archaeological_finds/models_finds.py:2208 msgid "Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:371 archaeological_finds/forms.py:1063 -#: archaeological_finds/models_finds.py:2192 +#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1073 +#: archaeological_finds/models_finds.py:2212 msgid "Type of marking" msgstr "" -#: archaeological_finds/forms.py:373 archaeological_finds/forms.py:1016 -#: archaeological_finds/forms.py:1943 archaeological_finds/models_finds.py:2135 +#: archaeological_finds/forms.py:375 archaeological_finds/forms.py:1026 +#: archaeological_finds/forms.py:1954 archaeological_finds/models_finds.py:2155 msgid "Marking details" msgstr "" -#: archaeological_finds/forms.py:380 archaeological_finds/forms.py:980 -#: archaeological_finds/forms.py:1634 archaeological_finds/models_finds.py:428 -#: archaeological_finds/models_finds.py:443 -#: archaeological_finds/models_finds.py:458 -#: archaeological_finds/models_finds.py:473 -#: archaeological_finds/models_finds.py:488 -#: archaeological_finds/models_finds.py:503 +#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:990 +#: archaeological_finds/forms.py:1644 archaeological_finds/models_finds.py:442 +#: archaeological_finds/models_finds.py:457 +#: archaeological_finds/models_finds.py:472 +#: archaeological_finds/models_finds.py:487 +#: archaeological_finds/models_finds.py:502 +#: archaeological_finds/models_finds.py:517 msgid "Museum" msgstr "" -#: archaeological_finds/forms.py:382 archaeological_finds/forms.py:1026 -#: archaeological_finds/models_finds.py:2159 +#: archaeological_finds/forms.py:384 archaeological_finds/forms.py:1036 +#: archaeological_finds/models_finds.py:2179 msgid "Owner institution" msgstr "" -#: archaeological_finds/forms.py:385 archaeological_finds/forms.py:1032 -#: archaeological_finds/models_finds.py:2164 +#: archaeological_finds/forms.py:387 archaeological_finds/forms.py:1042 +#: archaeological_finds/models_finds.py:2184 msgid "Assigned institution" msgstr "" -#: archaeological_finds/forms.py:388 archaeological_finds/forms.py:1038 -#: archaeological_finds/models_finds.py:2169 +#: archaeological_finds/forms.py:390 archaeological_finds/forms.py:1048 +#: archaeological_finds/models_finds.py:2189 msgid "Custodian institution" msgstr "" -#: archaeological_finds/forms.py:390 archaeological_finds/models_finds.py:2171 +#: archaeological_finds/forms.py:392 archaeological_finds/models_finds.py:2191 msgid "Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:392 archaeological_finds/forms.py:1043 -#: archaeological_finds/models_finds.py:2174 +#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1053 +#: archaeological_finds/models_finds.py:2194 msgid "Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:394 archaeological_finds/forms.py:1045 -#: archaeological_finds/models_finds.py:2176 +#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1055 +#: archaeological_finds/models_finds.py:2196 msgid "Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:395 archaeological_finds/forms.py:1048 -#: archaeological_finds/models_finds.py:2177 +#: archaeological_finds/forms.py:397 archaeological_finds/forms.py:1058 +#: archaeological_finds/models_finds.py:2197 msgid "Museum entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:396 archaeological_finds/forms.py:1050 -#: archaeological_finds/models_finds.py:2178 +#: archaeological_finds/forms.py:398 archaeological_finds/forms.py:1060 +#: archaeological_finds/models_finds.py:2198 msgid "Museum entry date (end)" msgstr "" -#: archaeological_finds/forms.py:397 archaeological_finds/models_finds.py:2179 +#: archaeological_finds/forms.py:399 archaeological_finds/models_finds.py:2199 msgid "Comment on museum entry date" msgstr "" -#: archaeological_finds/forms.py:403 archaeological_finds/forms.py:1052 -#: archaeological_finds/models_finds.py:2183 +#: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1062 +#: archaeological_finds/models_finds.py:2203 msgid "Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:407 archaeological_finds/forms.py:1065 -#: archaeological_finds/models_finds.py:2152 -#: archaeological_finds/models_finds.py:2199 +#: archaeological_finds/forms.py:409 archaeological_finds/forms.py:1075 +#: archaeological_finds/models_finds.py:2172 +#: archaeological_finds/models_finds.py:2219 msgid "Collection" msgstr "" -#: archaeological_finds/forms.py:410 archaeological_finds/forms.py:1067 +#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1077 msgid "Former collections" msgstr "" -#: archaeological_finds/forms.py:412 archaeological_finds/forms.py:1072 -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/forms.py:414 archaeological_finds/forms.py:1082 +#: archaeological_finds/models_finds.py:2227 msgid "Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:415 archaeological_finds/models_finds.py:2211 +#: archaeological_finds/forms.py:417 archaeological_finds/models_finds.py:2231 msgid "Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:418 archaeological_finds/models_finds.py:2213 +#: archaeological_finds/forms.py:420 archaeological_finds/models_finds.py:2233 msgid "Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:421 archaeological_finds/forms.py:1073 -#: archaeological_finds/models_finds.py:2217 +#: archaeological_finds/forms.py:423 archaeological_finds/forms.py:1083 +#: archaeological_finds/models_finds.py:2237 msgid "Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:423 archaeological_finds/models_finds.py:2219 +#: archaeological_finds/forms.py:425 archaeological_finds/models_finds.py:2239 msgid "Date of museum allocation" msgstr "" -#: archaeological_finds/forms.py:424 archaeological_finds/models_finds.py:2220 +#: archaeological_finds/forms.py:426 archaeological_finds/models_finds.py:2240 msgid "Purchase price" msgstr "" -#: archaeological_finds/forms.py:428 archaeological_finds/models_finds.py:2214 +#: archaeological_finds/forms.py:430 archaeological_finds/models_finds.py:2234 msgid "Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:434 archaeological_finds/models_finds.py:2258 +#: archaeological_finds/forms.py:436 archaeological_finds/models_finds.py:2278 +#: archaeological_operations/forms.py:1218 +#: archaeological_operations/forms.py:1349 +#: archaeological_operations/models.py:629 +#: archaeological_operations/templates/ishtar/sheet_site.html:55 msgid "Public description" msgstr "" -#: archaeological_finds/forms.py:436 archaeological_finds/forms.py:753 -#: archaeological_finds/forms.py:1801 archaeological_finds/models_finds.py:2075 +#: archaeological_finds/forms.py:439 archaeological_finds/forms.py:708 +#: archaeological_finds/forms.py:1807 archaeological_finds/models_finds.py:585 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:23 +msgid "Discovery method" +msgstr "" + +#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:763 +#: archaeological_finds/forms.py:1812 archaeological_finds/models_finds.py:2095 msgid "Is complete?" msgstr "" -#: archaeological_finds/forms.py:438 archaeological_finds/forms.py:756 -#: archaeological_finds/forms.py:1085 archaeological_finds/models_finds.py:95 -#: archaeological_finds/models_finds.py:1170 -#: archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1998 +#: archaeological_finds/forms.py:443 archaeological_finds/forms.py:766 +#: archaeological_finds/forms.py:1095 archaeological_finds/models_finds.py:95 +#: archaeological_finds/models_finds.py:1186 +#: archaeological_finds/models_finds.py:1187 +#: archaeological_finds/models_finds.py:2018 msgid "Material types" msgstr "" -#: archaeological_finds/forms.py:441 archaeological_finds/forms.py:759 -#: archaeological_finds/forms.py:1810 archaeological_finds/models_finds.py:2002 +#: archaeological_finds/forms.py:446 archaeological_finds/forms.py:769 +#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:2022 #: ishtar_common/models_imports.py:1101 msgid "Material type quality" msgstr "" -#: archaeological_finds/forms.py:444 archaeological_finds/forms.py:1088 -#: archaeological_finds/forms.py:1813 archaeological_finds/models_finds.py:2010 +#: archaeological_finds/forms.py:449 archaeological_finds/forms.py:1098 +#: archaeological_finds/forms.py:1824 archaeological_finds/models_finds.py:2030 msgid "Technical processes" msgstr "" -#: archaeological_finds/forms.py:448 archaeological_finds/forms.py:1819 -#: archaeological_finds/models_finds.py:2015 +#: archaeological_finds/forms.py:453 archaeological_finds/forms.py:1830 +#: archaeological_finds/models_finds.py:2035 msgid "Comment on the material" msgstr "" -#: archaeological_finds/forms.py:451 archaeological_finds/forms.py:762 -#: archaeological_finds/forms.py:1092 archaeological_finds/models_finds.py:275 -#: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1173 -#: archaeological_finds/models_finds.py:2077 +#: archaeological_finds/forms.py:456 archaeological_finds/forms.py:772 +#: archaeological_finds/forms.py:1102 archaeological_finds/models_finds.py:275 +#: archaeological_finds/models_finds.py:1188 +#: archaeological_finds/models_finds.py:1189 +#: archaeological_finds/models_finds.py:2097 msgid "Object types" msgstr "" -#: archaeological_finds/forms.py:455 archaeological_finds/forms.py:766 -#: archaeological_finds/forms.py:1826 archaeological_finds/models_finds.py:2081 +#: archaeological_finds/forms.py:460 archaeological_finds/forms.py:776 +#: archaeological_finds/forms.py:1837 archaeological_finds/models_finds.py:2101 msgid "Object type quality" msgstr "" -#: archaeological_finds/forms.py:458 archaeological_finds/forms.py:1096 -#: archaeological_finds/forms.py:1828 archaeological_finds/models_finds.py:2089 +#: archaeological_finds/forms.py:463 archaeological_finds/forms.py:1106 +#: archaeological_finds/forms.py:1839 archaeological_finds/models_finds.py:2109 msgid "Functional areas" msgstr "" -#: archaeological_finds/forms.py:462 archaeological_finds/forms.py:1100 -#: archaeological_finds/forms.py:1835 archaeological_finds/models_finds.py:2095 +#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:1110 +#: archaeological_finds/forms.py:1846 archaeological_finds/models_finds.py:2115 msgid "Technical areas" msgstr "" -#: archaeological_finds/forms.py:465 archaeological_finds/forms.py:768 -#: archaeological_finds/forms.py:1078 archaeological_finds/forms.py:1841 -#: archaeological_finds/forms.py:2352 archaeological_finds/models_finds.py:2022 +#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:778 +#: archaeological_finds/forms.py:1088 archaeological_finds/forms.py:1852 +#: archaeological_finds/forms.py:2364 archaeological_finds/models_finds.py:2042 msgid "Number of remains" msgstr "" -#: archaeological_finds/forms.py:467 archaeological_finds/forms.py:770 -#: archaeological_finds/forms.py:1080 archaeological_finds/forms.py:1843 -#: archaeological_finds/models_finds.py:2024 +#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:780 +#: archaeological_finds/forms.py:1090 archaeological_finds/forms.py:1854 +#: archaeological_finds/models_finds.py:2044 msgid "Minimum number of individuals (MNI)" msgstr "" -#: archaeological_finds/forms.py:469 archaeological_finds/forms.py:772 -#: archaeological_finds/forms.py:1082 archaeological_finds/forms.py:1845 -#: archaeological_finds/models_finds.py:2221 +#: archaeological_finds/forms.py:474 archaeological_finds/forms.py:782 +#: archaeological_finds/forms.py:1092 archaeological_finds/forms.py:1856 +#: archaeological_finds/models_finds.py:2241 msgid "Inventory quantity" msgstr "" -#: archaeological_finds/forms.py:470 archaeological_finds/forms.py:773 -#: archaeological_finds/forms.py:1083 archaeological_finds/forms.py:1846 -#: archaeological_finds/models_finds.py:2222 +#: archaeological_finds/forms.py:475 archaeological_finds/forms.py:783 +#: archaeological_finds/forms.py:1093 archaeological_finds/forms.py:1857 +#: archaeological_finds/models_finds.py:2242 msgid "Observed quantity" msgstr "" -#: archaeological_finds/forms.py:472 archaeological_finds/forms.py:775 -#: archaeological_finds/models_finds.py:2027 +#: archaeological_finds/forms.py:477 archaeological_finds/forms.py:785 +#: archaeological_finds/models_finds.py:2047 msgid "Comment on quantity" msgstr "" -#: archaeological_finds/forms.py:476 archaeological_finds/forms.py:779 -#: archaeological_finds/forms.py:1849 archaeological_finds/models_finds.py:1992 +#: archaeological_finds/forms.py:481 archaeological_finds/forms.py:789 +#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2012 msgid "Decoration" msgstr "" -#: archaeological_finds/forms.py:479 archaeological_finds/forms.py:782 -#: archaeological_finds/forms.py:1850 archaeological_finds/models_finds.py:1993 +#: archaeological_finds/forms.py:484 archaeological_finds/forms.py:792 +#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2013 msgid "Inscription" msgstr "" -#: archaeological_finds/forms.py:482 archaeological_finds/forms.py:785 -#: archaeological_finds/forms.py:1104 archaeological_finds/forms.py:1848 -#: archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:487 archaeological_finds/forms.py:795 +#: archaeological_finds/forms.py:1114 archaeological_finds/forms.py:1859 +#: archaeological_finds/models_finds.py:2015 msgid "Manufacturing place" msgstr "" -#: archaeological_finds/forms.py:485 archaeological_finds/forms.py:788 -#: archaeological_finds/forms.py:1107 archaeological_finds/forms.py:1852 -#: archaeological_finds/models_finds.py:1213 -#: archaeological_finds/models_finds.py:2113 +#: archaeological_finds/forms.py:490 archaeological_finds/forms.py:798 +#: archaeological_finds/forms.py:1117 archaeological_finds/forms.py:1863 +#: archaeological_finds/models_finds.py:1229 +#: archaeological_finds/models_finds.py:2133 msgid "Communicability" msgstr "" -#: archaeological_finds/forms.py:493 archaeological_finds/forms.py:794 -#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1858 -#: archaeological_finds/models_finds.py:2137 +#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:804 +#: archaeological_finds/forms.py:1150 archaeological_finds/forms.py:1869 +#: archaeological_finds/models_finds.py:2157 msgid "Comment on dating" msgstr "" -#: archaeological_finds/forms.py:498 archaeological_finds/forms.py:798 -#: archaeological_finds/forms.py:1860 archaeological_finds/models_finds.py:2117 +#: archaeological_finds/forms.py:503 archaeological_finds/forms.py:808 +#: archaeological_finds/forms.py:1871 archaeological_finds/models_finds.py:2137 msgid "Length (cm)" msgstr "" -#: archaeological_finds/forms.py:501 archaeological_finds/forms.py:799 -#: archaeological_finds/forms.py:1861 archaeological_finds/models_finds.py:2118 +#: archaeological_finds/forms.py:506 archaeological_finds/forms.py:809 +#: archaeological_finds/forms.py:1872 archaeological_finds/models_finds.py:2138 msgid "Width (cm)" msgstr "" -#: archaeological_finds/forms.py:504 archaeological_finds/forms.py:800 -#: archaeological_finds/forms.py:1862 archaeological_finds/models_finds.py:2119 +#: archaeological_finds/forms.py:509 archaeological_finds/forms.py:810 +#: archaeological_finds/forms.py:1873 archaeological_finds/models_finds.py:2139 msgid "Height (cm)" msgstr "" -#: archaeological_finds/forms.py:507 archaeological_finds/forms.py:803 -#: archaeological_finds/forms.py:1863 archaeological_finds/models_finds.py:2122 +#: archaeological_finds/forms.py:512 archaeological_finds/forms.py:813 +#: archaeological_finds/forms.py:1874 archaeological_finds/models_finds.py:2142 msgid "Thickness (cm)" msgstr "" -#: archaeological_finds/forms.py:510 archaeological_finds/forms.py:801 -#: archaeological_finds/forms.py:1864 archaeological_finds/models_finds.py:2120 +#: archaeological_finds/forms.py:515 archaeological_finds/forms.py:811 +#: archaeological_finds/forms.py:1875 archaeological_finds/models_finds.py:2140 msgid "Diameter (cm)" msgstr "" -#: archaeological_finds/forms.py:513 archaeological_finds/forms.py:802 -#: archaeological_finds/forms.py:1865 archaeological_finds/models_finds.py:2121 +#: archaeological_finds/forms.py:518 archaeological_finds/forms.py:812 +#: archaeological_finds/forms.py:1876 archaeological_finds/models_finds.py:2141 msgid "Circumference (cm)" msgstr "" -#: archaeological_finds/forms.py:517 archaeological_finds/forms.py:804 -#: archaeological_finds/forms.py:1866 archaeological_finds/forms.py:2350 -#: archaeological_finds/models_finds.py:2017 +#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:814 +#: archaeological_finds/forms.py:1877 archaeological_finds/forms.py:2362 +#: archaeological_finds/models_finds.py:2037 #: archaeological_warehouse/models.py:735 msgid "Volume (l)" msgstr "" -#: archaeological_finds/forms.py:519 archaeological_finds/forms.py:805 -#: archaeological_finds/forms.py:2351 +#: archaeological_finds/forms.py:524 archaeological_finds/forms.py:815 +#: archaeological_finds/forms.py:2363 #: archaeological_finds/templates/ishtar/sheet_find.html:205 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 #: cd17_app/templates/ishtar/sheet_find.html:210 @@ -3785,141 +3850,141 @@ msgstr "" msgid "Weight (g)" msgstr "" -#: archaeological_finds/forms.py:522 archaeological_finds/forms.py:807 -#: archaeological_finds/forms.py:1869 +#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:817 +#: archaeological_finds/forms.py:1880 msgid "Clutter long side (cm)" msgstr "" -#: archaeological_finds/forms.py:527 archaeological_finds/forms.py:810 -#: archaeological_finds/forms.py:1873 +#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:820 +#: archaeological_finds/forms.py:1884 msgid "Clutter short side (cm)" msgstr "" -#: archaeological_finds/forms.py:532 archaeological_finds/forms.py:813 -#: archaeological_finds/forms.py:1877 +#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:823 +#: archaeological_finds/forms.py:1888 msgid "Clutter height (cm)" msgstr "" -#: archaeological_finds/forms.py:537 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1880 archaeological_finds/models_finds.py:2133 +#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:826 +#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:2153 msgid "Dimensions comment" msgstr "" -#: archaeological_finds/forms.py:541 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1127 archaeological_finds/forms.py:1885 -#: archaeological_finds/models_finds.py:1214 -#: archaeological_finds/models_finds.py:2142 +#: archaeological_finds/forms.py:546 archaeological_finds/forms.py:830 +#: archaeological_finds/forms.py:1137 archaeological_finds/forms.py:1896 +#: archaeological_finds/models_finds.py:1230 +#: archaeological_finds/models_finds.py:2162 msgid "Check" msgstr "" -#: archaeological_finds/forms.py:542 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1886 -#: archaeological_finds/models_finds.py:2147 +#: archaeological_finds/forms.py:547 archaeological_finds/forms.py:831 +#: archaeological_finds/forms.py:1138 archaeological_finds/forms.py:1897 +#: archaeological_finds/models_finds.py:2167 msgid "Check date" msgstr "" -#: archaeological_finds/forms.py:600 +#: archaeological_finds/forms.py:606 msgid "Clutter: short side cannot be bigger than the long side." msgstr "" -#: archaeological_finds/forms.py:608 +#: archaeological_finds/forms.py:614 msgid "Find - 020 - General" msgstr "" -#: archaeological_finds/forms.py:694 archaeological_finds/models_finds.py:555 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:50 +#: archaeological_finds/forms.py:701 archaeological_finds/models_finds.py:567 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:697 archaeological_finds/forms.py:1009 -#: archaeological_finds/forms.py:1701 archaeological_finds/models_finds.py:553 +#: archaeological_finds/forms.py:704 archaeological_finds/forms.py:1019 +#: archaeological_finds/forms.py:1711 archaeological_finds/models_finds.py:565 msgid "Excavation ID" msgstr "" -#: archaeological_finds/forms.py:701 archaeological_finds/forms.py:1798 -#: archaeological_finds/models_finds.py:566 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:32 +#: archaeological_finds/forms.py:711 archaeological_finds/forms.py:1809 +#: archaeological_finds/models_finds.py:578 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:33 #: 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:704 archaeological_finds/forms.py:1799 -#: archaeological_finds/models_finds.py:569 -#: archaeological_finds/templates/ishtar/sheet_basefind.html:34 +#: archaeological_finds/forms.py:714 archaeological_finds/forms.py:1810 +#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:35 #: 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:707 archaeological_finds/forms.py:1800 -#: archaeological_finds/models_finds.py:573 +#: archaeological_finds/forms.py:717 archaeological_finds/forms.py:1811 +#: archaeological_finds/models_finds.py:589 msgid "Batch/object" msgstr "" -#: archaeological_finds/forms.py:710 +#: archaeological_finds/forms.py:720 msgid "Topography" msgstr "" -#: archaeological_finds/forms.py:712 archaeological_finds/forms.py:1883 -#: archaeological_finds/models_finds.py:581 +#: archaeological_finds/forms.py:722 archaeological_finds/forms.py:1894 +#: archaeological_finds/models_finds.py:597 msgid "Point of topographic reference" msgstr "" -#: archaeological_finds/forms.py:728 archaeological_finds/forms.py:2343 +#: archaeological_finds/forms.py:738 archaeological_finds/forms.py:2355 msgid "Resulting find" msgstr "" -#: archaeological_finds/forms.py:729 +#: archaeological_finds/forms.py:739 msgid "Treatment n-1 - 030 - Resulting find" msgstr "" -#: archaeological_finds/forms.py:836 archaeological_finds/forms.py:2358 +#: archaeological_finds/forms.py:846 archaeological_finds/forms.py:2370 msgid "Resulting finds" msgstr "" -#: archaeological_finds/forms.py:837 +#: archaeological_finds/forms.py:847 msgid "Treatment 1-n - 030 - Resulting finds" msgstr "" -#: archaeological_finds/forms.py:842 +#: archaeological_finds/forms.py:852 msgid "Number of resulting finds" msgstr "" -#: archaeological_finds/forms.py:845 +#: archaeological_finds/forms.py:855 msgid "Prefix label for resulting finds" msgstr "" -#: archaeological_finds/forms.py:848 +#: archaeological_finds/forms.py:858 msgid "" "E.g.: with a prefix \"item-\", each resulting item will be named \"item-1\", " "\"item-2\", \"item-3\"" msgstr "" -#: archaeological_finds/forms.py:853 +#: archaeological_finds/forms.py:863 msgid "Numbering starting from" msgstr "" -#: archaeological_finds/forms.py:856 +#: archaeological_finds/forms.py:866 msgid "Name of the new basket containing the resulting items" msgstr "" -#: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1321 -#: archaeological_finds/forms.py:1388 +#: archaeological_finds/forms.py:885 archaeological_finds/forms.py:1331 +#: archaeological_finds/forms.py:1398 msgid "A basket with this label already exists." msgstr "" -#: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1397 +#: archaeological_finds/forms.py:891 archaeological_finds/forms.py:1407 msgid "Find - Quick action - Modify" msgstr "" -#: archaeological_finds/forms.py:978 +#: archaeological_finds/forms.py:988 msgid "Datation" msgstr "" -#: archaeological_finds/forms.py:979 archaeological_finds/forms.py:1450 -#: archaeological_finds/forms.py:1621 +#: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1460 +#: archaeological_finds/forms.py:1631 #: archaeological_finds/templates/ishtar/sheet_find.html:283 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:309 #: cd17_app/templates/ishtar/sheet_find.html:287 @@ -3930,250 +3995,250 @@ msgstr "" msgid "Preservation" msgstr "" -#: archaeological_finds/forms.py:1109 archaeological_finds/forms.py:1489 -#: archaeological_finds/forms.py:1891 archaeological_finds/models_finds.py:1215 -#: archaeological_finds/models_finds.py:2240 +#: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1499 +#: archaeological_finds/forms.py:1902 archaeological_finds/models_finds.py:1231 +#: archaeological_finds/models_finds.py:2260 #: archaeological_warehouse/forms.py:597 msgid "Alteration" msgstr "" -#: archaeological_finds/forms.py:1111 archaeological_finds/forms.py:1495 -#: archaeological_finds/forms.py:1892 archaeological_finds/models_finds.py:1216 -#: archaeological_finds/models_finds.py:2244 +#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 +#: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:1232 +#: archaeological_finds/models_finds.py:2264 #: archaeological_warehouse/forms.py:598 msgid "Alteration cause" msgstr "" -#: archaeological_finds/forms.py:1113 archaeological_finds/forms.py:1483 -#: archaeological_finds/forms.py:1889 archaeological_finds/models_finds.py:1210 -#: archaeological_finds/models_finds.py:2227 +#: archaeological_finds/forms.py:1123 archaeological_finds/forms.py:1493 +#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:2247 #: archaeological_finds/templates/ishtar/sheet_find.html:287 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:313 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" msgstr "" -#: archaeological_finds/forms.py:1115 archaeological_finds/forms.py:1507 -#: archaeological_finds/forms.py:1896 archaeological_finds/models_finds.py:1217 -#: archaeological_finds/models_finds.py:2250 +#: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1517 +#: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1233 +#: archaeological_finds/models_finds.py:2270 #: archaeological_warehouse/forms.py:602 msgid "Treatment emergency" msgstr "" -#: archaeological_finds/forms.py:1118 archaeological_finds/forms.py:1471 -#: archaeological_finds/forms.py:1887 archaeological_finds/models_finds.py:1211 -#: archaeological_finds/models_finds.py:2101 +#: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1481 +#: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:1227 +#: archaeological_finds/models_finds.py:2121 #: archaeological_warehouse/forms.py:594 msgid "Integrity" msgstr "" -#: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1477 -#: archaeological_finds/forms.py:1888 archaeological_finds/models_finds.py:1212 -#: archaeological_finds/models_finds.py:2107 +#: archaeological_finds/forms.py:1131 archaeological_finds/forms.py:1487 +#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 +#: archaeological_finds/models_finds.py:2127 #: archaeological_warehouse/forms.py:595 msgid "Remarkability" msgstr "" -#: archaeological_finds/forms.py:1129 archaeological_finds/forms.py:1511 -#: archaeological_finds/forms.py:1900 archaeological_finds/models_finds.py:2256 +#: archaeological_finds/forms.py:1139 archaeological_finds/forms.py:1521 +#: archaeological_finds/forms.py:1911 archaeological_finds/models_finds.py:2276 msgid "Appraisal date" msgstr "" -#: archaeological_finds/forms.py:1130 archaeological_finds/forms.py:1510 -#: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1228 -#: archaeological_finds/models_finds.py:2255 +#: archaeological_finds/forms.py:1140 archaeological_finds/forms.py:1520 +#: archaeological_finds/forms.py:1910 archaeological_finds/models_finds.py:1244 +#: archaeological_finds/models_finds.py:2275 msgid "Insurance value" msgstr "" -#: archaeological_finds/forms.py:1144 +#: archaeological_finds/forms.py:1154 msgid "Comment on conservatory" msgstr "" -#: archaeological_finds/forms.py:1264 +#: archaeological_finds/forms.py:1274 msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:1280 ishtar_common/forms_common.py:2906 +#: archaeological_finds/forms.py:1290 ishtar_common/forms_common.py:2906 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" -#: archaeological_finds/forms.py:1284 archaeological_finds/forms.py:1789 -#: archaeological_finds/forms.py:2562 archaeological_finds/forms.py:2567 -#: archaeological_finds/forms.py:2584 archaeological_finds/forms.py:2589 +#: archaeological_finds/forms.py:1294 archaeological_finds/forms.py:1799 +#: archaeological_finds/forms.py:2574 archaeological_finds/forms.py:2579 +#: archaeological_finds/forms.py:2596 archaeological_finds/forms.py:2601 #: archaeological_finds/ishtar_menu.py:64 -#: archaeological_finds/models_finds.py:933 -#: archaeological_finds/models_finds.py:1862 +#: archaeological_finds/models_finds.py:949 +#: archaeological_finds/models_finds.py:1882 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1232 archaeological_finds/wizards.py:420 msgid "Basket" msgstr "" -#: archaeological_finds/forms.py:1307 +#: archaeological_finds/forms.py:1317 msgid "On update, you have to select a basket." msgstr "" -#: archaeological_finds/forms.py:1314 +#: archaeological_finds/forms.py:1324 msgid "You cannot update the selected basket." msgstr "" -#: archaeological_finds/forms.py:1318 archaeological_finds/forms.py:1385 +#: archaeological_finds/forms.py:1328 archaeological_finds/forms.py:1395 msgid "A label is required." msgstr "" -#: archaeological_finds/forms.py:1407 archaeological_finds/forms.py:2458 +#: archaeological_finds/forms.py:1417 archaeological_finds/forms.py:2470 #: ishtar_common/models.py:1051 ishtar_common/models.py:2054 #: ishtar_common/models.py:3813 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:1408 archaeological_finds/forms.py:2459 +#: archaeological_finds/forms.py:1418 archaeological_finds/forms.py:2471 msgid "Is public" msgstr "" -#: archaeological_finds/forms.py:1413 archaeological_finds/forms.py:2464 -#: archaeological_finds/forms.py:2506 ishtar_common/models.py:3826 +#: archaeological_finds/forms.py:1423 archaeological_finds/forms.py:2476 +#: archaeological_finds/forms.py:2518 ishtar_common/models.py:3826 msgid "Shared (read) with" msgstr "" -#: archaeological_finds/forms.py:1420 archaeological_finds/forms.py:2471 -#: archaeological_finds/forms.py:2513 ishtar_common/models.py:3832 +#: archaeological_finds/forms.py:1430 archaeological_finds/forms.py:2483 +#: archaeological_finds/forms.py:2525 ishtar_common/models.py:3832 msgid "Shared (read/edit) with" msgstr "" -#: archaeological_finds/forms.py:1451 +#: archaeological_finds/forms.py:1461 msgid "Find - 030 - Preservation" msgstr "" -#: archaeological_finds/forms.py:1501 archaeological_finds/forms.py:1894 -#: archaeological_finds/models_finds.py:1209 -#: archaeological_finds/models_finds.py:2235 +#: archaeological_finds/forms.py:1511 archaeological_finds/forms.py:1905 +#: archaeological_finds/models_finds.py:1225 +#: archaeological_finds/models_finds.py:2255 msgid "Recommended treatments" msgstr "" -#: archaeological_finds/forms.py:1509 archaeological_finds/forms.py:1898 -#: archaeological_finds/models_finds.py:1227 -#: archaeological_finds/models_finds.py:2148 +#: archaeological_finds/forms.py:1519 archaeological_finds/forms.py:1909 +#: archaeological_finds/models_finds.py:1243 +#: archaeological_finds/models_finds.py:2168 msgid "Estimated value" msgstr "" -#: archaeological_finds/forms.py:1513 archaeological_finds/forms.py:1890 -#: archaeological_finds/models_finds.py:2231 +#: archaeological_finds/forms.py:1523 archaeological_finds/forms.py:1901 +#: archaeological_finds/models_finds.py:2251 msgid "Conservatory comment" msgstr "" -#: archaeological_finds/forms.py:1563 +#: archaeological_finds/forms.py:1573 msgid "Find - 040 - Dating" msgstr "" -#: archaeological_finds/forms.py:1569 +#: archaeological_finds/forms.py:1579 msgid "Find - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:1573 +#: archaeological_finds/forms.py:1583 msgid "Find origin" msgstr "" -#: archaeological_finds/forms.py:1596 +#: archaeological_finds/forms.py:1606 msgid "Discovery" msgstr "" -#: archaeological_finds/forms.py:1699 archaeological_finds/models_finds.py:2298 +#: archaeological_finds/forms.py:1709 archaeological_finds/models_finds.py:2318 msgid "Complete museum ID" msgstr "" -#: archaeological_finds/forms.py:1705 archaeological_finds/models_finds.py:1150 +#: archaeological_finds/forms.py:1715 archaeological_finds/models_finds.py:1166 msgid "Base find - Short ID" msgstr "" -#: archaeological_finds/forms.py:1706 archaeological_finds/models_finds.py:1151 +#: archaeological_finds/forms.py:1716 archaeological_finds/models_finds.py:1167 msgid "Base find - Complete ID" msgstr "" -#: archaeological_finds/forms.py:1710 +#: archaeological_finds/forms.py:1720 msgid "Operation - number (index by year)" msgstr "" -#: archaeological_finds/forms.py:1713 +#: archaeological_finds/forms.py:1723 msgid "Operation - Code (PATRIARCHE)" msgstr "" -#: archaeological_finds/forms.py:1716 +#: archaeological_finds/forms.py:1726 msgid "Operation - Type" msgstr "" -#: archaeological_finds/forms.py:1719 +#: archaeological_finds/forms.py:1729 msgid "Operation - Address / Locality" msgstr "" -#: archaeological_finds/forms.py:1722 +#: archaeological_finds/forms.py:1732 msgid "Operation - In charge" msgstr "" -#: archaeological_finds/forms.py:1733 +#: archaeological_finds/forms.py:1743 msgid "Operation - Scientist in charge" msgstr "" -#: archaeological_finds/forms.py:1736 +#: archaeological_finds/forms.py:1746 msgid "Operation - Operator" msgstr "" -#: archaeological_finds/forms.py:1740 +#: archaeological_finds/forms.py:1750 msgid "Operation - Name" msgstr "" -#: archaeological_finds/forms.py:1743 +#: archaeological_finds/forms.py:1753 msgid "Operation - Remains" msgstr "" -#: archaeological_finds/forms.py:1746 archaeological_operations/forms.py:472 -#: archaeological_operations/forms.py:1208 ishtar_common/forms_common.py:1570 +#: archaeological_finds/forms.py:1756 archaeological_operations/forms.py:472 +#: archaeological_operations/forms.py:1216 ishtar_common/forms_common.py:1570 #: ishtar_common/models.py:2409 ishtar_common/models.py:3482 #: ishtar_common/templates/ishtar/sheet_document.html:133 #: ishtar_common/templates/ishtar/sheet_town.html:91 msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1749 archaeological_warehouse/forms.py:541 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:541 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1757 archaeological_warehouse/forms.py:549 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:549 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1760 archaeological_warehouse/forms.py:552 +#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:552 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1768 archaeological_warehouse/forms.py:560 +#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:560 msgid "Archaeological site name (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1771 +#: archaeological_finds/forms.py:1781 msgid "Archaeological site - Remains" msgstr "" -#: archaeological_finds/forms.py:1780 +#: archaeological_finds/forms.py:1790 msgid "Context record - Type" msgstr "" -#: archaeological_finds/forms.py:1785 +#: archaeological_finds/forms.py:1795 msgid "Search within related context records" msgstr "" -#: archaeological_finds/forms.py:1797 +#: archaeological_finds/forms.py:1808 msgid "Base find - Comment on the circumstances of discovery" msgstr "" -#: archaeological_finds/forms.py:1803 archaeological_finds/forms.py:2349 +#: archaeological_finds/forms.py:1814 archaeological_finds/forms.py:2361 #: archaeological_finds/models_finds.py:94 -#: archaeological_finds/models_finds.py:1207 +#: archaeological_finds/models_finds.py:1223 #: archaeological_operations/templates/ishtar/sheet_operation.html:573 #: archaeological_warehouse/forms.py:583 #: na_app/templates/ishtar/sheet_operation.html:541 @@ -4181,8 +4246,8 @@ msgstr "" msgid "Material type" msgstr "" -#: archaeological_finds/forms.py:1821 archaeological_finds/models_finds.py:274 -#: archaeological_finds/models_finds.py:1208 +#: archaeological_finds/forms.py:1832 archaeological_finds/models_finds.py:274 +#: archaeological_finds/models_finds.py:1224 #: archaeological_operations/templates/ishtar/sheet_operation.html:583 #: archaeological_warehouse/forms.py:589 ishtar_common/models_imports.py:1094 #: na_app/templates/ishtar/sheet_operation.html:551 @@ -4190,112 +4255,112 @@ msgstr "" msgid "Object type" msgstr "" -#: archaeological_finds/forms.py:1867 +#: archaeological_finds/forms.py:1878 msgid "Weight - lower than (g)" msgstr "" -#: archaeological_finds/forms.py:1902 +#: archaeological_finds/forms.py:1913 msgid "Loan?" msgstr "" -#: archaeological_finds/forms.py:1903 +#: archaeological_finds/forms.py:1914 msgid "Treatment file end date" msgstr "" -#: archaeological_finds/forms.py:1904 +#: archaeological_finds/forms.py:1915 msgid "Treatment end date" msgstr "" -#: archaeological_finds/forms.py:1906 +#: archaeological_finds/forms.py:1917 msgid "Museum - Comment on museum ID" msgstr "" -#: archaeological_finds/forms.py:1908 +#: archaeological_finds/forms.py:1919 msgid "Museum - Owner institution" msgstr "" -#: archaeological_finds/forms.py:1914 +#: archaeological_finds/forms.py:1925 msgid "Museum - Assigned institution" msgstr "" -#: archaeological_finds/forms.py:1920 +#: archaeological_finds/forms.py:1931 msgid "Museum - Custodian institution" msgstr "" -#: archaeological_finds/forms.py:1925 +#: archaeological_finds/forms.py:1936 msgid "Museum - Depositor inventory number" msgstr "" -#: archaeological_finds/forms.py:1926 +#: archaeological_finds/forms.py:1937 msgid "Museum - Collections entry mode" msgstr "" -#: archaeological_finds/forms.py:1927 +#: archaeological_finds/forms.py:1938 msgid "Museum - Comment on museum entry mode" msgstr "" -#: archaeological_finds/forms.py:1928 +#: archaeological_finds/forms.py:1939 msgid "Museum - Entry date (exact or start)" msgstr "" -#: archaeological_finds/forms.py:1929 +#: archaeological_finds/forms.py:1940 msgid "Museum - Entry date end" msgstr "" -#: archaeological_finds/forms.py:1930 +#: archaeological_finds/forms.py:1941 msgid "Museum - Comment on entry date" msgstr "" -#: archaeological_finds/forms.py:1932 +#: archaeological_finds/forms.py:1943 msgid "Museum - Donor, testator or vendor" msgstr "" -#: archaeological_finds/forms.py:1938 +#: archaeological_finds/forms.py:1949 msgid "Museum - Presence of inventory marking" msgstr "" -#: archaeological_finds/forms.py:1941 +#: archaeological_finds/forms.py:1952 msgid "Museum - Type of marking" msgstr "" -#: archaeological_finds/forms.py:1945 +#: archaeological_finds/forms.py:1956 msgid "Museum - Collection" msgstr "" -#: archaeological_finds/forms.py:1948 +#: archaeological_finds/forms.py:1959 msgid "Museum - Former collection" msgstr "" -#: archaeological_finds/forms.py:1953 +#: archaeological_finds/forms.py:1964 msgid "Museum - Inventory entry year" msgstr "" -#: archaeological_finds/forms.py:1955 +#: archaeological_finds/forms.py:1966 msgid "Museum - Conformity with inventory" msgstr "" -#: archaeological_finds/forms.py:1957 +#: archaeological_finds/forms.py:1968 msgid "Museum - Comment on conformity" msgstr "" -#: archaeological_finds/forms.py:1958 +#: archaeological_finds/forms.py:1969 msgid "Museum - Inventory transcript" msgstr "" -#: archaeological_finds/forms.py:1960 +#: archaeological_finds/forms.py:1971 msgid "Museum - Original/reproduction" msgstr "" -#: archaeological_finds/forms.py:1962 +#: archaeological_finds/forms.py:1973 msgid "Museum - Date of allocation" msgstr "" -#: archaeological_finds/forms.py:1963 +#: archaeological_finds/forms.py:1974 msgid "Museum - Purchase price" msgstr "" -#: archaeological_finds/forms.py:2035 archaeological_finds/models_finds.py:1167 -#: archaeological_finds/models_finds.py:2065 +#: archaeological_finds/forms.py:2047 archaeological_finds/models_finds.py:1183 +#: archaeological_finds/models_finds.py:2085 #: archaeological_finds/templates/ishtar/sheet_find.html:304 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:330 #: cd17_app/templates/ishtar/sheet_find.html:308 @@ -4307,11 +4372,11 @@ msgstr "" msgid "Reference container" msgstr "" -#: archaeological_finds/forms.py:2042 +#: archaeological_finds/forms.py:2054 msgid "Reference container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2061 archaeological_finds/models_finds.py:1166 +#: archaeological_finds/forms.py:2073 archaeological_finds/models_finds.py:1182 #: archaeological_finds/templates/ishtar/sheet_find.html:329 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:355 #: cd17_app/templates/ishtar/sheet_find.html:333 @@ -4323,47 +4388,47 @@ msgstr "" msgid "Current container" msgstr "" -#: archaeological_finds/forms.py:2068 +#: archaeological_finds/forms.py:2080 msgid "Current container - Warehouse (location)" msgstr "" -#: archaeological_finds/forms.py:2088 archaeological_finds/forms.py:2109 -#: archaeological_finds/forms.py:2165 archaeological_finds/views.py:382 +#: archaeological_finds/forms.py:2100 archaeological_finds/forms.py:2121 +#: archaeological_finds/forms.py:2177 archaeological_finds/views.py:382 msgid "Find search" msgstr "" -#: archaeological_finds/forms.py:2204 archaeological_finds/forms.py:2367 +#: archaeological_finds/forms.py:2216 archaeological_finds/forms.py:2379 #: archaeological_finds/models_treatments.py:410 #: archaeological_finds/templates/ishtar/sheet_treatment.html:117 msgid "Upstream finds" msgstr "" -#: archaeological_finds/forms.py:2227 +#: archaeological_finds/forms.py:2239 msgid "You should at least select one archaeological find." msgstr "" -#: archaeological_finds/forms.py:2348 +#: archaeological_finds/forms.py:2360 msgid "Precise description" msgstr "" -#: archaeological_finds/forms.py:2363 +#: archaeological_finds/forms.py:2375 msgid "Would you like to delete this find?" msgstr "" -#: archaeological_finds/forms.py:2406 +#: archaeological_finds/forms.py:2418 msgid "Find basket - 001 - Search" msgstr "" -#: archaeological_finds/forms.py:2418 archaeological_finds/forms.py:2436 +#: archaeological_finds/forms.py:2430 archaeological_finds/forms.py:2448 #: archaeological_finds/views.py:283 msgid "Basket search" msgstr "" -#: archaeological_finds/forms.py:2453 +#: archaeological_finds/forms.py:2465 msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2456 +#: archaeological_finds/forms.py:2468 #: archaeological_finds/forms_treatments.py:56 #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:211 @@ -4396,11 +4461,11 @@ msgstr "" msgid "Label" msgstr "" -#: archaeological_finds/forms.py:2498 archaeological_finds/forms.py:2553 +#: archaeological_finds/forms.py:2510 archaeological_finds/forms.py:2565 msgid "A basket with this slug already exists." msgstr "" -#: archaeological_finds/forms.py:2545 +#: archaeological_finds/forms.py:2557 msgid "Another basket already exists with this name." msgstr "" @@ -4447,8 +4512,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:837 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2574 -#: archaeological_operations/models.py:2907 ishtar_common/views.py:511 +#: archaeological_operations/models.py:2691 +#: archaeological_operations/models.py:3024 ishtar_common/views.py:511 msgid "Treatment" msgstr "" @@ -4545,8 +4610,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1269 #: archaeological_finds/models_treatments.py:1289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2573 -#: archaeological_operations/models.py:2899 ishtar_common/views.py:510 +#: archaeological_finds/wizards.py:567 archaeological_operations/models.py:2690 +#: archaeological_operations/models.py:3016 ishtar_common/views.py:510 msgid "Treatment request" msgstr "" @@ -4577,8 +4642,8 @@ msgid "Treatment type is required." msgstr "" #: archaeological_finds/forms_treatments.py:498 -#: archaeological_finds/models_finds.py:2053 -#: archaeological_finds/models_finds.py:3612 +#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:3632 #: archaeological_finds/models_treatments.py:280 #: archaeological_finds/models_treatments.py:852 #: archaeological_finds/templates/ishtar/sheet_find.html:390 @@ -4775,7 +4840,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:90 -#: archaeological_operations/models.py:2578 +#: archaeological_operations/models.py:2695 #: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:521 #: archaeological_warehouse/models.py:1166 ishtar_common/models.py:4027 msgid "Code" @@ -4866,7 +4931,7 @@ msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:187 -#: archaeological_finds/models_finds.py:2273 +#: archaeological_finds/models_finds.py:2293 #: archaeological_finds/models_treatments.py:76 #: archaeological_finds/models_treatments.py:304 #: archaeological_finds/models_treatments.py:316 @@ -4981,107 +5046,115 @@ msgid "Checked types" msgstr "" #: archaeological_finds/models_finds.py:421 -msgid "Collection entry mode type" +msgid "Discovery method type" msgstr "" #: archaeological_finds/models_finds.py:422 +msgid "Discovery method types" +msgstr "" + +#: archaeological_finds/models_finds.py:435 +msgid "Collection entry mode type" +msgstr "" + +#: archaeological_finds/models_finds.py:436 msgid "Collection entry mode types" msgstr "" -#: archaeological_finds/models_finds.py:437 +#: archaeological_finds/models_finds.py:451 msgid "Presence of inventory marking type" msgstr "" -#: archaeological_finds/models_finds.py:438 +#: archaeological_finds/models_finds.py:452 msgid "Presence of inventory marking types" msgstr "" -#: archaeological_finds/models_finds.py:452 +#: archaeological_finds/models_finds.py:466 msgid "Marking type" msgstr "" -#: archaeological_finds/models_finds.py:453 +#: archaeological_finds/models_finds.py:467 msgid "Marking types" msgstr "" -#: archaeological_finds/models_finds.py:467 +#: archaeological_finds/models_finds.py:481 msgid "Museum collection type" msgstr "" -#: archaeological_finds/models_finds.py:468 +#: archaeological_finds/models_finds.py:482 msgid "Museum collection types" msgstr "" -#: archaeological_finds/models_finds.py:482 +#: archaeological_finds/models_finds.py:496 msgid "Inventory conformity type" msgstr "" -#: archaeological_finds/models_finds.py:483 +#: archaeological_finds/models_finds.py:497 msgid "Inventory conformity types" msgstr "" -#: archaeological_finds/models_finds.py:497 +#: archaeological_finds/models_finds.py:511 msgid "Original/reproduction type" msgstr "" -#: archaeological_finds/models_finds.py:498 +#: archaeological_finds/models_finds.py:512 msgid "Original/reproduction types" msgstr "" -#: archaeological_finds/models_finds.py:557 +#: archaeological_finds/models_finds.py:569 msgid "Special interest" msgstr "" -#: archaeological_finds/models_finds.py:579 +#: archaeological_finds/models_finds.py:595 msgid "Material index" msgstr "" -#: archaeological_finds/models_finds.py:584 +#: archaeological_finds/models_finds.py:600 #: ishtar_common/models_imports.py:2863 #: ishtar_common/templates/blocks/DataTables-stats.html:30 #: ishtar_common/templates/ishtar/import_step_by_step.html:46 msgid "Line" msgstr "" -#: archaeological_finds/models_finds.py:586 +#: archaeological_finds/models_finds.py:602 msgid "Short ID" msgstr "" -#: archaeological_finds/models_finds.py:590 -#: archaeological_finds/models_finds.py:597 -#: archaeological_finds/models_finds.py:2302 ishtar_common/models.py:4672 +#: archaeological_finds/models_finds.py:606 +#: archaeological_finds/models_finds.py:613 +#: archaeological_finds/models_finds.py:2322 ishtar_common/models.py:4672 #: ishtar_common/models.py:4679 msgid "Cached value - do not edit" msgstr "" -#: archaeological_finds/models_finds.py:593 +#: archaeological_finds/models_finds.py:609 msgid "Complete ID" msgstr "" -#: archaeological_finds/models_finds.py:614 +#: archaeological_finds/models_finds.py:630 msgid "Concatenation of associated material types codes" msgstr "" -#: archaeological_finds/models_finds.py:620 -#: archaeological_finds/models_finds.py:1974 +#: archaeological_finds/models_finds.py:636 +#: archaeological_finds/models_finds.py:1994 msgid "Base find" msgstr "" -#: archaeological_finds/models_finds.py:904 +#: archaeological_finds/models_finds.py:920 msgid "g" msgstr "" -#: archaeological_finds/models_finds.py:905 +#: archaeological_finds/models_finds.py:921 msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:912 +#: archaeological_finds/models_finds.py:928 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:27 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:59 msgid "Associated finds" msgstr "" -#: archaeological_finds/models_finds.py:917 +#: archaeological_finds/models_finds.py:933 #: ishtar_common/templates/ishtar/blocks/modify_toolbar.html:1 #: ishtar_common/templates/ishtar/blocks/window_image.html:14 #: ishtar_common/templates/ishtar/blocks/window_image.html:26 @@ -5094,620 +5167,625 @@ msgstr "" msgid "Modify" msgstr "" -#: archaeological_finds/models_finds.py:974 archaeological_finds/views.py:539 +#: archaeological_finds/models_finds.py:990 archaeological_finds/views.py:539 msgid "Manage basket" msgstr "" -#: archaeological_finds/models_finds.py:986 +#: archaeological_finds/models_finds.py:1002 #: archaeological_warehouse/models.py:1946 msgid "Add treatment" msgstr "" -#: archaeological_finds/models_finds.py:997 +#: archaeological_finds/models_finds.py:1013 msgid "Add treatment file" msgstr "" -#: archaeological_finds/models_finds.py:1152 +#: archaeological_finds/models_finds.py:1168 msgid "Operation (code)" msgstr "" -#: archaeological_finds/models_finds.py:1157 +#: archaeological_finds/models_finds.py:1173 msgid "Batch" msgstr "" -#: archaeological_finds/models_finds.py:1158 +#: archaeological_finds/models_finds.py:1174 msgid "Base find - Comment" msgstr "" -#: archaeological_finds/models_finds.py:1159 +#: archaeological_finds/models_finds.py:1175 msgid "Base find - Description" msgstr "" -#: archaeological_finds/models_finds.py:1161 +#: archaeological_finds/models_finds.py:1177 msgid "Base find - Topographic localisation" msgstr "" -#: archaeological_finds/models_finds.py:1163 +#: archaeological_finds/models_finds.py:1179 msgid "Base find - Special interest" msgstr "" -#: archaeological_finds/models_finds.py:1164 +#: archaeological_finds/models_finds.py:1180 msgid "Base find - Discovery date (exact or beginning)" msgstr "" -#: archaeological_finds/models_finds.py:1165 +#: archaeological_finds/models_finds.py:1181 msgid "Base find - Discovery date (end)" msgstr "" -#: archaeological_finds/models_finds.py:1194 +#: archaeological_finds/models_finds.py:1210 #: archaeological_operations/forms.py:479 #: archaeological_operations/forms.py:684 -#: archaeological_operations/forms.py:1655 -#: archaeological_operations/forms.py:1723 -#: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1089 -#: archaeological_operations/models.py:1401 ishtar_common/models.py:5342 +#: archaeological_operations/forms.py:1699 +#: archaeological_operations/forms.py:1767 +#: archaeological_operations/models.py:1113 +#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1518 ishtar_common/models.py:5342 #: ishtar_common/models_imports.py:1071 msgid "Operation type" msgstr "" -#: archaeological_finds/models_finds.py:1226 +#: archaeological_finds/models_finds.py:1242 msgid "Weight (kg)" msgstr "" -#: archaeological_finds/models_finds.py:1311 +#: archaeological_finds/models_finds.py:1327 msgctxt "key for text search" msgid "short-id" msgstr "" -#: archaeological_finds/models_finds.py:1315 +#: archaeological_finds/models_finds.py:1331 msgctxt "key for text search" msgid "complete-id" msgstr "" -#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_finds.py:1335 msgctxt "key for text search" msgid "free-id" msgstr "" -#: archaeological_finds/models_finds.py:1322 +#: archaeological_finds/models_finds.py:1338 msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1337 archaeological_finds/tests.py:1537 +#: archaeological_finds/models_finds.py:1353 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:1341 ishtar_common/models.py:4378 +#: archaeological_finds/models_finds.py:1357 ishtar_common/models.py:4378 msgctxt "key for text search" msgid "operation-type" msgstr "" -#: archaeological_finds/models_finds.py:1345 -#: archaeological_operations/models.py:389 -#: archaeological_operations/models.py:1158 ishtar_common/models.py:4427 +#: archaeological_finds/models_finds.py:1361 +#: archaeological_operations/models.py:474 +#: archaeological_operations/models.py:1275 ishtar_common/models.py:4427 msgctxt "key for text search" msgid "area" msgstr "" -#: archaeological_finds/models_finds.py:1354 +#: archaeological_finds/models_finds.py:1370 #: archaeological_warehouse/models.py:994 msgctxt "key for text search" msgid "site-name" msgstr "" -#: archaeological_finds/models_finds.py:1359 -#: archaeological_finds/models_finds.py:1895 +#: archaeological_finds/models_finds.py:1375 +#: archaeological_finds/models_finds.py:1915 #: archaeological_warehouse/models.py:999 msgctxt "key for text search" msgid "context-record-site" msgstr "" -#: archaeological_finds/models_finds.py:1364 +#: archaeological_finds/models_finds.py:1380 #: archaeological_warehouse/models.py:1004 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" -#: archaeological_finds/models_finds.py:1368 -#: archaeological_finds/models_finds.py:1890 +#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1910 #: archaeological_warehouse/models.py:1008 ishtar_common/models.py:4386 #: ishtar_common/models.py:4488 msgctxt "key for text search" msgid "context-record" msgstr "" -#: archaeological_finds/models_finds.py:1372 +#: archaeological_finds/models_finds.py:1388 msgctxt "key for text search" msgid "context-record-type" msgstr "" -#: archaeological_finds/models_finds.py:1376 +#: archaeological_finds/models_finds.py:1392 msgctxt "key for text search" msgid "discovery-comment" msgstr "" -#: archaeological_finds/models_finds.py:1384 +#: archaeological_finds/models_finds.py:1400 msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1388 archaeological_finds/tests.py:1444 +#: archaeological_finds/models_finds.py:1404 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:1393 +#: archaeological_finds/models_finds.py:1409 #: archaeological_warehouse/models.py:1024 msgctxt "key for text search" msgid "object-type" msgstr "" -#: archaeological_finds/models_finds.py:1397 +#: archaeological_finds/models_finds.py:1413 msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1401 archaeological_finds/tests.py:1691 +#: archaeological_finds/models_finds.py:1417 archaeological_finds/tests.py:1691 #: archaeological_warehouse/models.py:1032 msgctxt "key for text search" msgid "conservatory" msgstr "" -#: archaeological_finds/models_finds.py:1405 +#: archaeological_finds/models_finds.py:1421 #: archaeological_warehouse/models.py:1036 msgctxt "key for text search" msgid "integrity" msgstr "" -#: archaeological_finds/models_finds.py:1409 +#: archaeological_finds/models_finds.py:1425 #: archaeological_warehouse/models.py:1040 msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1416 +#: archaeological_finds/models_finds.py:1432 msgctxt "key for text search" msgid "batch" msgstr "" -#: archaeological_finds/models_finds.py:1420 +#: archaeological_finds/models_finds.py:1436 msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1424 ishtar_common/models.py:4409 +#: archaeological_finds/models_finds.py:1440 ishtar_common/models.py:4409 msgctxt "key for text search" msgid "container" msgstr "" -#: archaeological_finds/models_finds.py:1428 -#: archaeological_finds/models_finds.py:1893 +#: archaeological_finds/models_finds.py:1444 +#: archaeological_finds/models_finds.py:1913 #: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "location" msgstr "" -#: archaeological_finds/models_finds.py:1432 +#: archaeological_finds/models_finds.py:1448 msgctxt "key for text search" msgid "current-location" msgstr "" -#: archaeological_finds/models_finds.py:1436 +#: archaeological_finds/models_finds.py:1452 msgctxt "key for text search" msgid "current-container" msgstr "" -#: archaeological_finds/models_finds.py:1440 +#: archaeological_finds/models_finds.py:1456 #: archaeological_finds/wizards.py:462 msgctxt "key for text search" msgid "basket" msgstr "" -#: archaeological_finds/models_finds.py:1447 +#: archaeological_finds/models_finds.py:1463 msgctxt "key for text search" msgid "last-modified-by" msgstr "" -#: archaeological_finds/models_finds.py:1451 +#: archaeological_finds/models_finds.py:1467 #: ishtar_common/models_common.py:1577 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1454 archaeological_finds/tests.py:1770 +#: archaeological_finds/models_finds.py:1470 archaeological_finds/tests.py:1770 msgctxt "key for text search" msgid "loan" msgstr "" -#: archaeological_finds/models_finds.py:1456 +#: archaeological_finds/models_finds.py:1472 msgctxt "key for text search" msgid "treatment-file-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1460 +#: archaeological_finds/models_finds.py:1476 msgctxt "key for text search" msgid "treatment-end-date" msgstr "" -#: archaeological_finds/models_finds.py:1464 +#: archaeological_finds/models_finds.py:1480 msgctxt "key for text search" msgid "previous-id" msgstr "" -#: archaeological_finds/models_finds.py:1471 +#: archaeological_finds/models_finds.py:1487 msgctxt "key for text search" msgid "seal-number" msgstr "" -#: archaeological_finds/models_finds.py:1474 +#: archaeological_finds/models_finds.py:1490 msgctxt "key for text search" msgid "excavation-id" msgstr "" -#: archaeological_finds/models_finds.py:1478 +#: archaeological_finds/models_finds.py:1494 msgctxt "key for text search" msgid "museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1481 +#: archaeological_finds/models_finds.py:1497 msgctxt "key for text search" msgid "complete-museum-id" msgstr "" -#: archaeological_finds/models_finds.py:1484 +#: archaeological_finds/models_finds.py:1500 msgctxt "key for text search" msgid "laboratory-id" msgstr "" -#: archaeological_finds/models_finds.py:1488 +#: archaeological_finds/models_finds.py:1504 msgctxt "key for text search" msgid "mark" msgstr "" -#: archaeological_finds/models_finds.py:1491 +#: archaeological_finds/models_finds.py:1507 msgctxt "key for text search" msgid "discovery-date" msgstr "" -#: archaeological_finds/models_finds.py:1495 +#: archaeological_finds/models_finds.py:1511 msgctxt "key for text search" msgid "discovery-date-taq" msgstr "" -#: archaeological_finds/models_finds.py:1499 +#: archaeological_finds/models_finds.py:1515 msgctxt "key for text search" msgid "is-complete" msgstr "" -#: archaeological_finds/models_finds.py:1502 +#: archaeological_finds/models_finds.py:1518 msgctxt "key for text search" msgid "material-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1506 +#: archaeological_finds/models_finds.py:1522 msgctxt "key for text search" msgid "object-type-quality" msgstr "" -#: archaeological_finds/models_finds.py:1510 +#: archaeological_finds/models_finds.py:1526 msgctxt "key for text search" msgid "find-number" msgstr "" -#: archaeological_finds/models_finds.py:1513 +#: archaeological_finds/models_finds.py:1529 msgctxt "key for text search" msgid "min-number-of-individuals" msgstr "" -#: archaeological_finds/models_finds.py:1517 +#: archaeological_finds/models_finds.py:1533 msgctxt "key for text search" msgid "decoration" msgstr "" -#: archaeological_finds/models_finds.py:1520 +#: archaeological_finds/models_finds.py:1536 msgctxt "key for text search" msgid "inscription" msgstr "" -#: archaeological_finds/models_finds.py:1523 +#: archaeological_finds/models_finds.py:1539 msgctxt "key for text search" msgid "manufacturing-place" msgstr "" -#: archaeological_finds/models_finds.py:1527 +#: archaeological_finds/models_finds.py:1543 msgctxt "key for text search" msgid "communicabilities" msgstr "" -#: archaeological_finds/models_finds.py:1534 +#: archaeological_finds/models_finds.py:1550 msgctxt "key for text search" msgid "material-comment" msgstr "" -#: archaeological_finds/models_finds.py:1538 +#: archaeological_finds/models_finds.py:1554 msgctxt "key for text search" msgid "dating-comment" msgstr "" -#: archaeological_finds/models_finds.py:1542 +#: archaeological_finds/models_finds.py:1558 msgctxt "key for text search" msgid "conservatory-comment" msgstr "" -#: archaeological_finds/models_finds.py:1546 +#: archaeological_finds/models_finds.py:1562 msgctxt "key for text search" msgid "length" msgstr "" -#: archaeological_finds/models_finds.py:1549 +#: archaeological_finds/models_finds.py:1565 msgctxt "key for text search" msgid "width" msgstr "" -#: archaeological_finds/models_finds.py:1552 +#: archaeological_finds/models_finds.py:1568 msgctxt "key for text search" msgid "height" msgstr "" -#: archaeological_finds/models_finds.py:1555 +#: archaeological_finds/models_finds.py:1571 msgctxt "key for text search" msgid "thickness" msgstr "" -#: archaeological_finds/models_finds.py:1558 +#: archaeological_finds/models_finds.py:1574 msgctxt "key for text search" msgid "diameter" msgstr "" -#: archaeological_finds/models_finds.py:1561 +#: archaeological_finds/models_finds.py:1577 msgctxt "key for text search" msgid "circumference" msgstr "" -#: archaeological_finds/models_finds.py:1565 +#: archaeological_finds/models_finds.py:1581 msgctxt "key for text search" msgid "volume" msgstr "" -#: archaeological_finds/models_finds.py:1568 +#: archaeological_finds/models_finds.py:1584 msgctxt "key for text search" msgid "weight" msgstr "" -#: archaeological_finds/models_finds.py:1571 +#: archaeological_finds/models_finds.py:1587 msgctxt "key for text search" msgid "clutter-long-side" msgstr "" -#: archaeological_finds/models_finds.py:1575 +#: archaeological_finds/models_finds.py:1591 msgctxt "key for text search" msgid "clutter-short-side" msgstr "" -#: archaeological_finds/models_finds.py:1579 +#: archaeological_finds/models_finds.py:1595 msgctxt "key for text search" msgid "clutter-height" msgstr "" -#: archaeological_finds/models_finds.py:1583 +#: archaeological_finds/models_finds.py:1599 msgctxt "key for text search" msgid "dimensions-comment" msgstr "" -#: archaeological_finds/models_finds.py:1587 +#: archaeological_finds/models_finds.py:1603 +msgctxt "key for text search" +msgid "discovery-method" +msgstr "" + +#: archaeological_finds/models_finds.py:1607 msgctxt "key for text search" msgid "topographic-localisation" msgstr "" -#: archaeological_finds/models_finds.py:1591 +#: archaeological_finds/models_finds.py:1611 msgctxt "key for text search" msgid "check-date" msgstr "" -#: archaeological_finds/models_finds.py:1594 +#: archaeological_finds/models_finds.py:1614 #: archaeological_warehouse/models.py:1044 msgctxt "key for text search" msgid "alterations" msgstr "" -#: archaeological_finds/models_finds.py:1598 +#: archaeological_finds/models_finds.py:1618 #: archaeological_warehouse/models.py:1048 msgctxt "key for text search" msgid "alteration-causes" msgstr "" -#: archaeological_finds/models_finds.py:1602 +#: archaeological_finds/models_finds.py:1622 #: archaeological_warehouse/models.py:1052 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" -#: archaeological_finds/models_finds.py:1606 +#: archaeological_finds/models_finds.py:1626 msgctxt "key for text search" msgid "estimated-value" msgstr "" -#: archaeological_finds/models_finds.py:1610 +#: archaeological_finds/models_finds.py:1630 msgctxt "key for text search" msgid "insurance-value" msgstr "" -#: archaeological_finds/models_finds.py:1614 +#: archaeological_finds/models_finds.py:1634 msgctxt "key for text search" msgid "appraisal-date" msgstr "" -#: archaeological_finds/models_finds.py:1622 +#: archaeological_finds/models_finds.py:1642 msgctxt "key for text search" msgid "functional-area" msgstr "" -#: archaeological_finds/models_finds.py:1626 +#: archaeological_finds/models_finds.py:1646 msgctxt "key for text search" msgid "technical-area" msgstr "" -#: archaeological_finds/models_finds.py:1630 +#: archaeological_finds/models_finds.py:1650 msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1634 archaeological_finds/tests.py:1631 +#: archaeological_finds/models_finds.py:1654 archaeological_finds/tests.py:1631 msgctxt "key for text search" msgid "operation-address" msgstr "" -#: archaeological_finds/models_finds.py:1642 -#: archaeological_operations/models.py:1188 +#: archaeological_finds/models_finds.py:1662 +#: archaeological_operations/models.py:1305 msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1646 archaeological_finds/tests.py:1557 -#: archaeological_operations/models.py:1193 +#: archaeological_finds/models_finds.py:1666 archaeological_finds/tests.py:1557 +#: archaeological_operations/models.py:1310 #: archaeological_operations/tests.py:2934 #: archaeological_operations/tests.py:3431 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1654 +#: archaeological_finds/models_finds.py:1674 msgctxt "key for text search" msgid "operation-remain" msgstr "" -#: archaeological_finds/models_finds.py:1658 +#: archaeological_finds/models_finds.py:1678 msgctxt "key for text search" msgid "site-remain" msgstr "" -#: archaeological_finds/models_finds.py:1662 +#: archaeological_finds/models_finds.py:1682 msgctxt "key for text search" msgid "museum-id-comment" msgstr "" -#: archaeological_finds/models_finds.py:1666 +#: archaeological_finds/models_finds.py:1686 msgctxt "key for text search" msgid "museum-owner-institution" msgstr "" -#: archaeological_finds/models_finds.py:1671 +#: archaeological_finds/models_finds.py:1691 msgctxt "key for text search" msgid "museum-assigned-institution" msgstr "" -#: archaeological_finds/models_finds.py:1676 +#: archaeological_finds/models_finds.py:1696 msgctxt "key for text search" msgid "museum-custodian-institution" msgstr "" -#: archaeological_finds/models_finds.py:1681 +#: archaeological_finds/models_finds.py:1701 msgctxt "key for text search" msgid "museum-depositor-inventory-number" msgstr "" -#: archaeological_finds/models_finds.py:1685 +#: archaeological_finds/models_finds.py:1705 msgctxt "key for text search" msgid "museum-collection-entry-mode" msgstr "" -#: archaeological_finds/models_finds.py:1689 +#: archaeological_finds/models_finds.py:1709 msgctxt "key for text search" msgid "museum-entry-mode-comment" msgstr "" -#: archaeological_finds/models_finds.py:1693 +#: archaeological_finds/models_finds.py:1713 msgctxt "key for text search" msgid "museum-entry-date" msgstr "" -#: archaeological_finds/models_finds.py:1697 +#: archaeological_finds/models_finds.py:1717 msgctxt "key for text search" msgid "museum-entry-date-end" msgstr "" -#: archaeological_finds/models_finds.py:1701 +#: archaeological_finds/models_finds.py:1721 msgctxt "key for text search" msgid "museum-entry-date-comment" msgstr "" -#: archaeological_finds/models_finds.py:1705 +#: archaeological_finds/models_finds.py:1725 msgctxt "key for text search" msgid "museum-donor" msgstr "" -#: archaeological_finds/models_finds.py:1710 +#: archaeological_finds/models_finds.py:1730 msgctxt "key for text search" msgid "museum-inventory-marking-presence" msgstr "" -#: archaeological_finds/models_finds.py:1714 +#: archaeological_finds/models_finds.py:1734 msgctxt "key for text search" msgid "museum-marking-type" msgstr "" -#: archaeological_finds/models_finds.py:1718 +#: archaeological_finds/models_finds.py:1738 msgctxt "key for text search" msgid "museum-collection" msgstr "" -#: archaeological_finds/models_finds.py:1723 +#: archaeological_finds/models_finds.py:1743 msgctxt "key for text search" msgid "museum-former-collection" msgstr "" -#: archaeological_finds/models_finds.py:1728 +#: archaeological_finds/models_finds.py:1748 msgctxt "key for text search" msgid "museum-inventory-entry-year" msgstr "" -#: archaeological_finds/models_finds.py:1732 +#: archaeological_finds/models_finds.py:1752 msgctxt "key for text search" msgid "museum-inventory-conformity" msgstr "" -#: archaeological_finds/models_finds.py:1737 +#: archaeological_finds/models_finds.py:1757 msgctxt "key for text search" msgid "museum-conformity-comment" msgstr "" -#: archaeological_finds/models_finds.py:1741 +#: archaeological_finds/models_finds.py:1761 msgctxt "key for text search" msgid "museum-inventory-transcript" msgstr "" -#: archaeological_finds/models_finds.py:1745 +#: archaeological_finds/models_finds.py:1765 msgctxt "key for text search" msgid "museum-original-repro" msgstr "" -#: archaeological_finds/models_finds.py:1750 +#: archaeological_finds/models_finds.py:1770 msgctxt "key for text search" msgid "museum-allocation-date" msgstr "" -#: archaeological_finds/models_finds.py:1754 +#: archaeological_finds/models_finds.py:1774 msgctxt "key for text search" msgid "museum-purchase-price" msgstr "" -#: archaeological_finds/models_finds.py:1758 +#: archaeological_finds/models_finds.py:1778 msgctxt "key for text search" msgid "museum-inventory-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1762 +#: archaeological_finds/models_finds.py:1782 msgctxt "key for text search" msgid "museum-observed-quantity" msgstr "" -#: archaeological_finds/models_finds.py:1869 -#: archaeological_finds/models_finds.py:2668 +#: archaeological_finds/models_finds.py:1889 +#: archaeological_finds/models_finds.py:2688 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1276 archaeological_warehouse/forms.py:696 #: archaeological_warehouse/views.py:304 ishtar_common/models.py:4526 @@ -5717,19 +5795,19 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1877 +#: archaeological_finds/models_finds.py:1897 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:2018 +#: archaeological_finds/models_finds.py:2038 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:2020 +#: archaeological_finds/models_finds.py:2040 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2055 #: archaeological_finds/templates/ishtar/sheet_find.html:427 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:445 #: cd17_app/templates/ishtar/sheet_find.html:424 @@ -5740,7 +5818,7 @@ msgstr "" msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2042 +#: archaeological_finds/models_finds.py:2062 #: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:483 #: cd17_app/templates/ishtar/sheet_find.html:462 @@ -5751,108 +5829,108 @@ msgstr "" msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:2060 +#: archaeological_finds/models_finds.py:2080 msgid "Container - first full location" msgstr "" -#: archaeological_finds/models_finds.py:2061 -#: archaeological_finds/models_finds.py:2073 +#: archaeological_finds/models_finds.py:2081 +#: archaeological_finds/models_finds.py:2093 msgid "Updated as long as no packaging is attached" msgstr "" -#: archaeological_finds/models_finds.py:2072 +#: archaeological_finds/models_finds.py:2092 msgid "Reference container - first full location" msgstr "" -#: archaeological_finds/models_finds.py:2124 +#: archaeological_finds/models_finds.py:2144 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2127 +#: archaeological_finds/models_finds.py:2147 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2130 +#: archaeological_finds/models_finds.py:2150 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:2153 +#: archaeological_finds/models_finds.py:2173 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2224 msgid "Former collection" msgstr "" -#: archaeological_finds/models_finds.py:2276 +#: archaeological_finds/models_finds.py:2296 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2286 +#: archaeological_finds/models_finds.py:2306 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2292 +#: archaeological_finds/models_finds.py:2312 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2332 +#: archaeological_finds/models_finds.py:2352 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2506 +#: archaeological_finds/models_finds.py:2526 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2507 +#: archaeological_finds/models_finds.py:2527 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2508 +#: archaeological_finds/models_finds.py:2528 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2509 +#: archaeological_finds/models_finds.py:2529 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2510 +#: archaeological_finds/models_finds.py:2530 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2641 +#: archaeological_finds/models_finds.py:2661 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2649 +#: archaeological_finds/models_finds.py:2669 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2657 +#: archaeological_finds/models_finds.py:2677 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:3135 +#: archaeological_finds/models_finds.py:3155 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3141 +#: archaeological_finds/models_finds.py:3161 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3631 +#: archaeological_finds/models_finds.py:3651 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Current" msgstr "" -#: archaeological_finds/models_finds.py:3632 +#: archaeological_finds/models_finds.py:3652 #: archaeological_finds/models_treatments.py:1198 #: archaeological_finds/templates/ishtar/sheet_find.html:420 #: archaeological_operations/forms.py:1101 #: archaeological_operations/forms.py:1198 -#: archaeological_operations/forms.py:1316 -#: archaeological_operations/forms.py:1773 -#: archaeological_operations/models.py:500 +#: archaeological_operations/forms.py:1341 +#: archaeological_operations/forms.py:1817 +#: archaeological_operations/models.py:597 #: archaeological_warehouse/forms.py:343 #: archaeological_warehouse/models.py:2103 ishtar_common/forms_common.py:2150 #: ishtar_common/forms_common.py:2438 ishtar_common/forms_common.py:2684 @@ -5861,28 +5939,28 @@ msgstr "" msgid "Reference" msgstr "" -#: archaeological_finds/models_finds.py:3633 +#: archaeological_finds/models_finds.py:3653 #: archaeological_finds/templates/ishtar/sheet_find.html:414 msgid "Reference/current" msgstr "" -#: archaeological_finds/models_finds.py:3653 +#: archaeological_finds/models_finds.py:3673 msgid "Full location" msgstr "" -#: archaeological_finds/models_finds.py:3654 +#: archaeological_finds/models_finds.py:3674 msgid "Location type" msgstr "" -#: archaeological_finds/models_finds.py:3658 +#: archaeological_finds/models_finds.py:3678 msgid "Find - Treatment" msgstr "" -#: archaeological_finds/models_finds.py:3659 +#: archaeological_finds/models_finds.py:3679 msgid "Find - Treatments" msgstr "" -#: archaeological_finds/models_finds.py:3696 ishtar_common/forms_common.py:127 +#: archaeological_finds/models_finds.py:3716 ishtar_common/forms_common.py:127 #: ishtar_common/forms_common.py:1424 ishtar_common/forms_common.py:2836 #: ishtar_common/ishtar_menu.py:38 ishtar_common/models.py:2954 #: ishtar_common/models.py:3273 ishtar_common/models.py:3371 @@ -5892,11 +5970,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3704 +#: archaeological_finds/models_finds.py:3724 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3705 +#: archaeological_finds/models_finds.py:3725 msgid "Properties" msgstr "" @@ -5931,7 +6009,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:168 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2830 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "index" @@ -6102,13 +6180,13 @@ msgstr "" msgid "Internal ID" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:26 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:27 #: man_app/templates/ishtar/sheet_basefind.html:23 #: sra_idf_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:29 +#: archaeological_finds/templates/ishtar/sheet_basefind.html:30 #: man_app/templates/ishtar/sheet_basefind.html:26 #: sra_idf_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery year" @@ -6435,8 +6513,8 @@ msgstr "" #: ishtar_common/forms.py:1211 ishtar_common/forms.py:1290 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:664 ishtar_common/views_item.py:936 -#: ishtar_common/views_item.py:973 ishtar_common/wizards.py:502 +#: ishtar_common/views_item.py:672 ishtar_common/views_item.py:944 +#: ishtar_common/views_item.py:981 ishtar_common/wizards.py:502 msgid "Yes" msgstr "" @@ -6542,7 +6620,7 @@ msgstr "" #: archaeological_operations/forms.py:1043 #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1065 -#: archaeological_operations/models.py:3198 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/sheet_operation.html:533 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 #: na_app/templates/ishtar/sheet_operation.html:501 @@ -6551,20 +6629,20 @@ msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:77 -#: archaeological_operations/models.py:3180 +#: archaeological_operations/models.py:3297 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:80 -#: archaeological_operations/models.py:3182 +#: archaeological_operations/models.py:3299 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:82 -#: archaeological_operations/models.py:3184 -#: archaeological_operations/models.py:3212 -#: archaeological_operations/models.py:3280 +#: archaeological_operations/models.py:3301 +#: archaeological_operations/models.py:3329 +#: archaeological_operations/models.py:3397 msgid "Public domain" msgstr "" @@ -6618,26 +6696,26 @@ msgstr "" #: archaeological_operations/forms.py:461 #: archaeological_operations/forms.py:911 -#: archaeological_operations/models.py:1389 -#: archaeological_operations/models.py:2061 +#: archaeological_operations/models.py:1506 +#: archaeological_operations/models.py:2178 msgid "Yearly index" msgstr "" #: archaeological_operations/forms.py:468 #: archaeological_operations/forms.py:702 -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1549 msgid "Old code" msgstr "" #: archaeological_operations/forms.py:470 #: archaeological_operations/forms.py:683 -#: archaeological_operations/models.py:1531 +#: archaeological_operations/models.py:1648 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:478 #: archaeological_operations/forms.py:688 -#: archaeological_operations/models.py:1472 +#: archaeological_operations/models.py:1589 #: archaeological_operations/templates/ishtar/sheet_operation.html:158 msgid "Address / Locality" msgstr "" @@ -6648,35 +6726,35 @@ msgstr "" #: archaeological_operations/forms.py:488 #: archaeological_operations/forms.py:739 -#: archaeological_operations/models.py:1378 -#: archaeological_operations/models.py:2850 +#: archaeological_operations/models.py:1495 +#: archaeological_operations/models.py:2967 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:728 -#: archaeological_operations/forms.py:1659 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/forms.py:1703 +#: archaeological_operations/models.py:1488 msgid "Operator" msgstr "" #: archaeological_operations/forms.py:504 #: archaeological_operations/forms.py:736 -#: archaeological_operations/models.py:1469 +#: archaeological_operations/models.py:1586 msgid "Operator reference" msgstr "" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:1109 -#: archaeological_operations/forms.py:1204 -#: archaeological_operations/forms.py:1324 -#: archaeological_operations/forms.py:1825 -#: archaeological_operations/models.py:306 -#: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1000 -#: archaeological_operations/models.py:1092 -#: archaeological_operations/models.py:1406 +#: archaeological_operations/forms.py:1208 +#: archaeological_operations/forms.py:1365 +#: archaeological_operations/forms.py:1869 +#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:376 +#: archaeological_operations/models.py:603 +#: archaeological_operations/models.py:1117 +#: archaeological_operations/models.py:1209 +#: archaeological_operations/models.py:1523 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -6687,26 +6765,26 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:795 -#: archaeological_operations/models.py:1475 +#: archaeological_operations/models.py:1592 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:516 #: archaeological_operations/forms.py:797 -#: archaeological_operations/models.py:1002 -#: archaeological_operations/models.py:1510 +#: archaeological_operations/models.py:1119 +#: archaeological_operations/models.py:1627 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:517 #: archaeological_operations/forms.py:757 -#: archaeological_operations/models.py:1427 +#: archaeological_operations/models.py:1544 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:519 #: archaeological_operations/forms.py:710 -#: archaeological_operations/models.py:1501 +#: archaeological_operations/models.py:1618 msgid "Virtual operation" msgstr "" @@ -6716,16 +6794,16 @@ msgstr "" #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:780 -#: archaeological_operations/forms.py:1667 -#: archaeological_operations/models.py:1003 -#: archaeological_operations/models.py:1521 +#: archaeological_operations/forms.py:1711 +#: archaeological_operations/models.py:1120 +#: archaeological_operations/models.py:1638 msgid "Documentation provided" msgstr "" #: archaeological_operations/forms.py:543 #: archaeological_operations/forms.py:782 -#: archaeological_operations/forms.py:1671 -#: archaeological_operations/models.py:1516 +#: archaeological_operations/forms.py:1715 +#: archaeological_operations/models.py:1633 #: archaeological_operations/templates/ishtar/sheet_operation.html:254 msgid "Documentation deposit date" msgstr "" @@ -6736,16 +6814,16 @@ msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:788 -#: archaeological_operations/forms.py:1674 -#: archaeological_operations/models.py:1004 -#: archaeological_operations/models.py:1527 +#: archaeological_operations/forms.py:1718 +#: archaeological_operations/models.py:1121 +#: archaeological_operations/models.py:1644 msgid "Finds provided" msgstr "" #: archaeological_operations/forms.py:550 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1678 -#: archaeological_operations/models.py:1523 +#: archaeological_operations/forms.py:1722 +#: archaeological_operations/models.py:1640 #: archaeological_operations/templates/ishtar/sheet_operation.html:262 msgid "Finds deposit date" msgstr "" @@ -6763,8 +6841,8 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:686 -#: archaeological_operations/forms.py:1721 -#: archaeological_operations/models.py:1471 +#: archaeological_operations/forms.py:1765 +#: archaeological_operations/models.py:1588 msgid "Generic name" msgstr "" @@ -6773,17 +6851,17 @@ msgid "Actors" msgstr "" #: archaeological_operations/forms.py:715 -#: archaeological_operations/models.py:1362 -#: archaeological_operations/models.py:2868 +#: archaeological_operations/models.py:1479 +#: archaeological_operations/models.py:2985 msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:750 -#: archaeological_operations/forms.py:1331 -#: archaeological_operations/forms.py:1681 -#: archaeological_operations/forms.py:1814 -#: archaeological_operations/models.py:523 -#: archaeological_operations/models.py:1385 +#: archaeological_operations/forms.py:1346 +#: archaeological_operations/forms.py:1725 +#: archaeological_operations/forms.py:1858 +#: archaeological_operations/models.py:640 +#: archaeological_operations/models.py:1502 msgid "Collaborators" msgstr "" @@ -6792,31 +6870,32 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:755 -#: archaeological_operations/models.py:1356 +#: archaeological_operations/models.py:1473 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:777 -#: archaeological_operations/models.py:1518 +#: archaeological_operations/models.py:1635 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1525 +#: archaeological_operations/models.py:1642 msgid "Deadline for submission of the finds" msgstr "" #: archaeological_operations/forms.py:793 +#: archaeological_operations/forms.py:1353 msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:800 -#: archaeological_operations/models.py:90 ishtar_common/models_imports.py:1074 +#: archaeological_operations/models.py:92 ishtar_common/models_imports.py:1074 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:806 -#: archaeological_operations/models.py:1515 +#: archaeological_operations/models.py:1632 msgid "Abstract" msgstr "" @@ -6852,12 +6931,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:956 -#: archaeological_operations/models.py:1534 +#: archaeological_operations/models.py:1651 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:959 -#: archaeological_operations/models.py:1536 +#: archaeological_operations/models.py:1653 msgid "Official report number" msgstr "" @@ -6866,12 +6945,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:971 -#: archaeological_operations/models.py:1548 +#: archaeological_operations/models.py:1665 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:977 -#: archaeological_operations/models.py:1556 +#: archaeological_operations/models.py:1673 msgid "Writer of the minutes" msgstr "" @@ -6884,22 +6963,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:986 -#: archaeological_operations/models.py:1411 +#: archaeological_operations/models.py:1528 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1415 +#: archaeological_operations/models.py:1532 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:989 -#: archaeological_operations/models.py:1419 +#: archaeological_operations/models.py:1536 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:991 -#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:1540 msgid "Effective man-days" msgstr "" @@ -6912,17 +6991,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1443 +#: archaeological_operations/models.py:1560 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1009 -#: archaeological_operations/models.py:1447 +#: archaeological_operations/models.py:1564 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1012 -#: archaeological_operations/models.py:1450 +#: archaeological_operations/models.py:1567 msgid "Prescription on geoarchaeological context" msgstr "" @@ -6943,8 +7022,8 @@ msgid "Operation - 050 - Parcels (2)" msgstr "" #: archaeological_operations/forms.py:1134 -#: archaeological_operations/forms.py:1362 -#: archaeological_operations/forms.py:1793 +#: archaeological_operations/forms.py:1413 +#: archaeological_operations/forms.py:1837 msgid "This reference already exists." msgstr "" @@ -6960,150 +7039,200 @@ msgstr "" msgid "Archaeological site - 001 - Search" msgstr "" +#: archaeological_operations/forms.py:1203 +#: archaeological_operations/forms.py:1355 +#: archaeological_operations/models.py:600 +#: archaeological_operations/templates/ishtar/sheet_site.html:44 +#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 +msgid "Types" +msgstr "" + +#: archaeological_operations/forms.py:1206 +#: archaeological_operations/forms.py:1372 +#: archaeological_operations/models.py:619 +#: archaeological_operations/templates/ishtar/sheet_site.html:52 +msgid "Discoverer" +msgstr "" + +#: archaeological_operations/forms.py:1211 +#: archaeological_operations/forms.py:1359 +#: archaeological_operations/models.py:616 +#: archaeological_operations/templates/ishtar/sheet_site.html:45 +msgid "Discovery status" +msgstr "" + #: archaeological_operations/forms.py:1212 +#: archaeological_operations/forms.py:1360 +#: archaeological_operations/models.py:612 +#: archaeological_operations/templates/ishtar/sheet_site.html:46 +msgid "Current status" +msgstr "" + +#: archaeological_operations/forms.py:1213 +#: archaeological_operations/forms.py:1357 +#: archaeological_operations/models.py:621 +#: archaeological_operations/templates/ishtar/sheet_site.html:47 +msgid "Nature of site" +msgstr "" + +#: archaeological_operations/forms.py:1214 +#: archaeological_operations/forms.py:1358 +#: archaeological_operations/models.py:624 +#: archaeological_operations/templates/ishtar/sheet_site.html:48 +msgid "Interpretation level" +msgstr "" + +#: archaeological_operations/forms.py:1221 msgid "Top operation" msgstr "" -#: archaeological_operations/forms.py:1224 -#: archaeological_operations/forms.py:1335 -#: archaeological_operations/models.py:515 +#: archaeological_operations/forms.py:1232 +#: archaeological_operations/forms.py:1378 +#: archaeological_operations/models.py:630 +#: archaeological_operations/templates/ishtar/sheet_site.html:86 +msgid "Precise locality" +msgstr "" + +#: archaeological_operations/forms.py:1235 +#: archaeological_operations/forms.py:1382 +#: archaeological_operations/models.py:632 msgid "National Geographic Institute locality" msgstr "" -#: archaeological_operations/forms.py:1227 -#: archaeological_operations/forms.py:1339 -#: archaeological_operations/models.py:518 +#: archaeological_operations/forms.py:1238 +#: archaeological_operations/forms.py:1386 +#: archaeological_operations/models.py:635 msgid "Cadastral locality" msgstr "" -#: archaeological_operations/forms.py:1231 -#: archaeological_operations/forms.py:1383 -#: archaeological_operations/models.py:535 +#: archaeological_operations/forms.py:1242 +#: archaeological_operations/forms.py:1427 +#: archaeological_operations/models.py:652 msgid "AffMar number" msgstr "" -#: archaeological_operations/forms.py:1233 -#: archaeological_operations/forms.py:1385 -#: archaeological_operations/models.py:538 +#: archaeological_operations/forms.py:1244 +#: archaeological_operations/forms.py:1429 +#: archaeological_operations/models.py:655 msgid "DRASSM number" msgstr "" -#: archaeological_operations/forms.py:1235 -#: archaeological_operations/forms.py:1387 -#: archaeological_operations/models.py:527 +#: archaeological_operations/forms.py:1246 +#: archaeological_operations/forms.py:1431 +#: archaeological_operations/models.py:644 msgid "Shipwreck name" msgstr "" -#: archaeological_operations/forms.py:1238 -#: archaeological_operations/forms.py:1395 -#: archaeological_operations/models.py:529 +#: archaeological_operations/forms.py:1249 +#: archaeological_operations/forms.py:1439 +#: archaeological_operations/models.py:646 msgid "Oceanographic service localisation" msgstr "" -#: archaeological_operations/forms.py:1241 -#: archaeological_operations/forms.py:1389 -#: archaeological_operations/models.py:531 +#: archaeological_operations/forms.py:1252 +#: archaeological_operations/forms.py:1433 +#: archaeological_operations/models.py:648 msgid "Shipwreck code" msgstr "" -#: archaeological_operations/forms.py:1243 -#: archaeological_operations/forms.py:1391 -#: archaeological_operations/models.py:532 +#: archaeological_operations/forms.py:1254 +#: archaeological_operations/forms.py:1435 +#: archaeological_operations/models.py:649 msgid "Sinking date" msgstr "" -#: archaeological_operations/forms.py:1245 -#: archaeological_operations/forms.py:1393 -#: archaeological_operations/models.py:533 +#: archaeological_operations/forms.py:1256 +#: archaeological_operations/forms.py:1437 +#: archaeological_operations/models.py:650 msgid "Discovery area" msgstr "" -#: archaeological_operations/forms.py:1307 +#: archaeological_operations/forms.py:1323 msgid "Archaeological site - 010 - General" msgstr "" -#: archaeological_operations/forms.py:1369 -msgid "Archaeological site - 020 - Towns" +#: archaeological_operations/forms.py:1373 +msgid "Localization" msgstr "" -#: archaeological_operations/forms.py:1378 -#: archaeological_operations/templates/ishtar/sheet_site.html:52 +#: archaeological_operations/forms.py:1422 +#: archaeological_operations/templates/ishtar/sheet_site.html:60 msgid "Underwater" msgstr "" -#: archaeological_operations/forms.py:1379 +#: archaeological_operations/forms.py:1423 msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1446 -#: archaeological_operations/views.py:760 +#: archaeological_operations/forms.py:1490 +#: archaeological_operations/views.py:758 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1461 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1505 +#: archaeological_operations/forms.py:1607 +#: archaeological_operations/forms.py:1674 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1471 -#: archaeological_operations/models.py:2875 +#: archaeological_operations/forms.py:1515 +#: archaeological_operations/models.py:2992 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1489 +#: archaeological_operations/forms.py:1533 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1523 +#: archaeological_operations/forms.py:1567 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1527 +#: archaeological_operations/forms.py:1571 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1540 +#: archaeological_operations/forms.py:1584 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1545 ishtar_common/forms.py:1334 +#: archaeological_operations/forms.py:1589 ishtar_common/forms.py:1334 #: ishtar_common/models.py:2057 msgid "Template" msgstr "" -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1573 +#: archaeological_operations/forms.py:1613 +#: archaeological_operations/forms.py:1617 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1591 +#: archaeological_operations/forms.py:1635 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1593 +#: archaeological_operations/forms.py:1637 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1614 +#: archaeological_operations/forms.py:1658 #: archaeological_operations/ishtar_menu.py:112 -#: archaeological_operations/views.py:871 +#: archaeological_operations/views.py:869 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1635 +#: archaeological_operations/forms.py:1679 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1748 +#: archaeological_operations/forms.py:1792 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1804 +#: archaeological_operations/forms.py:1848 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -7111,627 +7240,706 @@ msgstr "" msgid "Administrative Act" msgstr "" -#: archaeological_operations/models.py:91 +#: archaeological_operations/models.py:93 msgid "Remain types" msgstr "" -#: archaeological_operations/models.py:105 +#: archaeological_operations/models.py:107 msgid "Parent period" msgstr "" -#: archaeological_operations/models.py:112 +#: archaeological_operations/models.py:114 msgid "Type Period" msgstr "" -#: archaeological_operations/models.py:113 +#: archaeological_operations/models.py:115 msgid "Types Period" msgstr "" -#: archaeological_operations/models.py:128 +#: archaeological_operations/models.py:130 msgid "Type of report state" msgstr "" -#: archaeological_operations/models.py:129 +#: archaeological_operations/models.py:131 msgid "Types of report state" msgstr "" -#: archaeological_operations/models.py:146 +#: archaeological_operations/models.py:141 +msgid "Current status type" +msgstr "" + +#: archaeological_operations/models.py:142 +msgid "Current status types" +msgstr "" + +#: archaeological_operations/models.py:152 +msgid "Discovery status type" +msgstr "" + +#: archaeological_operations/models.py:153 +msgid "Discovery status types" +msgstr "" + +#: archaeological_operations/models.py:163 +msgid "Nature of site type" +msgstr "" + +#: archaeological_operations/models.py:164 +msgid "Nature of site types" +msgstr "" + +#: archaeological_operations/models.py:174 +msgid "Interpretation level type" +msgstr "" + +#: archaeological_operations/models.py:175 +msgid "Interpretation level types" +msgstr "" + +#: archaeological_operations/models.py:187 msgid "Type of record quality" msgstr "" -#: archaeological_operations/models.py:147 +#: archaeological_operations/models.py:188 msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:155 ishtar_common/models_imports.py:1070 +#: archaeological_operations/models.py:200 ishtar_common/models_imports.py:1070 msgid "Cultural attribution type" msgstr "" -#: archaeological_operations/models.py:156 +#: archaeological_operations/models.py:201 msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:211 +msgid "Site type" +msgstr "" + +#: archaeological_operations/models.py:212 +msgid "Site types" +msgstr "" + +#: archaeological_operations/models.py:449 +msgctxt "key for text search" +msgid "discovery-status" +msgstr "" + +#: archaeological_operations/models.py:453 +msgctxt "key for text search" +msgid "current-status" +msgstr "" + +#: archaeological_operations/models.py:457 +msgctxt "key for text search" +msgid "nature" +msgstr "" + +#: archaeological_operations/models.py:461 +msgctxt "key for text search" +msgid "interpretation-level" +msgstr "" + +#: archaeological_operations/models.py:468 +#: archaeological_operations/models.py:1315 #: archaeological_operations/tests.py:3156 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:395 +#: archaeological_operations/models.py:480 +msgctxt "key for text search" +msgid "discoverer" +msgstr "" + +#: archaeological_operations/models.py:483 +msgctxt "key for text search" +msgid "public-description" +msgstr "" + +#: archaeological_operations/models.py:489 +msgctxt "key for text search" +msgid "locality" +msgstr "" + +#: archaeological_operations/models.py:492 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:398 +#: archaeological_operations/models.py:495 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:402 +#: archaeological_operations/models.py:499 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:406 +#: archaeological_operations/models.py:503 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:410 +#: archaeological_operations/models.py:507 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:414 +#: archaeological_operations/models.py:511 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:417 +#: archaeological_operations/models.py:514 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:425 +#: archaeological_operations/models.py:522 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:429 +#: archaeological_operations/models.py:526 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:433 +#: archaeological_operations/models.py:530 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:581 msgid "Create associated operation" msgstr "" -#: archaeological_operations/models.py:553 -#: archaeological_operations/models.py:1569 +#: archaeological_operations/models.py:670 +#: archaeological_operations/models.py:1686 #: archaeological_warehouse/models.py:449 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:565 -#: archaeological_operations/models.py:1581 +#: archaeological_operations/models.py:682 +#: archaeological_operations/models.py:1698 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:575 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:692 +#: archaeological_operations/models.py:1607 #: 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:595 +#: archaeological_operations/models.py:712 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:647 +#: archaeological_operations/models.py:764 msgid "Create an operation associated to this site" msgstr "" -#: archaeological_operations/models.py:649 +#: archaeological_operations/models.py:766 msgid "ope." msgstr "" -#: archaeological_operations/models.py:659 +#: archaeological_operations/models.py:776 msgid "Create a cluster operation for site associated to many operations" msgstr "" -#: archaeological_operations/models.py:661 +#: archaeological_operations/models.py:778 msgid "top ope." msgstr "" -#: archaeological_operations/models.py:814 ishtar_common/forms.py:1210 +#: archaeological_operations/models.py:931 ishtar_common/forms.py:1210 #: ishtar_common/models.py:5470 ishtar_common/models.py:5631 -#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1817 +#: ishtar_common/models.py:5691 ishtar_common/views_item.py:1825 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:816 +#: archaeological_operations/models.py:933 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1071 +#: archaeological_operations/models.py:1188 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1072 +#: archaeological_operations/models.py:1189 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1073 +#: archaeological_operations/models.py:1190 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1074 +#: archaeological_operations/models.py:1191 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1075 +#: archaeological_operations/models.py:1192 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1076 +#: archaeological_operations/models.py:1193 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1077 +#: archaeological_operations/models.py:1194 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1078 +#: archaeological_operations/models.py:1195 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1079 +#: archaeological_operations/models.py:1196 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1080 +#: archaeological_operations/models.py:1197 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1081 +#: archaeological_operations/models.py:1198 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1082 +#: archaeological_operations/models.py:1199 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1087 +#: archaeological_operations/models.py:1204 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1144 +#: archaeological_operations/models.py:1261 msgctxt "key for text search" msgid "yearly-index" msgstr "" -#: archaeological_operations/models.py:1147 +#: archaeological_operations/models.py:1264 msgctxt "key for text search" msgid "operation-old-code" msgstr "" -#: archaeological_operations/models.py:1173 +#: archaeological_operations/models.py:1290 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1180 +#: archaeological_operations/models.py:1297 #: archaeological_operations/tests.py:3168 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1300 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1204 +#: archaeological_operations/models.py:1321 msgctxt "key for text search" msgid "start" msgstr "" -#: archaeological_operations/models.py:1207 +#: archaeological_operations/models.py:1324 msgctxt "key for text search" msgid "end" msgstr "" -#: archaeological_operations/models.py:1211 +#: archaeological_operations/models.py:1328 #: archaeological_operations/tests.py:3211 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1217 +#: archaeological_operations/models.py:1334 msgctxt "key for text search" msgid "operator-reference" msgstr "" -#: archaeological_operations/models.py:1220 +#: archaeological_operations/models.py:1337 msgctxt "key for text search" msgid "has-archeo-file" msgstr "" -#: archaeological_operations/models.py:1224 +#: archaeological_operations/models.py:1341 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1227 +#: archaeological_operations/models.py:1344 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1231 +#: archaeological_operations/models.py:1348 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1235 +#: archaeological_operations/models.py:1352 #: archaeological_operations/tests.py:3258 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1239 +#: archaeological_operations/models.py:1356 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1248 +#: archaeological_operations/models.py:1365 msgctxt "key for text search" msgid "documentation-deposit-date" msgstr "" -#: archaeological_operations/models.py:1252 +#: archaeological_operations/models.py:1369 msgctxt "key for text search" msgid "documentation-provided" msgstr "" -#: archaeological_operations/models.py:1256 +#: archaeological_operations/models.py:1373 msgctxt "key for text search" msgid "documentation-deadline" msgstr "" -#: archaeological_operations/models.py:1260 +#: archaeological_operations/models.py:1377 msgctxt "key for text search" msgid "finds-deposit-date" msgstr "" -#: archaeological_operations/models.py:1264 +#: archaeological_operations/models.py:1381 msgctxt "key for text search" msgid "finds-provided" msgstr "" -#: archaeological_operations/models.py:1271 +#: archaeological_operations/models.py:1388 msgctxt "key for text search" msgid "finds-deadline" msgstr "" -#: archaeological_operations/models.py:1275 +#: archaeological_operations/models.py:1392 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1313 ishtar_common/models.py:4405 +#: archaeological_operations/models.py:1430 ishtar_common/models.py:4405 #: ishtar_common/models.py:4491 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1496 +#: archaeological_operations/models.py:1521 ishtar_common/models_common.py:3395 +msgid "Surface (m2)" +msgstr "" + +#: archaeological_operations/models.py:1613 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1504 +#: archaeological_operations/models.py:1621 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1540 +#: archaeological_operations/models.py:1657 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1563 +#: archaeological_operations/models.py:1680 msgid "Cached label" msgstr "" -#: archaeological_operations/models.py:1591 -#: archaeological_operations/templates/ishtar/sheet_site.html:85 +#: archaeological_operations/models.py:1708 +#: archaeological_operations/templates/ishtar/sheet_site.html:94 #: ishtar_common/models.py:1006 #: ishtar_common/templates/ishtar/sheet_document.html:125 #: ishtar_common/templates/ishtar/sheet_town.html:129 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1631 +#: archaeological_operations/models.py:1748 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1632 +#: archaeological_operations/models.py:1749 msgid "List of containers with finds related to this operation" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1750 msgid "List of containers with documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1634 +#: archaeological_operations/models.py:1751 msgid "List of containers with finds or documents related to this operation" msgstr "" -#: archaeological_operations/models.py:1751 +#: archaeological_operations/models.py:1868 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1846 +#: archaeological_operations/models.py:1963 msgid "No associated town" msgstr "" -#: archaeological_operations/models.py:1861 +#: archaeological_operations/models.py:1978 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:2004 +#: archaeological_operations/models.py:2121 msgid "context record" msgstr "" -#: archaeological_operations/models.py:2046 +#: archaeological_operations/models.py:2163 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:2094 -#: archaeological_operations/models.py:3100 +#: archaeological_operations/models.py:2211 +#: archaeological_operations/models.py:3217 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2155 +#: archaeological_operations/models.py:2272 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2165 +#: archaeological_operations/models.py:2282 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2173 +#: archaeological_operations/models.py:2290 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2181 +#: archaeological_operations/models.py:2298 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2235 +#: archaeological_operations/models.py:2352 #: 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:2296 -#: archaeological_operations/models.py:2375 +#: archaeological_operations/models.py:2413 +#: archaeological_operations/models.py:2492 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2340 +#: archaeological_operations/models.py:2457 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2385 +#: archaeological_operations/models.py:2502 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2484 +#: archaeological_operations/models.py:2601 #: ishtar_common/models_imports.py:1075 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2485 +#: archaeological_operations/models.py:2602 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2510 +#: archaeological_operations/models.py:2627 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2511 +#: archaeological_operations/models.py:2628 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2577 +#: archaeological_operations/models.py:2694 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2582 +#: archaeological_operations/models.py:2699 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2585 +#: archaeological_operations/models.py:2702 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2589 +#: archaeological_operations/models.py:2706 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2832 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2725 +#: archaeological_operations/models.py:2842 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2728 +#: archaeological_operations/models.py:2845 #: archaeological_warehouse/models.py:975 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2732 +#: archaeological_operations/models.py:2849 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2744 +#: archaeological_operations/models.py:2861 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2865 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2752 +#: archaeological_operations/models.py:2869 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2755 +#: archaeological_operations/models.py:2872 msgctxt "key for text search" msgid "signature" msgstr "" -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:2876 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2888 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:2892 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2778 +#: archaeological_operations/models.py:2895 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2782 +#: archaeological_operations/models.py:2899 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2786 +#: archaeological_operations/models.py:2903 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2790 +#: archaeological_operations/models.py:2907 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2794 +#: archaeological_operations/models.py:2911 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2798 +#: archaeological_operations/models.py:2915 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2801 +#: archaeological_operations/models.py:2918 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2804 +#: archaeological_operations/models.py:2921 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2808 +#: archaeological_operations/models.py:2925 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2812 +#: archaeological_operations/models.py:2929 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2816 +#: archaeological_operations/models.py:2933 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2937 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2824 +#: archaeological_operations/models.py:2941 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2858 +#: archaeological_operations/models.py:2975 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2920 +#: archaeological_operations/models.py:3037 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2926 +#: archaeological_operations/models.py:3043 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:3191 +#: archaeological_operations/models.py:3308 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3193 ishtar_common/models.py:2644 +#: archaeological_operations/models.py:3310 ishtar_common/models.py:2644 #: ishtar_common/models.py:2949 ishtar_common/models.py:3956 #: ishtar_common/models_common.py:3421 ishtar_common/models_common.py:3456 #: ishtar_common/models_common.py:4394 msgid "Cached name" msgstr "" -#: archaeological_operations/models.py:3485 ishtar_common/models.py:3821 +#: archaeological_operations/models.py:3602 ishtar_common/models.py:3821 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3500 +#: archaeological_operations/models.py:3617 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3501 +#: archaeological_operations/models.py:3618 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3523 ishtar_common/models.py:5338 +#: archaeological_operations/models.py:3640 ishtar_common/models.py:5338 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3526 +#: archaeological_operations/models.py:3643 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3527 +#: archaeological_operations/models.py:3644 msgid "Operation types old" msgstr "" @@ -7979,23 +8187,23 @@ msgstr "" msgid "Operation deletion" msgstr "" -#: archaeological_operations/views.py:693 ishtar_common/models.py:1015 +#: archaeological_operations/views.py:691 ishtar_common/models.py:1015 msgid "Site deletion" msgstr "" -#: archaeological_operations/views.py:773 +#: archaeological_operations/views.py:771 msgid "Operation: new administrative act" msgstr "" -#: archaeological_operations/views.py:790 +#: archaeological_operations/views.py:788 msgid "Operation: administrative act modification" msgstr "" -#: archaeological_operations/views.py:825 +#: archaeological_operations/views.py:823 msgid "Operation: administrative act deletion" msgstr "" -#: archaeological_operations/views.py:945 +#: archaeological_operations/views.py:943 msgid "" "Syntax error on the source template \"{}\" - contact your administrator and " "ask him to check the syntax of this document." @@ -8774,12 +8982,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:665 ishtar_common/views_item.py:1635 +#: ishtar_common/views_item.py:673 ishtar_common/views_item.py:1643 msgid "True" msgstr "" #: ishtar_common/admin.py:202 ishtar_common/models_imports.py:936 -#: ishtar_common/views_item.py:1637 +#: ishtar_common/views_item.py:1645 msgid "False" msgstr "" @@ -11567,10 +11775,6 @@ msgstr "" msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2939 ishtar_common/models.py:3057 -msgid "Types" -msgstr "" - #: ishtar_common/models.py:2944 msgid "Is attached to" msgstr "" @@ -13862,8 +14066,8 @@ msgstr "" msgid ", " msgstr "" -#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2808 -#: ishtar_common/utils.py:2816 +#: ishtar_common/templates/blocks/comma_list.html:1 ishtar_common/utils.py:2801 +#: ishtar_common/utils.py:2809 msgid "." msgstr "" @@ -14596,37 +14800,45 @@ msgid "Operations associees en tant que rapporteur CIRA" msgstr "" #: ishtar_common/templates/ishtar/sheet_person.html:103 -msgid "Associated archaeological sites as collaborator" +msgid "Associated archaeological sites as discoverer" msgstr "" #: ishtar_common/templates/ishtar/sheet_person.html:108 +msgid "Associated archaeological sites as collaborator" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_person.html:113 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:113 +#: ishtar_common/templates/ishtar/sheet_person.html:118 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:15 msgid "General contractor of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:118 +#: ishtar_common/templates/ishtar/sheet_person.html:123 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:24 msgid "Responsible for planning service of archaeological files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:140 +#: ishtar_common/templates/ishtar/sheet_person.html:128 +msgid "Associated context records as excavator" +msgstr "" + +#: ishtar_common/templates/ishtar/sheet_person.html:150 msgid "In charge of treatments" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:145 +#: ishtar_common/templates/ishtar/sheet_person.html:155 msgid "In charge of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:150 +#: ishtar_common/templates/ishtar/sheet_person.html:160 msgid "Applicant of treatment files" msgstr "" -#: ishtar_common/templates/ishtar/sheet_person.html:155 +#: ishtar_common/templates/ishtar/sheet_person.html:165 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:96 msgid "In charge of warehouses" msgstr "" @@ -15190,47 +15402,47 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:219 ishtar_common/views.py:126 +#: ishtar_common/utils.py:218 ishtar_common/views.py:126 msgid "You don't have sufficient permissions to do this action." msgstr "" -#: ishtar_common/utils.py:1019 +#: ishtar_common/utils.py:1018 msgid " (...)" msgstr "" -#: ishtar_common/utils.py:1099 +#: ishtar_common/utils.py:1098 msgid "Information" msgstr "" -#: ishtar_common/utils.py:1100 +#: ishtar_common/utils.py:1099 msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1999 +#: ishtar_common/utils.py:1992 msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/utils.py:2785 +#: ishtar_common/utils.py:2778 msgid "uppercase letter" msgstr "" -#: ishtar_common/utils.py:2786 +#: ishtar_common/utils.py:2779 msgid "lowercase letter" msgstr "" -#: ishtar_common/utils.py:2787 +#: ishtar_common/utils.py:2780 msgid "number" msgstr "" -#: ishtar_common/utils.py:2788 +#: ishtar_common/utils.py:2781 msgid "punctuation sign" msgstr "" -#: ishtar_common/utils.py:2807 +#: ishtar_common/utils.py:2800 msgid "This password must contain one of this character: " msgstr "" -#: ishtar_common/utils.py:2813 +#: ishtar_common/utils.py:2806 msgid "Your password must contain each of these characters: " msgstr "" @@ -15274,8 +15486,8 @@ msgstr "" msgid "New biographical note" msgstr "" -#: ishtar_common/views.py:1166 ishtar_common/views_item.py:230 -#: ishtar_common/views_item.py:273 ishtar_common/views_item.py:290 +#: ishtar_common/views.py:1166 ishtar_common/views_item.py:238 +#: ishtar_common/views_item.py:281 ishtar_common/views_item.py:298 msgid "Operation not permitted." msgstr "" @@ -15407,17 +15619,17 @@ msgstr "" msgid "Delete geographic item" msgstr "" -#: ishtar_common/views_item.py:239 +#: ishtar_common/views_item.py:247 #, python-format msgid "New %s" msgstr "" -#: ishtar_common/views_item.py:302 +#: ishtar_common/views_item.py:310 #, python-format msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:1044 +#: ishtar_common/views_item.py:1052 msgctxt "key for text search" msgid "today" msgstr "" |